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

28 files changed, 38 insertions, 778 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 31b544b6d1fe..d13ee6554745 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -71,7 +71,7 @@
     SUBDIR += im
     SUBDIR += imap-uw
     SUBDIR += imp
-    SUBDIR += imp-devel
+    SUBDIR += imp3
     SUBDIR += isync
     SUBDIR += junkfilter
     SUBDIR += kbiff
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 3eb05f0a462b..1427988c53a0 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -121,7 +121,7 @@ pre-install:
 # N.B.: database dependencies are binded with mod_php#, neither by Horde nor IMP.
 	@if [ -f ${IMPDIR}/index.php ]; then \
 	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please deinstall the port mail/imp-devel." ; \
+	    ${ECHO_MSG} "Please deinstall the port mail/imp3." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
diff --git a/mail/horde-imp/pkg-descr b/mail/horde-imp/pkg-descr
index 57770f046f84..91595ebce568 100644
--- a/mail/horde-imp/pkg-descr
+++ b/mail/horde-imp/pkg-descr
@@ -1,8 +1,9 @@
-IMP is a set of PHP scripts that implement an IMAP based webmail system.
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port mail/imp3.
+
+IMP is a set of PHP3 scripts that implement an IMAP based webmail system.
 Assuming you have an account on a server that supports IMAP, you can use
 an installation of IMP to check your mail from anywhere that you have web
 access.
 
 WWW: http://www.horde.org/imp/
-
-- Thierry Thomas <thierry@thomas.as>.
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 4eb18d012903..0e9ad21938f3 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
 .endif
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde-devel
+RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 NO_BUILD=	yes
 DOCS=		COPYING README docs/CHANGES docs/CREDITS \
diff --git a/mail/horde-turba/pkg-descr b/mail/horde-turba/pkg-descr
index 7c363e6d373a..7ad5e825db08 100644
--- a/mail/horde-turba/pkg-descr
+++ b/mail/horde-turba/pkg-descr
@@ -1,9 +1,8 @@
-Turba is the Horde contact management application. It is currently in
-the development stages, and makes heavy use of the Horde framework to
-provide integration with other applications.
+Turba is the Horde contact management application. It makes heavy use
+of the Horde framework to provide integration with other applications.
 
-Right now, Turba is a fairly complete basic contact management
-application. SQL and LDAP backends are available and fairly well tested.
+Turba is a fairly complete basic contact management application.
+SQL and LDAP backends are available.
 You can define the fields in your addressbooks in a very flexible way,
 just by changing the config files.
 And there are Horde API functions to add and search for contacts.
diff --git a/mail/horde-turba/pkg-message b/mail/horde-turba/pkg-message
index 7297d45a2967..85ffa7b6262b 100644
--- a/mail/horde-turba/pkg-message
+++ b/mail/horde-turba/pkg-message
@@ -3,7 +3,7 @@ Turba has been installed in %%TURBADIR%% with your blank
 configuration files.
 
 Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 3eb05f0a462b..1427988c53a0 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -121,7 +121,7 @@ pre-install:
 # N.B.: database dependencies are binded with mod_php#, neither by Horde nor IMP.
 	@if [ -f ${IMPDIR}/index.php ]; then \
 	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please deinstall the port mail/imp-devel." ; \
+	    ${ECHO_MSG} "Please deinstall the port mail/imp3." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
diff --git a/mail/horde4-imp/pkg-descr b/mail/horde4-imp/pkg-descr
index 57770f046f84..91595ebce568 100644
--- a/mail/horde4-imp/pkg-descr
+++ b/mail/horde4-imp/pkg-descr
@@ -1,8 +1,9 @@
-IMP is a set of PHP scripts that implement an IMAP based webmail system.
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port mail/imp3.
+
+IMP is a set of PHP3 scripts that implement an IMAP based webmail system.
 Assuming you have an account on a server that supports IMAP, you can use
 an installation of IMP to check your mail from anywhere that you have web
 access.
 
 WWW: http://www.horde.org/imp/
-
-- Thierry Thomas <thierry@thomas.as>.
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 4eb18d012903..0e9ad21938f3 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
 .endif
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde-devel
+RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 NO_BUILD=	yes
 DOCS=		COPYING README docs/CHANGES docs/CREDITS \
diff --git a/mail/horde4-turba/pkg-descr b/mail/horde4-turba/pkg-descr
index 7c363e6d373a..7ad5e825db08 100644
--- a/mail/horde4-turba/pkg-descr
+++ b/mail/horde4-turba/pkg-descr
@@ -1,9 +1,8 @@
-Turba is the Horde contact management application. It is currently in
-the development stages, and makes heavy use of the Horde framework to
-provide integration with other applications.
+Turba is the Horde contact management application. It makes heavy use
+of the Horde framework to provide integration with other applications.
 
-Right now, Turba is a fairly complete basic contact management
-application. SQL and LDAP backends are available and fairly well tested.
+Turba is a fairly complete basic contact management application.
+SQL and LDAP backends are available.
 You can define the fields in your addressbooks in a very flexible way,
 just by changing the config files.
 And there are Horde API functions to add and search for contacts.
