Update to 4.1

> Major changes compared to the IMP H3 (4.1-RC3) version are:
>     * Small bugfixes.
>
> Major changes compared to the IMP H3 (4.0) versions are:
>     * User changes:
>       - Virtual Inbox and Virtual Trash folder.
>       - "Empty Spam" menu item.
>       - Stationery and form responses.
>       - Not necessary to click on "Attach" button when attaching files.
>       - Play sound on new mail.
>       - Multiple message view.
>       - Ability to create notes from email messages.
>       - Improved message previews.
>       - Import of photo attachments into a gallery application.
>       - Send notification when linked attachments are downloaded.
>       - Graphical representation of thread on thread view screen.
>       - Less intrusive notifications when expanding addresses.
>       - Encrypt PGP messages for all recipients in one message.
>       - Always send new messages in "flowed" format.
>       - Added Hebrew and Khmer translation.
>     * Administrator changes:
>       - Compatible with PHP 5.1.
>       - Auto-detection of namespace information from IMAP server.
>       - Permission to restrict folder creation.
>       - Support for changing SMTP server/port on login.
>       - More flexible custom email headers.

3 files changed, 49 insertions, 35 deletions

diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile
index 7ad0df97a64..87906da8a8e 100644
--- a/mail/imp4/Makefile
+++ b/mail/imp4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/02/14 23:05:50 seb Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/08 23:38:09 adrianp Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
-PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/tarballs/
 
@@ -22,11 +21,11 @@ DOCDIR=		${PREFIX}/share/doc/imp
 EGDIR=		${PREFIX}/share/examples/imp
 HORDEDIR=	${PREFIX}/share/horde
 IMPDIR=		${HORDEDIR}/imp
-IMPVER=		4.0.4
+IMPVER=		4.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
 
@@ -62,7 +61,7 @@ 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."
+SUBST_MESSAGE.files=	Fixing configuration files.
 
 .include "options.mk"
 
@@ -86,15 +85,15 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d} && ${PAX} -rwpam . ${IMPDIR}/${d}
+		@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
+	@${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 "../../mk/bsd.pkg.mk"
diff --git a/mail/imp4/PLIST b/mail/imp4/PLIST
index 71f79b298a6..db3ca6b312e 100644
--- a/mail/imp4/PLIST
+++ b/mail/imp4/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/14 23:05:50 seb Exp $
-share/doc/imp/COPYING
+@comment $NetBSD: PLIST,v 1.4 2006/03/08 23:38:09 adrianp Exp $
 share/doc/imp/CHANGES
+share/doc/imp/COPYING
 share/doc/imp/CREDITS
 share/doc/imp/INSTALL
 share/doc/imp/README
@@ -13,7 +13,7 @@ share/horde/imp/attachment.php
 share/horde/imp/compose.php
 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/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
@@ -38,6 +38,10 @@ 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
@@ -81,7 +85,6 @@ 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/VFolder.php
 share/horde/imp/lib/api.php
 share/horde/imp/lib/base.php
 share/horde/imp/lib/prefs.php
@@ -112,6 +115,7 @@ 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
@@ -119,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
@@ -145,6 +150,7 @@ 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
@@ -171,12 +177,14 @@ 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
@@ -199,12 +207,13 @@ share/horde/imp/po/zh_CN.po
 share/horde/imp/po/zh_TW.po
 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/singlescript.php
 share/horde/imp/search.php
 share/horde/imp/smime.php
 share/horde/imp/spelling.php
+share/horde/imp/stationery.php
 share/horde/imp/templates/acl/acl.inc
 share/horde/imp/templates/common-header.inc
 share/horde/imp/templates/compose/attachments.inc
@@ -233,9 +242,9 @@ 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/import.inc
-share/horde/imp/templates/folders/javascript.inc
-share/horde/imp/templates/javascript/open_compose_win.js
-share/horde/imp/templates/javascript/open_print_win.js
+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
@@ -259,10 +268,9 @@ 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/open_pgp_import.js
-share/horde/imp/templates/pgp/open_pgp_win.js
 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/initialpageselect.inc
@@ -271,19 +279,17 @@ 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/open_smime_import.js
-share/horde/imp/templates/smime/open_smime_win.js
 share/horde/imp/templates/smime/passphrase.inc
 share/horde/imp/templates/smime/smime.inc
-share/horde/imp/templates/thread/bottom.inc
+share/horde/imp/templates/stationery/prefs.inc
 share/horde/imp/templates/thread/thread.html
-share/horde/imp/templates/thread/top.inc
 share/horde/imp/test.php
 share/horde/imp/themes/azur/screen.css
 share/horde/imp/themes/bluemoon/screen.css
@@ -293,11 +299,13 @@ 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-blue.png
-share/horde/imp/themes/graphics/addressbook-red.png
+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
@@ -309,14 +317,13 @@ 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/templates.png
 share/horde/imp/themes/graphics/folders/trash.png
-share/horde/imp/themes/graphics/forward.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
@@ -331,7 +338,6 @@ 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/reply.png
 share/horde/imp/themes/graphics/shared.png
 share/horde/imp/themes/graphics/signed.png
 share/horde/imp/themes/graphics/spacer_red.png
@@ -342,6 +348,7 @@ 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/screen.css
 share/horde/imp/themes/screen.css
 share/horde/imp/themes/simplex/screen.css
 share/horde/imp/themes/sun/screen.css
@@ -349,12 +356,14 @@ 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/rtl
 @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
@@ -367,6 +376,8 @@ share/horde/imp/view.php
 @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
@@ -467,6 +478,10 @@ share/horde/imp/view.php
 @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
diff --git a/mail/imp4/distinfo b/mail/imp4/distinfo
index f0e33810e7d..383096b831f 100644
--- a/mail/imp4/distinfo
+++ b/mail/imp4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/10/18 12:38:11 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2006/03/08 23:38:09 adrianp Exp $
 
-SHA1 (imp-h3-4.0.4.tar.gz) = 7538321bfc86bc353696017610fdae0a1c7903e3
-RMD160 (imp-h3-4.0.4.tar.gz) = 8d8adf32bd1ded4fbc080a7d17204db7d0ca62d1
-Size (imp-h3-4.0.4.tar.gz) = 3349908 bytes
+SHA1 (imp-h3-4.1.tar.gz) = e842f08c8d69364d675d2a37fd12426181be157b
+RMD160 (imp-h3-4.1.tar.gz) = f6dd0f41ea77cd270f91a69b5f69808afbcec8e6
+Size (imp-h3-4.1.tar.gz) = 3756910 bytes