Upgrade to 4.0.4.

Changelog at
<http://cvs.horde.org/diff.php/imp/docs/CHANGES?r1=1.699.2.62&r2=1.699.2.115&ty=h>

9 files changed, 60 insertions, 21 deletions

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 62de9a6..c1404a5 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.3
+PORTVERSION=	4.0.4
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index f02a82a..06a2bb3 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1,2 +1,2 @@
-MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9
-SIZE (imp-h3-4.0.3.tar.gz) = 3060914
+MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
+SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index 9e5b4de..47730f8 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -98,6 +98,7 @@
 %%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ca_ES/help.xml
 %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
@@ -114,6 +115,7 @@
 %%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/et_EE/help.xml
 %%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fa_IR/help.xml
 %%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/fi_FI/help.xml
 %%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
@@ -167,6 +169,7 @@
 %%IMPDIR%%/po/ar_OM.po
 %%IMPDIR%%/po/ar_SY.po
 %%IMPDIR%%/po/bg_BG.po
+%%IMPDIR%%/po/bs_BA.po
 %%IMPDIR%%/po/ca_ES.po
 %%IMPDIR%%/po/cs_CZ.po
 %%IMPDIR%%/po/da_DK.po
@@ -238,6 +241,7 @@
 %%IMPDIR%%/templates/filters/prefs.inc
 %%IMPDIR%%/templates/folders/actions.inc
 %%IMPDIR%%/templates/folders/folders.html
+%%IMPDIR%%/templates/folders/folders_confirm.html
 %%IMPDIR%%/templates/folders/foot.inc
 %%IMPDIR%%/templates/folders/head.inc
 %%IMPDIR%%/templates/folders/import.inc
@@ -265,7 +269,6 @@
 %%IMPDIR%%/templates/message/navbar_actions.inc
 %%IMPDIR%%/templates/message/navbar_navigate.inc
 %%IMPDIR%%/templates/message/navbar_top.inc
-%%IMPDIR%%/templates/message/print.inc
 %%IMPDIR%%/templates/pgp/import_key.inc
 %%IMPDIR%%/templates/pgp/notactive.inc
 %%IMPDIR%%/templates/pgp/open_pgp_import.js
@@ -300,15 +303,15 @@
 %%IMPDIR%%/themes/brown/screen.css
 %%IMPDIR%%/themes/burntorange/screen.css
 %%IMPDIR%%/themes/cherry/screen.css
+%%IMPDIR%%/themes/cornflower/screen.css
 %%IMPDIR%%/themes/gennevilliers/screen.css
-%%IMPDIR%%/themes/green/screen.css
-%%IMPDIR%%/themes/grey/screen.css
 %%IMPDIR%%/themes/graphics/addressbook-blue.png
 %%IMPDIR%%/themes/graphics/addressbook-red.png
 %%IMPDIR%%/themes/graphics/apple.png
 %%IMPDIR%%/themes/graphics/attachment.png
 %%IMPDIR%%/themes/graphics/compose.png
 %%IMPDIR%%/themes/graphics/empty_trash.png
+%%IMPDIR%%/themes/graphics/encrypted.png
 %%IMPDIR%%/themes/graphics/expand.png
 %%IMPDIR%%/themes/graphics/favicon.ico
 %%IMPDIR%%/themes/graphics/fetchmail.png
@@ -331,6 +334,7 @@
 %%IMPDIR%%/themes/graphics/mail_priority_low.png
 %%IMPDIR%%/themes/graphics/mail_unseen.png
 %%IMPDIR%%/themes/graphics/manage_attachments.png
+%%IMPDIR%%/themes/graphics/mime/binary.png
 %%IMPDIR%%/themes/graphics/mime/compressed.png
 %%IMPDIR%%/themes/graphics/mime/encryption.png
 %%IMPDIR%%/themes/graphics/mime/html.png
@@ -344,9 +348,13 @@
 %%IMPDIR%%/themes/graphics/signed.png
 %%IMPDIR%%/themes/graphics/spacer_red.png
 %%IMPDIR%%/themes/graphics/spellcheck.png
-%%IMPDIR%%/themes/screen.css
+%%IMPDIR%%/themes/green/screen.css
+%%IMPDIR%%/themes/grey/screen.css
 %%IMPDIR%%/themes/lavander/screen.css
