ports/61171: [Maintainer Patch] Port: lang/php5

Alex Dupre ale at FreeBSD.org
Sat Jan 10 14:30:28 UTC 2004


>Number:         61171
>Category:       ports
>Synopsis:       [Maintainer Patch] Port: lang/php5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 10 06:30:18 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed Jan 7 02:41:45 CET 2004 alex at armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
Adapt php5 Makefile to support apache2-worker.

Well, the previous patch fix PR 56205.
php5 could be installed already with apache2-worker using a wrong extdir, this
is the reason for the portrevision bump.

	
>How-To-Repeat:
	
>Fix:

	

--- php5.diff begins here ---
diff -ruN php5.orig/Makefile php5/Makefile
--- php5.orig/Makefile	Sat Jan 10 13:45:14 2004
+++ php5/Makefile	Sat Jan 10 14:05:20 2004
@@ -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 @@
 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 @@
 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}
@@ -539,6 +539,11 @@
 .endif
 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}
--- php5.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list