From alex@armada.alexdupre.com  Sat Jan 10 06:24:45 2004
Return-Path: <alex@armada.alexdupre.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3E10516A4CE; Sat, 10 Jan 2004 06:24:45 -0800 (PST)
Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D780D43D41; Sat, 10 Jan 2004 06:24:43 -0800 (PST)
	(envelope-from alex@armada.alexdupre.com)
Received: from armada.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245])
	by relay.gufi.org (Postfix) with ESMTP
	id A9C8620F53; Sat, 10 Jan 2004 15:24:42 +0100 (CET)
Received: from armada.alexdupre.com (localhost.alexdupre.com [127.0.0.1])
	by armada.alexdupre.com (8.12.10/8.12.10) with ESMTP id i0AEOgpH039059;
	Sat, 10 Jan 2004 15:24:42 +0100 (CET)
	(envelope-from alex@armada.alexdupre.com)
Received: (from alex@localhost)
	by armada.alexdupre.com (8.12.10/8.12.10/Submit) id i0AEOgM9039058;
	Sat, 10 Jan 2004 15:24:42 +0100 (CET)
	(envelope-from alex)
Message-Id: <200401101424.i0AEOgM9039058@armada.alexdupre.com>
Date: Sat, 10 Jan 2004 15:24:42 +0100 (CET)
From: Alex Dupre <ale@freebsd.org>
Reply-To: Alex Dupre <ale@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nork@freebsd.org
Subject: [Maintainer Patch] Port: lang/php5
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61171
>Category:       ports
>Synopsis:       [Maintainer Patch] Port: lang/php5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 10 06:30:18 PST 2004
>Closed-Date:    Sat Jan 10 08:50:05 PST 2004
>Last-Modified:  Sat Jan 10 08:50:05 PST 2004
>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@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:
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Sat Jan 10 08:49:54 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61171 
>Unformatted:
