mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Back out last commit (autodetection of apache2) for now.

Browse Source 
It's causing too many problems due to inclusion of bsd.port.pre.mk/
bsd.port.post.mk and Makefile.inc.

This needs further investigation.

Reported by:	many
This commit is contained in:
Dirk Froemberg 2002-11-23 20:49:41 +00:00
parent 1b3325c535
commit 3a0f8513a1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=70898
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/mod_php4/Makefile
View File

@ -37,12 +37,6 @@ SLAVEDIRS= lang/php4
USE_BZIP2= yes
USE_SUBMAKE= yes
USE_AUTOCONF_VER=213
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/include/apache2/apr.h)
WITH_APACHE2= yes
.endif
.if defined(WITH_APACHE2)
APACHE_PORT?= ${PORTSDIR}/www/apache2
.else
@ -91,14 +85,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
.if !defined(STANDALONE)
.if !defined(WITH_APACHE2)
.if !defined(STANDALONE) && !defined(WITH_APACHE2)
@${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module."
@${ECHO_CMD} ""
.else
@${ECHO_CMD} "Building mod_php4 as an apache2 module."
@${ECHO_CMD} ""
.endif
.endif
post-install:
@ -131,4 +120,4 @@ post-clean:
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

15
www/mod_php5/Makefile
View File

@ -37,12 +37,6 @@ SLAVEDIRS= lang/php4
USE_BZIP2= yes
USE_SUBMAKE= yes
USE_AUTOCONF_VER=213
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/include/apache2/apr.h)
WITH_APACHE2= yes
.endif
.if defined(WITH_APACHE2)
APACHE_PORT?= ${PORTSDIR}/www/apache2
.else
@ -91,14 +85,9 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
pre-fetch:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
.if !defined(STANDALONE)
.if !defined(WITH_APACHE2)
.if !defined(STANDALONE) && !defined(WITH_APACHE2)
@${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module."
@${ECHO_CMD} ""
.else
@${ECHO_CMD} "Building mod_php4 as an apache2 module."
@${ECHO_CMD} ""
.endif
.endif
post-install:
@ -131,4 +120,4 @@ post-clean:
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>