upgrade to RC3

PR:		32516
Submitted by:	maintainer

16 files changed, 162 insertions, 146 deletions

diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
index 6bd1e63290f7..5d24b7e0a61a 100644
--- a/www/horde-devel/Makefile
+++ b/www/horde-devel/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:
diff --git a/www/horde-devel/distinfo b/www/horde-devel/distinfo
index f53fe23b91ef..42bbf809d2e6 100644
--- a/www/horde-devel/distinfo
+++ b/www/horde-devel/distinfo
@@ -1 +1 @@
-MD5 (horde-2.0-RC2.tar.gz) = 5b17e2aebe62a711f700bd17c4fb5081
+MD5 (horde-2.0-RC3.tar.gz) = 3e19caa323b075520b9dc5fc90a94475
diff --git a/www/horde-devel/files/httpd.conf.horde b/www/horde-devel/files/httpd.conf.horde
index 1fdfa8f33867..a88a93b23031 100644
--- a/www/horde-devel/files/httpd.conf.horde
+++ b/www/horde-devel/files/httpd.conf.horde
@@ -1,5 +1,5 @@
+# This is included in Apache's httpd.conf for Horde   
 
-# Added for Horde   
 <Directory /home/httpd/html/horde>  
     Options Indexes FollowSymLinks
     AllowOverride None
diff --git a/www/horde-devel/files/patch-ab b/www/horde-devel/files/patch-ab
index 1e11851637fa..387a52ef0ebf 100644
--- a/www/horde-devel/files/patch-ab
+++ b/www/horde-devel/files/patch-ab
@@ -1,6 +1,6 @@
---- config/horde.php.dist.orig	Mon Sep 17 19:47:06 2001
-+++ config/horde.php.dist	Fri Nov 16 23:38:28 2001
-@@ -77,7 +77,7 @@
+--- config/horde.php.dist.orig	Tue Nov 27 13:36:00 2001
++++ config/horde.php.dist	Tue Dec  4 21:37:30 2001
+@@ -78,7 +78,7 @@
  
  // What backend should we use for authenticating users to Horde? Valid
  // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
@@ -9,7 +9,7 @@
  
  // An array holding any parameters that the Auth object will need to
  // function correctly. For IMAP, this is the server name, port,
-@@ -94,6 +94,10 @@
+@@ -99,6 +99,10 @@
  
  // What log driver should we use? Valid values are 'file', 'mcal',
  // 'sql', and 'syslog'.
@@ -20,7 +20,16 @@
  $conf['log']['type'] = 'file';
  
  // What is the name of the log? For the 'file' driver, this is the
-@@ -126,12 +130,17 @@
+@@ -106,7 +110,7 @@
+ // and for sql it would be the table name to use. For the 'syslog'
+ // driver it is the facility as a _constant_ (with no quotes), e.g.:
+ // ... = LOG_LOCAL0;
+-$conf['log']['name'] = '/tmp/horde.log';
++$conf['log']['name'] = '/var/log/horde.log';
+ 
+ // What level of messages should we log? The values are LOG_EMERG,
+ // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
+@@ -131,7 +135,7 @@
  // (meaning use system defaults and don't save any user preferences),
  // 'session' (preferences only persist during the login), 'ldap', 
  // and 'sql'.
@@ -29,8 +38,16 @@
  
  // Any parameters that the preferences driver needs. This includes
  // database or ldap server, username/password to connect with, etc.
- $conf['prefs']['params'] = array();
--
+@@ -140,12 +144,12 @@
+ // This is an example configuration for a MySQL preference backend.
+ // The SQL script to setup the preference database is placed in
+ // horde/scripts/db/prefs.sql.
+-// $conf['prefs']['params']['phptype'] = 'mysql';
+-// $conf['prefs']['params']['hostspec'] = 'localhost';
+-// $conf['prefs']['params']['username'] = 'horde';
+-// $conf['prefs']['params']['password'] = '*****';
+-// $conf['prefs']['params']['database'] = 'horde';
+-// $conf['prefs']['params']['table'] = 'horde_prefs';
 +$conf['prefs']['params']['phptype'] = 'mysql';
 +$conf['prefs']['params']['hostspec'] = 'localhost';
 +$conf['prefs']['params']['username'] = 'hordemgr';
@@ -38,5 +55,5 @@
 +$conf['prefs']['params']['database'] = 'horde';
 +$conf['prefs']['params']['table'] = 'horde_prefs';
  
