Move www/horde-devel -> www/horde2 & mail/imp-devel -> mail/imp3

From PR's description:
  IMP 3.0 is the stable release of IMP,
  and Horde 2.0 the stable release of Horde.
Note:	mail/imp3 and deskutils/kronolith are marked as IS_INTERACTIVE
	since they need depending port mod_php4 with its mcrypt option
	enabled by hand.

PR:		ports/35051
Submitted by:	maintainer

24 files changed, 18 insertions, 1117 deletions

diff --git a/www/Makefile b/www/Makefile
index f6181e6d24da..b74f5946aa07 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -94,7 +94,7 @@
     SUBDIR += gtkhtml
     SUBDIR += harvest
     SUBDIR += horde
-    SUBDIR += horde-devel
+    SUBDIR += horde2
     SUBDIR += hotjava
     SUBDIR += htdump
     SUBDIR += html2wml
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 10aca4f46e2b..b2a2c57130bc 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -77,7 +77,7 @@ pre-everything::
 pre-install:
 	@if [ -f ${HORDEDIR}/index.php ]; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "Please deinstall the port www/horde-devel." ; \
+		${ECHO_MSG} "Please deinstall the port www/horde2." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	 fi
diff --git a/www/horde-base/pkg-comment b/www/horde-base/pkg-comment
index 20a1d723f4fc..9d28558ea160 100644
--- a/www/horde-base/pkg-comment
+++ b/www/horde-base/pkg-comment
@@ -1 +1 @@
-A common code-base used by Horde applications, written in PHP
+A common code-base used by Horde applications, written in PHP3
diff --git a/www/horde-base/pkg-descr b/www/horde-base/pkg-descr
index fd1087dfbeff..c0c36f4ae843 100644
--- a/www/horde-base/pkg-descr
+++ b/www/horde-base/pkg-descr
@@ -1,3 +1,6 @@
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port www/horde2.
+
 Horde is both a piece of software and a project.
 
 The Horde Project comprises a set of Web-based productivity, messaging,
@@ -12,5 +15,3 @@ in Horde's components, and mostly IMP, the well-known webmail (see the
 port mail/imp).
 
 WWW: http://www.horde.org/
-
-- Thierry Thomas <thierry@thomas.as>.
diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
deleted file mode 100644
index 966b8e6f2c5a..000000000000
--- a/www/horde-devel/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-# Ports collection makefile for:  horde-devel
-# Date created:			  Sun Oct 07, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	horde
-PORTVERSION=	2.0
-PORTREVISION=	3
-CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	thierry@pompo.net
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_SSL		: if you do not need Apache with mod_ssl;
-#
-#-----------------------------------------------------------------------
-
-LIB_DEPENDS+=	intl.2:${PORTSDIR}/devel/gettext
-.if !defined(WITHOUT_MCAL)
-LIB_DEPENDS+=	mcal.0:${PORTSDIR}/misc/libmcal
-.endif
-.if !defined(WITHOUT_SSL)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libssl.so:${PORTSDIR}/www/apache13-modssl
-.endif
-#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/CODING_STANDARDS \
-		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL
-CONFFILE=	html.php lang.php mime_drivers.php mime_mapping.php \
-		motd.php registry.php
-
-LHORDEDIR?=	www/horde
-LHORDESBIN?=	sbin
-
-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::
-.if !defined(WITHOUT_SSL)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Press CTRL-C and define WITHOUT_SSL"
-	@${ECHO_MSG} " if you do not want to use Apache with SSL."
-	@${ECHO_MSG} ""
-.endif
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If you plan to install IMP, it is better to configure"
-	@${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} ""
-
-pre-install:
-	@if [ -f ${HORDEDIR}/index.php3 ]; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please deinstall the port www/horde." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.2"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with gettext support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	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 ${CONFDIR}/horde.php ]; then \
-		${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \
-		${PERL} -pi -e "s:/var/www/htdocs/horde/templates:${HORDEDIR}/templates:g" \
-			${CONFDIR}/horde.php ; \
-		${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
-	fi
-	@${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \
-		${HORDEDIR}/lib/Auth/mcal.php
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${CONFDIR}/mime_drivers.php
-	@${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
-	@${CHMOD} u+x ${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_CMD} "# Horde's include directory" >> ${APACHE_CONF} ; \
-	    ${ECHO_CMD} "Include ${HORDE_INC}" >> ${APACHE_CONF} ; \
-	fi)
-	@${CHOWN} -R www:www ${HORDEDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${TOUCH} ${LOG_FILE}
-	@${CHOWN} www:www ${LOG_FILE}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${PERL} -pi -e "s:/usr/local/apache/htdocs/horde:${DOCSDIR}:g" ${DOCSDIR}/INSTALL
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE} | ${SED} -e \
-	"s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g;s:%%HORDESBIN%%:${HORDESBIN}:g"
-	@${ECHO}
-
-.include <bsd.port.mk>
diff --git a/www/horde-devel/distinfo b/www/horde-devel/distinfo
deleted file mode 100644
index f5f679ed8103..000000000000
--- a/www/horde-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (horde-2.0.tar.gz) = 039d760ebf282dca33ab6081179c2be0
diff --git a/www/horde-devel/files/httpd.conf.horde b/www/horde-devel/files/httpd.conf.horde
deleted file mode 100644
index a88a93b23031..000000000000
--- a/www/horde-devel/files/httpd.conf.horde
+++ /dev/null
@@ -1,52 +0,0 @@
-# This is included in Apache's httpd.conf for Horde   
-
-<Directory /home/httpd/html/horde>  
-    Options Indexes FollowSymLinks
-    AllowOverride None
-    order allow,deny
-    allow from all
-    <IfModule mod_php4.c>
-        php_value include_path '/home/httpd/phplib:.'
-        php_flag register_globals On
-        php_flag magic_quotes_gpc Off
-        php_flag track_vars On
-    </IfModule>
-</Directory>
-
-<IfModule mod_alias.c>
-    Alias /horde/ "/home/httpd/html/horde/"
-</IfModule>
-#
-# For security, don't serve pages from the Horde configuration and library
-# directories.
-#
-<Directory "/home/httpd/html/horde/admin">
-    Order deny,allow
-    Deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/config">
-    Order deny,allow
-    Deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/lib">
-    Order deny,allow
-    Deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/locale">
-    Order deny,allow
-    Deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/po">
-    Order deny,allow
-    Deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/scripts">
-    Order deny,allow
-    Deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/templates">
-    Order deny,allow
-    Deny from all
-</Directory>
-# End of Horde configuration ================
-
diff --git a/www/horde-devel/files/patch-aa b/www/horde-devel/files/patch-aa
deleted file mode 100644
index deb6f20bb48d..000000000000
--- a/www/horde-devel/files/patch-aa
+++ /dev/null
@@ -1,68 +0,0 @@
---- scripts/set_perms.sh.orig	Sun Apr 15 03:55:32 2001
-+++ scripts/set_perms.sh	Wed Oct 24 23:48:43 2001
-@@ -1,6 +1,7 @@
- #!/bin/sh
- #
- # set_perms.sh - Jon Parise <jon@csh.rit.edu>
-+# patched by the FreeBSD port - Th. Thomas <thierry@thomas.as>
- #
- # $Horde: horde/scripts/set_perms.sh,v 1.7 2001/04/15 01:55:32 chuck Exp $
- 
-@@ -10,7 +11,7 @@
- 
- # Default non-web server user who will own the tree.
- #
--OWNER=root
-+OWNER=www
- 
- # Introductory text
- #
-@@ -26,29 +27,30 @@
- 
- # Verify that we're at the top of the Horde tree.
- #
--pwd
--echo
--echo -n "Is this directory the top of your Horde installation? [y,N] "
--read RESPONSE 
--if [ "$RESPONSE" != "y" -a "$RESPONSE" != "Y" ]; then
--    echo
--    echo -n "Enter your Horde directory: "
--    read DIR  
--	if [ "x$DIR" = "x" ]; then
--		echo "Exiting..."
--		exit
--	else
--    	cd $DIR
--	fi
--fi
--echo
-+#pwd
-+#echo
-+#echo -n "Is this directory the top of your Horde installation? [y,N] "
-+#read RESPONSE 
-+#if [ "$RESPONSE" != "y" -a "$RESPONSE" != "Y" ]; then
-+#    echo
-+#    echo -n "Enter your Horde directory: "
-+#    read DIR  
-+#	if [ "x$DIR" = "x" ]; then
-+#		echo "Exiting..."
-+#		exit
-+#	else
-+#    	cd $DIR
-+#	fi
-+#fi
-+#echo
-+cd UPDATED_BY_THE_PORT
- 
- # Get the web server's group.
- #
--echo -n "Under what group does the web process run? [nobody] "
-+echo -n "Under what group does the web process run? [www] "
- read WEB_GROUP
- if [ "x$WEB_GROUP" = "x" ]; then
--    WEB_GROUP="nobody" 
-+    WEB_GROUP="www" 
- fi
- 
- # Ask before proceeding.
diff --git a/www/horde-devel/files/patch-ab b/www/horde-devel/files/patch-ab
deleted file mode 100644
index 1b2f203e7ee3..000000000000
--- a/www/horde-devel/files/patch-ab
+++ /dev/null
@@ -1,69 +0,0 @@
---- config/horde.php.dist.orig	Fri Dec 28 19:48:37 2001
-+++ config/horde.php.dist	Thu Jan  3 17:01:56 2002
-@@ -83,12 +83,13 @@
- 
- /* Which users should be treated as administrators (root, super-user)
-  * by Horde? Example: $conf['auth']['admins'] = array('admin', 'john');
-+ * N.B.: 'admin' is used by Jonah to fetch the news.
-  */
--$conf['auth']['admins'] = array();
-+$conf['auth']['admins'] = array('admin');
- 
- // What backend should we use for authenticating users to Horde? Valid
- // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
--$conf['auth']['driver'] = '';
-+$conf['auth']['driver'] = 'imap';
- 
- /* An array holding any parameters that the Auth object will need to
-  * function correctly. For IMAP, this is the server name, port,
-@@ -119,8 +120,12 @@
-  * 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;
-+ * Warning: il you keep file, do not forget to add a line in your
-+ * /etc/newsyslog.conf
-+ * For example:
-+ * /var/log/horde.log		600  5     100  *     Z
-  */
--$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,
-@@ -148,7 +153,7 @@
-  * 'session' (preferences only persist during the login), 'ldap', 
-  * and 'sql'.
-  */
--$conf['prefs']['driver'] = 'none';
-+$conf['prefs']['driver'] = 'sql';
- 
- /* Any parameters that the preferences driver needs. This includes
-  * database or ldap server, username/password to connect with, etc.
-@@ -159,12 +164,12 @@
-  * Be sure to set the prefs driver to 'sql' above if you use this
-  * configuration. 
-  */
--// $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';
-+$conf['prefs']['params']['password'] = 'hordemgr';
-+$conf['prefs']['params']['database'] = 'horde';
-+$conf['prefs']['params']['table'] = 'horde_prefs';
- 
- 
- /**
-@@ -216,7 +221,7 @@
-  * option; SMTP requires at least a server and a port (if nonstandard).
-  */
- $conf['mailer']['params'] = array();
--// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
-+// $conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
- // $conf['mailer']['params'] = array('server' => 'smtp.example.com');
- 
- /**
diff --git a/www/horde-devel/files/patch-ac b/www/horde-devel/files/patch-ac
deleted file mode 100644
index 29f56e72a9eb..000000000000
--- a/www/horde-devel/files/patch-ac
+++ /dev/null
@@ -1,193 +0,0 @@
---- config/registry.php.dist.orig	Sun Dec 23 03:22:14 2001
-+++ config/registry.php.dist	Tue Dec 25 13:11:34 2001
-@@ -20,8 +20,8 @@
-  *   IMP or Gollem handle the authentication for Horde. This avoids the
-  *   "double login" while accessing IMP.
-  */
--// $this->registry['auth']['login'] = 'imp';
--// $this->registry['auth']['logout'] = 'imp';
-+//UNCOMMENTWHENINSTIMP$this->registry['auth']['login'] = 'imp';
-+//UNCOMMENTWHENINSTIMP$this->registry['auth']['logout'] = 'imp';
- 
- /* mail: Handler for sending mail. */
- $this->registry['mail']['compose'] = 'imp';
-@@ -62,32 +62,103 @@
-     'server_port' => $GLOBALS['HTTP_SERVER_VARS']['SERVER_PORT']
- );
- 
--// $this->applications['imp'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../imp',
--//     'webroot' => $this->applications['horde']['webroot'] . '/imp',
--//     'icon' => '/horde/imp/graphics/imp.gif',
--//     'name' => _("Mail"),
--//     'allow_guests' => true,
--//     'show' => true
--// );
--
--// $this->applications['turba'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../turba',
--//     'webroot' => $this->applications['horde']['webroot'] . '/turba',
--//     'icon' => '/horde/turba/graphics/turba.gif',
--//     'name' => _("Addressbook"),
--//     'allow_guests' => false,
--//     'show' => true
--// );
--
--// $this->applications['chora'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../chora',
--//     'webroot' => $this->applications['horde']['webroot'] . '/chora',
--//     'icon' => '/horde/chora/graphics/chora.gif',
--//     'name' => _("CVS"),
--//     'allow_guests' => true,
--//     'show' => false
--// );
-+//UNCOMMENTWHENINSTIMP$this->applications['imp'] = array(
-+//UNCOMMENTWHENINSTIMP    'fileroot' => dirname(__FILE__) . '/../imp',
-+//UNCOMMENTWHENINSTIMP    'webroot' => $this->applications['horde']['webroot'] . '/imp',
-+//UNCOMMENTWHENINSTIMP    'icon' => '/horde/imp/graphics/imp.gif',
-+//UNCOMMENTWHENINSTIMP    'name' => _("Mail"),
-+//UNCOMMENTWHENINSTIMP    'allow_guests' => false,
-+//UNCOMMENTWHENINSTIMP    'show' => true
-+//UNCOMMENTWHENINSTIMP);
-+
-+//UNCOMMENTWHENINSTTURBA$this->applications['turba'] = array(
-+//UNCOMMENTWHENINSTTURBA    'fileroot' => dirname(__FILE__) . '/../turba',
-+//UNCOMMENTWHENINSTTURBA    'webroot' => $this->applications['horde']['webroot'] . '/turba',
-+//UNCOMMENTWHENINSTTURBA    'icon' => '/horde/turba/graphics/turba.gif',
-+//UNCOMMENTWHENINSTTURBA    'name' => _("Addressbook"),
-+//UNCOMMENTWHENINSTTURBA    'allow_guests' => false,
-+//UNCOMMENTWHENINSTTURBA    'show' => true
-+//UNCOMMENTWHENINSTTURBA );
-+
-+//UNCOMMENTWHENINSTCHORA$this->applications['chora'] = array(
-+//UNCOMMENTWHENINSTCHORA    'fileroot' => dirname(__FILE__) . '/../chora',
-+//UNCOMMENTWHENINSTCHORA    'webroot' => $this->applications['horde']['webroot'] . '/chora',
-+//UNCOMMENTWHENINSTCHORA    'icon' => '/horde/chora/graphics/chora.gif',
-+//UNCOMMENTWHENINSTCHORA    'name' => _("CVS"),
-+//UNCOMMENTWHENINSTCHORA    'allow_guests' => true,
-+//UNCOMMENTWHENINSTCHORA    'show' => true
-+//UNCOMMENTWHENINSTCHORA );
-+ 
-+//UNCOMMENTWHENINSTGOLLEM$this->applications['gollem'] = array(
-+//UNCOMMENTWHENINSTGOLLEM    'fileroot' => dirname(__FILE__) . '/../gollem',
-+//UNCOMMENTWHENINSTGOLLEM    'webroot' => '/horde/gollem',
-+//UNCOMMENTWHENINSTGOLLEM    'icon' => '/horde/gollem/graphics/gollem.gif',
-+//UNCOMMENTWHENINSTGOLLEM    'name' => _("FTP"),
-+//UNCOMMENTWHENINSTGOLLEM    'allow_guests' => true,
-+//UNCOMMENTWHENINSTGOLLEM    'show' => true
-+//UNCOMMENTWHENINSTGOLLEM);
-+
-+//UNCOMMENTWHENINSTNIC$this->applications['nic'] = array(
-+//UNCOMMENTWHENINSTNIC    'fileroot' => dirname(__FILE__) . '/../nic',
-+//UNCOMMENTWHENINSTNIC    'webroot' => '/horde/nic',
-+//UNCOMMENTWHENINSTNIC    'icon' => '/horde/nic/graphics/nic.gif',
-+//UNCOMMENTWHENINSTNIC    'name' => _("Network"),
-+//UNCOMMENTWHENINSTNIC    'allow_guests' => true,
-+//UNCOMMENTWHENINSTNIC    'show' => true
-+//UNCOMMENTWHENINSTNIC);
-+
-+//UNCOMMENTWHENINSTKRONOLITH$this->applications['kronolith'] = array(
-+//UNCOMMENTWHENINSTKRONOLITH    'fileroot' => dirname(__FILE__) . '/../kronolith',
-+//UNCOMMENTWHENINSTKRONOLITH    'webroot' => '/horde/kronolith',
-+//UNCOMMENTWHENINSTKRONOLITH    'icon' => '/horde/kronolith/graphics/kronolith.gif',
-+//UNCOMMENTWHENINSTKRONOLITH    'name' => _("Calendar"),
-+//UNCOMMENTWHENINSTKRONOLITH    'allow_guests' => false,
-+//UNCOMMENTWHENINSTKRONOLITH    'show' => true
-+//UNCOMMENTWHENINSTKRONOLITH);
-+
-+//UNCOMMENTWHENINSTJONAH$this->applications['jonah'] = array(
-+//UNCOMMENTWHENINSTJONAH    'fileroot' => dirname(__FILE__) . '/../jonah',
-+//UNCOMMENTWHENINSTJONAH    'webroot' => '/horde/jonah',
-+//UNCOMMENTWHENINSTJONAH    'icon' => '/horde/jonah/graphics/jonah.gif',
-+//UNCOMMENTWHENINSTJONAH    'name' => _("Headlines"),
-+//UNCOMMENTWHENINSTJONAH    'allow_guests' => true,
-+//UNCOMMENTWHENINSTJONAH    'show' => true
-+//UNCOMMENTWHENINSTJONAH);
-+
-+//UNCOMMENTWHENINSTTROLL$this->applications['troll'] = array(
-+//UNCOMMENTWHENINSTTROLL    'fileroot' => dirname(__FILE__) . '/../troll',
-+//UNCOMMENTWHENINSTTROLL    'webroot' => '/horde/troll',
-+//UNCOMMENTWHENINSTTROLL    'icon' => '/horde/troll/graphics/troll.gif',
-+//UNCOMMENTWHENINSTTROLL    'name' => _("News"),
-+//UNCOMMENTWHENINSTTROLL    'allow_guests' => true,
-+//UNCOMMENTWHENINSTTROLL    'show' => true
-+//UNCOMMENTWHENINSTTROLL);
-+
-+//UNCOMMENTWHENINSTWHUPS$this->applications['whups'] = array(
-+//UNCOMMENTWHENINSTWHUPS    'fileroot' => dirname(__FILE__) . '/../whups',
-+//UNCOMMENTWHENINSTWHUPS    'webroot' => '/horde/whups',
-+//UNCOMMENTWHENINSTWHUPS    'icon' => '/horde/whups/graphics/whups.gif',
-+//UNCOMMENTWHENINSTWHUPS    'name' => _("Bugs"),
-+//UNCOMMENTWHENINSTWHUPS    'allow_guests' => true,
-+//UNCOMMENTWHENINSTWHUPS    'show' => true
-+//UNCOMMENTWHENINSTWHUPS);
-+
-+//UNCOMMENTWHENINSTNAG$this->applications['nag'] = array(
-+//UNCOMMENTWHENINSTNAG    'fileroot' => dirname(__FILE__) . '/../nag',
-+//UNCOMMENTWHENINSTNAG    'webroot' => '/horde/nag',
-+//UNCOMMENTWHENINSTNAG    'icon' => '/horde/nag/graphics/nag.gif',
-+//UNCOMMENTWHENINSTNAG    'name' => _("Tasks"),
-+//UNCOMMENTWHENINSTNAG    'allow_guests' => true,
-+//UNCOMMENTWHENINSTNAG    'show' => true
-+//UNCOMMENTWHENINSTNAG);
-+
-+//UNCOMMENTWHENINSTORATOR$this->applications['orator'] = array(
-+//UNCOMMENTWHENINSTORATOR    'fileroot' => dirname(__FILE__) . '/../orator',
-+//UNCOMMENTWHENINSTORATOR    'webroot' => '/horde/orator',
-+//UNCOMMENTWHENINSTORATOR    'name' => _("Presentations"),
-+//UNCOMMENTWHENINSTORATOR    'allow_guests' => true,
-+//UNCOMMENTWHENINSTORATOR    'show' => true
-+//UNCOMMENTWHENINSTORATOR);
- 
- 
- /** 
-@@ -144,6 +215,49 @@
-     'function' => 'turbaGetFields',
-     'args' => array('addressbook'),
-     'type' => 'array'
-+);
-+
-+$this->services['kronolith']['horde']['summary'] = array( 
-+    'file' => '%application%/lib/api.php',
-+    'function' => 'kronolithSummary',
-+    'args' => array(),
-+    'type' => 'string'
-+);
-+
-+$this->services['nag']['tasks']['list'] = array(
-+    'file' => '%application%/lib/api.php',
-+    'function' => 'nagListTasks',
-+    'args' => array('sortby', 'sortdir'),
-+    'type' => 'array'
-+);
-+$this->services['nag']['tasks']['search'] = array(
-+    'link' => "%application%/search.php"
-+);
-+$this->services['nag']['tasks']['show'] = array(
-+    'link' => "%application%/view.php?task=|task|"
-+);
-+$this->services['nag']['tasks']['add'] = array(
-+    'file' => '%application%/lib/api.php',
-+    'function' => 'nagAddTask',
-+    'args' => array('name', 'description', 'due'),
-+    'type' => 'integer'
-+);
-+$this->services['nag']['horde']['summary'] = array(
-+    'file' => '%application%/lib/api.php',
-+    'function' => 'nagSummary',
-+    'args' => array(),
-+    'type' => 'string'
-+);
-+$this->services['nic']['net']['finger'] = array(
-+    'link' => "%application%/finger.php?address=|address|"
-+);
-+
-+
-+$this->services['whups']['horde']['summary'] = array(
-+    'file' => '%application%/lib/api.php',
-+    'function' => 'whupsSummary',
-+    'args' => array(),
-+    'type' => 'string'
- );
- 
- $this->services['default']['mail']['compose'] = array(
diff --git a/www/horde-devel/files/patch-mime_drivers.php.dist b/www/horde-devel/files/patch-mime_drivers.php.dist
deleted file mode 100644
index 73cec6a0cf91..000000000000
--- a/www/horde-devel/files/patch-mime_drivers.php.dist
+++ /dev/null
@@ -1,170 +0,0 @@
---- config/mime_drivers.php.dist.orig	Sun Dec 23 22:36:27 2001
-+++ config/mime_drivers.php.dist	Sun Feb 17 10:11:21 2002
-@@ -20,8 +20,12 @@
- 
- $mime_drivers_map['horde']['registered'] = array(
-     'php', 'tgz', 'vcard'
--    // ,'msword', 'msexcel', 'mspowerpoint',
--    // ,'enscript', 'rar', 'zip', 'rpm', 'deb'
-+    //UNCOMMENTIFWV ,'msword'
-+    //UNCOMMENTIFXL , 'msexcel', 'mspowerpoint'
-+    //UNCOMMENTWHENINSTCHORA ,'enscript'
-+    //UNCOMMENTIFRAR , 'rar'
-+    //UNCOMMENTIFZIP , 'zip'
-+    // , 'rpm', 'deb'
-     );
- 
- 
-@@ -101,19 +105,19 @@
-  */
- 
- /* Location of the enscript binary. */
--// $mime_drivers['horde']['enscript']['location'] = '/usr/bin/enscript';
--// $mime_drivers['horde']['enscript']['inline'] = false;
--// $mime_drivers['horde']['enscript']['handles'] = array(
--//     'text/html', 'x-extension/pl', 'x-extension/c',
--//     'text/xml', 'application/x-sh', 'application/x-javascript',
--//     'x-extension/java', 'x-extension/h', 'x-extension/cpp');
--// $mime_drivers['horde']['enscript']['icons'] = array(
--//     'default'          => 'text.gif',
--//     'text/html'        => 'html.gif',
--//     'text/xml'         => 'xml.gif',
--//     'x-extension/c'    => 'source-c.gif',
--//     'x-extension/h'    => 'source-h.gif',
--//     'x-extension/java' => 'source-java.gif');
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['location'] = '%%LOCALBASE%%/bin/enscript';
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['inline'] = false;
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['handles'] = array(
-+//UNCOMMENTWHENINSTCHORA     'text/html', 'x-extension/pl', 'x-extension/c',
-+//UNCOMMENTWHENINSTCHORA     'text/xml', 'application/x-sh', 'application/x-javascript',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/java', 'x-extension/h', 'x-extension/cpp');
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['icons'] = array(
-+//UNCOMMENTWHENINSTCHORA     'default'          => 'text.gif',
-+//UNCOMMENTWHENINSTCHORA     'text/html'        => 'html.gif',
-+//UNCOMMENTWHENINSTCHORA     'text/xml'         => 'xml.gif',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/c'    => 'source-c.gif',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/h'    => 'source-h.gif',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/java' => 'source-java.gif');
- 
- 
- /**
-@@ -121,7 +125,7 @@
-  */
- 
- /* Location of the tar binary. */
--$mime_drivers['horde']['tgz']['location'] = '/bin/tar';
-+$mime_drivers['horde']['tgz']['location'] = '/usr/bin/tar';
- $mime_drivers['horde']['tgz']['inline'] = true;
- $mime_drivers['horde']['tgz']['handles'] = array(
-     'x-extension/tgz',
-@@ -138,13 +142,13 @@
-  */
- 
- /* Location of the zipinfo binary. */
--// $mime_drivers['horde']['zip']['location'] = '/usr/bin/zipinfo';
--// $mime_drivers['horde']['zip']['inline'] = true;
--// $mime_drivers['horde']['zip']['handles'] = array(
--//     'x-extension/zip',
--//     'application/x-zip-compressed');
--// $mime_drivers['horde']['zip']['icons'] = array(
--//     'default' => 'compressed.gif');
-+//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['location'] = '%%LOCALBASE%%/bin/zipinfo';
-+//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['inline'] = true;
-+//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['handles'] = array(
-+//UNCOMMENTIFZIP     'x-extension/zip',
-+//UNCOMMENTIFZIP     'application/x-zip-compressed');
-+//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['icons'] = array(
-+//UNCOMMENTIFZIP     'default' => 'compressed.gif');
- 
- 
- /**
-@@ -153,12 +157,12 @@
-  */
- 
- /* Location of the rar binary. */
--// $mime_drivers['horde']['rar']['location'] = '/usr/bin/rar';
--// $mime_drivers['horde']['rar']['inline'] = true;
--// $mime_drivers['horde']['rar']['handles'] = array(
--//     'x-extension/rar');
--// $mime_drivers['horde']['rar']['icons'] = array(
--//     'default' => 'compressed.gif');
-+//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['location'] = '%%LOCALBASE%%/bin/rar';
-+//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['inline'] = true;
-+//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['handles'] = array(
-+//UNCOMMENTIFRAR     'x-extension/rar');
-+//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['icons'] = array(
-+//UNCOMMENTIFRAR     'default' => 'compressed.gif');
- 
- 
- /**
-@@ -168,15 +172,15 @@
-  */
- 
- /* Location of the wvHtml binary. */
--// $mime_drivers['horde']['msword']['location'] = '/usr/bin/wvHtml';
--// $mime_drivers['horde']['msword']['inline'] = true;
--// $mime_drivers['horde']['msword']['handles'] = array(
--//     'application/msword',
--//     'text/rtf',
--//     'x-extension/doc',
--//     'x-extension/rtf');
--// $mime_drivers['horde']['msword']['icons'] = array(
--//     'default' => 'msword.gif');
-+//UNCOMMENTIFWV $mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
-+//UNCOMMENTIFWV $mime_drivers['horde']['msword']['inline'] = true;
-+//UNCOMMENTIFWV $mime_drivers['horde']['msword']['handles'] = array(
-+//UNCOMMENTIFWV     'application/msword',
-+//UNCOMMENTIFWV     'text/rtf',
-+//UNCOMMENTIFWV     'x-extension/doc',
-+//UNCOMMENTIFWV     'x-extension/rtf');
-+//UNCOMMENTIFWV $mime_drivers['horde']['msword']['icons'] = array(
-+//UNCOMMENTIFWV     'default' => 'msword.gif');
- 
- 
- /**
-@@ -186,14 +190,14 @@
-  */
- 
- /* Location of the xlhtml binary. */
--// $mime_drivers['horde']['msexcel']['location'] = '/usr/local/bin/xlhtml';
--// $mime_drivers['horde']['msexcel']['inline'] = false;
--// $mime_drivers['horde']['msexcel']['handles'] = array(
--//     'application/vnd.ms-excel',
--//     'application/msexcel',
--//     'x-extension/xls');
--// $mime_drivers['horde']['msexcel']['icons'] = array(
--//     'default' => 'msexcel.gif');
-+//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['location'] = '%%LOCALBASE%%/bin/xlHtml';
-+//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['inline'] = false;
-+//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['handles'] = array(
-+//UNCOMMENTIFXL     'application/vnd.ms-excel',
-+//UNCOMMENTIFXL     'application/msexcel',
-+//UNCOMMENTIFXL     'x-extension/xls');
-+//UNCOMMENTIFXL $mime_drivers['horde']['msexcel']['icons'] = array(
-+//UNCOMMENTIFXL     'default' => 'msexcel.gif');
- 
- 
- /**
-@@ -204,14 +208,14 @@
-  */
- 
- /* Location of the ppthtml binary. */
--// $mime_drivers['horde']['mspowerpoint']['location'] = '/usr/local/bin/ppthtml';
--// $mime_drivers['horde']['mspowerpoint']['inline'] = false;
--// $mime_drivers['horde']['mspowerpoint']['handles'] = array(
--//     'application/vnd.ms-powerpoint',
--//     'application/mspowerpoint',
--//     'x-extension/ppt');
--// $mime_drivers['horde']['mspowerpoint']['icons'] = array(
--//     'default' => 'mspowerpoint.gif');
-+//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['location'] = '%%LOCALBASE%%/bin/pptHtml';
-+//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['inline'] = false;
-+//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['handles'] = array(
-+//UNCOMMENTIFXL     'application/vnd.ms-powerpoint',
-+//UNCOMMENTIFXL     'application/mspowerpoint',
-+//UNCOMMENTIFXL     'x-extension/ppt');
-+//UNCOMMENTIFXL $mime_drivers['horde']['mspowerpoint']['icons'] = array(
-+//UNCOMMENTIFXL     'default' => 'mspowerpoint.gif');
- 
- 
- /**
diff --git a/www/horde-devel/pkg-comment b/www/horde-devel/pkg-comment
deleted file mode 100644
index 20a1d723f4fc..000000000000
--- a/www/horde-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A common code-base used by Horde applications, written in PHP
diff --git a/www/horde-devel/pkg-deinstall b/www/horde-devel/pkg-deinstall
deleted file mode 100644
index 6a75b26f7a23..000000000000
--- a/www/horde-devel/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Try to restore httpd.conf when deinstalling Horde
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-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
-	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
deleted file mode 100644
index 296d9852610c..000000000000
--- a/www/horde-devel/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Horde  2.0 is a massive upgrade of the Horde Application Framework.
-
-Many components have been added or streamlined. Inter-application
-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, devel/chora,
-deskutils/kronolith, deskutils/nag, www/jonah and net/nic.
-
-WWW: http://www.horde.org/
diff --git a/www/horde-devel/pkg-message b/www/horde-devel/pkg-message
deleted file mode 100644
index d4d255b32d8a..000000000000
--- a/www/horde-devel/pkg-message
+++ /dev/null
@@ -1,33 +0,0 @@
-************************************************************************
-Horde has been installed in %%HORDEDIR%% with your blank
-configuration files.
-
-You have to update the file %%HORDEDIR%%/config/horde.php:
-select a backend for authenticating users at the line
-conf['auth']['driver'] of the section 'Horde Authentication'
-(tip: if you plan to install imp, you should have an IMAP server,
-and you may select 'imap').
-Select a log driver; if you keep 'file', do not forget to add a line
-in /etc/newsyslog.conf.
-Then select and configure a preferences driver.
-
-If you want Horde to access a database, you have to run the
-appropriate scripts located in %%HORDEDIR%%/scripts/db.
-
-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.
-
-Your %%APACHE_CONF%% has been updated,
-you have to restart Apache.
-
-When everything is OK, you should be able to access Horde from
-<URL:http://localhost/horde/>.
-(If <URL:http://localhost/horde/> does not run, but
- <URL:http://localhost/horde/index.php> is OK, then you have
- to define index.php as a DirectoryIndex in %%APACHE_CONF%%.)
-
-There is a testing script at <URL:http://localhost/horde/test.php>.
-
-The script horde_set_perms.sh has been installed in %%HORDESBIN%%.
-************************************************************************
diff --git a/www/horde-devel/pkg-plist b/www/horde-devel/pkg-plist
deleted file mode 100644
index 3db3adf64e0c..000000000000
--- a/www/horde-devel/pkg-plist
+++ /dev/null
@@ -1,350 +0,0 @@
-%%HORDEDIR%%/admin/css/find.php
-%%HORDEDIR%%/admin/css/graphics/color_picker.gif
-%%HORDEDIR%%/admin/css/index.php
-%%HORDEDIR%%/admin/css/templates/colorpicker/behavior.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/blue.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/boxbevel.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/colorspace.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/colorthumb.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/getcolor.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/green.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/grey3.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/grey4.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/grey5.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/hls.jpg
-%%HORDEDIR%%/admin/css/templates/colorpicker/hls_sat.jpg
-%%HORDEDIR%%/admin/css/templates/colorpicker/openit.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/picker_two.html
-%%HORDEDIR%%/admin/css/templates/colorpicker/red.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/rgb.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/spectrum.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/spectrum.jpg
-%%HORDEDIR%%/admin/css/templates/colorpicker/tabHLS.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/tabHSB.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/tabRGB.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumb.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbB.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbC.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbG.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbL.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbR.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbS.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbT.gif
-%%HORDEDIR%%/admin/user.php
-%%HORDEDIR%%/config/.htaccess
-%%HORDEDIR%%/config/horde.php
-%%HORDEDIR%%/config/horde.php.dist
-%%HORDEDIR%%/config/horde.php.dist.orig
-%%HORDEDIR%%/config/html.php
-%%HORDEDIR%%/config/html.php.dist
-%%HORDEDIR%%/config/lang.php
-%%HORDEDIR%%/config/lang.php.dist
-%%HORDEDIR%%/config/mime_drivers.php
-%%HORDEDIR%%/config/mime_drivers.php.dist
-%%HORDEDIR%%/config/mime_drivers.php.dist.orig
-%%HORDEDIR%%/config/mime_mapping.php
-%%HORDEDIR%%/config/mime_mapping.php.dist
-%%HORDEDIR%%/config/motd.php
-%%HORDEDIR%%/config/motd.php.dist
-%%HORDEDIR%%/config/registry.php
-%%HORDEDIR%%/config/registry.php.dist
-%%HORDEDIR%%/config/registry.php.dist.orig
-%%HORDEDIR%%/css.php
-%%HORDEDIR%%/graphics/administration.gif
-%%HORDEDIR%%/graphics/alerts/error.gif
-%%HORDEDIR%%/graphics/alerts/message.gif
-%%HORDEDIR%%/graphics/alerts/success.gif
-%%HORDEDIR%%/graphics/alerts/warning.gif
-%%HORDEDIR%%/graphics/data.gif
-%%HORDEDIR%%/graphics/help.gif
-%%HORDEDIR%%/graphics/home.gif
-%%HORDEDIR%%/graphics/keyboard.gif
-%%HORDEDIR%%/graphics/login.gif
-%%HORDEDIR%%/graphics/logout.gif
-%%HORDEDIR%%/graphics/mime/audio.gif
-%%HORDEDIR%%/graphics/mime/binary.gif
-%%HORDEDIR%%/graphics/mime/compressed.gif
-%%HORDEDIR%%/graphics/mime/csv.gif
-%%HORDEDIR%%/graphics/mime/deb.gif
-%%HORDEDIR%%/graphics/mime/encryption.gif
-%%HORDEDIR%%/graphics/mime/executable.gif
-%%HORDEDIR%%/graphics/mime/html.gif
-%%HORDEDIR%%/graphics/mime/image.gif
-%%HORDEDIR%%/graphics/mime/inf.gif
-%%HORDEDIR%%/graphics/mime/mail.gif
-%%HORDEDIR%%/graphics/mime/makefile.gif
-%%HORDEDIR%%/graphics/mime/msexcel.gif
-%%HORDEDIR%%/graphics/mime/msi.gif
-%%HORDEDIR%%/graphics/mime/msp.gif
-%%HORDEDIR%%/graphics/mime/mspowerpoint.gif
-%%HORDEDIR%%/graphics/mime/msword.gif
-%%HORDEDIR%%/graphics/mime/pdf.gif
-%%HORDEDIR%%/graphics/mime/php.gif
-%%HORDEDIR%%/graphics/mime/readme.gif
-%%HORDEDIR%%/graphics/mime/rpm.gif
-%%HORDEDIR%%/graphics/mime/script-asa.gif
-%%HORDEDIR%%/graphics/mime/script-asp.gif
-%%HORDEDIR%%/graphics/mime/setup.gif
-%%HORDEDIR%%/graphics/mime/signed.gif
-%%HORDEDIR%%/graphics/mime/source-c.gif
-%%HORDEDIR%%/graphics/mime/source-h.gif
-%%HORDEDIR%%/graphics/mime/source-java.gif
-%%HORDEDIR%%/graphics/mime/text.gif
-%%HORDEDIR%%/graphics/mime/unknown.gif
-%%HORDEDIR%%/graphics/mime/vcard.gif
-%%HORDEDIR%%/graphics/mime/xml.gif
-%%HORDEDIR%%/graphics/prefs.gif
-%%HORDEDIR%%/graphics/problem.gif
-%%HORDEDIR%%/help.php
-%%HORDEDIR%%/index.php
-%%HORDEDIR%%/javascript.php
-%%HORDEDIR%%/lib/.htaccess
-%%HORDEDIR%%/lib/Auth.php
-%%HORDEDIR%%/lib/Auth/ftp.php
-%%HORDEDIR%%/lib/Auth/imap.php
-%%HORDEDIR%%/lib/Auth/ldap.php
-%%HORDEDIR%%/lib/Auth/mcal.php
-%%HORDEDIR%%/lib/Auth/sql.php
-%%HORDEDIR%%/lib/Browser.php
-%%HORDEDIR%%/lib/Cache.php
-%%HORDEDIR%%/lib/Cache/file.php
-%%HORDEDIR%%/lib/Category.php
-%%HORDEDIR%%/lib/Category/sql.php
-%%HORDEDIR%%/lib/Data.php
-%%HORDEDIR%%/lib/Group.php
-%%HORDEDIR%%/lib/Help.php
-%%HORDEDIR%%/lib/Horde.php
-%%HORDEDIR%%/lib/Identity.php
-%%HORDEDIR%%/lib/Lang.php
-%%HORDEDIR%%/lib/MIME.php
-%%HORDEDIR%%/lib/MIME/Magic.php
-%%HORDEDIR%%/lib/MIME/Message.php
-%%HORDEDIR%%/lib/MIME/Part.php
-%%HORDEDIR%%/lib/MIME/Structure.php
-%%HORDEDIR%%/lib/MIME/Viewer.php
-%%HORDEDIR%%/lib/MIME/Viewer/deb.php
-%%HORDEDIR%%/lib/MIME/Viewer/default.php
-%%HORDEDIR%%/lib/MIME/Viewer/enscript.php
-%%HORDEDIR%%/lib/MIME/Viewer/msexcel.php
-%%HORDEDIR%%/lib/MIME/Viewer/mspowerpoint.php
-%%HORDEDIR%%/lib/MIME/Viewer/msword.php
-%%HORDEDIR%%/lib/MIME/Viewer/php.php
-%%HORDEDIR%%/lib/MIME/Viewer/rar.php
-%%HORDEDIR%%/lib/MIME/Viewer/rpm.php
-%%HORDEDIR%%/lib/MIME/Viewer/tgz.php
-%%HORDEDIR%%/lib/MIME/Viewer/vcard.php
-%%HORDEDIR%%/lib/MIME/Viewer/zip.php
-%%HORDEDIR%%/lib/Maintenance.php
-%%HORDEDIR%%/lib/Menu.php
-%%HORDEDIR%%/lib/Perms.php
-%%HORDEDIR%%/lib/Perms/sql.php
-%%HORDEDIR%%/lib/Prefs.php
-%%HORDEDIR%%/lib/Prefs/ldap.php
-%%HORDEDIR%%/lib/Prefs/session.php
-%%HORDEDIR%%/lib/Prefs/sql.php
-%%HORDEDIR%%/lib/Registry.php
-%%HORDEDIR%%/lib/Secret.php
-%%HORDEDIR%%/lib/Serialize.php
-%%HORDEDIR%%/lib/SessionCache.php
-%%HORDEDIR%%/lib/Text.php
-%%HORDEDIR%%/lib/Token.php
-%%HORDEDIR%%/lib/Token/file.php
-%%HORDEDIR%%/lib/Token/sql.php
-%%HORDEDIR%%/lib/base.php
-%%HORDEDIR%%/lib/version.php
-%%HORDEDIR%%/locale/.htaccess
-%%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_US/help.xml
-%%HORDEDIR%%/locale/es_ES/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/it_IT/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/ko_KR/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/nl_NL/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/no_BOK/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/pl_PL/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/pt_BR/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/ru_koi/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/ru_win/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/sv_SE/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/zh_CN/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/zh_TW/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/login.php
-%%HORDEDIR%%/maintenance.php
-%%HORDEDIR%%/menu.php
-%%HORDEDIR%%/po/.htaccess
-%%HORDEDIR%%/po/Makefile
-%%HORDEDIR%%/po/README
-%%HORDEDIR%%/po/README.WinToKoi
-%%HORDEDIR%%/po/WinToKoi.pl
-%%HORDEDIR%%/po/cs_CZ.po
-%%HORDEDIR%%/po/de_DE.po
-%%HORDEDIR%%/po/el_GR.po
-%%HORDEDIR%%/po/es_ES.po
-%%HORDEDIR%%/po/extract.pl
-%%HORDEDIR%%/po/fi_FI.po
-%%HORDEDIR%%/po/fr_FR.po
-%%HORDEDIR%%/po/it_IT.po
-%%HORDEDIR%%/po/ko_KR.po
-%%HORDEDIR%%/po/nl_NL.po
-%%HORDEDIR%%/po/no_BOK.po
-%%HORDEDIR%%/po/pl_PL.po
-%%HORDEDIR%%/po/pt_BR.po
-%%HORDEDIR%%/po/ru_koi.po
-%%HORDEDIR%%/po/ru_win.po
-%%HORDEDIR%%/po/shtool
-%%HORDEDIR%%/po/sv_SE.po
-%%HORDEDIR%%/po/xgettext.sh
-%%HORDEDIR%%/po/zh_CN.po
-%%HORDEDIR%%/po/zh_TW.po
-%%HORDEDIR%%/problem.php
-%%HORDEDIR%%/scripts/.htaccess
-%%HORDEDIR%%/scripts/SCRIPTS
-%%HORDEDIR%%/scripts/db/README
-%%HORDEDIR%%/scripts/db/auth.sql
-%%HORDEDIR%%/scripts/db/category.sql
-%%HORDEDIR%%/scripts/db/mysql_create.sql
-%%HORDEDIR%%/scripts/db/mysql_drop.sql
-%%HORDEDIR%%/scripts/db/pgsql_create.sql
-%%HORDEDIR%%/scripts/db/pgsql_drop.sql
-%%HORDEDIR%%/scripts/db/prefs.sql
-%%HORDEDIR%%/scripts/horde-rsync.sh
-%%HORDEDIR%%/scripts/mime_mapping/Makefile
-%%HORDEDIR%%/scripts/mime_mapping/convert.pl
-%%HORDEDIR%%/scripts/mime_mapping/mime.types
-%%HORDEDIR%%/scripts/set_perms.sh
-%%HORDEDIR%%/scripts/set_perms.sh.orig
-%%HORDEDIR%%/status.php
-%%HORDEDIR%%/templates/.htaccess
-%%HORDEDIR%%/templates/admin/user/add.inc
-%%HORDEDIR%%/templates/admin/user/list.inc
-%%HORDEDIR%%/templates/admin/user/noadd.inc
-%%HORDEDIR%%/templates/admin/user/nolist.inc
-%%HORDEDIR%%/templates/common-footer.inc
-%%HORDEDIR%%/templates/common-header.inc
-%%HORDEDIR%%/templates/data/csvmap.inc
-%%HORDEDIR%%/templates/data/datemap.inc
-%%HORDEDIR%%/templates/help/footer.inc
-%%HORDEDIR%%/templates/help/header.inc
-%%HORDEDIR%%/templates/help/index.inc
-%%HORDEDIR%%/templates/help/menu.inc
-%%HORDEDIR%%/templates/horde/modules.inc
-%%HORDEDIR%%/templates/index/css.inc
-%%HORDEDIR%%/templates/index/floating_index.inc
-%%HORDEDIR%%/templates/index/frames_index.inc
-%%HORDEDIR%%/templates/index/notconfigured.inc
-%%HORDEDIR%%/templates/index/wap.inc
-%%HORDEDIR%%/templates/javascript/open_help_win.js
-%%HORDEDIR%%/templates/login/login.inc
-%%HORDEDIR%%/templates/login/user.inc
-%%HORDEDIR%%/templates/maintenance/confirm_bottom.inc
-%%HORDEDIR%%/templates/maintenance/confirm_middle.inc
-%%HORDEDIR%%/templates/maintenance/confirm_top.inc
-%%HORDEDIR%%/templates/maintenance/javascript.inc
-%%HORDEDIR%%/templates/prefs/begin.inc
-%%HORDEDIR%%/templates/prefs/checkbox.inc
-%%HORDEDIR%%/templates/prefs/end.inc
-%%HORDEDIR%%/templates/prefs/enum.inc
-%%HORDEDIR%%/templates/prefs/link.inc
-%%HORDEDIR%%/templates/prefs/number.inc
-%%HORDEDIR%%/templates/prefs/overview.inc
-%%HORDEDIR%%/templates/prefs/select.inc
-%%HORDEDIR%%/templates/prefs/text.inc
-%%HORDEDIR%%/templates/prefs/textarea.inc
-%%HORDEDIR%%/templates/problem/javascript.inc
-%%HORDEDIR%%/templates/problem/problem.inc
-%%HORDEDIR%%/templates/wml/common-footer.inc
-%%HORDEDIR%%/templates/wml/common-header.inc
-%%HORDEDIR%%/templates/wml/doctype.inc
-%%HORDEDIR%%/templates/wml/login/login.inc
-%%HORDEDIR%%/templates/wml/login/user.inc
-%%HORDEDIR%%/test.php
-%%HORDEDIR%%/util/special_characters.php
-%%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/CONTRIBUTING
-%%PORTDOCS%%share/doc/horde/COPYING
-%%PORTDOCS%%share/doc/horde/CREDITS
-%%PORTDOCS%%share/doc/horde/HACKING
-%%PORTDOCS%%share/doc/horde/INSTALL
-%%PORTDOCS%%share/doc/horde/README
-%%PORTDOCS%%@dirrm share/doc/horde
-@dirrm %%HORDEDIR%%/admin/css/graphics
-@dirrm %%HORDEDIR%%/admin/css/templates/colorpicker
-@dirrm %%HORDEDIR%%/admin/css/templates
-@dirrm %%HORDEDIR%%/admin/css
-@dirrm %%HORDEDIR%%/admin
-@dirrm %%HORDEDIR%%/config
-@dirrm %%HORDEDIR%%/graphics/alerts
-@dirrm %%HORDEDIR%%/graphics/mime
-@dirrm %%HORDEDIR%%/graphics
-@dirrm %%HORDEDIR%%/lib/Auth
-@dirrm %%HORDEDIR%%/lib/Cache
-@dirrm %%HORDEDIR%%/lib/Category
-@dirrm %%HORDEDIR%%/lib/MIME/Viewer
-@dirrm %%HORDEDIR%%/lib/MIME
-@dirrm %%HORDEDIR%%/lib/Prefs
-@dirrm %%HORDEDIR%%/lib/Perms
-@dirrm %%HORDEDIR%%/lib/Token
-@dirrm %%HORDEDIR%%/lib
-@dirrm %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/cs_CZ
-@dirrm %%HORDEDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/de_DE
-@dirrm %%HORDEDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/el_GR
-@dirrm %%HORDEDIR%%/locale/en_US
-@dirrm %%HORDEDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/es_ES
-@dirrm %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/fi_FI
-@dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/fr_FR
-@dirrm %%HORDEDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/it_IT
-@dirrm %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/ko_KR
-@dirrm %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/nl_NL
-@dirrm %%HORDEDIR%%/locale/no_BOK/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/no_BOK
-@dirrm %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/pl_PL
-@dirrm %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/pt_BR
-@dirrm %%HORDEDIR%%/locale/ru_koi/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/ru_koi
-@dirrm %%HORDEDIR%%/locale/ru_win/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/ru_win
-@dirrm %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/sv_SE
-@dirrm %%HORDEDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/zh_CN
-@dirrm %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/zh_TW
-@dirrm %%HORDEDIR%%/locale
-@dirrm %%HORDEDIR%%/scripts/db
-@dirrm %%HORDEDIR%%/scripts/mime_mapping
-@dirrm %%HORDEDIR%%/scripts
-@dirrm %%HORDEDIR%%/templates/admin/user
-@dirrm %%HORDEDIR%%/templates/admin
-@dirrm %%HORDEDIR%%/templates/data
-@dirrm %%HORDEDIR%%/templates/help
-@dirrm %%HORDEDIR%%/templates/horde
-@dirrm %%HORDEDIR%%/templates/index
-@dirrm %%HORDEDIR%%/templates/javascript
-@dirrm %%HORDEDIR%%/templates/login
-@dirrm %%HORDEDIR%%/templates/maintenance/
-@dirrm %%HORDEDIR%%/templates/prefs
-@dirrm %%HORDEDIR%%/templates/problem
-@dirrm %%HORDEDIR%%/templates/wml/login
-@dirrm %%HORDEDIR%%/templates/wml
-@dirrm %%HORDEDIR%%/templates
-@dirrm %%HORDEDIR%%/util
-@dirrm %%HORDEDIR%%/po
-@dirrm %%HORDEDIR%%
-@dirrm etc/horde
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 10aca4f46e2b..b2a2c57130bc 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -77,7 +77,7 @@ pre-everything::
 pre-install:
 	@if [ -f ${HORDEDIR}/index.php ]; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "Please deinstall the port www/horde-devel." ; \
+		${ECHO_MSG} "Please deinstall the port www/horde2." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	 fi
diff --git a/www/horde/pkg-comment b/www/horde/pkg-comment
index 20a1d723f4fc..9d28558ea160 100644
--- a/www/horde/pkg-comment
+++ b/www/horde/pkg-comment
@@ -1 +1 @@
-A common code-base used by Horde applications, written in PHP
+A common code-base used by Horde applications, written in PHP3
diff --git a/www/horde/pkg-descr b/www/horde/pkg-descr
index fd1087dfbeff..c0c36f4ae843 100644
--- a/www/horde/pkg-descr
+++ b/www/horde/pkg-descr
@@ -1,3 +1,6 @@
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port www/horde2.
+
 Horde is both a piece of software and a project.
 
 The Horde Project comprises a set of Web-based productivity, messaging,
@@ -12,5 +15,3 @@ in Horde's components, and mostly IMP, the well-known webmail (see the
 port mail/imp).
 
 WWW: http://www.horde.org/
-
-- Thierry Thomas <thierry@thomas.as>.
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 966b8e6f2c5a..5e8e016c27ee 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for:  horde-devel
+# Ports collection makefile for:  horde2
 # Date created:			  Sun Oct 07, 2001
 # Whom:				  Thierry Thomas (<thierry@thomas.as>)
 #
@@ -10,7 +10,6 @@ PORTVERSION=	2.0
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	thierry@pompo.net
 
diff --git a/www/horde2/pkg-descr b/www/horde2/pkg-descr
index 296d9852610c..8f00bc7b704b 100644
--- a/www/horde2/pkg-descr
+++ b/www/horde2/pkg-descr
@@ -5,7 +5,7 @@ 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, devel/chora,
+Horde is used by these ports: mail/imp3, mail/turba, devel/chora,
 deskutils/kronolith, deskutils/nag, www/jonah and net/nic.
 
 WWW: http://www.horde.org/
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index 10aca4f46e2b..b2a2c57130bc 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -77,7 +77,7 @@ pre-everything::
 pre-install:
 	@if [ -f ${HORDEDIR}/index.php ]; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} "Please deinstall the port www/horde-devel." ; \
+		${ECHO_MSG} "Please deinstall the port www/horde2." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	 fi
diff --git a/www/horde4-base/pkg-comment b/www/horde4-base/pkg-comment
index 20a1d723f4fc..9d28558ea160 100644
--- a/www/horde4-base/pkg-comment
+++ b/www/horde4-base/pkg-comment
@@ -1 +1 @@
-A common code-base used by Horde applications, written in PHP
+A common code-base used by Horde applications, written in PHP3
diff --git a/www/horde4-base/pkg-descr b/www/horde4-base/pkg-descr
index fd1087dfbeff..c0c36f4ae843 100644
--- a/www/horde4-base/pkg-descr
+++ b/www/horde4-base/pkg-descr
@@ -1,3 +1,6 @@
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port www/horde2.
+
 Horde is both a piece of software and a project.
 
 The Horde Project comprises a set of Web-based productivity, messaging,
@@ -12,5 +15,3 @@ in Horde's components, and mostly IMP, the well-known webmail (see the
 port mail/imp).
 
 WWW: http://www.horde.org/
-
-- Thierry Thomas <thierry@thomas.as>.