+%%IMPDIR%%/themes/luc/screen.css
+%%IMPDIR%%/themes/lucblue/screen.css
 %%IMPDIR%%/themes/postnuke/screen.css
+%%IMPDIR%%/themes/screen.css
 %%IMPDIR%%/themes/simplex/screen.css
 %%IMPDIR%%/themes/sun/screen.css
 %%IMPDIR%%/thread.php
@@ -356,6 +364,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
 @dirrm %%IMPDIR%%/themes/postnuke
+@dirrm %%IMPDIR%%/themes/lucblue
+@dirrm %%IMPDIR%%/themes/luc
 @dirrm %%IMPDIR%%/themes/lavander
 @dirrm %%IMPDIR%%/themes/graphics/mime
 @dirrm %%IMPDIR%%/themes/graphics/folders
@@ -363,6 +373,7 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/themes/grey
 @dirrm %%IMPDIR%%/themes/green
 @dirrm %%IMPDIR%%/themes/gennevilliers
+@dirrm %%IMPDIR%%/themes/cornflower
 @dirrm %%IMPDIR%%/themes/cherry
 @dirrm %%IMPDIR%%/themes/burntorange
 @dirrm %%IMPDIR%%/themes/brown
@@ -462,6 +473,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/locale/cs_CZ
 @dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ca_ES
+@dirrm %%IMPDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/bs_BA
 @dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/bg_BG
 @dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 62de9a6..c1404a5 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.3
+PORTVERSION=	4.0.4
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index f02a82a..06a2bb3 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,2 +1,2 @@
-MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9
-SIZE (imp-h3-4.0.3.tar.gz) = 3060914
+MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
+SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index 9e5b4de..47730f8 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -98,6 +98,7 @@
 %%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ca_ES/help.xml
 %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
@@ -114,6 +115,7 @@
 %%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/et_EE/help.xml
 %%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fa_IR/help.xml
 %%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/fi_FI/help.xml
 %%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
@@ -167,6 +169,7 @@
 %%IMPDIR%%/po/ar_OM.po
 %%IMPDIR%%/po/ar_SY.po
 %%IMPDIR%%/po/bg_BG.po
+%%IMPDIR%%/po/bs_BA.po
 %%IMPDIR%%/po/ca_ES.po
 %%IMPDIR%%/po/cs_CZ.po
 %%IMPDIR%%/po/da_DK.po
@@ -238,6 +241,7 @@
 %%IMPDIR%%/templates/filters/prefs.inc
 %%IMPDIR%%/templates/folders/actions.inc
 %%IMPDIR%%/templates/folders/folders.html
+%%IMPDIR%%/templates/folders/folders_confirm.html
 %%IMPDIR%%/templates/folders/foot.inc
 %%IMPDIR%%/templates/folders/head.inc
 %%IMPDIR%%/templates/folders/import.inc
@@ -265,7 +269,6 @@
 %%IMPDIR%%/templates/message/navbar_actions.inc
 %%IMPDIR%%/templates/message/navbar_navigate.inc
 %%IMPDIR%%/templates/message/navbar_top.inc
-%%IMPDIR%%/templates/message/print.inc
 %%IMPDIR%%/templates/pgp/import_key.inc
 %%IMPDIR%%/templates/pgp/notactive.inc
 %%IMPDIR%%/templates/pgp/open_pgp_import.js
@@ -300,15 +303,15 @@
 %%IMPDIR%%/themes/brown/screen.css
 %%IMPDIR%%/themes/burntorange/screen.css
 %%IMPDIR%%/themes/cherry/screen.css
+%%IMPDIR%%/themes/cornflower/screen.css
 %%IMPDIR%%/themes/gennevilliers/screen.css
-%%IMPDIR%%/themes/green/screen.css
-%%IMPDIR%%/themes/grey/screen.css
 %%IMPDIR%%/themes/graphics/addressbook-blue.png
 %%IMPDIR%%/themes/graphics/addressbook-red.png
 %%IMPDIR%%/themes/graphics/apple.png
 %%IMPDIR%%/themes/graphics/attachment.png
 %%IMPDIR%%/themes/graphics/compose.png
 %%IMPDIR%%/themes/graphics/empty_trash.png
+%%IMPDIR%%/themes/graphics/encrypted.png
 %%IMPDIR%%/themes/graphics/expand.png
 %%IMPDIR%%/themes/graphics/favicon.ico
 %%IMPDIR%%/themes/graphics/fetchmail.png
