4 files changed, 13 insertions, 20 deletions

diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index 523f26a5104f..7e0094ef7ddf 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.0.5
+PORTVERSION=	3.0.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.planetmirror.com/pub/horde/horde/		\
diff --git a/www/horde4-base/distinfo b/www/horde4-base/distinfo
index dc27c07836fd..4553b0e8c274 100644
--- a/www/horde4-base/distinfo
+++ b/www/horde4-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (horde-3.0.5.tar.gz) = 31ee0819be4efe44819f8ffef5db5365
-SIZE (horde-3.0.5.tar.gz) = 3549687
+MD5 (horde-3.0.6.tar.gz) = e1148c8f04125851660ff9643cf46db8
+SIZE (horde-3.0.6.tar.gz) = 3725318
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 3128b9e744ea..9b32d41ebb5e 100644
--- a/www/horde4-base/files/patch-config_mime_drivers.php.dist
+++ b/www/horde4-base/files/patch-config_mime_drivers.php.dist
@@ -1,5 +1,5 @@
---- 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
+--- config/mime_drivers.php.dist.orig	Fri Sep 30 22:52:16 2005
++++ config/mime_drivers.php.dist	Fri Oct 28 23:01:17 2005
 @@ -37,10 +37,21 @@
   * zip            Zip files
   */
@@ -115,7 +115,7 @@
 -    'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc',
 -    'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src',
 -    'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql',
--    'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp');
+-    'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex');
 -$mime_drivers['horde']['enscript']['icons'] = array(
 -    'default'                  => 'text.png',
 -    'text/xml'                 => 'xml.png',
@@ -132,7 +132,7 @@
 +//UNCOMMENTIFES    'text/diff', 'text/x-diff', 'text/x-patch', 'text/x-csrc',
 +//UNCOMMENTIFES    'x-extension/cs', 'text/x-java', 'text/x-chdr', 'text/x-c++src',
 +//UNCOMMENTIFES    'text/x-c++hdr', 'x-extension/vhd', 'x-extension/vhdl', 'text/x-sql',
-+//UNCOMMENTIFES    'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp');
++//UNCOMMENTIFES    'x-extension/vb', 'x-extension/vba', 'text/x-emacs-lisp', 'text/x-tex');
 +//UNCOMMENTIFES$mime_drivers['horde']['enscript']['icons'] = array(
 +//UNCOMMENTIFES    'default'                  => 'text.png',
 +//UNCOMMENTIFES    'text/xml'                 => 'xml.png',
@@ -144,7 +144,7 @@
  
  
  /**
-@@ -272,15 +283,15 @@
+@@ -272,14 +283,14 @@
   * The 'location' entry should point to the 'wvHtml' program, NOT the
   * 'wvWare' program.
   */
@@ -153,8 +153,7 @@
 -$mime_drivers['horde']['msword']['handles'] = array(
 -    'application/vnd.ms-word',
 -    'application/msword',
--    'application/rtf',
--    'text/rtf');
+-);
 -$mime_drivers['horde']['msword']['icons'] = array(
 -    'default' => 'msword.png');
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['location'] = '%%LOCALBASE%%/bin/wvHtml';
@@ -162,14 +161,13 @@
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['handles'] = array(
 +//UNCOMMENTIFWV    'application/vnd.ms-word',
 +//UNCOMMENTIFWV    'application/msword',
-+//UNCOMMENTIFWV    'application/rtf',
-+//UNCOMMENTIFWV    'text/rtf');
++//UNCOMMENTIFWV);
 +//UNCOMMENTIFWV$mime_drivers['horde']['msword']['icons'] = array(
 +//UNCOMMENTIFWV    'default' => 'msword.png');
  
  
  /**
-@@ -288,14 +299,14 @@
+@@ -287,14 +298,14 @@
   * This driver requires xlhtml to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -192,7 +190,7 @@
  
  
  /**
-@@ -303,13 +314,13 @@
+@@ -302,13 +313,13 @@
   * This driver requires ppthtml, included with xlhtml, to be installed.
   * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
   */
@@ -213,7 +211,7 @@
  
  
  /**
-@@ -325,24 +336,24 @@
+@@ -324,24 +335,24 @@
  /**
   * RPM driver settings
   */
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index e7d9c63f290c..f13bb1a01166 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -702,10 +702,6 @@ etc/horde/httpd.conf.horde
 %%HORDEDIR%%/templates/admin/user/remove.inc
 %%HORDEDIR%%/templates/admin/user/removequeued.inc
 %%HORDEDIR%%/templates/admin/user/update.inc
-%%HORDEDIR%%/templates/categorytree/rowend.inc
-%%HORDEDIR%%/templates/categorytree/rowstart.inc
-%%HORDEDIR%%/templates/categorytree/tablefoot.inc
-%%HORDEDIR%%/templates/categorytree/tablehead.inc
 %%HORDEDIR%%/templates/common-footer.inc
 %%HORDEDIR%%/templates/common-header.inc
 %%HORDEDIR%%/templates/contents/open_view_win.js
@@ -1396,7 +1392,6 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/templates/help
 @dirrm %%HORDEDIR%%/templates/data
 @dirrm %%HORDEDIR%%/templates/contents
-@dirrm %%HORDEDIR%%/templates/categorytree
 @dirrm %%HORDEDIR%%/templates/admin/user
 @dirrm %%HORDEDIR%%/templates/admin/setup
 @dirrm %%HORDEDIR%%/templates/admin/groups