+ 
  /**
-  ** Cache System Settings
diff --git a/www/horde-devel/pkg-deinstall b/www/horde-devel/pkg-deinstall
index 8277aa19805c..6a75b26f7a23 100644
--- a/www/horde-devel/pkg-deinstall
+++ b/www/horde-devel/pkg-deinstall
@@ -8,5 +8,6 @@ fi
 if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
 	echo "Restoring httpd.conf..."
 	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde
-	mv ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ${PKG_PREFIX}/etc/apache/httpd.conf
+	perl -pi -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+		${PKG_PREFIX}/etc/apache/httpd.conf
 fi
diff --git a/www/horde-devel/pkg-descr b/www/horde-devel/pkg-descr
index 3e9896be98af..1bbede97877c 100644
--- a/www/horde-devel/pkg-descr
+++ b/www/horde-devel/pkg-descr
@@ -5,4 +5,6 @@ support is much more robust, a generic MIME_Viewer framework is
 included, the preferences system supports global or application scope
 for preferences, and assorted bugs have been fixed.
 
+Horde is used by these ports: mail/imp, mail/turba and devel/chora.
+
 WWW: http://www.horde.org/
diff --git a/www/horde-devel/pkg-message b/www/horde-devel/pkg-message
index a4a32eac338b..d4d255b32d8a 100644
--- a/www/horde-devel/pkg-message
+++ b/www/horde-devel/pkg-message
@@ -18,7 +18,7 @@ It is recommended that you change the password of the 'hordemgr'
 user used to connect to the horde database.
 Horde is setup by default to access MySQL.
 
-If %%APACHE_CONF%% has been updated,
+Your %%APACHE_CONF%% has been updated,
 you have to restart Apache.
 
 When everything is OK, you should be able to access Horde from
diff --git a/www/horde-devel/pkg-plist b/www/horde-devel/pkg-plist
index feb4e5f854de..ea42f9c31784 100644
--- a/www/horde-devel/pkg-plist
+++ b/www/horde-devel/pkg-plist
@@ -109,7 +109,6 @@
 %%HORDEDIR%%/templates/data/datemap.inc
 %%HORDEDIR%%/templates/horde/modules.inc
 %%HORDEDIR%%/templates/problem/javascript.inc
-%%HORDEDIR%%/templates/problem/lynx_problem.inc
 %%HORDEDIR%%/templates/problem/problem.inc
 %%HORDEDIR%%/templates/help/footer.inc
 %%HORDEDIR%%/templates/help/header.inc
@@ -144,7 +143,6 @@
 %%HORDEDIR%%/templates/wml/doctype.inc
 %%HORDEDIR%%/templates/common-header.inc
 %%HORDEDIR%%/templates/common-footer.inc
-%%HORDEDIR%%/scripts/compare_revisions.sh
 %%HORDEDIR%%/scripts/db/mysql_drop.sql
 %%HORDEDIR%%/scripts/db/README
 %%HORDEDIR%%/scripts/db/category.sql
@@ -158,13 +156,12 @@
 %%HORDEDIR%%/scripts/mime_mapping/mime.types
 %%HORDEDIR%%/scripts/set_perms.sh
 %%HORDEDIR%%/scripts/set_perms.sh.orig
-%%HORDEDIR%%/scripts/make-tarball.pl
 %%HORDEDIR%%/scripts/SCRIPTS
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/de_DE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/el_GR/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/en/help.xml
 %%HORDEDIR%%/locale/es_ES/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/en_EN/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/it_IT/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES/horde.mo
@@ -233,14 +230,16 @@
 %%HORDEDIR%%/po/zh_CN.po
 %%HORDEDIR%%/po/zh_TW.po
 %%HORDESBIN%%/horde_set_perms.sh
+etc/horde/httpd.conf.horde
 %%PORTDOCS%%share/doc/horde/CHANGES
 %%PORTDOCS%%share/doc/horde/CODING_STANDARDS
 %%PORTDOCS%%share/doc/horde/COPYING
 %%PORTDOCS%%share/doc/horde/CREDITS
 %%PORTDOCS%%share/doc/horde/HELP
 %%PORTDOCS%%share/doc/horde/INSTALL
+%%PORTDOCS%%share/doc/horde/LISTS
 %%PORTDOCS%%share/doc/horde/README
-%%PORTDOCS%%share/doc/horde/RELEASE
+%%PORTDOCS%%share/doc/horde/SOURCE
 %%PORTDOCS%%@dirrm share/doc/horde
 @dirrm %%HORDEDIR%%/lib/MIME/Viewer
 @dirrm %%HORDEDIR%%/lib/MIME
@@ -278,7 +277,7 @@
 @dirrm %%HORDEDIR%%/locale/de_DE
 @dirrm %%HORDEDIR%%/locale/el_GR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/el_GR
-@dirrm %%HORDEDIR%%/locale/en
+@dirrm %%HORDEDIR%%/locale/en_EN
 @dirrm %%HORDEDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/es_ES
 @dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
@@ -312,3 +311,4 @@
 @dirrm %%HORDEDIR%%/admin
 @dirrm %%HORDEDIR%%/po
 @dirrm %%HORDEDIR%%
+@dirrm etc/horde
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:
diff --git a/www/horde2/distinfo b/www/horde2/distinfo
index f53fe23b91ef..42bbf809d2e6 100644
--- a/www/horde2/distinfo
+++ b/www/horde2/distinfo
@@ -1 +1 @@
-MD5 (horde-2.0-RC2.tar.gz) = 5b17e2aebe62a711f700bd17c4fb5081
+MD5 (horde-2.0-RC3.tar.gz) = 3e19caa323b075520b9dc5fc90a94475
diff --git a/www/horde2/files/httpd.conf.horde b/www/horde2/files/httpd.conf.horde
index 1fdfa8f33867..a88a93b23031 100644
--- a/www/horde2/files/httpd.conf.horde
+++ b/www/horde2/files/httpd.conf.horde
@@ -1,5 +1,5 @@
+# This is included in Apache's httpd.conf for Horde   
 
-# Added for Horde   
 <Directory /home/httpd/html/horde>  
     Options Indexes FollowSymLinks
     AllowOverride None
diff --git a/www/horde2/files/patch-ab b/www/horde2/files/patch-ab
index 1e11851637fa..387a52ef0ebf 100644
--- a/www/horde2/files/patch-ab
+++ b/www/horde2/files/patch-ab
@@ -1,6 +1,6 @@
---- config/horde.php.dist.orig	Mon Sep 17 19:47:06 2001
-+++ config/horde.php.dist	Fri Nov 16 23:38:28 2001
-@@ -77,7 +77,7 @@
+--- config/horde.php.dist.orig	Tue Nov 27 13:36:00 2001
++++ config/horde.php.dist	Tue Dec  4 21:37:30 2001
+@@ -78,7 +78,7 @@
  
  // What backend should we use for authenticating users to Horde? Valid
  // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
@@ -9,7 +9,7 @@
  
  // An array holding any parameters that the Auth object will need to
  // function correctly. For IMAP, this is the server name, port,
-@@ -94,6 +94,10 @@
+@@ -99,6 +99,10 @@
  
  // What log driver should we use? Valid values are 'file', 'mcal',
  // 'sql', and 'syslog'.
@@ -20,7 +20,16 @@
  $conf['log']['type'] = 'file';
  
  // What is the name of the log? For the 'file' driver, this is the
-@@ -126,12 +130,17 @@
+@@ -106,7 +110,7 @@
+ // and for sql it would be the table name to use. For the 'syslog'
+ // driver it is the facility as a _constant_ (with no quotes), e.g.:
+ // ... = LOG_LOCAL0;
+-$conf['log']['name'] = '/tmp/horde.log';
++$conf['log']['name'] = '/var/log/horde.log';
+ 
+ // What level of messages should we log? The values are LOG_EMERG,
+ // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
+@@ -131,7 +135,7 @@
  // (meaning use system defaults and don't save any user preferences),
  // 'session' (preferences only persist during the login), 'ldap', 
  // and 'sql'.
@@ -29,8 +38,16 @@
  
  // Any parameters that the preferences driver needs. This includes
  // database or ldap server, username/password to connect with, etc.
- $conf['prefs']['params'] = array();
--
+@@ -140,12 +144,12 @@
+ // This is an example configuration for a MySQL preference backend.
+ // The SQL script to setup the preference database is placed in
+ // horde/scripts/db/prefs.sql.
+-// $conf['prefs']['params']['phptype'] = 'mysql';
+-// $conf['prefs']['params']['hostspec'] = 'localhost';
+-// $conf['prefs']['params']['username'] = 'horde';
+-// $conf['prefs']['params']['password'] = '*****';
+-// $conf['prefs']['params']['database'] = 'horde';
+-// $conf['prefs']['params']['table'] = 'horde_prefs';
 +$conf['prefs']['params']['phptype'] = 'mysql';
 +$conf['prefs']['params']['hostspec'] = 'localhost';
 +$conf['prefs']['params']['username'] = 'hordemgr';
@@ -38,5 +55,5 @@
 +$conf['prefs']['params']['database'] = 'horde';
 +$conf['prefs']['params']['table'] = 'horde_prefs';
  
+ 
  /**
-  ** Cache System Settings
diff --git a/www/horde2/pkg-deinstall b/www/horde2/pkg-deinstall
index 8277aa19805c..6a75b26f7a23 100644
--- a/www/horde2/pkg-deinstall
+++ b/www/horde2/pkg-deinstall
@@ -8,5 +8,6 @@ fi
 if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
 	echo "Restoring httpd.conf..."
 	cp ${PKG_PREFIX}/etc/apache/httpd.conf ${PKG_PREFIX}/etc/apache/httpd.conf.deinstHorde
-	mv ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ${PKG_PREFIX}/etc/apache/httpd.conf
+	perl -pi -e "s:Include ${PKG_PREFIX}/etc/horde:# Include ${PKG_PREFIX}/etc/horde:g" \
+		${PKG_PREFIX}/etc/apache/httpd.conf
 fi
diff --git a/www/horde2/pkg-descr b/www/horde2/pkg-descr
index 3e9896be98af..1bbede97877c 100644
--- a/www/horde2/pkg-descr
+++ b/www/horde2/pkg-descr
@@ -5,4 +5,6 @@ support is much more robust, a generic MIME_Viewer framework is
 included, the preferences system supports global or application scope
 for preferences, and assorted bugs have been fixed.
 
+Horde is used by these ports: mail/imp, mail/turba and devel/chora.
+
 WWW: http://www.horde.org/
diff --git a/www/horde2/pkg-message b/www/horde2/pkg-message
index a4a32eac338b..d4d255b32d8a 100644
--- a/www/horde2/pkg-message
+++ b/www/horde2/pkg-message
@@ -18,7 +18,7 @@ It is recommended that you change the password of the 'hordemgr'
 user used to connect to the horde database.
 Horde is setup by default to access MySQL.
 
-If %%APACHE_CONF%% has been updated,
+Your %%APACHE_CONF%% has been updated,
 you have to restart Apache.
 
 When everything is OK, you should be able to access Horde from
diff --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist
index feb4e5f854de..ea42f9c31784 100644
--- a/www/horde2/pkg-plist
+++ b/www/horde2/pkg-plist
@@ -109,7 +109,6 @@
 %%HORDEDIR%%/templates/data/datemap.inc
 %%HORDEDIR%%/templates/horde/modules.inc
 %%HORDEDIR%%/templates/problem/javascript.inc
-%%HORDEDIR%%/templates/problem/lynx_problem.inc
 %%HORDEDIR%%/templates/problem/problem.inc
 %%HORDEDIR%%/templates/help/footer.inc
 %%HORDEDIR%%/templates/help/header.inc
@@ -144,7 +143,6 @@
 %%HORDEDIR%%/templates/wml/doctype.inc
 %%HORDEDIR%%/templates/common-header.inc
 %%HORDEDIR%%/templates/common-footer.inc
-%%HORDEDIR%%/scripts/compare_revisions.sh
 %%HORDEDIR%%/scripts/db/mysql_drop.sql
 %%HORDEDIR%%/scripts/db/README
 %%HORDEDIR%%/scripts/db/category.sql
@@ -158,13 +156,12 @@
 %%HORDEDIR%%/scripts/mime_mapping/mime.types
 %%HORDEDIR%%/scripts/set_perms.sh
 %%HORDEDIR%%/scripts/set_perms.sh.orig
-%%HORDEDIR%%/scripts/make-tarball.pl
 %%HORDEDIR%%/scripts/SCRIPTS
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/de_DE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/el_GR/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/en/help.xml
 %%HORDEDIR%%/locale/es_ES/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/en_EN/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/it_IT/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES/horde.mo
@@ -233,14 +230,16 @@
 %%HORDEDIR%%/po/zh_CN.po
 %%HORDEDIR%%/po/zh_TW.po
 %%HORDESBIN%%/horde_set_perms.sh
+etc/horde/httpd.conf.horde
 %%PORTDOCS%%share/doc/horde/CHANGES
 %%PORTDOCS%%share/doc/horde/CODING_STANDARDS
 %%PORTDOCS%%share/doc/horde/COPYING
 %%PORTDOCS%%share/doc/horde/CREDITS
 %%PORTDOCS%%share/doc/horde/HELP
 %%PORTDOCS%%share/doc/horde/INSTALL
+%%PORTDOCS%%share/doc/horde/LISTS
 %%PORTDOCS%%share/doc/horde/README
-%%PORTDOCS%%share/doc/horde/RELEASE
+%%PORTDOCS%%share/doc/horde/SOURCE
 %%PORTDOCS%%@dirrm share/doc/horde
 @dirrm %%HORDEDIR%%/lib/MIME/Viewer
 @dirrm %%HORDEDIR%%/lib/MIME
@@ -278,7 +277,7 @@
 @dirrm %%HORDEDIR%%/locale/de_DE
 @dirrm %%HORDEDIR%%/locale/el_GR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/el_GR
-@dirrm %%HORDEDIR%%/locale/en
+@dirrm %%HORDEDIR%%/locale/en_EN
 @dirrm %%HORDEDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/es_ES
 @dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
@@ -312,3 +311,4 @@
 @dirrm %%HORDEDIR%%/admin
 @dirrm %%HORDEDIR%%/po
 @dirrm %%HORDEDIR%%
+@dirrm etc/horde