- Upadte to 4.2 (release)

- Bump PORTEPOCH

6 files changed, 34 insertions, 72 deletions

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 14a9c4238654..fe77df7a8f19 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.2
-PORTREVISION=	3
+PORTEPOCH=	1
 CATEGORIES=	mail www
+DISTFILES=	${PORTNAME}-h3-4.2${EXTRACT_SUFX}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Webmail system for IMAP/POP3 mailboxes
 
-DISTFILES=	${PORTNAME}-h3-4.2-rc2${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/${PORTNAME}-h3-4.2-rc2
+WRKSRC=		${WRKDIR}/${PORTNAME}-h3-4.2
 
 #-----------------------------------------------------------------------
 # You may define these options:
diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo
index 27749cf28794..a6787bcbb05a 100644
--- a/mail/horde-imp/distinfo
+++ b/mail/horde-imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.2-rc2.tar.gz) = f71b54aa1a0fd6b7bb10b26f22d0d5f0
-SHA256 (imp-h3-4.2-rc2.tar.gz) = befced47bb51893dce967fc7a46d5cc9e3d6ad951426f86678322c59b559f3ac
-SIZE (imp-h3-4.2-rc2.tar.gz) = 4934340
+MD5 (imp-h3-4.2.tar.gz) = 2ab4314b58bea1906a2f34acb3e09a2e
+SHA256 (imp-h3-4.2.tar.gz) = 02302eeecf70067dee6eb5a8d2007cc9dfb3b11ba6e744f984b84541a5335fd4
+SIZE (imp-h3-4.2.tar.gz) = 5042955
diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist
index dda5cd3f903a..d9de5096dd24 100644
--- a/mail/horde-imp/pkg-plist
+++ b/mail/horde-imp/pkg-plist
@@ -88,7 +88,7 @@
 %%HORDIR%%/lib/IMAP/ACL/rfc4314.php
 %%HORDIR%%/lib/IMAP/Cache.php
 %%HORDIR%%/lib/IMAP/Client.php
-%%HORDIR%%/lib/IMAP/MailboxCache.php
+%%HORDIR%%/lib/IMAP/MessageCache.php
 %%HORDIR%%/lib/IMAP/Search.php
 %%HORDIR%%/lib/IMAP/Sort.php
 %%HORDIR%%/lib/IMAP/Thread.php
@@ -134,6 +134,7 @@
 %%HORDIR%%/lib/Notification/Listener/status.php
 %%HORDIR%%/lib/Quota.php
 %%HORDIR%%/lib/Quota/command.php
+%%HORDIR%%/lib/Quota/hook.php
 %%HORDIR%%/lib/Quota/imap.php
 %%HORDIR%%/lib/Quota/logfile.php
 %%HORDIR%%/lib/Quota/maildir.php
@@ -415,6 +416,8 @@
 %%HORDIR%%/themes/green/screen.css
 %%HORDIR%%/themes/grey/screen.css
 %%HORDIR%%/themes/ideas/screen.css
+%%HORDIR%%/themes/ie6_or_less.css
+%%HORDIR%%/themes/ie7.css
 %%HORDIR%%/themes/lavander/screen.css
 %%HORDIR%%/themes/luc/screen.css
 %%HORDIR%%/themes/lucblue/screen.css
@@ -483,8 +486,6 @@
 %%HORDIR%%/themes/silver/themed_graphics
 %%HORDIR%%/themes/simplex/screen.css
 %%HORDIR%%/themes/sun/screen.css
-%%HORDIR%%/themes/tango-blue/graphics/addressbook-blue.png
-%%HORDIR%%/themes/tango-blue/graphics/addressbook-red.png
 %%HORDIR%%/themes/tango-blue/graphics/addressbook_add.png
 %%HORDIR%%/themes/tango-blue/graphics/addressbook_browse.png
 %%HORDIR%%/themes/tango-blue/graphics/apple.png
@@ -494,7 +495,6 @@
 %%HORDIR%%/themes/tango-blue/graphics/audio/jetsndb.wav
 %%HORDIR%%/themes/tango-blue/graphics/audio/reminder.wav
 %%HORDIR%%/themes/tango-blue/graphics/audio/theetone.wav
-%%HORDIR%%/themes/tango-blue/graphics/az.png
 %%HORDIR%%/themes/tango-blue/graphics/compose.png
 %%HORDIR%%/themes/tango-blue/graphics/empty_spam.png
 %%HORDIR%%/themes/tango-blue/graphics/empty_trash.png