diff --git a/mail/horde4-turba/pkg-message b/mail/horde4-turba/pkg-message
index 7297d45a2967..85ffa7b6262b 100644
--- a/mail/horde4-turba/pkg-message
+++ b/mail/horde4-turba/pkg-message
@@ -3,7 +3,7 @@ Turba has been installed in %%TURBADIR%% with your blank
 configuration files.
 
 Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and
diff --git a/mail/imp-devel/Makefile b/mail/imp-devel/Makefile
deleted file mode 100644
index 3de535817eba..000000000000
--- a/mail/imp-devel/Makefile
+++ /dev/null
@@ -1,308 +0,0 @@
-# Ports collection makefile for:  imp-devel
-# Date created:			  Mon Oct 08, 2001
-# Whom:				  Thierry Thomas (<thierry@thomas.as>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	imp
-PORTVERSION=	3.0
-PORTREVISION=	2
-CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	thierry@pompo.net
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-#-----------------------------------------------------------------------
-# You may define these options:
-#
-# - WITHOUT_LDAP	: if you do not need OpenLDAP;
-# - WITH_LDAP1		: if you prefer OpenLDAP1.
-#
-# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
-#
-# - WITHOUT_WV		: if your users never receive MS-Word docs;
-#
-# - WITHOUT_XL		: if your users never receive MS-Excel sheets
-#			  (or .ppt presentations);
-#
-# - WITHOUT_ZIP		: if not interested by zipinfo;
-#
-# - WITH_RAR		: if interested by rar (shareware archiver);
-#
-# - WITHOUT_ASPELL	: for spelling bees...
-#
-# - NOCRYPT		: if crypto is restricted in your country;
-#
-# - WITHOUT_SSL		: if you have not installed c-client WITH_SSL;
-#
-# - WITH_VALID_CERT	: if you own a valid SSL certificate;
-#
-# - WITHOUT_TURBA	: if you do not want adressbooks;
-#
-# - WITHOUT_IMAPSERVER	: if your IMAP server runs on another machine;
-#
-# or you can select to work with one of these servers:
-#
-# - WITH_CYRUS-IMAPD	: IMP will work with cyrus-imapd;
-#
-# - WITH_CYRUS		: IMP will work with cyrus;
-#
-# - WITH_IMAP-UW	: IMP will work with imap-uw;
-#
-# - WITH_COURIER-IMAP	: IMP will work with courier-imap.
-#
-# These choice are mutually exclusive, and imap-uw is the default.
-#
-#-----------------------------------------------------------------------
-
-LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
-
-.if defined(WITHOUT_TURBA)
-.if !defined(WITHOUT_LDAP)
-.if defined(WITH_LDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap \
-		lber.1:${PORTSDIR}/net/openldap
-.else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
-.endif
-.endif
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde${PKGNAMESUFFIX}
-.else
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/turba/index.php:${PORTSDIR}/mail/turba
-.endif
-
-# Support of GnuPG is not implemented in this release
-#.if !defined(NOCRYPT)
-#RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
-#.endif
-
-# I have no report about the support of dkimap4 by IMP,
-# but I shall be happy to add it if somebody report success with it.
-# If an IMAP server is already installed, we just record the dependence,
-# else we shall install imap-uw.
-# IMAP servers are ordered according to my tastes, if several are
-# installed, we just record the first one.
-.if !defined(WITHOUT_IMAPSERVER)
-.if defined(WITH_IMAP-UW)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
-.elif defined(WITH_CYRUS-IMAPD)
-RUN_DEPENDS+=	${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd
-.elif defined(WITH_CYRUS)
-RUN_DEPENDS+=	${LOCALBASE}/cyrus/:${PORTSDIR}/mail/cyrus
-.elif defined(WITH_COURIER-IMAP)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/courier-imap/:${PORTSDIR}/mail/courier-imap
-.else
-RUN_DEPENDS+=	${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw
-.endif
-.endif
-
-.if !defined(WITHOUT_X11)
-.if !defined(WITHOUT_WV)
-RUN_DEPENDS+=	${LOCALBASE}/bin/wvHtml:${PORTSDIR}/textproc/wv
-.endif
-.if !defined(WITHOUT_XL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/xlHtml:${PORTSDIR}/textproc/xlhtml
-.endif
-.if !defined(WITHOUT_ZIP)
-RUN_DEPENDS+=	${LOCALBASE}/bin/zipinfo:${PORTSDIR}/archivers/unzip
-.endif
-.if defined(WITH_RAR)
-RUN_DEPENDS+=	${LOCALBASE}/bin/rar:${PORTSDIR}/archivers/rar
-.endif
-.if !defined(WITHOUT_ASPELL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
-.endif
-.endif
-
-NO_BUILD=	yes
-DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
-CONFFILE=	conf.php filter.txt header.txt html.php menu.php \
-		mime_drivers.php motd.php prefs.php servers.php \
-		trailer.txt
-
-LHORDEDIR?=	www/horde
-LIMPDIR?=	${LHORDEDIR}/imp
-HORDESBIN?=	${PREFIX}/sbin
-
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} IMPDIR=${LIMPDIR}
-
-HORDEDIR=	${PREFIX}/${LHORDEDIR}
-IMPDIR=		${PREFIX}/${LIMPDIR}
-TURBADIR?=	${HORDEDIR}/turba
-CONFDIR=	${IMPDIR}/config
-HCONFDIR=	${HORDEDIR}/config
-
-HORDE_INC=	${LOCALBASE}/etc/horde
-
-HOSTNAME?=	`/bin/hostname`
-SERVOS?=	${OPSYS}-${OSREL}
-
-PORTREV_H?=	${LOCALBASE}/include/c-client/portrevision.h
-
-# Where you want to store the public keyrings needed for gpg
-# (in a subdirectory in that directory called .gnupg)
-GNUPG_CNFDIR?=	${LOCALBASE}/etc
-
-pre-everything::
-.if !defined(WITHOUT_IMAPSERVER)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Press CTRL-C and define WITHOUT_IMAPSERVER"
-	@${ECHO_MSG} "if you intend to run an IMAP server on an other machine."
-	@${ECHO_MSG} ""
-.endif
-
-pre-install:
-# N.B.: database dependencies are binded with mod_php#, neither by Horde nor IMP.
-	@if [ -f ${IMPDIR}/index.php3 ]; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please deinstall the port mail/imp." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "c-client4.8"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with IMAP or IMAP-SSL support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.if !defined(BATCH)
-.if !defined(WITHOUT_SSL)
-	@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure c-client with SSL support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-.endif
-.if !defined(WITHOUT_LDAP)
-.if defined(WITH_LDAP1)
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.else
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.2"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-.endif
-.if !defined(NOCRYPT)
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mcrypt.7"; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with mcrypt support." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	fi
-.endif
-.if !defined(WITHOUT_SUPPORTED_DB)
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mysqlclient.10" ; then \
-	 if ! ${LDCONFIG} -r | ${GREP} -q -e "pq.2" ; then \
-	  if ! ${LDCONFIG} -r | ${GREP} -q -e "sybdb.1" ; then \
-	   if ! ${LDCONFIG} -r | ${GREP} -q -e "ct.0" ; then \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
-	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
-	    ${ECHO_MSG} "can be used with PHP AND IMP." ; \
-	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "(If everything will run on this machine, do not" ; \
-	    ${ECHO_MSG} " forget to install the database server-side!)" ; \
-	    ${ECHO_MSG} "" ; \
-	    ${FALSE} ; \
-	   fi ; \
-	  fi ; \
-	 fi ; \
-	fi
-.endif
-
-do-install:
-	@${MKDIR}  ${IMPDIR}
-	@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${IMPDIR}
-	@${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${IMPDIR}
-	@${CP} -Rp ${WRKSRC}/po ${IMPDIR}
-	@${CP} -p  ${WRKSRC}/*.php ${IMPDIR}
-.for FILE in ${CONFFILE}
-	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
-	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
-	fi
-.endfor
-	@${PERL} -pi -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
-	@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
-	@${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
-		${IMPDIR}/compose.php
-.if defined(WITHOUT_SSL)
-	@${PERL} -pi -e "s:%%PROTOCOL%%:imap:;s:%%IMAPPORT%%:143:" \
-		${CONFDIR}/servers.php
-.else
-	@${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
-.if defined(WITH_VALID_CERT)
-	@${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
-.else
-	@${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
-		${CONFDIR}/servers.php
-.endif
-.endif
-.if !defined(WITHOUT_ASPELL)
-	@${PERL} -pi -e "s:spellchecker'] = '':spellchecker'] = '${LOCALBASE}/bin/aspell':" \
-		${CONFDIR}/conf.php
-.endif
-.if !defined(WITHOUT_X11)
-.if !defined(WITHOUT_WV)
-	@${PERL} -pi -e "s://UNCOMMENTIFWV ::" ${HCONFDIR}/mime_drivers.php
-.endif
-.if !defined(WITHOUT_XL)
-	@${PERL} -pi -e "s://UNCOMMENTIFXL ::" ${HCONFDIR}/mime_drivers.php
-.endif
-.endif
-#.if !defined(NOCRYPT)
-#	@(if [ ! -d ${GNUPG_CNFDIR} ] ; then \
-#		${MKDIR} ${GNUPG_CNFDIR} ; \
-#	fi)
-#	@${PERL} -pi -e "s:pgp']['enabled'] = false:pgp']['enabled'] = true:g" \
-#			${CONFDIR}/conf.php
-#	@${PERL} -pi -e "s:%%GNUPG_CNFDIR%%:${GNUPG_CNFDIR}:" \
-#			${CONFDIR}/conf.php
-#.endif
-.if !defined(WITHOUT_ZIP)
-	@${PERL} -pi -e "s://UNCOMMENTIFZIP ::" ${HCONFDIR}/mime_drivers.php
-.endif
-.if defined(WITH_RAR)
-	@${PERL} -pi -e "s://UNCOMMENTIFRAR ::" ${HCONFDIR}/mime_drivers.php
-.endif
-	@${CHOWN} -R www:www ${IMPDIR}
-	@${CHMOD} -R o-rwx ${CONFDIR}
-	@${CP} -p ${FILESDIR}/httpd.conf.imp ${HORDE_INC}/httpd.conf.imp
-	@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${HORDE_INC}/httpd.conf.imp
-# Let's Horde use IMP for auth
-	@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${HCONFDIR}/registry.php
-# Provide a link to IMP from Turba
-.if !defined(WITHOUT_TURBA)
-	@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
-	@${PERL} -pi -e "s:apps'] = array\(\):apps'] = array('turba'):" \
-		${CONFDIR}/conf.php
-.endif
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-	${SED} -e "s:%%IMPDIR%%:${IMPDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"
-	@${ECHO_MSG}
-
-.include <bsd.port.mk>
diff --git a/mail/imp-devel/distinfo b/mail/imp-devel/distinfo
deleted file mode 100644
index 7745bb27ad36..000000000000
--- a/mail/imp-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (imp-3.0.tar.gz) = d941d7b11231c771fb801ae8010e7271
diff --git a/mail/imp-devel/files/httpd.conf.imp b/mail/imp-devel/files/httpd.conf.imp
deleted file mode 100644
index edd7b1df357e..000000000000
--- a/mail/imp-devel/files/httpd.conf.imp
+++ /dev/null
@@ -1,31 +0,0 @@
-# This is included in Apache's httpd.conf for IMP
-#
-# For security, don't serve pages from the IMP configuration and
-# library directories.
-#
-<Directory "/home/httpd/html/horde/imp/config">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/lib">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/locale">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/po">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/scripts">
-    order deny,allow
-    deny from all
-</Directory>
-<Directory "/home/httpd/html/horde/imp/templates">
-    order deny,allow
-    deny from all
-</Directory>
-# End of IMP configuration ================
-
diff --git a/mail/imp-devel/files/patch-aa b/mail/imp-devel/files/patch-aa
deleted file mode 100644
index 132794233fcc..000000000000
--- a/mail/imp-devel/files/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
---- config/mime_drivers.php.dist.orig	Mon Dec 24 04:51:49 2001
-+++ config/mime_drivers.php.dist	Sun Feb 17 11:47:19 2002
-@@ -61,4 +61,28 @@
- $mime_drivers['imp']['html']['handles'] = array(
-         'text/html', 'text/richtext' );
- 
-+/**
-+ * Misc utilities
-+ */
-+
-+/**
-+ ** PGP/GnuPG Configuration
-+ **/
-+
-+// Should we attempt to verify pgp/gpg signatures?
-+//$conf['pgp']['enabled'] = false;
-+
-+// If we are using gpg support, where is the gpg binary?
-+//$conf['utils']['gpg'] = '%%LOCALBASE%%/bin/gpg';
-+
-+// What kind of binary are we using? Valid values are 'gpg', 'pgp2',
-+// and 'pgp5'.
-+//$conf['pgp']['type'] = 'gpg';
-+
-+// Where should we look for keyrings?
-+//$conf['pgp']['conf_dir'] = '%%GNUPG_CNFDIR%%';
-+
-+// What keyserver should we use?
-+//$conf['pgp']['keyserver'] = 'wwwkeys.pgp.net';
-+
- ?>
diff --git a/mail/imp-devel/files/patch-ab b/mail/imp-devel/files/patch-ab
deleted file mode 100644
index 7c274c3fb977..000000000000
--- a/mail/imp-devel/files/patch-ab
+++ /dev/null
@@ -1,35 +0,0 @@
---- config/servers.php.dist.orig	Fri Jun 22 20:08:14 2001
-+++ config/servers.php.dist	Tue Dec 18 23:08:00 2001
-@@ -31,7 +31,7 @@
-  * is on.
-  *
-  * folders: The folder path for the IMAP server. i.e. UW IMAP
-- * generally looks to "mail/" while Cyrus and Courier put folders
-+ * generally looks to "Mail/" while Cyrus and Courier put folders
-  * under "INBOX." (not the trailing dot. IMPORTANT: Use this only if
-  * you want to restrict users to this subfolder. If you set this to
-  * 'INBOX.' with Cyrus or Courier-IMAPd, then users will not be able
-@@ -84,14 +84,17 @@
- 
- $servers['imap'] = array(
-     'name' => 'IMAP Server',
--    'server' => 'imap.example.com',
--    'protocol' => 'imap',
--    'port' => 143,
--    'folders' => 'mail/',
-+//  'server' => 'imap.example.com',
-+    'server' => 'localhost',
-+    'protocol' => '%%PROTOCOL%%',
-+    'port' => %%IMAPPORT%%,
-+    'folders' => 'Mail/',
-     'namespace' => '',
-     'maildomain' => 'example.com',
--    'smtphost' => 'smtp.example.com',
--    'realm' => 'example.com',
-+//  'smtphost' => 'smtp.example.com',
-+    'smtphost' => 'localhost',
-+//  'realm' => 'example.com',
-+    'realm' => '',
-     'preferred' => ''
- );
- 
diff --git a/mail/imp-devel/files/patch-ac b/mail/imp-devel/files/patch-ac
deleted file mode 100644
index a7a34acdf937..000000000000
--- a/mail/imp-devel/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/prefs.php.dist.orig	Sun Dec 23 18:24:39 2001
-+++ config/prefs.php.dist	Thu Jan  3 20:57:38 2002
-@@ -444,7 +444,7 @@
- 
- // addressbook(s) to use when expanding addresses
- $_prefs['search_sources'] = array(
--    'value' => '',
-+    'value' => 'localsql',
-     'locked' => false,
-     'shared' => false,
-     'type' => 'implicit'
diff --git a/mail/imp-devel/pkg-comment b/mail/imp-devel/pkg-comment
deleted file mode 100644
index 46c5ace08f7e..000000000000
--- a/mail/imp-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A webmail system which accesses mail over IMAP
diff --git a/mail/imp-devel/pkg-descr b/mail/imp-devel/pkg-descr
deleted file mode 100644
index 7aa00a473a1b..000000000000
--- a/mail/imp-devel/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-IMP 3 is the new stable version of IMP. Features that have been added
-include searching; a new, flexible preferences system; a hierarchical
-folder tree; and more.
-
-It requires PHP4. You should use it if you want to take advantage of
-PHP4s built-in session handling and improved speed or if you want access
-to features such as the interactive spell checker and folder searching.
-
-WWW: http://www.horde.org/imp/
diff --git a/mail/imp-devel/pkg-message b/mail/imp-devel/pkg-message
deleted file mode 100644
index 4ca4e8caccdf..000000000000
--- a/mail/imp-devel/pkg-message
+++ /dev/null
@@ -1,22 +0,0 @@
-************************************************************************
-IMP has been installed in %%IMPDIR%% with your blank
-configuration files.
-
-Horde must be configured and the tables created; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
-
-Then, you will have to tune the configuration files located in
-%%CONFDIR%%/, specially the files conf.php and
-servers.php.
-
-To protect your configuration files, you have to restart Apache.
-
-IMP requires an IMAP server. If you want to install one on this
-machine, you may install the ports mail/cyrus-imapd, or
-mail/imap-uw, or mail/courier-imap.
-
-To secure your installation, it is at least recommended that you change
-the default database password used by horde and imp.
-Then, you might change the 'session.save_path' setting in php.ini to a
-directory only readable and writeable by your webserver.
-************************************************************************
diff --git a/mail/imp-devel/pkg-plist b/mail/imp-devel/pkg-plist
deleted file mode 100644
index 2a5334368c84..000000000000
--- a/mail/imp-devel/pkg-plist
+++ /dev/null
@@ -1,291 +0,0 @@
-%%PORTDOCS%%share/doc/imp/CHANGES
-%%PORTDOCS%%share/doc/imp/COPYING
-%%PORTDOCS%%share/doc/imp/CREDITS 
-%%PORTDOCS%%share/doc/imp/INSTALL
-%%PORTDOCS%%share/doc/imp/README
-%%IMPDIR%%/compose.php
-%%IMPDIR%%/config/.htaccess
-%%IMPDIR%%/config/conf.php
-%%IMPDIR%%/config/conf.php.dist
-%%IMPDIR%%/config/filter.txt
-%%IMPDIR%%/config/filter.txt.dist
-%%IMPDIR%%/config/header.txt
-%%IMPDIR%%/config/header.txt.dist
-%%IMPDIR%%/config/html.php
-%%IMPDIR%%/config/html.php.dist
-%%IMPDIR%%/config/menu.php
-%%IMPDIR%%/config/menu.php.dist
-%%IMPDIR%%/config/mime_drivers.php
-%%IMPDIR%%/config/mime_drivers.php.dist
-%%IMPDIR%%/config/mime_drivers.php.dist.orig
-%%IMPDIR%%/config/motd.php
-%%IMPDIR%%/config/motd.php.dist
-%%IMPDIR%%/config/prefs.php
-%%IMPDIR%%/config/prefs.php.dist
-%%IMPDIR%%/config/prefs.php.dist.orig
-%%IMPDIR%%/config/servers.php
-%%IMPDIR%%/config/servers.php.dist
-%%IMPDIR%%/config/servers.php.dist.orig
-%%IMPDIR%%/config/trailer.txt
-%%IMPDIR%%/config/trailer.txt.dist
-%%IMPDIR%%/filters.php
-%%IMPDIR%%/folders.php
-%%IMPDIR%%/graphics/addressbook-blue.gif
-%%IMPDIR%%/graphics/addressbook-red.gif
-%%IMPDIR%%/graphics/addressbook-yellow.gif
-%%IMPDIR%%/graphics/alternative.gif
-%%IMPDIR%%/graphics/answered.gif
-%%IMPDIR%%/graphics/attachment.gif
-%%IMPDIR%%/graphics/checkbox.gif
-%%IMPDIR%%/graphics/compose.gif
-%%IMPDIR%%/graphics/deleted.gif
-%%IMPDIR%%/graphics/down.gif
-%%IMPDIR%%/graphics/download.gif
-%%IMPDIR%%/graphics/draft.gif
-%%IMPDIR%%/graphics/expand.gif
-%%IMPDIR%%/graphics/fetchmail.gif
-%%IMPDIR%%/graphics/filters.gif
-%%IMPDIR%%/graphics/first-grey.gif
-%%IMPDIR%%/graphics/first.gif
-%%IMPDIR%%/graphics/folders.gif
-%%IMPDIR%%/graphics/folders/collapsed.gif
-%%IMPDIR%%/graphics/folders/empty.gif
-%%IMPDIR%%/graphics/folders/expanded.gif
-%%IMPDIR%%/graphics/folders/folder.gif
-%%IMPDIR%%/graphics/folders/folder_open.gif
-%%IMPDIR%%/graphics/folders/inbox.gif
-%%IMPDIR%%/graphics/folders/mbox.gif
-%%IMPDIR%%/graphics/folders/mbox_marked.gif
-%%IMPDIR%%/graphics/folders/mbox_noselect.gif
-%%IMPDIR%%/graphics/folders/mbox_unmarked.gif
-%%IMPDIR%%/graphics/folders/spacer.gif
-%%IMPDIR%%/graphics/imp.gif
-%%IMPDIR%%/graphics/important.gif
-%%IMPDIR%%/graphics/last-grey.gif
-%%IMPDIR%%/graphics/last.gif
-%%IMPDIR%%/graphics/lhand.gif
-%%IMPDIR%%/graphics/lock.gif
-%%IMPDIR%%/graphics/manage_attachments.gif
-%%IMPDIR%%/graphics/mime/html.gif
-%%IMPDIR%%/graphics/mime/text.gif
-%%IMPDIR%%/graphics/next-grey.gif
-%%IMPDIR%%/graphics/next.gif
-%%IMPDIR%%/graphics/personal.gif
-%%IMPDIR%%/graphics/prev-grey.gif
-%%IMPDIR%%/graphics/prev.gif
-%%IMPDIR%%/graphics/print.gif
-%%IMPDIR%%/graphics/reload.gif
-%%IMPDIR%%/graphics/rhand.gif
-%%IMPDIR%%/graphics/search.gif
-%%IMPDIR%%/graphics/signed.gif
-%%IMPDIR%%/graphics/spellcheck.gif
-%%IMPDIR%%/graphics/unseen.gif
-%%IMPDIR%%/graphics/up.gif
-%%IMPDIR%%/identities.php
-%%IMPDIR%%/index.php
-%%IMPDIR%%/intro.php
-%%IMPDIR%%/lib/.htaccess
-%%IMPDIR%%/lib/Folder.php
-%%IMPDIR%%/lib/IMP.php
-%%IMPDIR%%/lib/Identity/IMP.php
-%%IMPDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php
-%%IMPDIR%%/lib/Maintenance/Task/purge_trash.php
-%%IMPDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php
-%%IMPDIR%%/lib/Maintenance/imp.php
-%%IMPDIR%%/lib/MIME/Viewer/html.php
-%%IMPDIR%%/lib/MIME/Viewer/text.php
-%%IMPDIR%%/lib/Message.php
-%%IMPDIR%%/lib/Tree.php
-%%IMPDIR%%/lib/api.php
-%%IMPDIR%%/lib/base.php
-%%IMPDIR%%/lib/version.php
-%%IMPDIR%%/locale/.htaccess
-%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/cs_CZ/help.xml
-%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/de_DE/help.xml
-%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/el_GR/help.xml
-%%IMPDIR%%/locale/en_US/help.xml
-%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/es_ES/help.xml
-%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fi_FI/help.xml
-%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/fr_FR/help.xml
-%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/it_IT/help.xml
-%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ko_KR/help.xml
-%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/nl_NL/help.xml
-%%IMPDIR%%/locale/no_BOK/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/no_BOK/help.xml
-%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pl_PL/help.xml
-%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/pt_BR/help.xml
-%%IMPDIR%%/locale/ru_win/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/ru_win/help.xml
-%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/sv_SE/help.xml
-%%IMPDIR%%/locale/uk/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/uk/help.xml
-%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/zh_CN/help.xml
-%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/zh_TW/help.xml
-%%IMPDIR%%/login.php
-%%IMPDIR%%/mailbox.php
-%%IMPDIR%%/menu.php
-%%IMPDIR%%/message.php
-%%IMPDIR%%/po/.htaccess
-%%IMPDIR%%/po/Makefile
-%%IMPDIR%%/po/README
-%%IMPDIR%%/po/cs_CZ.po
-%%IMPDIR%%/po/de_DE.po
-%%IMPDIR%%/po/el_GR.po
-%%IMPDIR%%/po/es_ES.po
-%%IMPDIR%%/po/extract.pl
-%%IMPDIR%%/po/fi_FI.po
-%%IMPDIR%%/po/fr_FR.po
-%%IMPDIR%%/po/it_IT.po
-%%IMPDIR%%/po/ko_KR.po
-%%IMPDIR%%/po/nl_NL.po
-%%IMPDIR%%/po/no_BOK.po
-%%IMPDIR%%/po/pl_PL.po
-%%IMPDIR%%/po/pt_BR.po
-%%IMPDIR%%/po/ru_win.po
-%%IMPDIR%%/po/shtool
-%%IMPDIR%%/po/sv_SE.po
-%%IMPDIR%%/po/uk.po
-%%IMPDIR%%/po/xgettext.sh
-%%IMPDIR%%/po/zh_CN.po
-%%IMPDIR%%/po/zh_TW.po
-%%IMPDIR%%/prefs.php
-%%IMPDIR%%/redirect.php
-%%IMPDIR%%/scripts/.htaccess
-%%IMPDIR%%/scripts/Imp.reg
-%%IMPDIR%%/scripts/custom_login.php
-%%IMPDIR%%/scripts/imp-cleanup.cron
-%%IMPDIR%%/scripts/imp2horde.pl
-%%IMPDIR%%/scripts/imp2turba.pl
-%%IMPDIR%%/search.php
-%%IMPDIR%%/spelling.php
-%%IMPDIR%%/status.php
-%%IMPDIR%%/templates/.htaccess
-%%IMPDIR%%/templates/common-footer.inc
-%%IMPDIR%%/templates/common-header.inc
-%%IMPDIR%%/templates/compose/bounce.inc
-%%IMPDIR%%/templates/compose/compose.inc
-%%IMPDIR%%/templates/compose/javascript.inc
-%%IMPDIR%%/templates/compose/spelling.inc
-%%IMPDIR%%/templates/filters/javascript.inc
-%%IMPDIR%%/templates/filters/list.inc
-%%IMPDIR%%/templates/filters/manage.inc
-%%IMPDIR%%/templates/folders/actions.inc
-%%IMPDIR%%/templates/folders/alert.inc
-%%IMPDIR%%/templates/folders/confirm.inc
-%%IMPDIR%%/templates/folders/foot.inc
-%%IMPDIR%%/templates/folders/head.inc
-%%IMPDIR%%/templates/folders/javascript.inc
-%%IMPDIR%%/templates/folders/row.inc
-%%IMPDIR%%/templates/identities/javascript.inc
-%%IMPDIR%%/templates/identities/manage.inc
-%%IMPDIR%%/templates/index/css.inc
-%%IMPDIR%%/templates/index/notconfigured.inc
-%%IMPDIR%%/templates/intro/main.inc
-%%IMPDIR%%/templates/javascript/open_compose_win.js
-%%IMPDIR%%/templates/javascript/open_print_win.js
-%%IMPDIR%%/templates/login/login.inc
-%%IMPDIR%%/templates/mailbox/actions.inc
-%%IMPDIR%%/templates/mailbox/alert.inc
-%%IMPDIR%%/templates/mailbox/empty_mailbox.inc
-%%IMPDIR%%/templates/mailbox/footer.inc
-%%IMPDIR%%/templates/mailbox/header.inc
-%%IMPDIR%%/templates/mailbox/javascript.inc
-%%IMPDIR%%/templates/mailbox/legend.inc
-%%IMPDIR%%/templates/mailbox/message_footers.inc
-%%IMPDIR%%/templates/mailbox/message_headers.inc
-%%IMPDIR%%/templates/mailbox/message_summaries.inc
-%%IMPDIR%%/templates/mailbox/navbar.inc
-%%IMPDIR%%/templates/mailbox/searchfolder.inc
-%%IMPDIR%%/templates/menu/menu.inc
-%%IMPDIR%%/templates/message/headers.inc
-%%IMPDIR%%/templates/message/javascript.inc
-%%IMPDIR%%/templates/message/message.inc
-%%IMPDIR%%/templates/message/navbar.inc
-%%IMPDIR%%/templates/message/navbar_aux_bottom.inc
-%%IMPDIR%%/templates/message/navbar_aux_top.inc
-%%IMPDIR%%/templates/prefs/folderselect.inc
-%%IMPDIR%%/templates/prefs/identityselect.inc
-%%IMPDIR%%/templates/prefs/sourceselect.inc
-%%IMPDIR%%/templates/prefs/trashselect.inc
-%%IMPDIR%%/templates/search/javascript.inc
-%%IMPDIR%%/templates/search/main.inc
-%%IMPDIR%%/view.php
-%%PORTDOCS%%@dirrm share/doc/imp
-etc/horde/httpd.conf.imp
-@dirrm %%IMPDIR%%/config
-@dirrm %%IMPDIR%%/graphics/folders
-@dirrm %%IMPDIR%%/graphics/mime
-@dirrm %%IMPDIR%%/graphics
-@dirrm %%IMPDIR%%/lib/Identity
-@dirrm %%IMPDIR%%/lib/MIME/Viewer
-@dirrm %%IMPDIR%%/lib/MIME
-@dirrm %%IMPDIR%%/lib/Maintenance/Task
-@dirrm %%IMPDIR%%/lib/Maintenance
-@dirrm %%IMPDIR%%/lib
-@dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/cs_CZ
-@dirrm %%IMPDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/de_DE
-@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/en_US
-@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/es_ES
-@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fi_FI
-@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/fr_FR
-@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/it_IT
-@dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ko_KR
-@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/nl_NL
-@dirrm %%IMPDIR%%/locale/no_BOK/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/no_BOK
-@dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pl_PL
-@dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/pt_BR
-@dirrm %%IMPDIR%%/locale/ru_win/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/ru_win
-@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/sv_SE
-@dirrm %%IMPDIR%%/locale/uk/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/uk
-@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/zh_CN
-@dirrm %%IMPDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%IMPDIR%%/locale/zh_TW
-@dirrm %%IMPDIR%%/locale
-@dirrm %%IMPDIR%%/po
-@dirrm %%IMPDIR%%/scripts
-@dirrm %%IMPDIR%%/templates/compose
-@dirrm %%IMPDIR%%/templates/filters
-@dirrm %%IMPDIR%%/templates/folders
-@dirrm %%IMPDIR%%/templates/identities
-@dirrm %%IMPDIR%%/templates/index
-@dirrm %%IMPDIR%%/templates/intro
-@dirrm %%IMPDIR%%/templates/javascript
-@dirrm %%IMPDIR%%/templates/login
-@dirrm %%IMPDIR%%/templates/mailbox
-@dirrm %%IMPDIR%%/templates/menu
-@dirrm %%IMPDIR%%/templates/message
-@dirrm %%IMPDIR%%/templates/prefs
-@dirrm %%IMPDIR%%/templates/search
-@dirrm %%IMPDIR%%/templates
-@dirrm %%IMPDIR%%
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 3eb05f0a462b..1427988c53a0 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -121,7 +121,7 @@ pre-install:
 # N.B.: database dependencies are binded with mod_php#, neither by Horde nor IMP.
 	@if [ -f ${IMPDIR}/index.php ]; then \
 	    ${ECHO_MSG} "" ; \
-	    ${ECHO_MSG} "Please deinstall the port mail/imp-devel." ; \
+	    ${ECHO_MSG} "Please deinstall the port mail/imp3." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
diff --git a/mail/imp/pkg-descr b/mail/imp/pkg-descr
index 57770f046f84..91595ebce568 100644
--- a/mail/imp/pkg-descr
+++ b/mail/imp/pkg-descr
@@ -1,8 +1,9 @@
-IMP is a set of PHP scripts that implement an IMAP based webmail system.
+Note: this port is mostly for sites running PHP3.
+      For a new installation, please consider the port mail/imp3.
+
+IMP is a set of PHP3 scripts that implement an IMAP based webmail system.
 Assuming you have an account on a server that supports IMAP, you can use
 an installation of IMP to check your mail from anywhere that you have web
 access.
 
 WWW: http://www.horde.org/imp/
-
-- Thierry Thomas <thierry@thomas.as>.
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index 3de535817eba..48b454ac7f93 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -1,4 +1,4 @@
-# Ports collection makefile for:  imp-devel
+# Ports collection makefile for:  imp3
 # Date created:			  Mon Oct 08, 2001
 # Whom:				  Thierry Thomas (<thierry@thomas.as>)
 #
@@ -10,7 +10,6 @@ PORTVERSION=	3.0
 PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	thierry@pompo.net
 
@@ -71,7 +70,7 @@ LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
 		lber.2:${PORTSDIR}/net/openldap2
 .endif
 .endif
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde${PKGNAMESUFFIX}
+RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 .else
 RUN_DEPENDS+=	${LOCALBASE}/www/horde/turba/index.php:${PORTSDIR}/mail/turba
 .endif
@@ -119,6 +118,7 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
 .endif
 .endif
 
+IS_INTERACTIVE=	'need to build mod_php4 with mcrypt option set.'
 NO_BUILD=	yes
 DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
 CONFFILE=	conf.php filter.txt header.txt html.php menu.php \
diff --git a/mail/imp3/pkg-message b/mail/imp3/pkg-message
index 4ca4e8caccdf..0dbb7ea1b34c 100644
--- a/mail/imp3/pkg-message
+++ b/mail/imp3/pkg-message
@@ -3,7 +3,7 @@ IMP has been installed in %%IMPDIR%% with your blank
 configuration files.
 
 Horde must be configured and the tables created; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 4eb18d012903..0e9ad21938f3 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -35,7 +35,7 @@ LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
 .endif
 .endif
 
-RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde-devel
+RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 NO_BUILD=	yes
 DOCS=		COPYING README docs/CHANGES docs/CREDITS \
diff --git a/mail/turba/pkg-descr b/mail/turba/pkg-descr
index 7c363e6d373a..7ad5e825db08 100644
--- a/mail/turba/pkg-descr
+++ b/mail/turba/pkg-descr
@@ -1,9 +1,8 @@
-Turba is the Horde contact management application. It is currently in
-the development stages, and makes heavy use of the Horde framework to
-provide integration with other applications.
+Turba is the Horde contact management application. It makes heavy use
+of the Horde framework to provide integration with other applications.
 
-Right now, Turba is a fairly complete basic contact management
-application. SQL and LDAP backends are available and fairly well tested.
+Turba is a fairly complete basic contact management application.
+SQL and LDAP backends are available.
 You can define the fields in your addressbooks in a very flexible way,
 just by changing the config files.
 And there are Horde API functions to add and search for contacts.
diff --git a/mail/turba/pkg-message b/mail/turba/pkg-message
index 7297d45a2967..85ffa7b6262b 100644
--- a/mail/turba/pkg-message
+++ b/mail/turba/pkg-message
@@ -3,7 +3,7 @@ Turba has been installed in %%TURBADIR%% with your blank
 configuration files.
 
 Horde must be configured; if not, see
-%%PORTSDIR%%/www/horde-devel/pkg-message.
+%%PORTSDIR%%/www/horde2/pkg-message.
 
 Then, you will have to tune the configuration files located in
 %%CONFDIR%%/, specially the files conf.php and