From alex@vaio.alexdupre.com  Thu Jun 26 15:12:38 2003
Return-Path: <alex@vaio.alexdupre.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 97C3F37B401; Thu, 26 Jun 2003 15:12:38 -0700 (PDT)
Received: from vaio.alexdupre.com (ppp-190-67.30-151.libero.it [151.30.67.190])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7E8D243FF3; Thu, 26 Jun 2003 15:12:36 -0700 (PDT)
	(envelope-from alex@vaio.alexdupre.com)
Received: from vaio.alexdupre.com (localhost [127.0.0.1])
	by vaio.alexdupre.com (8.12.9/8.12.9) with ESMTP id h5QMCXAT000366;
	Fri, 27 Jun 2003 00:12:33 +0200 (CEST)
	(envelope-from alex@vaio.alexdupre.com)
Received: (from alex@localhost)
	by vaio.alexdupre.com (8.12.9/8.12.9/Submit) id h5QMCWjF000365;
	Fri, 27 Jun 2003 00:12:32 +0200 (CEST)
Message-Id: <200306262212.h5QMCWjF000365@vaio.alexdupre.com>
Date: Fri, 27 Jun 2003 00:12:32 +0200 (CEST)
From: Alex Dupre <sysadmin@alexdupre.com>
Reply-To: Alex Dupre <sysadmin@alexdupre.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: nork@freebsd.org
Subject: [Maintainer Update] Port: lang/php4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         53800
>Category:       ports
>Synopsis:       [Maintainer Update] Port: lang/php4
>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:   Thu Jun 26 15:20:11 PDT 2003
>Closed-Date:    Wed Jul 02 22:51:37 PDT 2003
>Last-Modified:  Wed Jul 02 22:51:37 PDT 2003
>Originator:     Alex Dupre
>Release:        FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Add WANT_PHP_WEB knob, for ports that require a web server to work, but for
which is indifferent the PHP sapi (CGI or Apache Module).
>How-To-Repeat:
>Fix:

--- php4.diff begins here ---
--- bsd.php.mk.orig	Thu Jun 26 23:52:18 2003
+++ bsd.php.mk	Fri Jun 27 00:07:01 2003
@@ -6,6 +6,7 @@
 # WANT_PHP_CLI=yes - Want the CLI version of PHP.
 # WANT_PHP_CGI=yes - Want the CGI version of PHP.
 # WANT_PHP_MOD=yes - Want the Apache Module for PHP.
+# WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP.
 #
 # You may combine multiple WANT_PHP_* knobs.
 # Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI.
@@ -45,6 +46,17 @@
 	@${FALSE}
 .else
 PHP_PORT?=	${PORTSDIR}/lang/php4-cli
+.endif
+.endif
+
+.if defined(WANT_PHP_WEB)
+.if defined(HAVE_PHP) && !defined(HAVE_PHP_CGI) && !defined(HAVE_PHP_MOD)
+.BEGIN:
+        @${ECHO_CMD} "This port requires the Apache Module or the CGI version of PHP, but you have"
+        @${ECHO_CMD} "already installed a conflicting PHP port without them."
+        @${FALSE}
+.else
+PHP_PORT?=	${PORTSDIR}/www/mod_php4
 .endif
 .endif
 
--- php4.diff ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Wed Jul 2 22:51:28 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

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