Upgrade to v3.0.4.

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

12 files changed, 99 insertions, 81 deletions

diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 09d48105bab7..c7da1a6e431a 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -94,6 +94,7 @@ NO_BUILD=	yes
 USE_PHP=	ctype gettext session
 WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
+SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if !defined(WITHOUT_FILEINFO)
@@ -196,8 +197,8 @@ RUN_DEPENDS+=	${LOCALBASE}/share/GeoIP/GeoIP.dat:${PORTSDIR}/net/GeoIP
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
-		docs/PERFORMANCE docs/RELEASE docs/RELEASE_NOTES docs/SECURITY \
-		docs/TODO docs/TRANSLATIONS docs/UPGRADING
+		docs/PERFORMANCE docs/RELEASE_NOTES docs/SECURITY docs/TODO \
+		docs/TRANSLATIONS docs/UPGRADING
 CONFFILE=	conf.php mime_drivers.php motd.php nls.php prefs.php registry.php
 SUB_DIRS=	admin config js lib locale po scripts services templates themes util
 
@@ -205,6 +206,7 @@ LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
+SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
@@ -333,9 +335,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"	\
-		-e "s:%%HORDESBIN%%:${HORDESBIN}:;s:%%DOCSDIR%%:${DOCSDIR}:"		\
-		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/www/horde-base/distinfo b/www/horde-base/distinfo
index 1a7b08c92e35..5824018951f6 100644
--- a/www/horde-base/distinfo
+++ b/www/horde-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.3.tar.gz) = 96a4c9fb2047987164a3981a31667ef2
-SIZE (horde-3.0.3.tar.gz) = 3246122
+MD5 (horde-3.0.4.tar.gz) = e2221d409ba1c8841ce4ecee981d7b61
+SIZE (horde-3.0.4.tar.gz) = 3378143
diff --git a/www/horde-base/files/patch-config_mime_drivers.php.dist b/www/horde-base/files/patch-config_mime_drivers.php.dist
index 4e4afff1deae..3128b9e744ea 100644
--- a/www/horde-base/files/patch-config_mime_drivers.php.dist
+++ b/www/horde-base/files/patch-config_mime_drivers.php.dist
@@ -1,31 +1,32 @@
---- config/mime_drivers.php.dist.orig	Mon Feb  7 23:17:54 2005
-+++ config/mime_drivers.php.dist	Fri Feb 11 21:37:05 2005
-@@ -37,10 +37,20 @@
+--- config/mime_drivers.php.dist.orig	Mon Mar 14 14:48:05 2005
++++ config/mime_drivers.php.dist	Wed Mar 30 00:41:34 2005
+@@ -37,10 +37,21 @@
   * zip            Zip files
   */
  $mime_drivers_map['horde']['registered'] = array(
--    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword', 'msexcel',
--    'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
--    'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz', 'tnef',
--    'vcard', 'webcpp', 'zip');
+-    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword',
+-    'msexcel', 'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
+-    'rfc822', 'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz',
+-    'tnef', 'vcard', 'webcpp', 'zip');
 +    'css'
 +//UNCOMMENTIFDEB , 'deb'
-+    , 'enriched'
++   , 'enriched'
 +//UNCOMMENTIFES , 'enscript'
-+    , 'html', 'images'
++   , 'html', 'images'
 +//UNCOMMENTIFWV , 'msword'
 +//UNCOMMENTIFXL , 'msexcel', 'mspowerpoint'
-+    , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report', 'richtext'
++   , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
++    'rfc822', 'richtext'
 +//UNCOMMENTIFRPM , 'rpm'
-+    , 'security', 'simple'
++   , 'security', 'simple'
 +//UNCOMMENTIFSRCHIGH , 'srchighlite'
-+    , 'tgz', 'tnef', 'vcard'
++   , 'tgz', 'tnef', 'vcard'
 +//UNCOMMENTIFWCPP , 'webcpp'
-+    , 'zip');
++   , 'zip');
  
  
  /**
-@@ -161,66 +171,66 @@
+@@ -161,66 +172,66 @@
   * Web C Plus Plus driver settings
   * http://webcpp.sourceforge.net/
   */
