Upgrade to 2.2.

PR:		ports/47229
Submitted by:	Thierry Thomas <thierry@pompo.net>

7 files changed, 229 insertions, 127 deletions

diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index fbb290ccba28..bd9f426b7676 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	2.2
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/%SUBDIR%/
-MASTER_SITE_SUBDIR=	. old
+MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
+		ftp://ftp.au.horde.org/pub/horde/			\
+		ftp://ftp.es.horde.org/pub/horde/			\
+		ftp://ftp.it.horde.org/pub/mirror/horde.org/horde/	\
+		ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/horde/	\
+		ftp://ftp.pt.horde.org/pub/horde-ftp/horde/
 
 MAINTAINER=	thierry@pompo.net
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 #-----------------------------------------------------------------------
 # You may define these options:
 #
-# - WITHOUT_SSL		: if you do not need Apache with mod_ssl;
+# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree;
 #
 #-----------------------------------------------------------------------
 
@@ -27,11 +28,21 @@ LIB_DEPENDS+=	intl.4:${PORTSDIR}/devel/gettext
 .if !defined(WITHOUT_MCAL)
 LIB_DEPENDS+=	mcal.0:${PORTSDIR}/misc/libmcal
 .endif
-RUN_DEPENDS=	${LOCALBASE}/lib/php/Log.php:${PORTSDIR}/sysutils/pear-Log
+# Remark: pear-XML_sql2xml is included, but never used.
+RUN_DEPENDS=	${PHP_LIB}/Console/Getopt.php:${PORTSDIR}/devel/pear-Console_Getopt \
+		${PHP_LIB}/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC	\
+		${PHP_LIB}/Date.php:${PORTSDIR}/devel/pear-Date		\
+		${PHP_LIB}/DB.php:${PORTSDIR}/databases/pear-DB		\
+		${PHP_LIB}/HTML/Select.php:${PORTSDIR}/devel/pear-HTML_Select	\
+		${PHP_LIB}/Log.php:${PORTSDIR}/sysutils/pear-Log	\
+		${PHP_LIB}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime \
+		${PHP_LIB}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
+LDD=		/usr/bin/ldd
+
 REINPLACE_ARGS=	-i.beforeHorde
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL
@@ -51,21 +62,16 @@ CONFDIR=	${HORDEDIR}/config
 APACHE_CNFDIR?=	${LOCALBASE}/etc/apache
 APACHE_CONF=	${APACHE_CNFDIR}/httpd.conf
 PHP_LIB?=	${LOCALBASE}/lib/php
+PHPSO?=		${LOCALBASE}/libexec/apache/libphp4.so
 HORDE_INC=	${PREFIX}/etc/horde
 LOG_FILE?=	/var/log/horde.log
 
 pre-everything::
-.if !defined(WITHOUT_SSL)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Press CTRL-C and define WITHOUT_SSL"
-	@${ECHO_MSG} " if you do not want to use Apache with SSL."
-	@${ECHO_MSG} ""
-.endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "If you plan to install IMP, it is better to configure"
 	@${ECHO_MSG} "PHP with IMAP / IMAP-SSL, OpenLDAP, OpenSSL, mcrypt, XML,"
-	@${ECHO_MSG} "FTP, gettext, pspell, zlib, MCAL and"
-	@${ECHO_MSG} "a database (like MySQL or PostgreSQL)."
+	@${ECHO_MSG} "FTP, gettext, zlib, MCAL and a database (like MySQL or"
+	@${ECHO_MSG} "PostgreSQL)."
 	@${ECHO_MSG} "For Japanese language, please enable mbstring."
 	@${ECHO_MSG} ""
 
@@ -76,12 +82,32 @@ pre-install:
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "lintl.4"; then \
+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libintl.so"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with gettext support." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
+# N.B.: database dependencies are binded with mod_php#, not with Horde
+.if !defined(WITHOUT_SUPPORTED_DB)
+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libmysqlclient" ; then \
+	 if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libpq.so" ; then \
+	  if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libsybdb.so" ; then \
+	   if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libct.so" ; then \
+	    ${ECHO_MSG} "" ; \
+	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
+	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
+	    ${ECHO_MSG} "can be used with PHP AND Horde." ; \
+	    ${ECHO_MSG} "" ; \
+	    ${ECHO_MSG} "(If everything will run on this machine, do not" ; \
+	    ${ECHO_MSG} " forget to install the database server-side!)" ; \
+	    ${ECHO_MSG} "" ; \
+	    ${FALSE} ; \
+	   fi ; \
+	  fi ; \
+	 fi ; \
+	fi
+.endif
 
 do-install:
 	@${MKDIR}  ${HORDEDIR}
