The old mail/imp4 package is now mail/imp

The 3.x tree has been retired from pkgsrc

6 files changed, 331 insertions, 184 deletions

diff --git a/mail/imp/DESCR b/mail/imp/DESCR
index 791f5712bfb..2ab31503ce7 100644
--- a/mail/imp/DESCR
+++ b/mail/imp/DESCR
@@ -1,6 +1,4 @@
-IMP is a set of PHP scripts that implement an IMAP based webmail system.
-Assuming you have an account on a server that supports IMAP, you can use
+IMP is a set of PHP scripts that implement an IMAP/POP based webmail system.
+Assuming you have an account on a server that supports IMAP/POP, you can use
 an installation of IMP to check your mail from anywhere that you have web
 access.
-This is the previous stable branch of IMP.  A version of IMP using the
-current stable branch is available as mail/imp4.
diff --git a/mail/imp/MESSAGE b/mail/imp/MESSAGE
index a53f07a1ebf..7a6c9fc3fbb 100644
--- a/mail/imp/MESSAGE
+++ b/mail/imp/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2003/05/16 00:47:41 mason Exp $
+$NetBSD: MESSAGE,v 1.7 2006/06/16 09:24:36 adrianp Exp $
 
 Please refer to the file:
 
@@ -7,21 +7,15 @@ Please refer to the file:
 
 on how to setup your IMP installation. You need to at least edit
 
-	${IMPDIR}/config/conf.php
+	${PREFIX}/share/horde/config/registry.php
+
+to enable IMP in the horde framework.  You will also need to configure IMP
+by using the Horde administrative interface.
 
-You will also need to make IMP accessible through your HTTP server.  If
+Finally you will also need to make IMP accessible through your HTTP server.  If
 you are running Apache and ap-php, then you can add the following lines
 to httpd.conf:
 
-	Include ${PKG_SYSCONFDIR}/horde.conf
 	Include ${PKG_SYSCONFDIR}/imp.conf
 
-and then you have to edit
-	${PREFIX}/share/horde/config/registry.php
-to enable IMP in the horde framework.
-
-If you are updating from IMP 2.2.x, use the script
-	${PREFIX}/share/horde/imp/scripts/imp2horde.pl
-to convert the IMP 2.2.x user preference database to the new format.
-
 ===========================================================================
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 2abfc35403e..5cdd4191897 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,75 +1,102 @@
-# $NetBSD: Makefile,v 1.37 2006/06/02 18:27:56 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2006/06/16 09:24:36 adrianp Exp $
 
-DISTNAME=	imp-3.2.8
-PKGREVISION=	3
+DISTNAME=	imp-h3-${IMPVER}
+PKGNAME=	imp-${IMPVER}
+PKGREVISION=	1
 CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
+MASTER_SITES=	http://ftp.horde.org/pub/imp/ \
+		ftp://ftp.horde.org/pub/imp/
 
-MAINTAINER=	bouyer@NetBSD.org
+MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.horde.org/imp/
 COMMENT=	Internet Messaging Program
 
-CONFLICTS+=	imp-4.*
+CONFLICTS+=	imp-3.*
 
-DEPENDS+=	horde>=2.2.4:../../www/horde
-DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.0.0:../../mail/php-imap
+DEPENDS+=	horde>=3.0.2:../../www/horde
+DEPENDS+=	${PHP_PKG_PREFIX}-imap>4.3.3:../../mail/php-imap
 DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail-[0-9]*:../../mail/pear-Mail
 
+.include "../../mk/bsd.prefs.mk"
+
 DOCDIR=		${PREFIX}/share/doc/imp
 EGDIR=		${PREFIX}/share/examples/imp
 HORDEDIR=	${PREFIX}/share/horde
 IMPDIR=		${HORDEDIR}/imp
+IMPVER=		4.1.1
+PAXDIRS=	lib locale po scripts templates themes
 
-MESSAGE_SUBST+=	IMPDIR=${IMPDIR}
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+=	IMPDIR=${IMPDIR:Q}
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 PKG_SYSCONFSUBDIR?=	httpd
 
-CONF_FILES=	${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
-CONF_FILES+=	${IMPDIR}/config/conf.php.dist				\
-		${IMPDIR}/config/conf.php
-CONF_FILES+=	${IMPDIR}/config/servers.php.dist			\
-		${IMPDIR}/config/servers.php
-CONF_FILES+=	${IMPDIR}/config/filter.txt.dist			\
-		${IMPDIR}/config/filter.txt
-CONF_FILES+=	${IMPDIR}/config/header.txt.dist			\
-		${IMPDIR}/config/header.txt
-CONF_FILES+=	${IMPDIR}/config/html.php.dist				\
-		${IMPDIR}/config/html.php
-CONF_FILES+=	${IMPDIR}/config/menu.php.dist				\
-		${IMPDIR}/config/menu.php
-CONF_FILES+=	${IMPDIR}/config/mime_drivers.php.dist			\
-		${IMPDIR}/config/mime_drivers.php
-CONF_FILES+=	${IMPDIR}/config/motd.php.dist				\
-		${IMPDIR}/config/motd.php
-CONF_FILES+=	${IMPDIR}/config/prefs.php.dist				\
-		${IMPDIR}/config/prefs.php
-CONF_FILES+=	${IMPDIR}/config/trailer.txt.dist			\
-		${IMPDIR}/config/trailer.txt
+CONF_FILES=		${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
+CONF_FILES+=		${IMPDIR}/config/servers.php.dist \
+			${IMPDIR}/config/servers.php
+CONF_FILES_PERMS+=	${IMPDIR}/config/conf.xml.dist \
+			${IMPDIR}/config/conf.xml \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/filter.txt.dist \
+			${IMPDIR}/config/filter.txt \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/header.txt.dist \
+			${IMPDIR}/config/header.txt \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/menu.php.dist \
+			${IMPDIR}/config/menu.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/mime_drivers.php.dist \
+			${IMPDIR}/config/mime_drivers.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/motd.php.dist \
+			${IMPDIR}/config/motd.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/prefs.php.dist \
+			${IMPDIR}/config/prefs.php \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+CONF_FILES_PERMS+=	${IMPDIR}/config/trailer.txt.dist \
+			${IMPDIR}/config/trailer.txt \
+			${APACHE_USER} ${ROOT_GROUP} 0440
+
+SUBST_CLASSES+=		files
+SUBST_STAGE.files=	post-build
+SUBST_FILES.files=	imp.conf.dist
+SUBST_SED.files=	-e "s|@IMPDIR@|${IMPDIR}|g"
+SUBST_MESSAGE.files=	Fixing configuration files.
+
+.include "options.mk"
 
 do-build:
+	${CP} ${FILESDIR}/imp.conf.dist ${WRKSRC}/imp.conf.dist
+	${CP} ${WRKSRC}/config/conf.xml ${WRKSRC}/config/conf.xml.dist
 	${FIND} ${WRKSRC} -name .htaccess -print | ${XARGS} ${RM} -f
-	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
-	${FIND} ${WRKSRC} -name "*.pl" -print | ${XARGS} ${CHMOD} +x
-	${FIND} ${WRKSRC} -name "*.sh" -print | ${XARGS} ${CHMOD} +x
-
-pre-install:
-	${SED}	-e "s|@IMPDIR@|${IMPDIR}|g"				\
-		${FILESDIR}/imp.conf.dist > ${WRKDIR}/imp.conf.dist
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA_DIR} ${IMPDIR}
-	cd ${WRKDIR}; ${INSTALL_DATA} imp.conf.dist ${EGDIR}/imp.conf
-	cd ${WRKSRC}; ${INSTALL_DATA} COPYING README docs/* ${DOCDIR}
-	cd ${WRKSRC}; ${CP} -R graphics lib locale po scripts templates ${IMPDIR}
 	${INSTALL_DATA_DIR} ${IMPDIR}/config
-	cd ${WRKSRC}/config; ${INSTALL_DATA} * ${IMPDIR}/config
-	cd ${WRKSRC}; ${INSTALL_DATA} *.php ${IMPDIR}
+	${INSTALL_DATA} ${WRKSRC}/imp.conf.dist ${EGDIR}/imp.conf
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
+
+.	for d in ${PAXDIRS}
+		${INSTALL_DATA_DIR} ${IMPDIR}/${d}
+.	endfor
+
+.	for d in ${PAXDIRS}
+		@cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${IMPDIR}/${d}
+.	endfor
+
+	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${IMPDIR}/config
+	${INSTALL_DATA} ${WRKSRC}/*.php ${IMPDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
 	${FIND} ${IMPDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${IMPDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+	${CHOWN} ${APACHE_USER}:${ROOT_GROUP} ${IMPDIR}/config
+	${CHMOD} 0750 ${IMPDIR}/config
 
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imp/PLIST b/mail/imp/PLIST
index 6f619a56850..7b686b306a3 100644
--- a/mail/imp/PLIST
+++ b/mail/imp/PLIST
@@ -1,16 +1,19 @@
-@comment $NetBSD: PLIST,v 1.9 2004/06/26 20:35:48 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2006/06/16 09:24:36 adrianp Exp $
 share/doc/imp/CHANGES
 share/doc/imp/COPYING
 share/doc/imp/CREDITS
 share/doc/imp/INSTALL
 share/doc/imp/README
 share/doc/imp/RELEASE_NOTES
+share/doc/imp/TODO
+share/doc/imp/UPGRADING
 share/examples/imp/imp.conf
+share/horde/imp/acl.php
+share/horde/imp/attachment.php
 share/horde/imp/compose.php
-share/horde/imp/config/conf.php.dist
+share/horde/imp/config/conf.xml.dist
 share/horde/imp/config/filter.txt.dist
-share/horde/imp/config/header.txt.dist
-share/horde/imp/config/html.php.dist
+share/horde/imp/config/header.php.dist
 share/horde/imp/config/menu.php.dist
 share/horde/imp/config/mime_drivers.php.dist
 share/horde/imp/config/motd.php.dist
@@ -18,86 +21,78 @@ share/horde/imp/config/prefs.php.dist
 share/horde/imp/config/servers.php.dist
 share/horde/imp/config/trailer.txt.dist
 share/horde/imp/contacts.php
-share/horde/imp/filters.php
+share/horde/imp/expand.php
+share/horde/imp/fetchmail.php
+share/horde/imp/fetchmailprefs.php
+share/horde/imp/filterprefs.php
 share/horde/imp/folders.php
-share/horde/imp/graphics/addressbook-blue.gif
-share/horde/imp/graphics/addressbook-red.gif
-share/horde/imp/graphics/addressbook-yellow.gif
-share/horde/imp/graphics/alternative.gif
-share/horde/imp/graphics/answered.gif
-share/horde/imp/graphics/attachment.gif
-share/horde/imp/graphics/checkbox.gif
-share/horde/imp/graphics/compose.gif
-share/horde/imp/graphics/deleted.gif
-share/horde/imp/graphics/down.gif
-share/horde/imp/graphics/download.gif
-share/horde/imp/graphics/draft.gif
-share/horde/imp/graphics/empty_trash.gif
-share/horde/imp/graphics/expand.gif
-share/horde/imp/graphics/favicon.ico
-share/horde/imp/graphics/fetchmail.gif
-share/horde/imp/graphics/filters.gif
-share/horde/imp/graphics/first-grey.gif
-share/horde/imp/graphics/first.gif
-share/horde/imp/graphics/folders.gif
-share/horde/imp/graphics/folders/collapsed.gif
-share/horde/imp/graphics/folders/empty.gif
-share/horde/imp/graphics/folders/expanded.gif
-share/horde/imp/graphics/folders/folder.gif
-share/horde/imp/graphics/folders/folder_open.gif
-share/horde/imp/graphics/folders/inbox.gif
-share/horde/imp/graphics/folders/mbox.gif
-share/horde/imp/graphics/folders/mbox_marked.gif
-share/horde/imp/graphics/folders/mbox_noselect.gif
-share/horde/imp/graphics/folders/mbox_unmarked.gif
-share/horde/imp/graphics/folders/spacer.gif
-share/horde/imp/graphics/imp.gif
-share/horde/imp/graphics/important.gif
-share/horde/imp/graphics/last-grey.gif
-share/horde/imp/graphics/last.gif
-share/horde/imp/graphics/lhand.gif
-share/horde/imp/graphics/lock.gif
-share/horde/imp/graphics/manage_attachments.gif
-share/horde/imp/graphics/mime/html.gif
-share/horde/imp/graphics/mime/image.gif
-share/horde/imp/graphics/mime/text.gif
-share/horde/imp/graphics/next-grey.gif
-share/horde/imp/graphics/next.gif
-share/horde/imp/graphics/personal.gif
-share/horde/imp/graphics/prev-grey.gif
-share/horde/imp/graphics/prev.gif
-share/horde/imp/graphics/print.gif
-share/horde/imp/graphics/reload.gif
-share/horde/imp/graphics/rhand.gif
-share/horde/imp/graphics/search.gif
-share/horde/imp/graphics/signed.gif
-share/horde/imp/graphics/spellcheck.gif
-share/horde/imp/graphics/thread.gif
-share/horde/imp/graphics/unseen.gif
-share/horde/imp/graphics/up.gif
-share/horde/imp/identities.php
 share/horde/imp/index.php
-share/horde/imp/lib/Browser.php
+share/horde/imp/lib/Auth/imp.php
+share/horde/imp/lib/Block/summary.php
+share/horde/imp/lib/Block/tree_folders.php
+share/horde/imp/lib/Compose.php
+share/horde/imp/lib/Crypt/PGP.php
+share/horde/imp/lib/Crypt/SMIME.php
+share/horde/imp/lib/Fetchmail.php
+share/horde/imp/lib/Fetchmail/imap.php
+share/horde/imp/lib/Filter.php
 share/horde/imp/lib/Folder.php
+share/horde/imp/lib/IMAP.php
+share/horde/imp/lib/IMAP/Client.php
+share/horde/imp/lib/IMAP/Search.php
+share/horde/imp/lib/IMAP/Sort.php
+share/horde/imp/lib/IMAP/Thread.php
+share/horde/imp/lib/IMAP/Tree.php
 share/horde/imp/lib/IMP.php
-share/horde/imp/lib/Identity/IMP.php
+share/horde/imp/lib/Identity/imp.php
+share/horde/imp/lib/MIME/Contents.php
+share/horde/imp/lib/MIME/Headers.php
+share/horde/imp/lib/MIME/Viewer/alternative.php
+share/horde/imp/lib/MIME/Viewer/appledouble.php
 share/horde/imp/lib/MIME/Viewer/enriched.php
 share/horde/imp/lib/MIME/Viewer/html.php
 share/horde/imp/lib/MIME/Viewer/images.php
-share/horde/imp/lib/MIME/Viewer/text.php
+share/horde/imp/lib/MIME/Viewer/itip.php
+share/horde/imp/lib/MIME/Viewer/multipart.php
+share/horde/imp/lib/MIME/Viewer/notification.php
+share/horde/imp/lib/MIME/Viewer/partial.php
+share/horde/imp/lib/MIME/Viewer/pgp.php
+share/horde/imp/lib/MIME/Viewer/pkcs7.php
+share/horde/imp/lib/MIME/Viewer/plain.php
+share/horde/imp/lib/MIME/Viewer/related.php
+share/horde/imp/lib/MIME/Viewer/rfc822.php
+share/horde/imp/lib/MIME/Viewer/status.php
+share/horde/imp/lib/MIME/Viewer/tnef.php
+share/horde/imp/lib/MIME/Viewer/zip.php
+share/horde/imp/lib/Mailbox.php
+share/horde/imp/lib/Maillog.php
+share/horde/imp/lib/Maintenance/Task/delete_attachments_monthly.php
 share/horde/imp/lib/Maintenance/Task/delete_sentmail_monthly.php
+share/horde/imp/lib/Maintenance/Task/fetchmail_login.php
 share/horde/imp/lib/Maintenance/Task/purge_trash.php
 share/horde/imp/lib/Maintenance/Task/rename_sentmail_monthly.php
+share/horde/imp/lib/Maintenance/Task/tos_agreement.php
 share/horde/imp/lib/Maintenance/imp.php
 share/horde/imp/lib/Message.php
-share/horde/imp/lib/Tree.php
+share/horde/imp/lib/Notification/Listener/status.php
+share/horde/imp/lib/Quota.php
+share/horde/imp/lib/Quota/command.php
+share/horde/imp/lib/Quota/courier.php
+share/horde/imp/lib/Quota/cyrus.php
+share/horde/imp/lib/Quota/logfile.php
+share/horde/imp/lib/Quota/mdaemon.php
+share/horde/imp/lib/Quota/mercury32.php
+share/horde/imp/lib/Search.php
+share/horde/imp/lib/Session.php
+share/horde/imp/lib/Spam.php
 share/horde/imp/lib/api.php
 share/horde/imp/lib/base.php
-share/horde/imp/lib/constants.php
+share/horde/imp/lib/prefs.php
 share/horde/imp/lib/version.php
 share/horde/imp/locale/ar_OM/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ar_SY/LC_MESSAGES/imp.mo
 share/horde/imp/locale/bg_BG/LC_MESSAGES/imp.mo
+share/horde/imp/locale/bs_BA/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ca_ES/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ca_ES/help.xml
 share/horde/imp/locale/cs_CZ/LC_MESSAGES/imp.mo
@@ -108,17 +103,19 @@ share/horde/imp/locale/de_DE/LC_MESSAGES/imp.mo
 share/horde/imp/locale/de_DE/help.xml
 share/horde/imp/locale/el_GR/LC_MESSAGES/imp.mo
 share/horde/imp/locale/el_GR/help.xml
-share/horde/imp/locale/en_GB/help.xml
 share/horde/imp/locale/en_US/help.xml
 share/horde/imp/locale/es_ES/LC_MESSAGES/imp.mo
 share/horde/imp/locale/es_ES/help.xml
 share/horde/imp/locale/et_EE/LC_MESSAGES/imp.mo
 share/horde/imp/locale/et_EE/help.xml
+share/horde/imp/locale/fa_IR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/fa_IR/help.xml
 share/horde/imp/locale/fi_FI/LC_MESSAGES/imp.mo
 share/horde/imp/locale/fi_FI/help.xml
 share/horde/imp/locale/fr_FR/LC_MESSAGES/imp.mo
 share/horde/imp/locale/fr_FR/help.xml
 share/horde/imp/locale/gl_ES/LC_MESSAGES/imp.mo
+share/horde/imp/locale/he_IL/LC_MESSAGES/imp.mo
 share/horde/imp/locale/hu_HU/LC_MESSAGES/imp.mo
 share/horde/imp/locale/hu_HU/help.xml
 share/horde/imp/locale/id_ID/LC_MESSAGES/imp.mo
@@ -126,6 +123,7 @@ share/horde/imp/locale/is_IS/LC_MESSAGES/imp.mo
 share/horde/imp/locale/it_IT/LC_MESSAGES/imp.mo
 share/horde/imp/locale/it_IT/help.xml
 share/horde/imp/locale/ja_JP/LC_MESSAGES/imp.mo
+share/horde/imp/locale/km_KH/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ko_KR/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ko_KR/help.xml
 share/horde/imp/locale/lt_LT/LC_MESSAGES/imp.mo
@@ -143,17 +141,16 @@ share/horde/imp/locale/pt_BR/help.xml
 share/horde/imp/locale/pt_PT/LC_MESSAGES/imp.mo
 share/horde/imp/locale/pt_PT/help.xml
 share/horde/imp/locale/ro_RO/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ru_RU.KOI8-R/LC_MESSAGES/imp.mo
-share/horde/imp/locale/ru_RU.KOI8-R/help.xml
 share/horde/imp/locale/ru_RU/LC_MESSAGES/imp.mo
 share/horde/imp/locale/ru_RU/help.xml
 share/horde/imp/locale/sk_SK/LC_MESSAGES/imp.mo
 share/horde/imp/locale/sk_SK/help.xml
 share/horde/imp/locale/sl_SI/LC_MESSAGES/imp.mo
-share/horde/imp/locale/sr_YU/LC_MESSAGES/imp.mo
 share/horde/imp/locale/sv_SE/LC_MESSAGES/imp.mo
 share/horde/imp/locale/sv_SE/help.xml
 share/horde/imp/locale/th_TH/LC_MESSAGES/imp.mo
+share/horde/imp/locale/tr_TR/LC_MESSAGES/imp.mo
+share/horde/imp/locale/tr_TR/help.xml
 share/horde/imp/locale/uk_UA/LC_MESSAGES/imp.mo
 share/horde/imp/locale/uk_UA/help.xml
 share/horde/imp/locale/zh_CN/LC_MESSAGES/imp.mo
@@ -162,13 +159,13 @@ share/horde/imp/locale/zh_TW/LC_MESSAGES/imp.mo
 share/horde/imp/locale/zh_TW/help.xml
 share/horde/imp/login.php
 share/horde/imp/mailbox.php
-share/horde/imp/menu.php
 share/horde/imp/message.php
-share/horde/imp/po/Makefile
+share/horde/imp/pgp.php
 share/horde/imp/po/README
 share/horde/imp/po/ar_OM.po
 share/horde/imp/po/ar_SY.po
 share/horde/imp/po/bg_BG.po
+share/horde/imp/po/bs_BA.po
 share/horde/imp/po/ca_ES.po
 share/horde/imp/po/cs_CZ.po
 share/horde/imp/po/da_DK.po
@@ -176,16 +173,18 @@ share/horde/imp/po/de_DE.po
 share/horde/imp/po/el_GR.po
 share/horde/imp/po/es_ES.po
 share/horde/imp/po/et_EE.po
-share/horde/imp/po/extract.pl
+share/horde/imp/po/fa_IR.po
 share/horde/imp/po/fi_FI.po
 share/horde/imp/po/fr_FR.po
 share/horde/imp/po/gl_ES.po
+share/horde/imp/po/he_IL.po
 share/horde/imp/po/hu_HU.po
 share/horde/imp/po/id_ID.po
 share/horde/imp/po/imp.pot
 share/horde/imp/po/is_IS.po
 share/horde/imp/po/it_IT.po
 share/horde/imp/po/ja_JP.po
+share/horde/imp/po/km_KH.po
 share/horde/imp/po/ko_KR.po
 share/horde/imp/po/lt_LT.po
 share/horde/imp/po/lv_LV.po
@@ -197,96 +196,203 @@ share/horde/imp/po/pl_PL.po
 share/horde/imp/po/pt_BR.po
 share/horde/imp/po/pt_PT.po
 share/horde/imp/po/ro_RO.po
-share/horde/imp/po/ru_RU.KOI8-R.po
 share/horde/imp/po/ru_RU.po
-share/horde/imp/po/shtool
 share/horde/imp/po/sk_SK.po
 share/horde/imp/po/sl_SI.po
-share/horde/imp/po/sr_YU.po
 share/horde/imp/po/sv_SE.po
 share/horde/imp/po/th_TH.po
+share/horde/imp/po/tr_TR.po
 share/horde/imp/po/uk_UA.po
-share/horde/imp/po/xgettext.sh
 share/horde/imp/po/zh_CN.po
 share/horde/imp/po/zh_TW.po
-share/horde/imp/prefs.php
+share/horde/imp/recompose.php
 share/horde/imp/redirect.php
+share/horde/imp/saveimage.php
 share/horde/imp/scripts/Imp.reg
 share/horde/imp/scripts/custom_login.php
-share/horde/imp/scripts/imp-cleanup.cron
-share/horde/imp/scripts/imp2horde.pl
-share/horde/imp/scripts/imp2turba.pl
-share/horde/imp/scripts/singlescript.php
 share/horde/imp/search.php
+share/horde/imp/smime.php
 share/horde/imp/spelling.php
-share/horde/imp/status.php
-share/horde/imp/templates/common-footer.inc
+share/horde/imp/stationery.php
+share/horde/imp/templates/acl/acl.inc
 share/horde/imp/templates/common-header.inc
-share/horde/imp/templates/compose/bounce.inc
+share/horde/imp/templates/compose/attachments.inc
+share/horde/imp/templates/compose/attachments.js
 share/horde/imp/templates/compose/compose.inc
-share/horde/imp/templates/compose/javascript.inc
+share/horde/imp/templates/compose/compose.js
+share/horde/imp/templates/compose/compose_expand.js
+share/horde/imp/templates/compose/encrypt_list.inc
+share/horde/imp/templates/compose/expand.inc
+share/horde/imp/templates/compose/recompose.inc
+share/horde/imp/templates/compose/redirect.inc
 share/horde/imp/templates/compose/spelling.inc
+share/horde/imp/templates/compose/spelling.js
+share/horde/imp/templates/compose/success.inc
 share/horde/imp/templates/contacts/contacts.inc
-share/horde/imp/templates/contacts/javascript.inc
-share/horde/imp/templates/filters/javascript.inc
-share/horde/imp/templates/filters/list.inc
-share/horde/imp/templates/filters/manage.inc
+share/horde/imp/templates/fetchmail/account_select.inc
+share/horde/imp/templates/fetchmail/driver_select.inc
+share/horde/imp/templates/fetchmail/fetchmail.inc
+share/horde/imp/templates/fetchmail/manage.inc
+share/horde/imp/templates/fetchmail/top.inc
+share/horde/imp/templates/filters/notactive.inc
+share/horde/imp/templates/filters/prefs.inc
 share/horde/imp/templates/folders/actions.inc
-share/horde/imp/templates/folders/alert.inc
-share/horde/imp/templates/folders/confirm.inc
+share/horde/imp/templates/folders/folders.html
+share/horde/imp/templates/folders/folders_confirm.html
 share/horde/imp/templates/folders/foot.inc
 share/horde/imp/templates/folders/head.inc
-share/horde/imp/templates/folders/javascript.inc
-share/horde/imp/templates/folders/row.inc
-share/horde/imp/templates/identities/javascript.inc
-share/horde/imp/templates/identities/manage.inc
-share/horde/imp/templates/index/css.inc
-share/horde/imp/templates/index/notconfigured.inc
-share/horde/imp/templates/javascript/open_compose_win.js
-share/horde/imp/templates/javascript/open_print_win.js
+share/horde/imp/templates/folders/import.inc
+share/horde/imp/templates/javascript/addressesBlocks.js
+share/horde/imp/templates/javascript/folders.js
+share/horde/imp/templates/javascript/popup.js
 share/horde/imp/templates/login/login.inc
 share/horde/imp/templates/mailbox/actions.inc
+share/horde/imp/templates/mailbox/actions_deleted.inc
 share/horde/imp/templates/mailbox/alert.inc
 share/horde/imp/templates/mailbox/empty_mailbox.inc
 share/horde/imp/templates/mailbox/footer.inc
 share/horde/imp/templates/mailbox/header.inc
 share/horde/imp/templates/mailbox/javascript.inc
 share/horde/imp/templates/mailbox/legend.inc
+share/horde/imp/templates/mailbox/mailbox.html
 share/horde/imp/templates/mailbox/message_footers.inc
 share/horde/imp/templates/mailbox/message_headers.inc
-share/horde/imp/templates/mailbox/message_summaries.inc
 share/horde/imp/templates/mailbox/navbar.inc
 share/horde/imp/templates/mailbox/searchfolder.inc
-share/horde/imp/templates/menu/menu.inc
+share/horde/imp/templates/menu.inc
 share/horde/imp/templates/message/headers.inc
 share/horde/imp/templates/message/javascript.inc
 share/horde/imp/templates/message/message.inc
-share/horde/imp/templates/message/navbar.inc
-share/horde/imp/templates/message/navbar_aux_bottom.inc
-share/horde/imp/templates/message/navbar_aux_top.inc
-share/horde/imp/templates/message/print.inc
+share/horde/imp/templates/message/navbar_actions.inc
+share/horde/imp/templates/message/navbar_navigate.inc
+share/horde/imp/templates/message/navbar_top.inc
+share/horde/imp/templates/pgp/import_key.inc
+share/horde/imp/templates/pgp/notactive.inc
+share/horde/imp/templates/pgp/passphrase.inc
+share/horde/imp/templates/pgp/pgp.inc
+share/horde/imp/templates/prefs/defaultsearchselect.inc
+share/horde/imp/templates/prefs/encryptselect.inc
 share/horde/imp/templates/prefs/folderselect.inc
-share/horde/imp/templates/prefs/identityselect.inc
 share/horde/imp/templates/prefs/initialpageselect.inc
+share/horde/imp/templates/prefs/sentmailselect.inc
 share/horde/imp/templates/prefs/sourceselect.inc
+share/horde/imp/templates/prefs/spamselect.inc
 share/horde/imp/templates/prefs/trashselect.inc
+share/horde/imp/templates/quota/quota.inc
+share/horde/imp/templates/saveimage/saveimage.inc
+share/horde/imp/templates/search/fields.inc
+share/horde/imp/templates/search/header.inc
 share/horde/imp/templates/search/javascript.inc
 share/horde/imp/templates/search/main.inc
+share/horde/imp/templates/smime/import_key.inc
+share/horde/imp/templates/smime/notactive.inc
+share/horde/imp/templates/smime/passphrase.inc
+share/horde/imp/templates/smime/smime.inc
+share/horde/imp/templates/stationery/prefs.inc
+share/horde/imp/templates/thread/thread.html
 share/horde/imp/test.php
+share/horde/imp/themes/azur/screen.css
+share/horde/imp/themes/bluemoon/screen.css
+share/horde/imp/themes/bluewhite/screen.css
+share/horde/imp/themes/brown/screen.css
+share/horde/imp/themes/burntorange/screen.css
+share/horde/imp/themes/cherry/screen.css
+share/horde/imp/themes/cornflower/screen.css
+share/horde/imp/themes/gennevilliers/screen.css
+share/horde/imp/themes/graphics/addressbook_add.png
+share/horde/imp/themes/graphics/addressbook_browse.png
+share/horde/imp/themes/graphics/apple.png
+share/horde/imp/themes/graphics/attachment.png
+share/horde/imp/themes/graphics/audio/theetone.wav
+share/horde/imp/themes/graphics/compose.png
+share/horde/imp/themes/graphics/empty_spam.png
+share/horde/imp/themes/graphics/empty_trash.png
+share/horde/imp/themes/graphics/encrypted.png
+share/horde/imp/themes/graphics/expand.png
+share/horde/imp/themes/graphics/favicon.ico
+share/horde/imp/themes/graphics/fetchmail.png
+share/horde/imp/themes/graphics/filters.png
+share/horde/imp/themes/graphics/folders/drafts.png
+share/horde/imp/themes/graphics/folders/folder.png
+share/horde/imp/themes/graphics/folders/folder_open.png
+share/horde/imp/themes/graphics/folders/inbox.png
+share/horde/imp/themes/graphics/folders/sent.png
+share/horde/imp/themes/graphics/folders/trash.png
+share/horde/imp/themes/graphics/imp.png
+share/horde/imp/themes/graphics/mail_answered.png
+share/horde/imp/themes/graphics/mail_deleted.png
+share/horde/imp/themes/graphics/mail_draft.png
+share/horde/imp/themes/graphics/mail_flagged.png
+share/horde/imp/themes/graphics/mail_forwarded.png
+share/horde/imp/themes/graphics/mail_personal.png
+share/horde/imp/themes/graphics/mail_priority_high.png
+share/horde/imp/themes/graphics/mail_priority_low.png
+share/horde/imp/themes/graphics/mail_unseen.png
+share/horde/imp/themes/graphics/manage_attachments.png
+share/horde/imp/themes/graphics/mime/binary.png
+share/horde/imp/themes/graphics/mime/compressed.png
+share/horde/imp/themes/graphics/mime/encryption.png
+share/horde/imp/themes/graphics/mime/html.png
+share/horde/imp/themes/graphics/mime/image.png
+share/horde/imp/themes/graphics/mime/itip.png
+share/horde/imp/themes/graphics/mime/mail.png
+share/horde/imp/themes/graphics/mime/text.png
+share/horde/imp/themes/graphics/newmail.png
+share/horde/imp/themes/graphics/shared.png
+share/horde/imp/themes/graphics/signed.png
+share/horde/imp/themes/graphics/spacer_red.png
+share/horde/imp/themes/graphics/spellcheck.png
+share/horde/imp/themes/green/screen.css
+share/horde/imp/themes/grey/screen.css
+share/horde/imp/themes/lavander/screen.css
+share/horde/imp/themes/luc/screen.css
+share/horde/imp/themes/lucblue/screen.css
+share/horde/imp/themes/postnuke/screen.css
+share/horde/imp/themes/rtl.css
+share/horde/imp/themes/screen.css
+share/horde/imp/themes/simplex/screen.css
+share/horde/imp/themes/sun/screen.css
+share/horde/imp/thread.php
 share/horde/imp/view.php
+@dirrm share/horde/imp/themes/sun
+@dirrm share/horde/imp/themes/simplex
+@dirrm share/horde/imp/themes/postnuke
+@dirrm share/horde/imp/themes/lucblue
+@dirrm share/horde/imp/themes/luc
+@dirrm share/horde/imp/themes/lavander
+@dirrm share/horde/imp/themes/grey
+@dirrm share/horde/imp/themes/green
+@dirrm share/horde/imp/themes/graphics/audio
+@dirrm share/horde/imp/themes/graphics/mime
+@dirrm share/horde/imp/themes/graphics/folders
+@dirrm share/horde/imp/themes/graphics
+@dirrm share/horde/imp/themes/gennevilliers
+@dirrm share/horde/imp/themes/cornflower
+@dirrm share/horde/imp/themes/cherry
+@dirrm share/horde/imp/themes/burntorange
+@dirrm share/horde/imp/themes/brown
+@dirrm share/horde/imp/themes/bluewhite
+@dirrm share/horde/imp/themes/bluemoon
+@dirrm share/horde/imp/themes/azur
+@dirrm share/horde/imp/themes
+@dirrm share/horde/imp/templates/stationery
+@dirrm share/horde/imp/templates/saveimage
+@dirrm share/horde/imp/templates/thread
+@dirrm share/horde/imp/templates/smime
 @dirrm share/horde/imp/templates/search
+@dirrm share/horde/imp/templates/quota
 @dirrm share/horde/imp/templates/prefs
+@dirrm share/horde/imp/templates/pgp
 @dirrm share/horde/imp/templates/message
-@dirrm share/horde/imp/templates/menu
 @dirrm share/horde/imp/templates/mailbox
 @dirrm share/horde/imp/templates/login
 @dirrm share/horde/imp/templates/javascript
-@dirrm share/horde/imp/templates/index
-@dirrm share/horde/imp/templates/identities
 @dirrm share/horde/imp/templates/folders
 @dirrm share/horde/imp/templates/filters
+@dirrm share/horde/imp/templates/fetchmail
 @dirrm share/horde/imp/templates/contacts
 @dirrm share/horde/imp/templates/compose
+@dirrm share/horde/imp/templates/acl
 @dirrm share/horde/imp/templates
 @dirrm share/horde/imp/scripts
 @dirrm share/horde/imp/po
@@ -296,19 +402,17 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/locale/zh_CN
 @dirrm share/horde/imp/locale/uk_UA/LC_MESSAGES
 @dirrm share/horde/imp/locale/uk_UA
+@dirrm share/horde/imp/locale/tr_TR/LC_MESSAGES
+@dirrm share/horde/imp/locale/tr_TR
 @dirrm share/horde/imp/locale/th_TH/LC_MESSAGES
 @dirrm share/horde/imp/locale/th_TH
 @dirrm share/horde/imp/locale/sv_SE/LC_MESSAGES
 @dirrm share/horde/imp/locale/sv_SE
-@dirrm share/horde/imp/locale/sr_YU/LC_MESSAGES
-@dirrm share/horde/imp/locale/sr_YU
 @dirrm share/horde/imp/locale/sl_SI/LC_MESSAGES
 @dirrm share/horde/imp/locale/sl_SI
 @dirrm share/horde/imp/locale/sk_SK/LC_MESSAGES
 @dirrm share/horde/imp/locale/sk_SK
 @dirrm share/horde/imp/locale/ru_RU/LC_MESSAGES
-@dirrm share/horde/imp/locale/ru_RU.KOI8-R/LC_MESSAGES
-@dirrm share/horde/imp/locale/ru_RU.KOI8-R
 @dirrm share/horde/imp/locale/ru_RU
 @dirrm share/horde/imp/locale/ro_RO/LC_MESSAGES
 @dirrm share/horde/imp/locale/ro_RO
@@ -348,12 +452,13 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/locale/fr_FR
 @dirrm share/horde/imp/locale/fi_FI/LC_MESSAGES
 @dirrm share/horde/imp/locale/fi_FI
+@dirrm share/horde/imp/locale/fa_IR/LC_MESSAGES
+@dirrm share/horde/imp/locale/fa_IR
 @dirrm share/horde/imp/locale/et_EE/LC_MESSAGES
 @dirrm share/horde/imp/locale/et_EE
 @dirrm share/horde/imp/locale/es_ES/LC_MESSAGES
 @dirrm share/horde/imp/locale/es_ES
 @dirrm share/horde/imp/locale/en_US
-@dirrm share/horde/imp/locale/en_GB
 @dirrm share/horde/imp/locale/el_GR/LC_MESSAGES
 @dirrm share/horde/imp/locale/el_GR
 @dirrm share/horde/imp/locale/de_DE/LC_MESSAGES
@@ -364,23 +469,34 @@ share/horde/imp/view.php
 @dirrm share/horde/imp/locale/cs_CZ
 @dirrm share/horde/imp/locale/ca_ES/LC_MESSAGES
 @dirrm share/horde/imp/locale/ca_ES
+@dirrm share/horde/imp/locale/bs_BA/LC_MESSAGES
+@dirrm share/horde/imp/locale/bs_BA
 @dirrm share/horde/imp/locale/bg_BG/LC_MESSAGES
 @dirrm share/horde/imp/locale/bg_BG
 @dirrm share/horde/imp/locale/ar_SY/LC_MESSAGES
 @dirrm share/horde/imp/locale/ar_SY
 @dirrm share/horde/imp/locale/ar_OM/LC_MESSAGES
 @dirrm share/horde/imp/locale/ar_OM
+@dirrm share/horde/imp/locale/km_KH/LC_MESSAGES
+@dirrm share/horde/imp/locale/km_KH
+@dirrm share/horde/imp/locale/he_IL/LC_MESSAGES
+@dirrm share/horde/imp/locale/he_IL
 @dirrm share/horde/imp/locale
+@dirrm share/horde/imp/lib/Quota
+@dirrm share/horde/imp/lib/Notification/Listener
+@dirrm share/horde/imp/lib/Notification
 @dirrm share/horde/imp/lib/Maintenance/Task
 @dirrm share/horde/imp/lib/Maintenance
 @dirrm share/horde/imp/lib/MIME/Viewer
 @dirrm share/horde/imp/lib/MIME
 @dirrm share/horde/imp/lib/Identity
+@dirrm share/horde/imp/lib/IMAP
+@dirrm share/horde/imp/lib/Fetchmail
+@dirrm share/horde/imp/lib/Crypt
+@dirrm share/horde/imp/lib/Block
+@dirrm share/horde/imp/lib/Auth
 @dirrm share/horde/imp/lib
-@dirrm share/horde/imp/graphics/mime
-@dirrm share/horde/imp/graphics/folders
-@dirrm share/horde/imp/graphics
-@dirrm share/horde/imp/config
-@dirrm share/horde/imp
+@unexec ${RMDIR} %D/share/horde/imp/config 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/horde/imp 2>/dev/null || ${TRUE}
 @dirrm share/examples/imp
 @dirrm share/doc/imp
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index a88cd0ff551..6ef1a2b62bd 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2005/05/01 17:36:26 adrianp Exp $
+$NetBSD: distinfo,v 1.14 2006/06/16 09:24:36 adrianp Exp $
 
-SHA1 (imp-3.2.8.tar.gz) = 83b9b00dc396ea09fd54b27d2d9c6f885dd7e111
-RMD160 (imp-3.2.8.tar.gz) = 6b7263fd9994c37775ebe50448ece2a74130a2d7
-Size (imp-3.2.8.tar.gz) = 1587465 bytes
+SHA1 (imp-h3-4.1.1.tar.gz) = 08c9f9b172e0846f7ecf857e3b74188e44306fa5
+RMD160 (imp-h3-4.1.1.tar.gz) = 2bfeab260e78e26b73fd11f36b5ad55d94f6c3bb
+Size (imp-h3-4.1.1.tar.gz) = 4063589 bytes
diff --git a/mail/imp/files/imp.conf.dist b/mail/imp/files/imp.conf.dist
index 02631f95122..33a61b239b1 100644
--- a/mail/imp/files/imp.conf.dist
+++ b/mail/imp/files/imp.conf.dist
@@ -1,7 +1,19 @@
-# $NetBSD: imp.conf.dist,v 1.2 2002/02/01 22:44:28 bouyer Exp $
+# $NetBSD: imp.conf.dist,v 1.3 2006/06/16 09:24:36 adrianp Exp $
 #
 # IMP configuration file fragment for Apache
 
+<IfModule mod_alias.c>
+    Alias /imp/ "@IMPDIR@/"
+</IfModule>
+
+<Directory "@IMPDIR@">
+    DirectoryIndex index.php
+    <IfModule mod_php4.c>
+        php_flag file_uploads On
+        php_flag upload_max_filesize 5M  
+    </IfModule>
+</Directory>
+
 # For security, don't serve pages from the IMP configuration and library
 # directories.
 #