@@ -143,13 +144,14 @@
  
  
  /**
-@@ -272,14 +282,14 @@
+@@ -272,15 +283,15 @@
   * The 'location' entry should point to the 'wvHtml' program, NOT the
   * 'wvWare' program.
   */
 -$mime_drivers['horde']['msword']['location'] = '/usr/bin/wvHtml';
 -$mime_drivers['horde']['msword']['inline'] = false;
 -$mime_drivers['horde']['msword']['handles'] = array(
+-    'application/vnd.ms-word',
 -    'application/msword',
 -    'application/rtf',
 -    'text/rtf');
@@ -158,6 +160,7 @@
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['inline'] = false;
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['handles'] = array(
++//UNCOMMENTIFWV    'application/vnd.ms-word',
 +//UNCOMMENTIFWV    'application/msword',
 +//UNCOMMENTIFWV    'application/rtf',
 +//UNCOMMENTIFWV    'text/rtf');
@@ -166,7 +169,7 @@
  
  
  /**
-@@ -287,14 +297,14 @@
+@@ -288,14 +299,14 @@
   * This driver requires xlhtml to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -189,7 +192,7 @@
  
  
  /**
-@@ -302,13 +312,13 @@
+@@ -303,13 +314,13 @@
   * This driver requires ppthtml, included with xlhtml, to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -210,7 +213,7 @@
  
  
  /**
-@@ -324,24 +334,24 @@
+@@ -325,24 +336,24 @@
  /**
   * RPM driver settings
   */
diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist
index 890b80397600..fd10e201b310 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde-base/pkg-plist
@@ -9,7 +9,6 @@ etc/horde/httpd.conf.horde
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/PERFORMANCE
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -353,6 +352,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Tree.php
 %%HORDEDIR%%/lib/Horde/Tree/html.php
 %%HORDEDIR%%/lib/Horde/Tree/javascript.php
+%%HORDEDIR%%/lib/Horde/Tree/select.php
 %%HORDEDIR%%/lib/Horde/UI/Language.php
 %%HORDEDIR%%/lib/Horde/UI/Pager.php
 %%HORDEDIR%%/lib/Horde/UI/Table.php
@@ -573,6 +573,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/scripts/temp-cleanup.cron
 %%HORDEDIR%%/scripts/themes_check.php
 %%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.mysql.sql
+%%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.pgsql.sql
 %%HORDEDIR%%/services/cacheview.php
 %%HORDEDIR%%/services/download/index.php
 %%HORDEDIR%%/services/editor/htmlarea/dialog.js
@@ -1308,6 +1309,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/themes/lucblue/info.php
 %%HORDEDIR%%/themes/lucblue/screen.css
 %%HORDEDIR%%/themes/mobile/screen.css
+%%HORDEDIR%%/themes/moz14.css
 %%HORDEDIR%%/themes/mozilla/graphics/header.png
 %%HORDEDIR%%/themes/mozilla/graphics/menu-active.png
 %%HORDEDIR%%/themes/mozilla/graphics/menu.png
@@ -1319,6 +1321,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/themes/print/screen.css
 %%HORDEDIR%%/themes/purple/info.php
 %%HORDEDIR%%/themes/purple/screen.css
+%%HORDEDIR%%/themes/safari.css
 %%HORDEDIR%%/themes/screen.css
 %%HORDEDIR%%/themes/simplex/graphics/background.png
 %%HORDEDIR%%/themes/simplex/info.php
@@ -1569,6 +1572,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Horde/Block
 @dirrm %%HORDEDIR%%/lib/Horde/Auth
 @dirrm %%HORDEDIR%%/lib/Horde
+@dirrm %%HORDEDIR%%/lib/File/tests
 @dirrm %%HORDEDIR%%/lib/File/PDF/fonts
 @dirrm %%HORDEDIR%%/lib/File/PDF
 @dirrm %%HORDEDIR%%/lib/File
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 09d48105bab7..c7da1a6e431a 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -94,6 +94,7 @@ NO_BUILD=	yes
 USE_PHP=	ctype gettext session
 WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
+SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if !defined(WITHOUT_FILEINFO)
@@ -196,8 +197,8 @@ RUN_DEPENDS+=	${LOCALBASE}/share/GeoIP/GeoIP.dat:${PORTSDIR}/net/GeoIP
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
-		docs/PERFORMANCE docs/RELEASE docs/RELEASE_NOTES docs/SECURITY \
-		docs/TODO docs/TRANSLATIONS docs/UPGRADING
+		docs/PERFORMANCE docs/RELEASE_NOTES docs/SECURITY docs/TODO \
+		docs/TRANSLATIONS docs/UPGRADING
 CONFFILE=	conf.php mime_drivers.php motd.php nls.php prefs.php registry.php
 SUB_DIRS=	admin config js lib locale po scripts services templates themes util
 
@@ -205,6 +206,7 @@ LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
+SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
@@ -333,9 +335,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"	\
-		-e "s:%%HORDESBIN%%:${HORDESBIN}:;s:%%DOCSDIR%%:${DOCSDIR}:"		\
-		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/www/horde/distinfo b/www/horde/distinfo
index 1a7b08c92e35..5824018951f6 100644
--- a/www/horde/distinfo
+++ b/www/horde/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.3.tar.gz) = 96a4c9fb2047987164a3981a31667ef2
-SIZE (horde-3.0.3.tar.gz) = 3246122
+MD5 (horde-3.0.4.tar.gz) = e2221d409ba1c8841ce4ecee981d7b61
+SIZE (horde-3.0.4.tar.gz) = 3378143
diff --git a/www/horde/files/patch-config_mime_drivers.php.dist b/www/horde/files/patch-config_mime_drivers.php.dist
index 4e4afff1deae..3128b9e744ea 100644
--- a/www/horde/files/patch-config_mime_drivers.php.dist
+++ b/www/horde/files/patch-config_mime_drivers.php.dist
@@ -1,31 +1,32 @@
---- config/mime_drivers.php.dist.orig	Mon Feb  7 23:17:54 2005
-+++ config/mime_drivers.php.dist	Fri Feb 11 21:37:05 2005
-@@ -37,10 +37,20 @@
+--- config/mime_drivers.php.dist.orig	Mon Mar 14 14:48:05 2005
++++ config/mime_drivers.php.dist	Wed Mar 30 00:41:34 2005
+@@ -37,10 +37,21 @@
   * zip            Zip files
   */
  $mime_drivers_map['horde']['registered'] = array(
--    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword', 'msexcel',
--    'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
--    'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz', 'tnef',
--    'vcard', 'webcpp', 'zip');
+-    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword',
+-    'msexcel', 'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
+-    'rfc822', 'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz',
+-    'tnef', 'vcard', 'webcpp', 'zip');
 +    'css'
 +//UNCOMMENTIFDEB , 'deb'
