From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 10 06:30:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB91F16A4CE for ; Sat, 10 Jan 2004 06:30:28 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BC2143D48 for ; Sat, 10 Jan 2004 06:30:18 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0AEUIFR005258 for ; Sat, 10 Jan 2004 06:30:18 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0AEUITq005257; Sat, 10 Jan 2004 06:30:18 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 10 Jan 2004 06:30:18 -0800 (PST) Resent-Message-Id: <200401101430.i0AEUITq005257@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1817116A4CE; Sat, 10 Jan 2004 06:20:23 -0800 (PST) Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id E014D43D6E; Sat, 10 Jan 2004 06:20:14 -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 BBA3620F4E; Sat, 10 Jan 2004 15:20:12 +0100 (CET) Received: from armada.alexdupre.com (localhost.alexdupre.com [127.0.0.1]) i0AEKCpH038962; Sat, 10 Jan 2004 15:20:12 +0100 (CET) (envelope-from alex@armada.alexdupre.com) Received: (from alex@localhost) by armada.alexdupre.com (8.12.10/8.12.10/Submit) id i0AEKBHd038961; Sat, 10 Jan 2004 15:20:11 +0100 (CET) (envelope-from alex) Message-Id: <200401101420.i0AEKBHd038961@armada.alexdupre.com> Date: Sat, 10 Jan 2004 15:20:11 +0100 (CET) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: nork@FreeBSD.org Subject: ports/61169: [Maintainer Patch] Port: lang/php4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jan 2004 14:30:29 -0000 >Number: 61169 >Category: ports >Synopsis: [Maintainer Patch] Port: lang/php4 >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:17 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@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386 >Description: Adapt php4 Makefile and bsd.php.mk to support apache2-worker. Small other fixes. >How-To-Repeat: >Fix: --- php4.diff begins here --- diff -ruN php4.orig/Makefile php4/Makefile --- php4.orig/Makefile Sat Jan 10 11:12:41 2004 +++ php4/Makefile Sat Jan 10 14:25:45 2004 @@ -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= php4-cli-4* mod_php4-4* php4-cgi-4* .if defined(WITHOUT_APACHE) .if defined(WITHOUT_CLI) @@ -535,11 +530,16 @@ .if !defined(WITHOUT_APACHE) .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/libphp4.so +.if ${APACHE_MPM} == "worker" +EXT_DIR:= ${EXT_DIR}-zts +.endif .else APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} @@ -549,6 +549,11 @@ 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} \ EXT_DIR=${EXT_DIR} @@ -675,7 +680,6 @@ @${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}/lib/php/${EXT_DIR}/.php .if !defined(WITHOUT_APACHE) @${ECHO_CMD} "*****************************************************************************" @${ECHO_CMD} "" diff -ruN php4.orig/bsd.php.mk php4/bsd.php.mk --- php4.orig/bsd.php.mk Sat Jan 10 11:12:41 2004 +++ php4/bsd.php.mk Sat Jan 10 13:55:03 2004 @@ -18,10 +18,21 @@ .endif PHP_VER?= 4 -.if !defined(WITH_DEBUG) -PHP_EXT_DIR?= 20020429 +.if !defined(PHP_EXT_DIR) +PHP_EXT_DIR= 20020429 +.if exists(${LOCALBASE}/include/apache2/apr.h) +APACHE_MPM!= ${APXS} -q MPM_NAME +.if ${APACHE_MPM} == "worker" +PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts +.endif .else -PHP_EXT_DIR?= 20020429-debug +.if defined(WITH_APACHE2) && defined(WITH_MPM) && ${WITH_MPM} == "worker" +PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts +.endif +.endif +.if defined(WITH_DEBUG) +PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug +.endif .endif .if !defined(WITHOUT_PEAR) PHP_PEAR?= yes @@ -32,7 +43,7 @@ .if defined(BROKEN_WITH_PHP) . for VER in ${BROKEN_WITH_PHP} -. if (${PHP_VER} == "${VER}") +. if ${PHP_VER} == "${VER}" BROKEN= "Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP})" . endif . endfor diff -ruN php4.orig/pkg-plist php4/pkg-plist --- php4.orig/pkg-plist Sat Jan 10 11:12:41 2004 +++ php4/pkg-plist Sat Jan 10 13:38:25 2004 @@ -193,7 +193,6 @@ include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h -lib/php/%%EXT_DIR%%/.php lib/php/build/Makefile.global lib/php/build/acinclude.m4 lib/php/build/mkdep.awk @@ -242,6 +241,7 @@ @dirrm include/php/main @dirrm include/php/regex @dirrm include/php/ +@exec mkdir %D/lib/php/%%EXT_DIR%% @unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true @dirrm lib/php/build @unexec rmdir %D/lib/php 2> /dev/null || true --- php4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: