Date: Sat, 24 May 2003 15:10:18 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Norikatsu Shigemura <nork@FreeBSD.org> Subject: ports/52642: www/horde2: chasing PEAR upgrade. Message-ID: <20030524131018.2B76C750E@graf.pompo.net> Resent-Message-ID: <200305241320.h4ODK4WC053215@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 52642 >Category: ports >Synopsis: www/horde2: chasing PEAR upgrade. >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 24 06:20:04 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.8-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.8-STABLE FreeBSD 4.8-STABLE #0: Tue Apr 29 18:16:35 CEST 2003 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: Fixing Horde to work with the new PEAR strcture. >How-To-Repeat: N/A. >Fix: Pre-requisite: to be applied after the upgrade of mail/pear-Mail_Mime and PR ports/52641. --- horde2.diff begins here --- diff -urN www/horde2.orig/Makefile www/horde2/Makefile --- www/horde2.orig/Makefile Tue Apr 29 23:47:35 2003 +++ www/horde2/Makefile Sat May 24 14:38:06 2003 @@ -7,6 +7,7 @@ PORTNAME= horde PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ftp://ftp.horde.org/pub/horde/ \ ftp://ftp.au.horde.org/pub/horde/ \ @@ -30,10 +31,10 @@ LIB_DEPENDS+= mcal.0:${PORTSDIR}/misc/libmcal .endif # Remark: pear-XML_sql2xml is included, but never used. -RUN_DEPENDS= ${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date \ - ${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select_Common \ - ${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log \ - ${PHP_LIB}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime +RUN_DEPENDS= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \ + ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common \ + ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \ + ${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime NO_BUILD= yes USE_REINPLACE= yes @@ -58,7 +59,7 @@ CONFDIR= ${HORDEDIR}/config APACHE_CONF= ${APACHE_CNFDIR}/httpd.conf -PHP_LIB?= ${LOCALBASE}/lib/php +PEARDIR?= ${LOCALBASE}/share/pear .if defined(WITH_APACHE2) APACHE_CNFDIR= ${LOCALBASE}/etc/apache2 MOD_DIR= libexec/apache2 @@ -149,11 +150,11 @@ ${MKDIR} ${HORDE_INC} ; \ ${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \ ${REINPLACE_CMD} -e "s:/home/httpd/html/horde:${HORDEDIR}:g ; \ - s:/home/httpd/phplib:${PHP_LIB}:g" ${HORDE_INC}/httpd.conf.horde ; \ + s:/home/httpd/phplib:${PEARDIR}:g" ${HORDE_INC}/httpd.conf.horde ; \ ${RM} ${HORDE_INC}/httpd.conf.horde.beforeHorde ; \ ${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \ ${REINPLACE_CMD} -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g ; \ - s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \ + s:${HORDEDIR}/phplib:${PEARDIR}:g" ${APACHE_CONF} ; \ ${ECHO_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \ ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \ fi) --- horde2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030524131018.2B76C750E>