-+    , 'enriched'
++   , 'enriched'
 +//UNCOMMENTIFES , 'enscript'
-+    , 'html', 'images'
++   , 'html', 'images'
 +//UNCOMMENTIFWV , 'msword'
 +//UNCOMMENTIFXL , 'msexcel', 'mspowerpoint'
-+    , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report', 'richtext'
++   , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
++    'rfc822', 'richtext'
 +//UNCOMMENTIFRPM , 'rpm'
-+    , 'security', 'simple'
++   , 'security', 'simple'
 +//UNCOMMENTIFSRCHIGH , 'srchighlite'
-+    , 'tgz', 'tnef', 'vcard'
++   , 'tgz', 'tnef', 'vcard'
 +//UNCOMMENTIFWCPP , 'webcpp'
-+    , 'zip');
++   , 'zip');
  
  
  /**
-@@ -161,66 +171,66 @@
+@@ -161,66 +172,66 @@
   * Web C Plus Plus driver settings
   * http://webcpp.sourceforge.net/
   */
@@ -143,13 +144,14 @@
  
  
  /**
-@@ -272,14 +282,14 @@
+@@ -272,15 +283,15 @@
   * The 'location' entry should point to the 'wvHtml' program, NOT the
   * 'wvWare' program.
   */
 -$mime_drivers['horde']['msword']['location'] = '/usr/bin/wvHtml';
 -$mime_drivers['horde']['msword']['inline'] = false;
 -$mime_drivers['horde']['msword']['handles'] = array(
+-    'application/vnd.ms-word',
 -    'application/msword',
 -    'application/rtf',
 -    'text/rtf');