@@ -331,6 +334,7 @@
 %%IMPDIR%%/themes/graphics/mail_priority_low.png
 %%IMPDIR%%/themes/graphics/mail_unseen.png
 %%IMPDIR%%/themes/graphics/manage_attachments.png
+%%IMPDIR%%/themes/graphics/mime/binary.png
 %%IMPDIR%%/themes/graphics/mime/compressed.png
 %%IMPDIR%%/themes/graphics/mime/encryption.png
 %%IMPDIR%%/themes/graphics/mime/html.png
@@ -344,9 +348,13 @@
 %%IMPDIR%%/themes/graphics/signed.png
 %%IMPDIR%%/themes/graphics/spacer_red.png
 %%IMPDIR%%/themes/graphics/spellcheck.png
-%%IMPDIR%%/themes/screen.css
+%%IMPDIR%%/themes/green/screen.css
+%%IMPDIR%%/themes/grey/screen.css
 %%IMPDIR%%/themes/lavander/screen.css
+%%IMPDIR%%/themes/luc/screen.css
+%%IMPDIR%%/themes/lucblue/screen.css
 %%IMPDIR%%/themes/postnuke/screen.css
+%%IMPDIR%%/themes/screen.css
 %%IMPDIR%%/themes/simplex/screen.css
 %%IMPDIR%%/themes/sun/screen.css
 %%IMPDIR%%/thread.php
@@ -356,6 +364,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
 @dirrm %%IMPDIR%%/themes/postnuke
+@dirrm %%IMPDIR%%/themes/lucblue
+@dirrm %%IMPDIR%%/themes/luc
 @dirrm %%IMPDIR%%/themes/lavander
 @dirrm %%IMPDIR%%/themes/graphics/mime
 @dirrm %%IMPDIR%%/themes/graphics/folders
@@ -363,6 +373,7 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/themes/grey
 @dirrm %%IMPDIR%%/themes/green
 @dirrm %%IMPDIR%%/themes/gennevilliers
+@dirrm %%IMPDIR%%/themes/cornflower
 @dirrm %%IMPDIR%%/themes/cherry
 @dirrm %%IMPDIR%%/themes/burntorange
 @dirrm %%IMPDIR%%/themes/brown
@@ -462,6 +473,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/locale/cs_CZ
 @dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ca_ES
+@dirrm %%IMPDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/bs_BA
 @dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/bg_BG
 @dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 62de9a6..c1404a5 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	4.0.3
+PORTVERSION=	4.0.4
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
diff --git a/mail/imp/distinfo b/mail/imp/distinfo
index f02a82a..06a2bb3 100644
--- a/mail/imp/distinfo
+++ b/mail/imp/distinfo
@@ -1,2 +1,2 @@
-MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9
-SIZE (imp-h3-4.0.3.tar.gz) = 3060914
+MD5 (imp-h3-4.0.4.tar.gz) = 437767b420c6280e680a42c8e34182d1
+SIZE (imp-h3-4.0.4.tar.gz) = 3349908
diff --git a/mail/imp/pkg-plist b/mail/imp/pkg-plist
index 9e5b4de..47730f8 100644
--- a/mail/imp/pkg-plist
+++ b/mail/imp/pkg-plist
@@ -98,6 +98,7 @@
 %%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/bs_BA/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/ca_ES/help.xml
 %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
@@ -114,6 +115,7 @@
 %%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/et_EE/help.xml
 %%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fa_IR/help.xml
 %%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
 %%IMPDIR%%/locale/fi_FI/help.xml
 %%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
@@ -167,6 +169,7 @@
 %%IMPDIR%%/po/ar_OM.po
 %%IMPDIR%%/po/ar_SY.po
 %%IMPDIR%%/po/bg_BG.po
+%%IMPDIR%%/po/bs_BA.po
 %%IMPDIR%%/po/ca_ES.po
 %%IMPDIR%%/po/cs_CZ.po
 %%IMPDIR%%/po/da_DK.po
@@ -238,6 +241,7 @@
 %%IMPDIR%%/templates/filters/prefs.inc
 %%IMPDIR%%/templates/folders/actions.inc
 %%IMPDIR%%/templates/folders/folders.html
+%%IMPDIR%%/templates/folders/folders_confirm.html
 %%IMPDIR%%/templates/folders/foot.inc
 %%IMPDIR%%/templates/folders/head.inc
 %%IMPDIR%%/templates/folders/import.inc
