From thierry@pompo.net  Wed Mar  5 12:11:45 2003
Return-Path: <thierry@pompo.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A8F0E37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Mar 2003 12:11:45 -0800 (PST)
Received: from lautre.net (estelle.lautre.net [80.67.164.8])
	by mx1.FreeBSD.org (Postfix) with SMTP id 6E79E43F75
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Mar 2003 12:11:44 -0800 (PST)
	(envelope-from thierry@pompo.net)
Received: (qmail 26764 invoked by alias); 5 Mar 2003 20:11:39 -0000
Received: from unknown (HELO graf.pompo.net) (62.147.51.187)
  by estelle.lautre.net with SMTP; 5 Mar 2003 20:11:39 -0000
Received: by graf.pompo.net (Postfix, from userid 1001)
	id 7D5FD7629; Wed,  5 Mar 2003 21:10:46 +0100 (CET)
Message-Id: <20030305201046.7D5FD7629@graf.pompo.net>
Date: Wed,  5 Mar 2003 21:10:46 +0100 (CET)
From: Thierry Thomas <thierry@pompo.net>
Reply-To: Thierry Thomas <thierry@pompo.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Martin Matuska <martin@tradex.sk>
Subject: www/horde2 & devel/pear-install: adding support of Apache2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48954
>Category:       ports
>Synopsis:       www/horde2 & devel/pear-install: adding support of Apache2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 05 12:20:04 PST 2003
>Closed-Date:    Sat Mar 29 17:50:13 PST 2003
>Last-Modified:  Sat Mar 29 17:50:13 PST 2003
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.8-PRERELEASE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.8-PRERELEASE FreeBSD 4.8-PRERELEASE #0: Fri Feb 28 22:45:45 CET 2003 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	Adding a knob WITH_APACHE2, to support Apache2's dependences.

	Noticed by Martin Matuska <martin@tradex.sk>.

>How-To-Repeat:
	Install www/mod_php4 WITH_APACHE2, then try to install www/horde2
	& devel/pear-install: they don't check the good directories.

>Fix:
	Please apply the following patches:



--- devel/pear-install/Makefile.orig	Sat Feb 22 22:14:00 2003
+++ devel/pear-install/Makefile	Tue Mar  4 22:43:40 2003
@@ -16,7 +16,11 @@
 COMMENT=	Prepare the installation of the PEAR framework
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/php-config:${PORTSDIR}/www/mod_php4
+.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
 
 NO_BUILD=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/pear
@@ -27,7 +31,7 @@
 PHP_VERSION!=	${LOCALBASE}/bin/php-config --version
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
 .else
-PHP_VERSION=	4.3.0
+PHP_VERSION=	4.3.1
 .endif
 LPHP_LIB=	lib/php
 



--- www/horde2/Makefile.orig	Mon Feb 24 19:07:02 2003
+++ www/horde2/Makefile	Wed Mar  5 20:58:10 2003
@@ -59,10 +59,16 @@
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
 CONFDIR=	${HORDEDIR}/config
 
-APACHE_CNFDIR?=	${LOCALBASE}/etc/apache
 APACHE_CONF=	${APACHE_CNFDIR}/httpd.conf
 PHP_LIB?=	${LOCALBASE}/lib/php
-PHPSO?=		${LOCALBASE}/libexec/apache/libphp4.so
+.if defined(WITH_APACHE2)
+APACHE_CNFDIR=	${LOCALBASE}/etc/apache2
+MOD_DIR=	libexec/apache2
+.else
+APACHE_CNFDIR=	${LOCALBASE}/etc/apache
+MOD_DIR=	libexec/apache
+.endif
+PHPSO=		${LOCALBASE}/${MOD_DIR}/libphp4.so
 HORDE_INC=	${PREFIX}/etc/horde
 LOG_FILE?=	/var/log/horde.log

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sat Mar 29 17:50:09 PST 2003 
State-Changed-Why:  
Commited, thanks! 

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