@@ -158,6 +160,7 @@
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['inline'] = false;
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['handles'] = array(
++//UNCOMMENTIFWV    'application/vnd.ms-word',
 +//UNCOMMENTIFWV    'application/msword',
 +//UNCOMMENTIFWV    'application/rtf',
 +//UNCOMMENTIFWV    'text/rtf');
@@ -166,7 +169,7 @@
  
  
  /**
-@@ -287,14 +297,14 @@
+@@ -288,14 +299,14 @@
   * This driver requires xlhtml to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -189,7 +192,7 @@
  
  
  /**
-@@ -302,13 +312,13 @@
+@@ -303,13 +314,13 @@
   * This driver requires ppthtml, included with xlhtml, to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -210,7 +213,7 @@
  
  
  /**
-@@ -324,24 +334,24 @@
+@@ -325,24 +336,24 @@
  /**
   * RPM driver settings
   */
diff --git a/www/horde/pkg-plist b/www/horde/pkg-plist
index 890b80397600..fd10e201b310 100644
--- a/www/horde/pkg-plist
+++ b/www/horde/pkg-plist
@@ -9,7 +9,6 @@ etc/horde/httpd.conf.horde
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/PERFORMANCE
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -353,6 +352,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Tree.php
 %%HORDEDIR%%/lib/Horde/Tree/html.php
 %%HORDEDIR%%/lib/Horde/Tree/javascript.php
+%%HORDEDIR%%/lib/Horde/Tree/select.php
 %%HORDEDIR%%/lib/Horde/UI/Language.php
 %%HORDEDIR%%/lib/Horde/UI/Pager.php
 %%HORDEDIR%%/lib/Horde/UI/Table.php
@@ -573,6 +573,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/scripts/temp-cleanup.cron
 %%HORDEDIR%%/scripts/themes_check.php
 %%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.mysql.sql
+%%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.pgsql.sql
 %%HORDEDIR%%/services/cacheview.php
 %%HORDEDIR%%/services/download/index.php
 %%HORDEDIR%%/services/editor/htmlarea/dialog.js
@@ -1308,6 +1309,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/themes/lucblue/info.php
 %%HORDEDIR%%/themes/lucblue/screen.css
 %%HORDEDIR%%/themes/mobile/screen.css
+%%HORDEDIR%%/themes/moz14.css
 %%HORDEDIR%%/themes/mozilla/graphics/header.png
 %%HORDEDIR%%/themes/mozilla/graphics/menu-active.png
 %%HORDEDIR%%/themes/mozilla/graphics/menu.png
@@ -1319,6 +1321,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/themes/print/screen.css
 %%HORDEDIR%%/themes/purple/info.php
 %%HORDEDIR%%/themes/purple/screen.css
+%%HORDEDIR%%/themes/safari.css
 %%HORDEDIR%%/themes/screen.css
 %%HORDEDIR%%/themes/simplex/graphics/background.png
 %%HORDEDIR%%/themes/simplex/info.php
@@ -1569,6 +1572,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Horde/Block
 @dirrm %%HORDEDIR%%/lib/Horde/Auth
 @dirrm %%HORDEDIR%%/lib/Horde
+@dirrm %%HORDEDIR%%/lib/File/tests
 @dirrm %%HORDEDIR%%/lib/File/PDF/fonts
 @dirrm %%HORDEDIR%%/lib/File/PDF
 @dirrm %%HORDEDIR%%/lib/File
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index 09d48105bab7..c7da1a6e431a 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
@@ -94,6 +94,7 @@ NO_BUILD=	yes
 USE_PHP=	ctype gettext session
 WANT_PHP_MOD=	yes
 USE_REINPLACE=	yes
+SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if !defined(WITHOUT_FILEINFO)
@@ -196,8 +197,8 @@ RUN_DEPENDS+=	${LOCALBASE}/share/GeoIP/GeoIP.dat:${PORTSDIR}/net/GeoIP
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL \
-		docs/PERFORMANCE docs/RELEASE docs/RELEASE_NOTES docs/SECURITY \
-		docs/TODO docs/TRANSLATIONS docs/UPGRADING
+		docs/PERFORMANCE docs/RELEASE_NOTES docs/SECURITY docs/TODO \
+		docs/TRANSLATIONS docs/UPGRADING
 CONFFILE=	conf.php mime_drivers.php motd.php nls.php prefs.php registry.php
 SUB_DIRS=	admin config js lib locale po scripts services templates themes util
 
@@ -205,6 +206,7 @@ LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
 
 PLIST_SUB=	HORDEDIR=${LHORDEDIR} HORDESBIN=${LHORDESBIN}
+SUB_LIST=	HORDEDIR=${HORDEDIR} APACHE_CONF=${APACHE_CONF} HORDESBIN=${HORDESBIN}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 HORDESBIN=	${PREFIX}/${LHORDESBIN}
@@ -333,9 +335,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e "s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g"	\
-		-e "s:%%HORDESBIN%%:${HORDESBIN}:;s:%%DOCSDIR%%:${DOCSDIR}:"		\
-		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/www/horde4-base/distinfo b/www/horde4-base/distinfo
index 1a7b08c92e35..5824018951f6 100644
--- a/www/horde4-base/distinfo
+++ b/www/horde4-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.3.tar.gz) = 96a4c9fb2047987164a3981a31667ef2
-SIZE (horde-3.0.3.tar.gz) = 3246122
+MD5 (horde-3.0.4.tar.gz) = e2221d409ba1c8841ce4ecee981d7b61
+SIZE (horde-3.0.4.tar.gz) = 3378143
diff --git a/www/horde4-base/files/patch-config_mime_drivers.php.dist b/www/horde4-base/files/patch-config_mime_drivers.php.dist
index 4e4afff1deae..3128b9e744ea 100644
--- a/www/horde4-base/files/patch-config_mime_drivers.php.dist
+++ b/www/horde4-base/files/patch-config_mime_drivers.php.dist
@@ -1,31 +1,32 @@
---- config/mime_drivers.php.dist.orig	Mon Feb  7 23:17:54 2005
-+++ config/mime_drivers.php.dist	Fri Feb 11 21:37:05 2005
-@@ -37,10 +37,20 @@
+--- config/mime_drivers.php.dist.orig	Mon Mar 14 14:48:05 2005
++++ config/mime_drivers.php.dist	Wed Mar 30 00:41:34 2005
+@@ -37,10 +37,21 @@
   * zip            Zip files
   */
  $mime_drivers_map['horde']['registered'] = array(
--    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword', 'msexcel',
--    'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
--    'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz', 'tnef',
--    'vcard', 'webcpp', 'zip');
+-    'css', 'deb', 'enriched', 'enscript', 'html', 'images', 'msword',
+-    'msexcel', 'mspowerpoint', 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
+-    'rfc822', 'richtext', 'rpm', 'security', 'simple', 'srchighlite', 'tgz',
+-    'tnef', 'vcard', 'webcpp', 'zip');
 +    'css'
 +//UNCOMMENTIFDEB , 'deb'
