From owner-freebsd-ports Sat Oct 6 14:40:24 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 6BF8F37B405 for ; Sat, 6 Oct 2001 14:40:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f96Le1X05627; Sat, 6 Oct 2001 14:40:01 -0700 (PDT) (envelope-from gnats) Received: from postfix2-2.free.fr (postfix2-2.free.fr [213.228.0.140]) by hub.freebsd.org (Postfix) with ESMTP id 56F2B37B401 for ; Sat, 6 Oct 2001 14:38:24 -0700 (PDT) Received: from graf.pompo.net (lyon-2-a7-59-80.dial.proxad.net [212.27.59.80]) by postfix2-2.free.fr (Postfix) with ESMTP id A183A5F825 for ; Sat, 6 Oct 2001 23:38:21 +0200 (CEST) Received: by graf.pompo.net (Postfix, from userid 1001) id 00CC67676; Sat, 6 Oct 2001 23:22:17 +0200 (CEST) Message-Id: <20011006212217.00CC67676@graf.pompo.net> Date: Sat, 6 Oct 2001 23:22:17 +0200 (CEST) From: Thierry Thomas Reply-To: Thierry Thomas To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/31089: Port www/horde: minor patch to make the configuration easier. Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 31089 >Category: ports >Synopsis: Port www/horde: minor patch to make the configuration easier. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 06 14:40:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.4-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Sep 22 10:41:40 CEST 2001 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386 >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. >Fix: --- Makefile.orig Tue Sep 18 21:22:27 2001 +++ Makefile Sat Oct 6 23:20:18 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 \ @@ -109,12 +116,11 @@ (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) >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message