@@ -505,61 +505,42 @@
 %%HORDIR%%/themes/tango-blue/graphics/filters.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/drafts.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/folder.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/folder_create.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/folder_delete.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/folder_edit.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/folder_open.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/inbox.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/sent.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/spam.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/trash.png
-%%HORDIR%%/themes/tango-blue/graphics/forward.png
 %%HORDIR%%/themes/tango-blue/graphics/imp.png
 %%HORDIR%%/themes/tango-blue/graphics/loading.gif
 %%HORDIR%%/themes/tango-blue/graphics/mail_answered.png
+%%HORDIR%%/themes/tango-blue/graphics/mail_clearflag.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_deleted.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_draft.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_flagged.png
+%%HORDIR%%/themes/tango-blue/graphics/mail_forwarded.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_personal.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_priority_high.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_priority_low.png
+%%HORDIR%%/themes/tango-blue/graphics/mail_seen.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_unseen.png
 %%HORDIR%%/themes/tango-blue/graphics/manage_attachments.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/audio.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/binary.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/compressed.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/deb.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/encryption.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/html.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/icalendar.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/image.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/itip.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/mail.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/msexcel.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/mspowerpoint.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/msword.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_calc.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_draw.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_impress.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_math.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_writer.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/pdf.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/php.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/rpm.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/script-js.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-c.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-cpp.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-h.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-java.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-python.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/text.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/vcard.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/video.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/xml.png
+%%HORDIR%%/themes/tango-blue/graphics/mini-error.png
 %%HORDIR%%/themes/tango-blue/graphics/newmail.png
-%%HORDIR%%/themes/tango-blue/graphics/reply.png
 %%HORDIR%%/themes/tango-blue/graphics/shared.png
 %%HORDIR%%/themes/tango-blue/graphics/signed.png
 %%HORDIR%%/themes/tango-blue/graphics/spacer_red.png
 %%HORDIR%%/themes/tango-blue/graphics/spellcheck.png
-%%HORDIR%%/themes/tango-blue/graphics/za.png
 %%HORDIR%%/themes/tango-blue/screen.css
 %%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 14a9c4238654..fe77df7a8f19 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.2
-PORTREVISION=	3
+PORTEPOCH=	1
 CATEGORIES=	mail www
+DISTFILES=	${PORTNAME}-h3-4.2${EXTRACT_SUFX}
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	Webmail system for IMAP/POP3 mailboxes
 
-DISTFILES=	${PORTNAME}-h3-4.2-rc2${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/${PORTNAME}-h3-4.2-rc2
+WRKSRC=		${WRKDIR}/${PORTNAME}-h3-4.2
 
 #-----------------------------------------------------------------------
 # You may define these options:
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index 27749cf28794..a6787bcbb05a 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,3 +1,3 @@
-MD5 (imp-h3-4.2-rc2.tar.gz) = f71b54aa1a0fd6b7bb10b26f22d0d5f0
-SHA256 (imp-h3-4.2-rc2.tar.gz) = befced47bb51893dce967fc7a46d5cc9e3d6ad951426f86678322c59b559f3ac
-SIZE (imp-h3-4.2-rc2.tar.gz) = 4934340
+MD5 (imp-h3-4.2.tar.gz) = 2ab4314b58bea1906a2f34acb3e09a2e
+SHA256 (imp-h3-4.2.tar.gz) = 02302eeecf70067dee6eb5a8d2007cc9dfb3b11ba6e744f984b84541a5335fd4
+SIZE (imp-h3-4.2.tar.gz) = 5042955
diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist
index dda5cd3f903a..d9de5096dd24 100644
--- a/mail/horde4-imp/pkg-plist
+++ b/mail/horde4-imp/pkg-plist
@@ -88,7 +88,7 @@
 %%HORDIR%%/lib/IMAP/ACL/rfc4314.php
 %%HORDIR%%/lib/IMAP/Cache.php
 %%HORDIR%%/lib/IMAP/Client.php
-%%HORDIR%%/lib/IMAP/MailboxCache.php
+%%HORDIR%%/lib/IMAP/MessageCache.php
 %%HORDIR%%/lib/IMAP/Search.php
 %%HORDIR%%/lib/IMAP/Sort.php
 %%HORDIR%%/lib/IMAP/Thread.php
@@ -134,6 +134,7 @@
 %%HORDIR%%/lib/Notification/Listener/status.php
 %%HORDIR%%/lib/Quota.php
 %%HORDIR%%/lib/Quota/command.php
+%%HORDIR%%/lib/Quota/hook.php
 %%HORDIR%%/lib/Quota/imap.php
 %%HORDIR%%/lib/Quota/logfile.php
 %%HORDIR%%/lib/Quota/maildir.php
@@ -415,6 +416,8 @@
 %%HORDIR%%/themes/green/screen.css
 %%HORDIR%%/themes/grey/screen.css
 %%HORDIR%%/themes/ideas/screen.css
+%%HORDIR%%/themes/ie6_or_less.css
+%%HORDIR%%/themes/ie7.css
 %%HORDIR%%/themes/lavander/screen.css
 %%HORDIR%%/themes/luc/screen.css
 %%HORDIR%%/themes/lucblue/screen.css
@@ -483,8 +486,6 @@
 %%HORDIR%%/themes/silver/themed_graphics
 %%HORDIR%%/themes/simplex/screen.css
 %%HORDIR%%/themes/sun/screen.css
-%%HORDIR%%/themes/tango-blue/graphics/addressbook-blue.png
-%%HORDIR%%/themes/tango-blue/graphics/addressbook-red.png
 %%HORDIR%%/themes/tango-blue/graphics/addressbook_add.png
 %%HORDIR%%/themes/tango-blue/graphics/addressbook_browse.png
 %%HORDIR%%/themes/tango-blue/graphics/apple.png
@@ -494,7 +495,6 @@
 %%HORDIR%%/themes/tango-blue/graphics/audio/jetsndb.wav
 %%HORDIR%%/themes/tango-blue/graphics/audio/reminder.wav
 %%HORDIR%%/themes/tango-blue/graphics/audio/theetone.wav
-%%HORDIR%%/themes/tango-blue/graphics/az.png
 %%HORDIR%%/themes/tango-blue/graphics/compose.png
 %%HORDIR%%/themes/tango-blue/graphics/empty_spam.png
 %%HORDIR%%/themes/tango-blue/graphics/empty_trash.png
@@ -505,61 +505,42 @@
 %%HORDIR%%/themes/tango-blue/graphics/filters.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/drafts.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/folder.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/folder_create.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/folder_delete.png
+%%HORDIR%%/themes/tango-blue/graphics/folders/folder_edit.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/folder_open.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/inbox.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/sent.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/spam.png
 %%HORDIR%%/themes/tango-blue/graphics/folders/trash.png
-%%HORDIR%%/themes/tango-blue/graphics/forward.png
 %%HORDIR%%/themes/tango-blue/graphics/imp.png
 %%HORDIR%%/themes/tango-blue/graphics/loading.gif
 %%HORDIR%%/themes/tango-blue/graphics/mail_answered.png
+%%HORDIR%%/themes/tango-blue/graphics/mail_clearflag.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_deleted.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_draft.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_flagged.png
+%%HORDIR%%/themes/tango-blue/graphics/mail_forwarded.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_personal.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_priority_high.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_priority_low.png
+%%HORDIR%%/themes/tango-blue/graphics/mail_seen.png
 %%HORDIR%%/themes/tango-blue/graphics/mail_unseen.png
 %%HORDIR%%/themes/tango-blue/graphics/manage_attachments.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/audio.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/binary.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/compressed.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/deb.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/encryption.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/html.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/icalendar.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/image.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/itip.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/mail.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/msexcel.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/mspowerpoint.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/msword.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_calc.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_draw.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_impress.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_math.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/ooo_writer.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/pdf.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/php.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/rpm.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/script-js.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-c.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-cpp.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-h.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-java.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/source-python.png
 %%HORDIR%%/themes/tango-blue/graphics/mime/text.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/vcard.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/video.png
-%%HORDIR%%/themes/tango-blue/graphics/mime/xml.png
+%%HORDIR%%/themes/tango-blue/graphics/mini-error.png
 %%HORDIR%%/themes/tango-blue/graphics/newmail.png
-%%HORDIR%%/themes/tango-blue/graphics/reply.png
 %%HORDIR%%/themes/tango-blue/graphics/shared.png
 %%HORDIR%%/themes/tango-blue/graphics/signed.png
 %%HORDIR%%/themes/tango-blue/graphics/spacer_red.png
 %%HORDIR%%/themes/tango-blue/graphics/spellcheck.png
-%%HORDIR%%/themes/tango-blue/graphics/za.png
 %%HORDIR%%/themes/tango-blue/screen.css
 %%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/thread.php