-+    , 'enriched'
++   , 'enriched'
 +//UNCOMMENTIFES , 'enscript'
-+    , 'html', 'images'
++   , 'html', 'images'
 +//UNCOMMENTIFWV , 'msword'
 +//UNCOMMENTIFXL , 'msexcel', 'mspowerpoint'
-+    , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report', 'richtext'
++   , 'ooo', 'pdf', 'php', 'plain', 'rar', 'report',
++    'rfc822', 'richtext'
 +//UNCOMMENTIFRPM , 'rpm'
-+    , 'security', 'simple'
++   , 'security', 'simple'
 +//UNCOMMENTIFSRCHIGH , 'srchighlite'
-+    , 'tgz', 'tnef', 'vcard'
++   , 'tgz', 'tnef', 'vcard'
 +//UNCOMMENTIFWCPP , 'webcpp'
-+    , 'zip');
++   , 'zip');
  
  
  /**
-@@ -161,66 +171,66 @@
+@@ -161,66 +172,66 @@
   * Web C Plus Plus driver settings
   * http://webcpp.sourceforge.net/
   */
@@ -143,13 +144,14 @@
  
  
  /**
-@@ -272,14 +282,14 @@
+@@ -272,15 +283,15 @@
   * The 'location' entry should point to the 'wvHtml' program, NOT the
   * 'wvWare' program.
   */
 -$mime_drivers['horde']['msword']['location'] = '/usr/bin/wvHtml';
 -$mime_drivers['horde']['msword']['inline'] = false;
 -$mime_drivers['horde']['msword']['handles'] = array(
+-    'application/vnd.ms-word',
 -    'application/msword',
 -    'application/rtf',
 -    'text/rtf');
