1 files changed, 43 insertions, 55 deletions

diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 6bd1e63290f7..5d24b7e0a61a 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC2
+DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
 
 MAINTAINER=	thierry@thomas.as
 
@@ -34,8 +34,10 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/php/Cache/DB.php:${PORTSDIR}/devel/pear
 #RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
 NO_BUILD=	yes
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/CODING_STANDARDS \
-		docs/HELP docs/INSTALL docs/RELEASE
+DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS docs/CREDITS \
+		docs/HELP docs/INSTALL docs/LISTS docs/SOURCE
+CONFFILE=	html.php lang.php mime_drivers.php mime_mapping.php \
+		motd.php registry.php
 
 LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
@@ -44,10 +46,12 @@ PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
+CONFDIR=	${HORDEDIR}/config
 
 APACHE_CNFDIR?=	${LOCALBASE}/etc/apache
 APACHE_CONF=	${APACHE_CNFDIR}/httpd.conf
 PHP_LIB?=	${LOCALBASE}/lib/php
+HORDE_INC=	${PREFIX}/etc/horde
 LOG_FILE?=	/var/log/horde.log
 
 pre-everything::
@@ -59,8 +63,8 @@ pre-everything::
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "If you plan to install IMP, it is better to configure"
-	@${ECHO_MSG} "PHP with IMAP, OpenLDAP, OpenSSL, mcrypt, XML, FTP,"
-	@${ECHO_MSG} "gettext, pspell, zlib, MCAL and"
+	@${ECHO_MSG} "PHP with IMAP / IMAP-SSL, OpenLDAP, OpenSSL, mcrypt, XML,"
+	@${ECHO_MSG} "FTP, gettext, pspell, zlib, MCAL and"
 	@${ECHO_MSG} "a database (like MySQL or PostgreSQL)."
 	@${ECHO_MSG} ""
 
@@ -79,63 +83,47 @@ pre-install:
 	fi
 
 do-install:
-	${MKDIR}  ${HORDEDIR}
-	${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${HORDEDIR}
-	${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${HORDEDIR}
-	${CP} -Rp ${WRKSRC}/po ${WRKSRC}/admin ${WRKSRC}/util ${HORDEDIR}
-	${CP} -p  ${WRKSRC}/*.php ${HORDEDIR}
-	@if [ ! -f ${HORDEDIR}/config/horde.php ]; then \
-		${CP} ${HORDEDIR}/config/horde.php.dist ${HORDEDIR}/config/horde.php ; \
+	@${MKDIR}  ${HORDEDIR}
+	@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${HORDEDIR}
+	@${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${HORDEDIR}
+	@${CP} -Rp ${WRKSRC}/po ${WRKSRC}/admin ${WRKSRC}/util ${HORDEDIR}
+	@${CP} -p  ${WRKSRC}/*.php ${HORDEDIR}
+	@if [ ! -f ${CONFDIR}/horde.php ]; then \
+		${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \
 		${PERL} -pi -e "s:/var/www/htdocs/horde/templates:${HORDEDIR}/templates:g" \
-			${HORDEDIR}/config/horde.php ; \
-		${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${HORDEDIR}/config/horde.php ; \
+			${CONFDIR}/horde.php ; \
+		${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
 	fi
-	@if [ ! -f ${HORDEDIR}/config/html.php ]; then \
-		${CP} ${HORDEDIR}/config/html.php.dist ${HORDEDIR}/config/html.php ; \
+.for FILE in ${CONFFILE}
+	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
+	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
 	fi
-	@if [ ! -f ${HORDEDIR}/config/lang.php ]; then \
-		${CP} ${HORDEDIR}/config/lang.php.dist ${HORDEDIR}/config/lang.php ; \
-	fi
-	@if [ ! -f ${HORDEDIR}/config/mime_drivers.php ]; then \
-		${CP} ${HORDEDIR}/config/mime_drivers.php.dist ${HORDEDIR}/config/mime_drivers.php ; \
-	fi
-	@if [ ! -f ${HORDEDIR}/config/mime_mapping.php ]; then \
-		${CP} ${HORDEDIR}/config/mime_mapping.php.dist ${HORDEDIR}/config/mime_mapping.php ; \
-	fi
-	@if [ ! -f ${HORDEDIR}/config/motd.php ]; then \
-		${CP} ${HORDEDIR}/config/motd.php.dist ${HORDEDIR}/config/motd.php ; \
-	fi
-	@if [ ! -f ${HORDEDIR}/config/registry.php ]; then \
-		${CP} ${HORDEDIR}/config/registry.php.dist ${HORDEDIR}/config/registry.php ; \
-	fi
-	${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
-	${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" ${HORDESBIN}/horde_set_perms.sh
-	 (if [ -f ${APACHE_CONF} ] ; then \
-	    (if [ ! -f ${APACHE_CONF}.beforeHorde ] ; then \
-		${ECHO} "===> Updating ${APACHE_CONF}..." ; \
-		${CP} -p ${FILESDIR}/httpd.conf.horde ${WRKDIR}/httpd.conf.horde ; \
-		${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${WRKDIR}/httpd.conf.horde ; \
-		${PERL} -pi -e "s:/home/httpd/phplib:${PHP_LIB}:g" ${WRKDIR}/httpd.conf.horde ; \
-		${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
-		${GREP} -qw 'Added for Horde' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.horde >> ${APACHE_CONF} ; \
-	    else \
-		${ECHO} "===> Updating ${APACHE_CONF}..." ; \
-		${CP} -p ${APACHE_CONF} ${APACHE_CONF}.reinstHorde ; \
-		${PERL} -pi -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g" ${APACHE_CONF} ; \
-		${PERL} -pi -e "s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
-	    fi) ; \
+.endfor
+	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
+	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" ${HORDESBIN}/horde_set_perms.sh
+	@(if [ -f ${APACHE_CONF} ] ; then \
+	    ${MKDIR} ${HORDE_INC} ; \
+	    ${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \
+	    ${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${HORDE_INC}/httpd.conf.horde ; \
+	    ${PERL} -pi -e "s:/home/httpd/phplib:${PHP_LIB}:g" ${HORDE_INC}/httpd.conf.horde ; \
+	    ${ECHO_MSG} "===> Updating ${APACHE_CONF}..." ; \
+	    ${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
+	    ${PERL} -pi -e "s:php_value auto_prepend_file:# php_value auto_prepend_file:g" ${APACHE_CONF} ; \
+	    ${PERL} -pi -e "s:${HORDEDIR}/phplib:${PHP_LIB}:g" ${APACHE_CONF} ; \
+	    ${ECHO} "# Horde's include directory" >> ${APACHE_CONF} ; \
+	    ${ECHO} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
 	fi)
-	${CHOWN} -R www:www ${HORDEDIR}
-	${CHMOD} -R o-rwx ${HORDEDIR}/config
-	${TOUCH} ${LOG_FILE}
-	${CHOWN} www:www ${LOG_FILE}
+	@${CHOWN} -R www:www ${HORDEDIR}
+	@${CHMOD} -R o-rwx ${CONFDIR}
+	@${TOUCH} ${LOG_FILE}
+	@${CHOWN} www:www ${LOG_FILE}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
-	${PERL} -pi -e "s:/usr/local/apache/htdocs/horde:${DOCSDIR}:g" ${DOCSDIR}/INSTALL
-	@${ECHO} "Documentation installed in ${DOCSDIR}."
+	@${PERL} -pi -e "s:/usr/local/apache/htdocs/horde:${DOCSDIR}:g" ${DOCSDIR}/INSTALL
+	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 post-install: