diff options
author | Alex Dupre <ale@FreeBSD.org> | 2004-01-14 15:09:26 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2004-01-14 15:09:26 +0000 |
commit | e40c46e6b2485d27f12d93dffa6058c6fd546dd4 (patch) | |
tree | de553ca3ad2bb6ff6032957aa27de2b41213b435 /lang | |
parent | Update to recent snapshot. I hope 0.9.5 will be released soon... (diff) |
- Fix apache2 dependency (this was broken by the introduction
of the APACHE_PORT variable in bsd.port.mk).
- Fix php5 pkg-list when built without sqlite.
Approved by: nork (mentor/implicitly)
Notes
Notes:
svn path=/head/; revision=98161
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php4/Makefile | 2 | ||||
-rw-r--r-- | lang/php5/Makefile | 3 | ||||
-rw-r--r-- | lang/php53/Makefile | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 507ff908739c..7a3a04e19d74 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -534,7 +534,7 @@ APACHE_MPM!= ${APXS} -q MPM_NAME .endif .if defined(WITH_APACHE2) APACHE_MPM?= ${WITH_MPM} -APACHE_PORT?= www/apache2 +APACHE_PORT= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp4.so .if ${APACHE_MPM} == "worker" diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 72da22c10905..16342a80468f 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -526,7 +526,7 @@ APACHE_MPM!= ${APXS} -q MPM_NAME .endif .if defined(WITH_APACHE2) APACHE_MPM?= ${WITH_MPM} -APACHE_PORT?= www/apache2 +APACHE_PORT= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so .if ${APACHE_MPM} == "worker" @@ -673,6 +673,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc + @${TOUCH} ${PREFIX}/include/php/ext/sqlite/libsqlite/src/sqlite.h .if !defined(WITHOUT_APACHE) @${ECHO_CMD} "*****************************************************************************" @${ECHO_CMD} "" diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 72da22c10905..16342a80468f 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -526,7 +526,7 @@ APACHE_MPM!= ${APXS} -q MPM_NAME .endif .if defined(WITH_APACHE2) APACHE_MPM?= ${WITH_MPM} -APACHE_PORT?= www/apache2 +APACHE_PORT= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so .if ${APACHE_MPM} == "worker" @@ -673,6 +673,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc @${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc @${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc + @${TOUCH} ${PREFIX}/include/php/ext/sqlite/libsqlite/src/sqlite.h .if !defined(WITHOUT_APACHE) @${ECHO_CMD} "*****************************************************************************" @${ECHO_CMD} "" |