diff --git a/www/horde2/distinfo b/www/horde2/distinfo
index 6df8c62d12e8..31dc91016bf8 100644
--- a/www/horde2/distinfo
+++ b/www/horde2/distinfo
@@ -1 +1 @@
-MD5 (horde-2.1.tar.gz) = 2e66863e4b5ebabd1a3dae63d2b2cb53
+MD5 (horde-2.2.tar.gz) = 3074fe5e4a284e74af37e608f9981401
diff --git a/www/horde2/files/patch-ab b/www/horde2/files/patch-ab
index fbbef346a07f..1743baa81004 100644
--- a/www/horde2/files/patch-ab
+++ b/www/horde2/files/patch-ab
@@ -1,15 +1,15 @@
---- config/horde.php.dist.orig	Sat Jun  1 01:57:03 2002
-+++ config/horde.php.dist	Mon Jun 24 21:59:21 2002
-@@ -75,7 +75,7 @@
+--- config/horde.php.dist.orig	Tue Oct 29 22:21:36 2002
++++ config/horde.php.dist	Thu Jan  9 21:37:31 2003
+@@ -86,7 +86,7 @@
  
  // What backend should we use for authenticating users to Horde? Valid
- // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
+ // options are currently 'imap', 'ldap', 'mcal', 'sql', 'ftp' and 'krb5'.
 -$conf['auth']['driver'] = '';
 +$conf['auth']['driver'] = 'imap';
  
  // An array holding any parameters that the Auth object will need to
  // function correctly.
-@@ -131,7 +131,7 @@
+@@ -145,7 +145,7 @@
  // (meaning use system defaults and don't save any user preferences),
  // 'session' (preferences only persist during the login), 'ldap',
  // and 'sql'.
@@ -18,7 +18,7 @@
  
  // Any parameters that the preferences driver needs. This includes
  // database or ldap server, username/password to connect with, etc.
-@@ -140,12 +140,12 @@
+@@ -154,12 +154,12 @@
  // This is an example configuration for a MySQL preference backend.
  // The SQL script to setup the preference database is placed in
  // horde/scripts/db/prefs.sql.
@@ -37,16 +37,16 @@
  
  // This is an example configuration for an LDAP preference backend.
  // The schemas needed for ldap are in horde/scripts/ldap.  For more
-@@ -195,7 +195,7 @@
- // If you want to use SMTP authentication, set the 'auth' parameter
- // to 'true' (without quotes).
+@@ -209,7 +209,7 @@
+ // SMTP authentication can be enabled by setting the 'auth' parameter
+ // to true.
  $conf['mailer']['params'] = array();
 -// $conf['mailer']['params'] = array('sendmail_path' => '/usr/lib/sendmail');
 +// $conf['mailer']['params'] = array('sendmail_path' => '/usr/sbin/sendmail');
  // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
  
  
-@@ -241,3 +241,9 @@
+@@ -267,3 +267,9 @@
  // Should we use DHTML to display a floating menu of Horde appliation
  // links, instead of a frame?
  $conf['menu']['floating_bar'] = false;
diff --git a/www/horde2/files/patch-ac b/www/horde2/files/patch-ac
index ec05b7dffe7c..1b5a2da2db3e 100644
--- a/www/horde2/files/patch-ac
+++ b/www/horde2/files/patch-ac
@@ -1,7 +1,7 @@
---- config/registry.php.dist.orig	Mon May 20 18:43:28 2002
-+++ config/registry.php.dist	Tue Jun 11 18:53:47 2002
+--- config/registry.php.dist.orig	Mon Dec 30 02:26:06 2002
++++ config/registry.php.dist	Thu Jan 16 23:02:48 2003
 @@ -20,8 +20,8 @@
-  *   IMP or Gollem handle the authentication for Horde. This avoids the
+  *   IMP handle the authentication for Horde. This avoids the
   *   "double login" while accessing IMP.
   */
 -// $this->registry['auth']['login'] = 'imp';
@@ -11,7 +11,7 @@
  
  /* mail: Handler for sending mail. */
  $this->registry['mail']['compose'] = 'imp';
-@@ -39,12 +39,29 @@
+@@ -45,12 +45,29 @@
  $this->registry['memos']['show'] = 'mnemo';
  $this->registry['memos']['add'] = 'mnemo';
  
@@ -41,80 +41,88 @@
  
  /**
   * Application registry
-@@ -74,60 +91,121 @@
-     'server_port' => $GLOBALS['HTTP_SERVER_VARS']['SERVER_PORT']
+@@ -100,68 +117,122 @@
+     'status' => 'notoolbar'
  );
  
--// $this->applications['imp'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../imp',
--//     'webroot' => $this->applications['horde']['webroot'] . '/imp',
--//     'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
--//     'name' => _("Mail"),
--//     'allow_guests' => false,
--//     'show' => true
--// );
+-$this->applications['imp'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../imp',
+-    'webroot' => $this->applications['horde']['webroot'] . '/imp',
+-    'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
+-    'name' => _("Mail"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 -
--// $this->applications['turba'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../turba',
--//     'webroot' => $this->applications['horde']['webroot'] . '/turba',
--//     'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
--//     'name' => _("Addressbook"),
--//     'allow_guests' => false,
--//     'show' => true
--// );
+-$this->applications['turba'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../turba',
+-    'webroot' => $this->applications['horde']['webroot'] . '/turba',
+-    'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
+-    'name' => _("Address Book"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 -
--// $this->applications['kronolith'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../kronolith',
--//     'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
--//     'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
--//     'name' => _("Calendar"),
--//     'allow_guests' => false,
--//     'show' => false
--// );
+-$this->applications['kronolith'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../kronolith',
+-    'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
+-    'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
+-    'name' => _("Calendar"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 -
--// $this->applications['mnemo'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../mnemo',
--//     'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
--//     'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
--//     'name' => _("Memos"),
--//     'allow_guests' => false,
--//     'show' => true
--// );
+-$this->applications['mnemo'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../mnemo',
+-    'webroot' => $this->applications['horde']['webroot'] . '/mnemo',
+-    'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
+-    'name' => _("Memos"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 -
--// $this->applications['nag'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../nag',
--//     'webroot' => $this->applications['horde']['webroot'] . '/nag',
--//     'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
--//     'name' => _("Tasks"),
--//     'allow_guests' => false,
--//     'show' => false
--// );
+-$this->applications['nag'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../nag',
+-    'webroot' => $this->applications['horde']['webroot'] . '/nag',
+-    'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
+-    'name' => _("Tasks"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 -
--// $this->applications['chora'] = array(
--//     'fileroot' => dirname(__FILE__) . '/../chora',
--//     'webroot' => $this->applications['horde']['webroot'] . '/chora',
--//     'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
--//     'name' => _("CVS"),
--//     'allow_guests' => false,
--//     'show' => false
--// );
+-$this->applications['chora'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../chora',
+-    'webroot' => $this->applications['horde']['webroot'] . '/chora',
+-    'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
+-    'name' => _("CVS"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 -
+-$this->applications['klutz'] = array(
+-    'fileroot' => dirname(__FILE__) . '/../klutz',
+-    'webroot' => $this->applications['horde']['webroot'] . '/klutz',
+-    'icon' => $this->applications['horde']['webroot'] . '/klutz/graphics/klutz.gif',
+-    'name' => _("Comics"),
+-    'allow_guests' => false,
+-    'status' => 'inactive'
+-);
 +//UNCOMMENTWHENINSTIMP$this->applications['imp'] = array(
 +//UNCOMMENTWHENINSTIMP    'fileroot' => dirname(__FILE__) . '/../imp',
 +//UNCOMMENTWHENINSTIMP    'webroot' => $this->applications['horde']['webroot'] . '/imp',
 +//UNCOMMENTWHENINSTIMP    'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
 +//UNCOMMENTWHENINSTIMP    'name' => _("Mail"),
 +//UNCOMMENTWHENINSTIMP    'allow_guests' => false,
-+//UNCOMMENTWHENINSTIMP    'show' => true
++//UNCOMMENTWHENINSTIMP    'status' => 'active'
 +//UNCOMMENTWHENINSTIMP);
 +
 +//UNCOMMENTWHENINSTTURBA$this->applications['turba'] = array(
 +//UNCOMMENTWHENINSTTURBA    'fileroot' => dirname(__FILE__) . '/../turba',
 +//UNCOMMENTWHENINSTTURBA    'webroot' => $this->applications['horde']['webroot'] . '/turba',
 +//UNCOMMENTWHENINSTTURBA    'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
-+//UNCOMMENTWHENINSTTURBA    'name' => _("Addressbook"),
++//UNCOMMENTWHENINSTTURBA    'name' => _("Address Book"),
 +//UNCOMMENTWHENINSTTURBA    'allow_guests' => false,
-+//UNCOMMENTWHENINSTTURBA    'show' => true
++//UNCOMMENTWHENINSTTURBA    'status' => 'active'
 +//UNCOMMENTWHENINSTTURBA);
 +
 +//UNCOMMENTWHENINSTKRONOLITH$this->applications['kronolith'] = array(
@@ -123,7 +131,7 @@
 +//UNCOMMENTWHENINSTKRONOLITH    'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
 +//UNCOMMENTWHENINSTKRONOLITH    'name' => _("Calendar"),
 +//UNCOMMENTWHENINSTKRONOLITH    'allow_guests' => false,
-+//UNCOMMENTWHENINSTKRONOLITH    'show' => true
++//UNCOMMENTWHENINSTKRONOLITH    'status' => 'active'
 +//UNCOMMENTWHENINSTKRONOLITH);
 +
 +//UNCOMMENTWHENINSTMNEMO$this->applications['mnemo'] = array(
@@ -132,7 +140,7 @@
 +//UNCOMMENTWHENINSTMNEMO    'icon' => $this->applications['horde']['webroot'] . '/mnemo/graphics/mnemo.gif',
 +//UNCOMMENTWHENINSTMNEMO    'name' => _("Memos"),
 +//UNCOMMENTWHENINSTMNEMO    'allow_guests' => false,
-+//UNCOMMENTWHENINSTMNEMO    'show' => true
++//UNCOMMENTWHENINSTMNEMO    'status' => 'active'
 +//UNCOMMENTWHENINSTMNEMO);
 +
 +//UNCOMMENTWHENINSTNAG$this->applications['nag'] = array(
@@ -141,7 +149,7 @@
 +//UNCOMMENTWHENINSTNAG    'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
 +//UNCOMMENTWHENINSTNAG    'name' => _("Tasks"),
 +//UNCOMMENTWHENINSTNAG    'allow_guests' => false,
-+//UNCOMMENTWHENINSTNAG    'show' => true
++//UNCOMMENTWHENINSTNAG    'status' => 'active'
 +//UNCOMMENTWHENINSTNAG);
 +
 +//UNCOMMENTWHENINSTCHORA$this->applications['chora'] = array(
@@ -150,16 +158,25 @@
 +//UNCOMMENTWHENINSTCHORA    'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
 +//UNCOMMENTWHENINSTCHORA    'name' => _("CVS"),
 +//UNCOMMENTWHENINSTCHORA    'allow_guests' => false,
-+//UNCOMMENTWHENINSTCHORA    'show' => true
++//UNCOMMENTWHENINSTCHORA    'status' => 'active'
 +//UNCOMMENTWHENINSTCHORA);
-+ 
++
++//UNCOMMENTWHENINSTKLUTZ$this->applications['klutz'] = array(
++//UNCOMMENTWHENINSTKLUTZ    'fileroot' => dirname(__FILE__) . '/../klutz',
++//UNCOMMENTWHENINSTKLUTZ    'webroot' => $this->applications['horde']['webroot'] . '/klutz',
++//UNCOMMENTWHENINSTKLUTZ    'icon' => $this->applications['horde']['webroot'] . '/klutz/graphics/klutz.gif',
++//UNCOMMENTWHENINSTKLUTZ    'name' => _("Comics"),
++//UNCOMMENTWHENINSTKLUTZ    'allow_guests' => false,
++//UNCOMMENTWHENINSTKLUTZ    'status' => 'active'
++//UNCOMMENTWHENINSTKLUTZ);
++
 +//UNCOMMENTWHENINSTGOLLEM$this->applications['gollem'] = array(
 +//UNCOMMENTWHENINSTGOLLEM    'fileroot' => dirname(__FILE__) . '/../gollem',
 +//UNCOMMENTWHENINSTGOLLEM    'webroot' => '/horde/gollem',
 +//UNCOMMENTWHENINSTGOLLEM    'icon' => '/horde/gollem/graphics/gollem.gif',
 +//UNCOMMENTWHENINSTGOLLEM    'name' => _("FTP"),
 +//UNCOMMENTWHENINSTGOLLEM    'allow_guests' => false,
-+//UNCOMMENTWHENINSTGOLLEM    'show' => true
++//UNCOMMENTWHENINSTGOLLEM    'status' => 'active'
 +//UNCOMMENTWHENINSTGOLLEM);
 +
 +//UNCOMMENTWHENINSTNIC$this->applications['nic'] = array(
@@ -168,7 +185,7 @@
 +//UNCOMMENTWHENINSTNIC    'icon' => '/horde/nic/graphics/nic.gif',
 +//UNCOMMENTWHENINSTNIC    'name' => _("Network"),
 +//UNCOMMENTWHENINSTNIC    'allow_guests' => false,
-+//UNCOMMENTWHENINSTNIC    'show' => true
++//UNCOMMENTWHENINSTNIC    'status' => 'active'
 +//UNCOMMENTWHENINSTNIC);
 +
 +//UNCOMMENTWHENINSTJONAH$this->applications['jonah'] = array(
@@ -177,7 +194,7 @@
 +//UNCOMMENTWHENINSTJONAH    'icon' => '/horde/jonah/graphics/jonah.gif',
 +//UNCOMMENTWHENINSTJONAH    'name' => _("Headlines"),
 +//UNCOMMENTWHENINSTJONAH    'allow_guests' => true,
-+//UNCOMMENTWHENINSTJONAH    'show' => true
++//UNCOMMENTWHENINSTJONAH    'status' => 'active'
 +//UNCOMMENTWHENINSTJONAH);
 +
 +//UNCOMMENTWHENINSTTROLL$this->applications['troll'] = array(
@@ -186,7 +203,7 @@
 +//UNCOMMENTWHENINSTTROLL    'icon' => '/horde/troll/graphics/troll.gif',
 +//UNCOMMENTWHENINSTTROLL    'name' => _("News"),
 +//UNCOMMENTWHENINSTTROLL    'allow_guests' => false,
-+//UNCOMMENTWHENINSTTROLL    'show' => true
++//UNCOMMENTWHENINSTTROLL    'status' => 'active'
 +//UNCOMMENTWHENINSTTROLL);
 +
 +//UNCOMMENTWHENINSTBABEL$this->applications['babel'] = array(
@@ -195,7 +212,7 @@
 +//UNCOMMENTWHENINSTBABEL    'icon' => $this->applications['horde']['webroot'] . '/babel/graphics/babel.gif',
 +//UNCOMMENTWHENINSTBABEL    'name' => _("i18n"),
 +//UNCOMMENTWHENINSTBABEL    'allow_guests' => false,
-+//UNCOMMENTWHENINSTBABEL    'show' => true
++//UNCOMMENTWHENINSTBABEL    'status' => 'active'
 +//UNCOMMENTWHENINSTBABEL);
 +
 +//UNCOMMENTWHENINSTWHUPS$this->applications['whups'] = array(
@@ -204,29 +221,12 @@
 +//UNCOMMENTWHENINSTWHUPS    'icon' => '/horde/whups/graphics/whups.gif',
 +//UNCOMMENTWHENINSTWHUPS    'name' => _("Bugs"),
 +//UNCOMMENTWHENINSTWHUPS    'allow_guests' => false,
-+//UNCOMMENTWHENINSTWHUPS    'show' => true
++//UNCOMMENTWHENINSTWHUPS    'status' => 'active'
 +//UNCOMMENTWHENINSTWHUPS);
-+
-+//UNCOMMENTWHENINSTORATOR$this->applications['orator'] = array(
-+//UNCOMMENTWHENINSTORATOR    'fileroot' => dirname(__FILE__) . '/../orator',
-+//UNCOMMENTWHENINSTORATOR    'webroot' => '/horde/orator',
-+//UNCOMMENTWHENINSTORATOR    'name' => _("Presentations"),
-+//UNCOMMENTWHENINSTORATOR    'allow_guests' => true,
-+//UNCOMMENTWHENINSTORATOR    'show' => true
-+//UNCOMMENTWHENINSTORATOR);
  
- /**
-  * Service registry
-@@ -185,7 +263,7 @@
-     'type' => 'array'
- );
  
--$this->services['kronolith']['horde']['summary'] = array(
-+$this->services['kronolith']['horde']['summary'] = array( 
-     'file' => '%application%/lib/api.php',
-     'function' => 'kronolithSummary',
-     'args' => array(),
-@@ -238,6 +316,29 @@
+ /**
+@@ -303,6 +374,29 @@
  $this->services['nag']['horde']['summary'] = array(
      'file' => '%application%/lib/api.php',
      'function' => 'nagSummary',
diff --git a/www/horde2/files/patch-mime_drivers.php.dist b/www/horde2/files/patch-mime_drivers.php.dist
index c38c7cd85e79..836707d107fc 100644
--- a/www/horde2/files/patch-mime_drivers.php.dist
+++ b/www/horde2/files/patch-mime_drivers.php.dist
@@ -1,9 +1,9 @@
---- config/mime_drivers.php.dist.orig	Tue May  7 13:38:08 2002
-+++ config/mime_drivers.php.dist	Sat May 18 22:45:30 2002
-@@ -21,8 +21,12 @@
+--- config/mime_drivers.php.dist.orig	Thu Nov 14 21:04:34 2002
++++ config/mime_drivers.php.dist	Thu Jan  9 22:06:37 2003
+@@ -22,8 +22,12 @@
  
  $mime_drivers_map['horde']['registered'] = array(
-     'php', 'tgz', 'vcard', 'enriched'
+     'php', 'tgz', 'vcard', 'enriched', 'images'
 -    // ,'msword', 'msexcel', 'mspowerpoint'
 -    // ,'enscript', 'rar', 'zip', 'rpm', 'deb'
 +    //UNCOMMENTIFWV ,'msword'
@@ -11,11 +11,11 @@
 +    //UNCOMMENTWHENINSTCHORA ,'enscript'
 +    //UNCOMMENTIFRAR , 'rar'
 +    //UNCOMMENTIFZIP , 'zip'
-+    // , 'rpm', 'deb'
++    //, 'rpm', 'deb'
      );
  
  
-@@ -113,22 +117,22 @@
+@@ -111,22 +115,22 @@
   */
  
  /* Location of the enscript binary. */
@@ -54,7 +54,7 @@
  
  
  /**
-@@ -136,7 +140,7 @@
+@@ -134,7 +138,7 @@
   */
  
  /* Location of the tar binary. */
@@ -63,7 +63,7 @@
  $mime_drivers['horde']['tgz']['inline'] = true;
  $mime_drivers['horde']['tgz']['handles'] = array(
      'x-extension/tgz',
-@@ -154,14 +158,14 @@
+@@ -152,14 +156,14 @@
   */
  
  /* Location of the zipinfo binary. */
@@ -86,7 +86,7 @@
  
  
  /**
-@@ -170,13 +174,13 @@
+@@ -168,13 +172,13 @@
   */
  
  /* Location of the rar binary. */
@@ -107,7 +107,7 @@
  
  
  /**
-@@ -186,15 +190,15 @@
+@@ -184,15 +188,15 @@
   */
  
  /* Location of the wvHtml binary. */
@@ -132,7 +132,7 @@
  
  
  /**
-@@ -204,14 +208,14 @@
+@@ -202,14 +206,14 @@
   */
  
  /* Location of the xlhtml binary. */
@@ -155,7 +155,7 @@
  
  
  /**
-@@ -222,14 +226,14 @@
+@@ -220,14 +224,14 @@
   */
  
  /* Location of the ppthtml binary. */
diff --git a/www/horde2/pkg-deinstall b/www/horde2/pkg-deinstall
index 8352504f3599..5b9c3758c8c1 100644
--- a/www/horde2/pkg-deinstall
+++ b/www/horde2/pkg-deinstall
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 # Try to restore httpd.conf when deinstalling Horde
 
 if [ x$2 != xDEINSTALL ]; then
@@ -12,3 +15,23 @@ if [ -f ${PKG_PREFIX}/etc/apache/httpd.conf.beforeHorde ] ; then
 		${PKG_PREFIX}/etc/apache/httpd.conf
 	rm ${PKG_PREFIX}/etc/apache/httpd.conf.tmp
 fi
+
+# Backup Horde config files, if needed.
+
+if [ -z "${PACKAGE_BUILDING}" ]; then
+  for cf in `ls ${PKG_PREFIX}/www/horde/config/*php`; do
+    diff -bBqw $cf $cf.dist >/dev/null 2>&1
+    case $? in
+      0)  # original config file, will be deleted by pkg-plist
+          ;;
+      1)  # config file has been updated, must be backuped
+          cp -p $cf $cf.previous
+          echo "===> Backing-up..."
+          echo "--->   $cf has been saved ***"
+          echo "--->      as $cf.previous ***"
+          ;;
+      *)  # not found?
+          ;;
+    esac
+  done
+fi
diff --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist
index 0dac28a9f95b..275bc85f53f3 100644
--- a/www/horde2/pkg-plist
+++ b/www/horde2/pkg-plist
@@ -62,6 +62,7 @@
 %%HORDEDIR%%/graphics/mime/text.gif
 %%HORDEDIR%%/graphics/mime/unknown.gif
 %%HORDEDIR%%/graphics/mime/vcard.gif
+%%HORDEDIR%%/graphics/mime/video.gif
 %%HORDEDIR%%/graphics/mime/xml.gif
 %%HORDEDIR%%/graphics/prefs.gif
 %%HORDEDIR%%/graphics/problem.gif
@@ -82,8 +83,10 @@
 %%HORDEDIR%%/javascript.php
 %%HORDEDIR%%/lib/.htaccess
 %%HORDEDIR%%/lib/Auth.php
+%%HORDEDIR%%/lib/Auth/auto.php
 %%HORDEDIR%%/lib/Auth/ftp.php
 %%HORDEDIR%%/lib/Auth/imap.php
+%%HORDEDIR%%/lib/Auth/krb5.php
 %%HORDEDIR%%/lib/Auth/ldap.php
 %%HORDEDIR%%/lib/Auth/mcal.php
 %%HORDEDIR%%/lib/Auth/sql.php
@@ -93,6 +96,15 @@
 %%HORDEDIR%%/lib/Category.php
 %%HORDEDIR%%/lib/CategoryTree.php
 %%HORDEDIR%%/lib/Category/sql.php
+%%HORDEDIR%%/lib/Cipher.php
+%%HORDEDIR%%/lib/Cipher/BlockMode.php
+%%HORDEDIR%%/lib/Cipher/BlockMode/cbc.php
+%%HORDEDIR%%/lib/Cipher/BlockMode/cfb64.php
+%%HORDEDIR%%/lib/Cipher/BlockMode/ecb.php
+%%HORDEDIR%%/lib/Cipher/BlockMode/ofb64.php
+%%HORDEDIR%%/lib/Cipher/blowfish.php
+%%HORDEDIR%%/lib/Cipher/cast128.php
+%%HORDEDIR%%/lib/Cipher/rc2.php
 %%HORDEDIR%%/lib/Data.php
 %%HORDEDIR%%/lib/Group.php
 %%HORDEDIR%%/lib/Help.php
@@ -109,6 +121,7 @@
 %%HORDEDIR%%/lib/MIME/Viewer/default.php
 %%HORDEDIR%%/lib/MIME/Viewer/enriched.php
 %%HORDEDIR%%/lib/MIME/Viewer/enscript.php
+%%HORDEDIR%%/lib/MIME/Viewer/images.php
 %%HORDEDIR%%/lib/MIME/Viewer/msexcel.php
 %%HORDEDIR%%/lib/MIME/Viewer/mspowerpoint.php
 %%HORDEDIR%%/lib/MIME/Viewer/msword.php
@@ -132,13 +145,29 @@
 %%HORDEDIR%%/lib/Secret.php
 %%HORDEDIR%%/lib/Serialize.php
 %%HORDEDIR%%/lib/SessionCache.php
+%%HORDEDIR%%/lib/SessionHandler/dbm.php
+%%HORDEDIR%%/lib/SessionHandler/mysql.php
+%%HORDEDIR%%/lib/SessionHandler/pgsql.php
+%%HORDEDIR%%/lib/SessionHandler/sapdb.php
+%%HORDEDIR%%/lib/SessionHandler/sql.php
+%%HORDEDIR%%/lib/SessionHandler.php
+%%HORDEDIR%%/lib/SQL.php
 %%HORDEDIR%%/lib/Text.php
 %%HORDEDIR%%/lib/Token.php
 %%HORDEDIR%%/lib/Token/file.php
 %%HORDEDIR%%/lib/Token/sql.php
+%%HORDEDIR%%/lib/VFS.php
+%%HORDEDIR%%/lib/VFS/ListItem.php
+%%HORDEDIR%%/lib/VFS/Object.php
+%%HORDEDIR%%/lib/VFS/file.php
+%%HORDEDIR%%/lib/VFS/ftp.php
+%%HORDEDIR%%/lib/VFS/musql.php
+%%HORDEDIR%%/lib/VFS/sql.php
+%%HORDEDIR%%/lib/VFS/sql_file.php
 %%HORDEDIR%%/lib/base.php
 %%HORDEDIR%%/lib/version.php
 %%HORDEDIR%%/locale/.htaccess
+%%HORDEDIR%%/locale/bg_BG/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/da_DK/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/de_DE/LC_MESSAGES/horde.mo
@@ -147,17 +176,21 @@
 %%HORDEDIR%%/locale/es_ES/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/et_EE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/fi_FI/help.xml
 %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/hu_HU/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/it_IT/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ja_JP/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/lt_LT/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/lv_LV/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/nb_NO/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/nn_NO/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pt_PT/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/ro_RO/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ru_RU/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/sk_SK/LC_MESSAGES/horde.mo
@@ -173,6 +206,7 @@
 %%HORDEDIR%%/po/Makefile
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/wintokoi.pl
+%%HORDEDIR%%/po/bg_BG.po
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/da_DK.po
 %%HORDEDIR%%/po/de_DE.po
@@ -184,20 +218,25 @@
 %%HORDEDIR%%/po/fr_FR.po
 %%HORDEDIR%%/po/hu_HU.po
 %%HORDEDIR%%/po/it_IT.po
+%%HORDEDIR%%/po/horde.pot
 %%HORDEDIR%%/po/ja_JP.po
 %%HORDEDIR%%/po/ko_KR.po
+%%HORDEDIR%%/po/lt_LT.po
+%%HORDEDIR%%/po/lv_LV.po
 %%HORDEDIR%%/po/nl_NL.po
 %%HORDEDIR%%/po/nb_NO.po
 %%HORDEDIR%%/po/nn_NO.po
 %%HORDEDIR%%/po/pl_PL.po
 %%HORDEDIR%%/po/pt_BR.po
 %%HORDEDIR%%/po/pt_PT.po
+%%HORDEDIR%%/po/ro_RO.po
 %%HORDEDIR%%/po/ru_RU.po
 %%HORDEDIR%%/po/ru_RU.KOI8-R.po
 %%HORDEDIR%%/po/shtool
 %%HORDEDIR%%/po/sk_SK.po
 %%HORDEDIR%%/po/sl_SI.po
 %%HORDEDIR%%/po/sv_SE.po
+%%HORDEDIR%%/po/translation.php
 %%HORDEDIR%%/po/uk_UA.po
 %%HORDEDIR%%/po/xgettext.sh
 %%HORDEDIR%%/po/zh_CN.po
@@ -215,6 +254,8 @@
 %%HORDEDIR%%/scripts/db/pgsql_create.sql
 %%HORDEDIR%%/scripts/db/pgsql_drop.sql
 %%HORDEDIR%%/scripts/db/prefs.sql
+%%HORDEDIR%%/scripts/db/sessionhandler.sql
+%%HORDEDIR%%/scripts/db/sessionhandler_sapdb.sql
 %%HORDEDIR%%/scripts/horde-rsync.sh
 %%HORDEDIR%%/scripts/ldap/horde.schema
 %%HORDEDIR%%/scripts/mime_mapping/Makefile
@@ -288,12 +329,18 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/lib/Auth
 @dirrm %%HORDEDIR%%/lib/Cache
 @dirrm %%HORDEDIR%%/lib/Category
+@dirrm %%HORDEDIR%%/lib/Cipher/BlockMode
+@dirrm %%HORDEDIR%%/lib/Cipher
 @dirrm %%HORDEDIR%%/lib/MIME/Viewer
 @dirrm %%HORDEDIR%%/lib/MIME
 @dirrm %%HORDEDIR%%/lib/Notification
 @dirrm %%HORDEDIR%%/lib/Prefs
+@dirrm %%HORDEDIR%%/lib/SessionHandler
 @dirrm %%HORDEDIR%%/lib/Token
+@dirrm %%HORDEDIR%%/lib/VFS
 @dirrm %%HORDEDIR%%/lib
+@dirrm %%HORDEDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/bg_BG
 @dirrm %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @dirrm %%HORDEDIR%%/locale/da_DK/LC_MESSAGES
@@ -319,6 +366,10 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/ja_JP
 @dirrm %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/ko_KR
+@dirrm %%HORDEDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/lt_LT
+@dirrm %%HORDEDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/lv_LV
 @dirrm %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/nl_NL
 @dirrm %%HORDEDIR%%/locale/nb_NO/LC_MESSAGES
@@ -331,6 +382,8 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/pt_BR
 @dirrm %%HORDEDIR%%/locale/pt_PT/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/pt_PT
+@dirrm %%HORDEDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/ro_RO
 @dirrm %%HORDEDIR%%/locale/ru_RU/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/ru_RU
 @dirrm %%HORDEDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES