From delphij@frontfree.net  Wed Jan 14 04:10:41 2004
Return-Path: <delphij@frontfree.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8022916A4CE; Wed, 14 Jan 2004 04:10:41 -0800 (PST)
Received: from ftp.bjpu.edu.cn (ftp.bjpu.edu.cn [202.112.78.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5760543D53; Wed, 14 Jan 2004 04:10:40 -0800 (PST)
	(envelope-from delphij@frontfree.net)
Received: by ftp.bjpu.edu.cn (Postfix, from userid 426)
	id 1880552D4; Wed, 14 Jan 2004 20:10:39 +0800 (CST)
Received: from beastie.frontfree.net (beastie.frontfree.net [218.107.145.7])
	by ftp.bjpu.edu.cn (Postfix) with ESMTP
	id BAAA55299; Wed, 14 Jan 2004 20:10:38 +0800 (CST)
Received: by beastie.frontfree.net (Postfix, from userid 1001)
	id 49C4611703; Wed, 14 Jan 2004 20:10:37 +0800 (CST)
Message-Id: <20040114121037.49C4611703@beastie.frontfree.net>
Date: Wed, 14 Jan 2004 20:10:37 +0800 (CST)
From: Xin LI <delphij@frontfree.net>
Reply-To: Xin LI <delphij@frontfree.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: simond@irrelevant.org;, ale@FreeBSD.org
Subject: [PATCH] Unify PHP detection for ports/mail/squirrelmail
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61359
>Category:       ports
>Synopsis:       [PATCH] Unify PHP detection for ports/mail/squirrelmail
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 14 04:20:13 PST 2004
>Closed-Date:    Wed Jan 14 06:03:35 PST 2004
>Last-Modified:  Wed Jan 14 06:03:35 PST 2004
>Originator:     Xin LI
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
The FreeBSD Simplified Chinese Project
>Environment:
System: FreeBSD beastie.frontfree.net 5.2-RELEASE FreeBSD 5.2-RELEASE #16: Sat Jan 10 15:24:09 CST 2004 delphij@beastie.frontfree.net:/usr/obj/usr/src/sys/BEASTIE i386

>Description:
	The PHP detection logic in ports/lang/php4/bsd.php.mk works better than
the one I have submitted as ports/43227 (rev 1.7 of Makefile). So utilize it.
>How-To-Repeat:
>Fix:

	Apply the following patch

--- patch begins here ---
Index: mail/squirrelmail/Makefile
===================================================================
RCS file: /home/mirror/freebsd/ncvs/ports/mail/squirrelmail/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- mail/squirrelmail/Makefile	13 Jan 2004 15:59:50 -0000	1.18
+++ mail/squirrelmail/Makefile	14 Jan 2004 11:58:23 -0000
@@ -17,11 +17,9 @@
 
 CONFLICTS?=	ja-squirrelmail-1.*
 
-.if defined(WITH_APACHE2)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
-.endif
+WANT_PHP_MOD=	yes
+PHP_VER=	4
+.include <../../lang/php4/bsd.php.mk>
 
 USE_BZIP2=	yes
 
--- patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: ale 
Responsible-Changed-When: Wed Jan 14 04:29:33 PST 2004 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61359 
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Wed Jan 14 06:03:01 PST 2004 
State-Changed-Why:  
A slightly different patch has been committed, thanks! 

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