@@ -158,6 +160,7 @@
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['inline'] = false;
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['handles'] = array(
++//UNCOMMENTIFWV    'application/vnd.ms-word',
 +//UNCOMMENTIFWV    'application/msword',
 +//UNCOMMENTIFWV    'application/rtf',
 +//UNCOMMENTIFWV    'text/rtf');
@@ -166,7 +169,7 @@
  
  
  /**
-@@ -287,14 +297,14 @@
+@@ -288,14 +299,14 @@
   * This driver requires xlhtml to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -189,7 +192,7 @@
  
  
  /**
-@@ -302,13 +312,13 @@
+@@ -303,13 +314,13 @@
   * This driver requires ppthtml, included with xlhtml, to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -210,7 +213,7 @@
  
  
  /**
-@@ -324,24 +334,24 @@
+@@ -325,24 +336,24 @@
  /**
   * RPM driver settings
   */
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index 890b80397600..fd10e201b310 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -9,7 +9,6 @@ etc/horde/httpd.conf.horde
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/PERFORMANCE
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/TODO
@@ -353,6 +352,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/lib/Horde/Tree.php
 %%HORDEDIR%%/lib/Horde/Tree/html.php
 %%HORDEDIR%%/lib/Horde/Tree/javascript.php
+%%HORDEDIR%%/lib/Horde/Tree/select.php
 %%HORDEDIR%%/lib/Horde/UI/Language.php
 %%HORDEDIR%%/lib/Horde/UI/Pager.php
 %%HORDEDIR%%/lib/Horde/UI/Table.php
@@ -573,6 +573,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/scripts/temp-cleanup.cron
 %%HORDEDIR%%/scripts/themes_check.php
 %%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.mysql.sql
+%%HORDEDIR%%/scripts/upgrades/2.2_to_3.0.pgsql.sql
 %%HORDEDIR%%/services/cacheview.php
 %%HORDEDIR%%/services/download/index.php
 %%HORDEDIR%%/services/editor/htmlarea/dialog.js
@@ -1308,6 +1309,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/themes/lucblue/info.php
 %%HORDEDIR%%/themes/lucblue/screen.css
 %%HORDEDIR%%/themes/mobile/screen.css
+%%HORDEDIR%%/themes/moz14.css
 %%HORDEDIR%%/themes/mozilla/graphics/header.png
 %%HORDEDIR%%/themes/mozilla/graphics/menu-active.png
 %%HORDEDIR%%/themes/mozilla/graphics/menu.png
@@ -1319,6 +1321,7 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/themes/print/screen.css
 %%HORDEDIR%%/themes/purple/info.php
 %%HORDEDIR%%/themes/purple/screen.css
+%%HORDEDIR%%/themes/safari.css
 %%HORDEDIR%%/themes/screen.css
 %%HORDEDIR%%/themes/simplex/graphics/background.png
 %%HORDEDIR%%/themes/simplex/info.php
@@ -1569,6 +1572,7 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Horde/Block
 @dirrm %%HORDEDIR%%/lib/Horde/Auth
 @dirrm %%HORDEDIR%%/lib/Horde
+@dirrm %%HORDEDIR%%/lib/File/tests
 @dirrm %%HORDEDIR%%/lib/File/PDF/fonts
 @dirrm %%HORDEDIR%%/lib/File/PDF
 @dirrm %%HORDEDIR%%/lib/File