@@ -265,7 +269,6 @@
 %%IMPDIR%%/templates/message/navbar_actions.inc
 %%IMPDIR%%/templates/message/navbar_navigate.inc
 %%IMPDIR%%/templates/message/navbar_top.inc
-%%IMPDIR%%/templates/message/print.inc
 %%IMPDIR%%/templates/pgp/import_key.inc
 %%IMPDIR%%/templates/pgp/notactive.inc
 %%IMPDIR%%/templates/pgp/open_pgp_import.js
@@ -300,15 +303,15 @@
 %%IMPDIR%%/themes/brown/screen.css
 %%IMPDIR%%/themes/burntorange/screen.css
 %%IMPDIR%%/themes/cherry/screen.css
+%%IMPDIR%%/themes/cornflower/screen.css
 %%IMPDIR%%/themes/gennevilliers/screen.css
-%%IMPDIR%%/themes/green/screen.css
-%%IMPDIR%%/themes/grey/screen.css
 %%IMPDIR%%/themes/graphics/addressbook-blue.png
 %%IMPDIR%%/themes/graphics/addressbook-red.png
 %%IMPDIR%%/themes/graphics/apple.png
 %%IMPDIR%%/themes/graphics/attachment.png
 %%IMPDIR%%/themes/graphics/compose.png
 %%IMPDIR%%/themes/graphics/empty_trash.png
+%%IMPDIR%%/themes/graphics/encrypted.png
 %%IMPDIR%%/themes/graphics/expand.png
 %%IMPDIR%%/themes/graphics/favicon.ico
 %%IMPDIR%%/themes/graphics/fetchmail.png
@@ -331,6 +334,7 @@
 %%IMPDIR%%/themes/graphics/mail_priority_low.png
 %%IMPDIR%%/themes/graphics/mail_unseen.png
 %%IMPDIR%%/themes/graphics/manage_attachments.png
+%%IMPDIR%%/themes/graphics/mime/binary.png
 %%IMPDIR%%/themes/graphics/mime/compressed.png
 %%IMPDIR%%/themes/graphics/mime/encryption.png
 %%IMPDIR%%/themes/graphics/mime/html.png
@@ -344,9 +348,13 @@
 %%IMPDIR%%/themes/graphics/signed.png
 %%IMPDIR%%/themes/graphics/spacer_red.png
 %%IMPDIR%%/themes/graphics/spellcheck.png
-%%IMPDIR%%/themes/screen.css
+%%IMPDIR%%/themes/green/screen.css
+%%IMPDIR%%/themes/grey/screen.css
 %%IMPDIR%%/themes/lavander/screen.css
+%%IMPDIR%%/themes/luc/screen.css
+%%IMPDIR%%/themes/lucblue/screen.css
 %%IMPDIR%%/themes/postnuke/screen.css
+%%IMPDIR%%/themes/screen.css
 %%IMPDIR%%/themes/simplex/screen.css
 %%IMPDIR%%/themes/sun/screen.css
 %%IMPDIR%%/thread.php
@@ -356,6 +364,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/themes/sun
 @dirrm %%IMPDIR%%/themes/simplex
 @dirrm %%IMPDIR%%/themes/postnuke
+@dirrm %%IMPDIR%%/themes/lucblue
+@dirrm %%IMPDIR%%/themes/luc
 @dirrm %%IMPDIR%%/themes/lavander
 @dirrm %%IMPDIR%%/themes/graphics/mime
 @dirrm %%IMPDIR%%/themes/graphics/folders
@@ -363,6 +373,7 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/themes/grey
 @dirrm %%IMPDIR%%/themes/green
 @dirrm %%IMPDIR%%/themes/gennevilliers
+@dirrm %%IMPDIR%%/themes/cornflower
 @dirrm %%IMPDIR%%/themes/cherry
 @dirrm %%IMPDIR%%/themes/burntorange
 @dirrm %%IMPDIR%%/themes/brown
@@ -462,6 +473,8 @@ etc/horde/httpd.conf.imp
 @dirrm %%IMPDIR%%/locale/cs_CZ
 @dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/ca_ES
+@dirrm %%IMPDIR%%/locale/bs_BA/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/bs_BA
 @dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%IMPDIR%%/locale/bg_BG
 @dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES