diff options
| author | nork <nork@FreeBSD.org> | 2004-01-11 00:49:00 +0800 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2004-01-11 00:49:00 +0800 |
| commit | ce164cfa98bb24bc714313642d85a8d9601db155 (patch) | |
| tree | 856aed127bbbbae13bcdd7c2a4e619cbdb1e6512 | |
| parent | 8c3210d956ebe1ab4797240552fee5c595f93a20 (diff) | |
| download | freebsd-ports-gnome-ce164cfa98bb24bc714313642d85a8d9601db155.tar.gz freebsd-ports-gnome-ce164cfa98bb24bc714313642d85a8d9601db155.tar.zst freebsd-ports-gnome-ce164cfa98bb24bc714313642d85a8d9601db155.zip | |
Adapt php5 Makefile to support apache2-worker.
PR: ports/56205[1], ports/61171 [2]
Submitted by: Christian Ullrich <chris+freebsd@chrullrich.de>
ale (maintainer) [2]
| -rw-r--r-- | lang/php5/Makefile | 17 | ||||
| -rw-r--r-- | lang/php53/Makefile | 17 |
2 files changed, 22 insertions, 12 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index e8c890db86ac..72da22c10905 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -21,7 +21,7 @@ PORTNAME= php5 PORTVERSION= 5.0.0.a4 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ http://it.php.net/distributions/:release \ @@ -87,11 +87,6 @@ CONFIGURE_ARGS+=--with-regex=apache EXT_DIR= 20020429 SAPI_FILE= "@comment " -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug -EXT_DIR:= ${EXT_DIR}-debug -.endif - CONFLICTS= php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) @@ -527,11 +522,16 @@ CONFIGURE_ARGS+=--with-zlib APXS?= ${LOCALBASE}/sbin/apxs .if exists(${LOCALBASE}/include/apache2/apr.h) WITH_APACHE2= yes +APACHE_MPM!= ${APXS} -q MPM_NAME .endif .if defined(WITH_APACHE2) +APACHE_MPM?= ${WITH_MPM} APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so +.if ${APACHE_MPM} == "worker" +EXT_DIR:= ${EXT_DIR}-zts +.endif .else APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} @@ -541,6 +541,11 @@ BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +EXT_DIR:= ${EXT_DIR}-debug +.endif + PLIST_SUB+= SAPI_FILE=${SAPI_FILE} .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) diff --git a/lang/php53/Makefile b/lang/php53/Makefile index e8c890db86ac..72da22c10905 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -21,7 +21,7 @@ PORTNAME= php5 PORTVERSION= 5.0.0.a4 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ http://it.php.net/distributions/:release \ @@ -87,11 +87,6 @@ CONFIGURE_ARGS+=--with-regex=apache EXT_DIR= 20020429 SAPI_FILE= "@comment " -.if defined(WITH_DEBUG) -CONFIGURE_ARGS+=--enable-debug -EXT_DIR:= ${EXT_DIR}-debug -.endif - CONFLICTS= php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) @@ -527,11 +522,16 @@ CONFIGURE_ARGS+=--with-zlib APXS?= ${LOCALBASE}/sbin/apxs .if exists(${LOCALBASE}/include/apache2/apr.h) WITH_APACHE2= yes +APACHE_MPM!= ${APXS} -q MPM_NAME .endif .if defined(WITH_APACHE2) +APACHE_MPM?= ${WITH_MPM} APACHE_PORT?= www/apache2 CONFIGURE_ARGS+=--with-apxs2=${APXS} SAPI_FILE= libexec/apache2/libphp5.so +.if ${APACHE_MPM} == "worker" +EXT_DIR:= ${EXT_DIR}-zts +.endif .else APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} @@ -541,6 +541,11 @@ BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+=--enable-debug +EXT_DIR:= ${EXT_DIR}-debug +.endif + PLIST_SUB+= SAPI_FILE=${SAPI_FILE} .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) |