From owner-freebsd-ports  Mon Oct  8 13: 0:10 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 62E7D37B405
	for <freebsd-ports@hub.freebsd.org>; Mon,  8 Oct 2001 13:00:03 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f98K03978473;
	Mon, 8 Oct 2001 13:00:03 -0700 (PDT)
	(envelope-from gnats)
Date: Mon, 8 Oct 2001 13:00:03 -0700 (PDT)
Message-Id: <200110082000.f98K03978473@freefall.freebsd.org>
To: freebsd-ports@FreeBSD.org
Cc: 
From: Thierry Thomas <thierry@thomas.as>
Subject: Re: ports/31089: Port www/horde: minor patch to make the configuration easier.
Reply-To: Thierry Thomas <thierry@thomas.as>
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org

The following reply was made to PR ports/31089; it has been noted by GNATS.

From: Thierry Thomas <thierry@thomas.as>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: ports/31089: Port www/horde: minor patch to make the configuration easier.
Date: Mon, 8 Oct 2001 21:56:18 +0200

 Le  6 Oct 01 à 23:22:17 +0000, Thierry Thomas écrivait :
 > >Description:
 > 	Trying to make the post-install configuration easier.
 > 	No need to upgrade if you already have Horde running.
 > >How-To-Repeat:
 > 	Apply the included patch.
 
 Please, replace the patch enclosed in PR/31089 with the following one:
 
 
 --- Makefile.orig	Tue Sep 18 21:22:27 2001
 +++ Makefile	Mon Oct  8 21:22:55 2001
 @@ -50,6 +50,8 @@
  APACHE_CONF=	${APACHE_CNFDIR}/httpd.conf
  MIMETYPES=	${APACHE_CNFDIR}/mime.types
  
 +PHP_CNFDIR?=	${LOCALBASE}/etc
 +
  pre-everything::
  .if !defined(WITHOUT_SSL)
  	@${ECHO_MSG} ""
 @@ -89,6 +91,11 @@
  	${CP}     ${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3
  	${CHMOD}  444 ${HORDEDIR}/config/horde.php3
  	${CHMOD}  444 ${HORDEDIR}/setup.php3
 +	${PERL} -pi -e "s:/usr/local/apache/php:${PHPLIBDIR}:g" ${PHPLIBDIR}/README
 +	${PERL} -pi -e "s:horde/docs:${DOCSDIR}:g" ${PHPLIBDIR}/README
 +	${PERL} -pi -e "s:/usr/lib:${PHP_CNFDIR}:g" ${PHPLIBDIR}/README
 +	${PERL} -pi -e "s:horde/scripts:${HORDEDIR}/scripts:g" ${PHPLIBDIR}/README
 +	${PERL} -pi -e "s:horde/docs:${DOCSDIR}:g" ${HORDEDIR}/scripts/database/MYSQL
  .if !defined(WITH_PHP3)
  # Enabling execution of .php3, in case you only run php4
  	@(if [ -f ${MIMETYPES} ] ; then \
 @@ -108,13 +115,11 @@
  	@(if [ -f ${APACHE_CONF} ] ; then \
  	    (if [ ! -f ${APACHE_CONF}.beforeHorde ] ; then \
  		${ECHO} "===> Updating httpd.conf..." ; \
 -		${CP} -p ${.CURDIR}/httpd.conf.phplib ${WRKDIR}/httpd.conf.phplib.orig ; \
 +		${CP} -p ${.CURDIR}/httpd.conf.phplib ${WRKDIR}/httpd.conf.phplib ; \
  		${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
  		${PERL} -pi -e "s:/home/httpd/phplib:${PHPLIBDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
  		${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
  		${GREP} -qw 'phplib' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.phplib >> ${APACHE_CONF} ; \
 -		${RM} ${.CURDIR}/httpd.conf.phplib ; \
 -		${MV} ${.CURDIR}/httpd.conf.phplib.orig ${.CURDIR}/httpd.conf.phplib ; \
  	    fi) ; \
  	fi)
  .if !defined(NOPORTDOCS)
 
 
 [end of patch]
 There was a mistake when copying httpd.conf.phplib.
 
 Best regards,
 -- 
 Th. Thomas.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message