Upgrade to version 2.1 RC2.

PR:	ports/36903
Submitted by:	maintainer

7 files changed, 250 insertions, 175 deletions

diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index 5e8e016c27ee..e3f979808e0e 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	2.0
-PORTREVISION=	3
+PORTVERSION=	2.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-RC2
 
 MAINTAINER=	thierry@pompo.net
 
@@ -36,7 +36,8 @@ NO_BUILD=	yes
 DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS \
 		docs/CONTRIBUTING docs/CREDITS docs/HACKING docs/INSTALL
 CONFFILE=	html.php lang.php mime_drivers.php mime_mapping.php \
-		motd.php registry.php
+		motd.php prefs.php registry.php
+SUB_DIRS=	config graphics lib locale po scripts templates util
 
 LHORDEDIR?=	www/horde
 LHORDESBIN?=	sbin
@@ -65,6 +66,7 @@ pre-everything::
 	@${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} "For Japanese language, please enable mbstring."
 	@${ECHO_MSG} ""
 
 pre-install:
@@ -83,9 +85,9 @@ pre-install:
 
 do-install:
 	@${MKDIR}  ${HORDEDIR}
-	@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${HORDEDIR}
-	@${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${HORDEDIR}
-	@${CP} -Rp ${WRKSRC}/po ${WRKSRC}/admin ${WRKSRC}/util ${HORDEDIR}
+.for REP in ${SUB_DIRS}
+	@${CP} -Rp ${WRKSRC}/${REP} ${HORDEDIR}
+.endfor
 	@${CP} -p  ${WRKSRC}/*.php ${HORDEDIR}
 	@if [ ! -f ${CONFDIR}/horde.php ]; then \
 		${CP} ${CONFDIR}/horde.php.dist ${CONFDIR}/horde.php ; \
diff --git a/www/horde2/distinfo b/www/horde2/distinfo
index f5f679ed8103..9aa1da9f3a39 100644
--- a/www/horde2/distinfo
+++ b/www/horde2/distinfo
@@ -1 +1 @@
-MD5 (horde-2.0.tar.gz) = 039d760ebf282dca33ab6081179c2be0
+MD5 (horde-2.1-RC2.tar.gz) = 212e5f84a37a20dac48799b9d0f8e4b6
diff --git a/www/horde2/files/patch-ab b/www/horde2/files/patch-ab
index 1b2f203e7ee3..16553bca732a 100644
--- a/www/horde2/files/patch-ab
+++ b/www/horde2/files/patch-ab
@@ -1,48 +1,36 @@
---- config/horde.php.dist.orig	Fri Dec 28 19:48:37 2001
-+++ config/horde.php.dist	Thu Jan  3 17:01:56 2002
-@@ -83,12 +83,13 @@
- 
- /* Which users should be treated as administrators (root, super-user)
-  * by Horde? Example: $conf['auth']['admins'] = array('admin', 'john');
-+ * N.B.: 'admin' is used by Jonah to fetch the news.
-  */
--$conf['auth']['admins'] = array();
-+$conf['auth']['admins'] = array('admin');
+--- config/horde.php.dist.orig	Sat Mar  9 19:43:35 2002
++++ config/horde.php.dist	Wed Mar 13 01:21:30 2002
+@@ -75,7 +75,7 @@
  
  // What backend should we use for authenticating users to Horde? Valid
  // options are currently 'imap', 'ldap', 'mcal', 'sql', and 'ftp'.
 -$conf['auth']['driver'] = '';
 +$conf['auth']['driver'] = 'imap';
  
- /* An array holding any parameters that the Auth object will need to
-  * function correctly. For IMAP, this is the server name, port,
-@@ -119,8 +120,12 @@
-  * and for sql it would be the table name to use. For the 'syslog'
-  * driver it is the facility as a _constant_ (with no quotes), e.g.:
-  * ... = LOG_LOCAL0;
-+ * Warning: il you keep file, do not forget to add a line in your
-+ * /etc/newsyslog.conf
-+ * For example:
-+ * /var/log/horde.log		600  5     100  *     Z
-  */
+ // An array holding any parameters that the Auth object will need to
+ // function correctly.
+@@ -106,7 +106,7 @@
+ // and for sql it would be the table name to use. For the 'syslog'
+ // driver it is the facility as a _constant_ (with no quotes), e.g.:
+ // ... = LOG_LOCAL0;
 -$conf['log']['name'] = '/tmp/horde.log';
 +$conf['log']['name'] = '/var/log/horde.log';
  
- /* What level of messages should we log? The values are LOG_EMERG,
-  * LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
-@@ -148,7 +153,7 @@
-  * 'session' (preferences only persist during the login), 'ldap', 
-  * and 'sql'.
-  */
+ // What level of messages should we log? The values are LOG_EMERG,
+ // LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO,
+@@ -131,7 +131,7 @@
+ // (meaning use system defaults and don't save any user preferences),
+ // 'session' (preferences only persist during the login), 'ldap', 
+ // and 'sql'.
 -$conf['prefs']['driver'] = 'none';
 +$conf['prefs']['driver'] = 'sql';
  
- /* Any parameters that the preferences driver needs. This includes
-  * database or ldap server, username/password to connect with, etc.
-@@ -159,12 +164,12 @@
-  * Be sure to set the prefs driver to 'sql' above if you use this
-  * configuration. 
-  */
+ // Any parameters that the preferences driver needs. This includes
+ // database or ldap server, username/password to connect with, etc.
+@@ -140,12 +140,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.
 -// $conf['prefs']['params']['phptype'] = 'mysql';
 -// $conf['prefs']['params']['hostspec'] = 'localhost';
 -// $conf['prefs']['params']['username'] = 'horde';
@@ -58,12 +46,22 @@
  
  
  /**
-@@ -216,7 +221,7 @@
-  * option; SMTP requires at least a server and a port (if nonstandard).
-  */
+@@ -177,7 +177,7 @@
+ // function correctly. For sendmail, this is mainly the sendmail_path
+ // option; SMTP requires at least a server and a port (if nonstandard).
  $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('server' => 'smtp.example.com');
+ // $conf['mailer']['params'] = array('host' => 'smtp.example.com');
  
- /**
+ 
+@@ -223,3 +223,9 @@
+ // Should we use DHTML to display a floating menu of Horde appliation
+ // links, instead of a frame?
+ $conf['menu']['floating_bar'] = false;
++
++/* Which users should be treated as administrators (root, super-user)
++ * by Horde? Example: $conf['auth']['admins'] = array('admin', 'john');
++ * N.B.: 'admin' is used by Jonah to fetch the news.
++ */
++$conf['auth']['admins'] = array('admin');
diff --git a/www/horde2/files/patch-ac b/www/horde2/files/patch-ac
index 29f56e72a9eb..e21d55a0ac02 100644
--- a/www/horde2/files/patch-ac
+++ b/www/horde2/files/patch-ac
@@ -1,5 +1,5 @@
---- config/registry.php.dist.orig	Sun Dec 23 03:22:14 2001
-+++ config/registry.php.dist	Tue Dec 25 13:11:34 2001
+--- config/registry.php.dist.orig	Tue Mar 12 17:56:41 2002
++++ config/registry.php.dist	Mon Apr  8 21:47:24 2002
 @@ -20,8 +20,8 @@
   *   IMP or Gollem handle the authentication for Horde. This avoids the
   *   "double login" while accessing IMP.
@@ -11,40 +11,77 @@
  
  /* mail: Handler for sending mail. */
  $this->registry['mail']['compose'] = 'imp';
-@@ -62,32 +62,103 @@
+@@ -33,12 +33,18 @@
+ $this->registry['contacts']['sources'] = 'turba';
+ $this->registry['contacts']['fields'] = 'turba';
+ 
++/* nic: network utilities */
++$this->registry['net']['finger'] = 'nic';
++
+ /* tasks: Handler for todo lists. */
+ $this->registry['tasks']['search'] = 'nag';
+ $this->registry['tasks']['list'] = 'nag';
+ $this->registry['tasks']['show'] = 'nag';
+ $this->registry['tasks']['add'] = 'nag';
+ 
++/* whups: bugs reports */
++$this->registry['projects']['list'] = 'whups';
++$this->registry['projects']['add'] = 'whups';
+ 
+ /**
+  * Application registry
+@@ -68,50 +74,112 @@
      'server_port' => $GLOBALS['HTTP_SERVER_VARS']['SERVER_PORT']
  );
  
 -// $this->applications['imp'] = array(
 -//     'fileroot' => dirname(__FILE__) . '/../imp',
 -//     'webroot' => $this->applications['horde']['webroot'] . '/imp',
--//     'icon' => '/horde/imp/graphics/imp.gif',
+-//     'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
 -//     'name' => _("Mail"),
--//     'allow_guests' => true,
+-//     'allow_guests' => false,
 -//     'show' => true
 -// );
 -
 -// $this->applications['turba'] = array(
 -//     'fileroot' => dirname(__FILE__) . '/../turba',
 -//     'webroot' => $this->applications['horde']['webroot'] . '/turba',
--//     'icon' => '/horde/turba/graphics/turba.gif',
+-//     'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
 -//     'name' => _("Addressbook"),
 -//     'allow_guests' => false,
 -//     'show' => true
 -// );
 -
+-// $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['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['chora'] = array(
 -//     'fileroot' => dirname(__FILE__) . '/../chora',
 -//     'webroot' => $this->applications['horde']['webroot'] . '/chora',
--//     'icon' => '/horde/chora/graphics/chora.gif',
+-//     'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
 -//     'name' => _("CVS"),
--//     'allow_guests' => true,
+-//     'allow_guests' => false,
 -//     'show' => false
 -// );
 +//UNCOMMENTWHENINSTIMP$this->applications['imp'] = array(
 +//UNCOMMENTWHENINSTIMP    'fileroot' => dirname(__FILE__) . '/../imp',
 +//UNCOMMENTWHENINSTIMP    'webroot' => $this->applications['horde']['webroot'] . '/imp',
-+//UNCOMMENTWHENINSTIMP    'icon' => '/horde/imp/graphics/imp.gif',
++//UNCOMMENTWHENINSTIMP    'icon' => $this->applications['horde']['webroot'] . '/imp/graphics/imp.gif',
 +//UNCOMMENTWHENINSTIMP    'name' => _("Mail"),
 +//UNCOMMENTWHENINSTIMP    'allow_guests' => false,
 +//UNCOMMENTWHENINSTIMP    'show' => true
@@ -53,27 +90,18 @@
 +//UNCOMMENTWHENINSTTURBA$this->applications['turba'] = array(
 +//UNCOMMENTWHENINSTTURBA    'fileroot' => dirname(__FILE__) . '/../turba',
 +//UNCOMMENTWHENINSTTURBA    'webroot' => $this->applications['horde']['webroot'] . '/turba',
-+//UNCOMMENTWHENINSTTURBA    'icon' => '/horde/turba/graphics/turba.gif',
++//UNCOMMENTWHENINSTTURBA    'icon' => $this->applications['horde']['webroot'] . '/turba/graphics/turba.gif',
 +//UNCOMMENTWHENINSTTURBA    'name' => _("Addressbook"),
 +//UNCOMMENTWHENINSTTURBA    'allow_guests' => false,
 +//UNCOMMENTWHENINSTTURBA    'show' => true
-+//UNCOMMENTWHENINSTTURBA );
-+
-+//UNCOMMENTWHENINSTCHORA$this->applications['chora'] = array(
-+//UNCOMMENTWHENINSTCHORA    'fileroot' => dirname(__FILE__) . '/../chora',
-+//UNCOMMENTWHENINSTCHORA    'webroot' => $this->applications['horde']['webroot'] . '/chora',
-+//UNCOMMENTWHENINSTCHORA    'icon' => '/horde/chora/graphics/chora.gif',
-+//UNCOMMENTWHENINSTCHORA    'name' => _("CVS"),
-+//UNCOMMENTWHENINSTCHORA    'allow_guests' => true,
-+//UNCOMMENTWHENINSTCHORA    'show' => true
-+//UNCOMMENTWHENINSTCHORA );
++//UNCOMMENTWHENINSTTURBA);
 + 
 +//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' => true,
++//UNCOMMENTWHENINSTGOLLEM    'allow_guests' => false,
 +//UNCOMMENTWHENINSTGOLLEM    'show' => true
 +//UNCOMMENTWHENINSTGOLLEM);
 +
@@ -82,14 +110,14 @@
 +//UNCOMMENTWHENINSTNIC    'webroot' => '/horde/nic',
 +//UNCOMMENTWHENINSTNIC    'icon' => '/horde/nic/graphics/nic.gif',
 +//UNCOMMENTWHENINSTNIC    'name' => _("Network"),
-+//UNCOMMENTWHENINSTNIC    'allow_guests' => true,
++//UNCOMMENTWHENINSTNIC    'allow_guests' => false,
 +//UNCOMMENTWHENINSTNIC    'show' => true
 +//UNCOMMENTWHENINSTNIC);
 +
 +//UNCOMMENTWHENINSTKRONOLITH$this->applications['kronolith'] = array(
 +//UNCOMMENTWHENINSTKRONOLITH    'fileroot' => dirname(__FILE__) . '/../kronolith',
-+//UNCOMMENTWHENINSTKRONOLITH    'webroot' => '/horde/kronolith',
-+//UNCOMMENTWHENINSTKRONOLITH    'icon' => '/horde/kronolith/graphics/kronolith.gif',
++//UNCOMMENTWHENINSTKRONOLITH    'webroot' => $this->applications['horde']['webroot'] . '/kronolith',
++//UNCOMMENTWHENINSTKRONOLITH    'icon' => $this->applications['horde']['webroot'] . '/kronolith/graphics/kronolith.gif',
 +//UNCOMMENTWHENINSTKRONOLITH    'name' => _("Calendar"),
 +//UNCOMMENTWHENINSTKRONOLITH    'allow_guests' => false,
 +//UNCOMMENTWHENINSTKRONOLITH    'show' => true
@@ -109,25 +137,43 @@
 +//UNCOMMENTWHENINSTTROLL    'webroot' => '/horde/troll',
 +//UNCOMMENTWHENINSTTROLL    'icon' => '/horde/troll/graphics/troll.gif',
 +//UNCOMMENTWHENINSTTROLL    'name' => _("News"),
-+//UNCOMMENTWHENINSTTROLL    'allow_guests' => true,
++//UNCOMMENTWHENINSTTROLL    'allow_guests' => false,
 +//UNCOMMENTWHENINSTTROLL    'show' => true
 +//UNCOMMENTWHENINSTTROLL);
 +
++//UNCOMMENTWHENINSTCHORA$this->applications['chora'] = array(
++//UNCOMMENTWHENINSTCHORA    'fileroot' => dirname(__FILE__) . '/../chora',
++//UNCOMMENTWHENINSTCHORA    'webroot' => $this->applications['horde']['webroot'] . '/chora',
++//UNCOMMENTWHENINSTCHORA    'icon' => $this->applications['horde']['webroot'] . '/chora/graphics/chora.gif',
++//UNCOMMENTWHENINSTCHORA    'name' => _("CVS"),
++//UNCOMMENTWHENINSTCHORA    'allow_guests' => true,
++//UNCOMMENTWHENINSTCHORA    'show' => true
++//UNCOMMENTWHENINSTCHORA);
++
++//UNCOMMENTWHENINSTBABEL$this->applications['babel'] = array(
++//UNCOMMENTWHENINSTBABEL    'fileroot' => dirname(__FILE__) . '/../babel',
++//UNCOMMENTWHENINSTBABEL    'webroot' => $this->applications['horde']['webroot'] . '/babel',
++//UNCOMMENTWHENINSTBABEL    'icon' => $this->applications['horde']['webroot'] . '/babel/graphics/babel.gif',
++//UNCOMMENTWHENINSTBABEL    'name' => _("i18n"),
++//UNCOMMENTWHENINSTBABEL    'allow_guests' => false,
++//UNCOMMENTWHENINSTBABEL    'show' => true
++//UNCOMMENTWHENINSTBABEL);
++
 +//UNCOMMENTWHENINSTWHUPS$this->applications['whups'] = array(
 +//UNCOMMENTWHENINSTWHUPS    'fileroot' => dirname(__FILE__) . '/../whups',
 +//UNCOMMENTWHENINSTWHUPS    'webroot' => '/horde/whups',
 +//UNCOMMENTWHENINSTWHUPS    'icon' => '/horde/whups/graphics/whups.gif',
 +//UNCOMMENTWHENINSTWHUPS    'name' => _("Bugs"),
-+//UNCOMMENTWHENINSTWHUPS    'allow_guests' => true,
++//UNCOMMENTWHENINSTWHUPS    'allow_guests' => false,
 +//UNCOMMENTWHENINSTWHUPS    'show' => true
 +//UNCOMMENTWHENINSTWHUPS);
 +
 +//UNCOMMENTWHENINSTNAG$this->applications['nag'] = array(
 +//UNCOMMENTWHENINSTNAG    'fileroot' => dirname(__FILE__) . '/../nag',
-+//UNCOMMENTWHENINSTNAG    'webroot' => '/horde/nag',
-+//UNCOMMENTWHENINSTNAG    'icon' => '/horde/nag/graphics/nag.gif',
++//UNCOMMENTWHENINSTNAG    'webroot' => $this->applications['horde']['webroot'] . '/nag',
++//UNCOMMENTWHENINSTNAG    'icon' => $this->applications['horde']['webroot'] . '/nag/graphics/nag.gif',
 +//UNCOMMENTWHENINSTNAG    'name' => _("Tasks"),
-+//UNCOMMENTWHENINSTNAG    'allow_guests' => true,
++//UNCOMMENTWHENINSTNAG    'allow_guests' => false,
 +//UNCOMMENTWHENINSTNAG    'show' => true
 +//UNCOMMENTWHENINSTNAG);
 +
@@ -141,7 +187,7 @@
  
  
  /** 
-@@ -144,6 +215,49 @@
+@@ -168,6 +236,61 @@
      'function' => 'turbaGetFields',
      'args' => array('addressbook'),
      'type' => 'array'
@@ -183,6 +229,18 @@
 +);
 +
 +
++$this->services['whups']['projects']['list'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'whupsListModules',
++    'args' => array(),
++    'type' => 'array'
++);
++$this->services['whups']['projects']['add'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'whupsAddModule',
++    'args' => array('name'),
++    'type' => 'integer'
++);
 +$this->services['whups']['horde']['summary'] = array(
 +    'file' => '%application%/lib/api.php',
 +    'function' => 'whupsSummary',
@@ -190,4 +248,4 @@
 +    'type' => 'string'
  );
  
- $this->services['default']['mail']['compose'] = array(
+ $this->services['kronolith']['horde']['summary'] = array(
diff --git a/www/horde2/files/patch-mime_drivers.php.dist b/www/horde2/files/patch-mime_drivers.php.dist
index 32ded852e74d..67de15a2d6d5 100644
--- a/www/horde2/files/patch-mime_drivers.php.dist
+++ b/www/horde2/files/patch-mime_drivers.php.dist
@@ -1,5 +1,5 @@
---- config/mime_drivers.php.dist.orig	Sun Dec 23 22:36:27 2001
-+++ config/mime_drivers.php.dist	Sun Feb 17 10:11:21 2002
+--- config/mime_drivers.php.dist.orig	Sat Mar  9 19:43:39 2002
++++ config/mime_drivers.php.dist	Tue Mar 12 22:51:51 2002
 @@ -20,8 +20,12 @@
  
  $mime_drivers_map['horde']['registered'] = array(
@@ -15,7 +15,7 @@
      );
  
  
-@@ -101,19 +105,19 @@
+@@ -101,22 +105,22 @@
   */
  
  /* Location of the enscript binary. */
@@ -24,31 +24,37 @@
 -// $mime_drivers['horde']['enscript']['handles'] = array(
 -//     'text/html', 'x-extension/pl', 'x-extension/c',
 -//     'text/xml', 'application/x-sh', 'application/x-javascript',
--//     'x-extension/java', 'x-extension/h', 'x-extension/cpp');
+-//     'x-extension/java', 'x-extension/h', 'x-extension/cpp',
+-//     'x-extension/vhd', 'x-extension/vhdl', 'x-extension/sql',
+-//     'x-extension/vb', 'x-extension/vba', 'x-extension/el');
 -// $mime_drivers['horde']['enscript']['icons'] = array(
--//     'default'          => 'text.gif',
--//     'text/html'        => 'html.gif',
--//     'text/xml'         => 'xml.gif',
--//     'x-extension/c'    => 'source-c.gif',
--//     'x-extension/h'    => 'source-h.gif',
--//     'x-extension/java' => 'source-java.gif');
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['location'] = '%%LOCALBASE%%/bin/enscript';
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['inline'] = false;
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['handles'] = array(
-+//UNCOMMENTWHENINSTCHORA     'text/html', 'x-extension/pl', 'x-extension/c',
-+//UNCOMMENTWHENINSTCHORA     'text/xml', 'application/x-sh', 'application/x-javascript',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/java', 'x-extension/h', 'x-extension/cpp');
-+//UNCOMMENTWHENINSTCHORA $mime_drivers['horde']['enscript']['icons'] = array(
-+//UNCOMMENTWHENINSTCHORA     'default'          => 'text.gif',
-+//UNCOMMENTWHENINSTCHORA     'text/html'        => 'html.gif',
-+//UNCOMMENTWHENINSTCHORA     'text/xml'         => 'xml.gif',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/c'    => 'source-c.gif',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/h'    => 'source-h.gif',
-+//UNCOMMENTWHENINSTCHORA     'x-extension/java' => 'source-java.gif');
+-//     'default'                  => 'text.gif',
+-//     'text/html'                => 'html.gif',
+-//     'text/xml'                 => 'xml.gif',
+-//     'x-extension/c'            => 'source-c.gif',
+-//     'x-extension/h'            => 'source-h.gif',
+-//     'x-extension/java'         => 'source-java.gif',
+-//     'application/x-javascript' => 'script-js.gif');
++//UNCOMMENTWHENINSTCHORA$mime_drivers['horde']['enscript']['location'] = '%%LOCALBASE%%/bin/enscript';
++//UNCOMMENTWHENINSTCHORA$mime_drivers['horde']['enscript']['inline'] = false;
++//UNCOMMENTWHENINSTCHORA$mime_drivers['horde']['enscript']['handles'] = array(
++//UNCOMMENTWHENINSTCHORA    'text/html', 'x-extension/pl', 'x-extension/c',
++//UNCOMMENTWHENINSTCHORA    'text/xml', 'application/x-sh', 'application/x-javascript',
++//UNCOMMENTWHENINSTCHORA    'x-extension/java', 'x-extension/h', 'x-extension/cpp',
++//UNCOMMENTWHENINSTCHORA    'x-extension/vhd', 'x-extension/vhdl', 'x-extension/sql',
++//UNCOMMENTWHENINSTCHORA    'x-extension/vb', 'x-extension/vba', 'x-extension/el');
++//UNCOMMENTWHENINSTCHORA$mime_drivers['horde']['enscript']['icons'] = array(
++//UNCOMMENTWHENINSTCHORA    'default'                  => 'text.gif',
++//UNCOMMENTWHENINSTCHORA    'text/html'                => 'html.gif',
++//UNCOMMENTWHENINSTCHORA    'text/xml'                 => 'xml.gif',
++//UNCOMMENTWHENINSTCHORA    'x-extension/c'            => 'source-c.gif',
++//UNCOMMENTWHENINSTCHORA    'x-extension/h'            => 'source-h.gif',
++//UNCOMMENTWHENINSTCHORA    'x-extension/java'         => 'source-java.gif',
++//UNCOMMENTWHENINSTCHORA    'application/x-javascript' => 'script-js.gif');
  
  
  /**
-@@ -121,7 +125,7 @@
+@@ -124,7 +128,7 @@
   */
  
  /* Location of the tar binary. */
@@ -57,7 +63,7 @@
  $mime_drivers['horde']['tgz']['inline'] = true;
  $mime_drivers['horde']['tgz']['handles'] = array(
      'x-extension/tgz',
-@@ -138,13 +142,13 @@
+@@ -142,14 +146,14 @@
   */
  
  /* Location of the zipinfo binary. */
@@ -65,6 +71,7 @@
 -// $mime_drivers['horde']['zip']['inline'] = true;
 -// $mime_drivers['horde']['zip']['handles'] = array(
 -//     'x-extension/zip',
+-//     'application/x-compressed',
 -//     'application/x-zip-compressed');
 -// $mime_drivers['horde']['zip']['icons'] = array(
 -//     'default' => 'compressed.gif');
@@ -72,32 +79,35 @@
 +//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['inline'] = true;
 +//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['handles'] = array(
 +//UNCOMMENTIFZIP     'x-extension/zip',
++//UNCOMMENTIFZIP     'application/x-compressed',
 +//UNCOMMENTIFZIP     'application/x-zip-compressed');
 +//UNCOMMENTIFZIP $mime_drivers['horde']['zip']['icons'] = array(
 +//UNCOMMENTIFZIP     'default' => 'compressed.gif');
  
  
  /**
-@@ -153,12 +157,12 @@
+@@ -158,13 +162,13 @@
   */
  
  /* Location of the rar binary. */
 -// $mime_drivers['horde']['rar']['location'] = '/usr/bin/rar';
 -// $mime_drivers['horde']['rar']['inline'] = true;
 -// $mime_drivers['horde']['rar']['handles'] = array(
--//     'x-extension/rar');
+-//     'x-extension/rar',
+-//     'application/x-rar-compressed');
 -// $mime_drivers['horde']['rar']['icons'] = array(
 -//     'default' => 'compressed.gif');
 +//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['location'] = '%%LOCALBASE%%/bin/rar';
 +//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['inline'] = true;
 +//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['handles'] = array(
-+//UNCOMMENTIFRAR     'x-extension/rar');
++//UNCOMMENTIFRAR     'x-extension/rar',
++//UNCOMMENTIFRAR     'application/x-rar-compressed');
 +//UNCOMMENTIFRAR $mime_drivers['horde']['rar']['icons'] = array(
 +//UNCOMMENTIFRAR     'default' => 'compressed.gif');
  
  
  /**
-@@ -168,15 +172,15 @@
+@@ -174,15 +178,15 @@
   */
  
  /* Location of the wvHtml binary. */
@@ -122,7 +132,7 @@
  
  
  /**
-@@ -186,14 +190,14 @@
+@@ -192,14 +196,14 @@
   */
  
  /* Location of the xlhtml binary. */
@@ -145,7 +155,7 @@
  
  
  /**
-@@ -204,14 +208,14 @@
+@@ -210,14 +214,14 @@
   */
  
  /* Location of the ppthtml binary. */
diff --git a/www/horde2/pkg-descr b/www/horde2/pkg-descr
index 8f00bc7b704b..04cfeae5e30b 100644
--- a/www/horde2/pkg-descr
+++ b/www/horde2/pkg-descr
@@ -1,11 +1,6 @@
-Horde  2.0 is a massive upgrade of the Horde Application Framework.
-
-Many components have been added or streamlined. Inter-application
-support is much more robust, a generic MIME_Viewer framework is
-included, the preferences system supports global or application scope
-for preferences, and assorted bugs have been fixed.
+Horde is a framework used by several applications written in PHP4.
 
 Horde is used by these ports: mail/imp3, mail/turba, devel/chora,
-deskutils/kronolith, deskutils/nag, www/jonah and net/nic.
+deskutils/kronolith, deskutils/nag, www/jonah, net/nic and devel/whups.
 
 WWW: http://www.horde.org/
diff --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist
index 3db3adf64e0c..6c5d31850394 100644
--- a/www/horde2/pkg-plist
+++ b/www/horde2/pkg-plist
@@ -1,36 +1,3 @@
-%%HORDEDIR%%/admin/css/find.php
-%%HORDEDIR%%/admin/css/graphics/color_picker.gif
-%%HORDEDIR%%/admin/css/index.php
-%%HORDEDIR%%/admin/css/templates/colorpicker/behavior.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/blue.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/boxbevel.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/colorspace.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/colorthumb.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/getcolor.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/green.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/grey3.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/grey4.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/grey5.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/hls.jpg
-%%HORDEDIR%%/admin/css/templates/colorpicker/hls_sat.jpg
-%%HORDEDIR%%/admin/css/templates/colorpicker/openit.js
-%%HORDEDIR%%/admin/css/templates/colorpicker/picker_two.html
-%%HORDEDIR%%/admin/css/templates/colorpicker/red.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/rgb.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/spectrum.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/spectrum.jpg
-%%HORDEDIR%%/admin/css/templates/colorpicker/tabHLS.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/tabHSB.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/tabRGB.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumb.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbB.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbC.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbG.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbL.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbR.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbS.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbT.gif
-%%HORDEDIR%%/admin/user.php
 %%HORDEDIR%%/config/.htaccess
 %%HORDEDIR%%/config/horde.php
 %%HORDEDIR%%/config/horde.php.dist
@@ -46,16 +13,18 @@
 %%HORDEDIR%%/config/mime_mapping.php.dist
 %%HORDEDIR%%/config/motd.php
 %%HORDEDIR%%/config/motd.php.dist
+%%HORDEDIR%%/config/prefs.php
+%%HORDEDIR%%/config/prefs.php.dist
 %%HORDEDIR%%/config/registry.php
 %%HORDEDIR%%/config/registry.php.dist
 %%HORDEDIR%%/config/registry.php.dist.orig
 %%HORDEDIR%%/css.php
-%%HORDEDIR%%/graphics/administration.gif
 %%HORDEDIR%%/graphics/alerts/error.gif
 %%HORDEDIR%%/graphics/alerts/message.gif
 %%HORDEDIR%%/graphics/alerts/success.gif
 %%HORDEDIR%%/graphics/alerts/warning.gif
 %%HORDEDIR%%/graphics/data.gif
+%%HORDEDIR%%/graphics/favicon.ico
 %%HORDEDIR%%/graphics/help.gif
 %%HORDEDIR%%/graphics/home.gif
 %%HORDEDIR%%/graphics/keyboard.gif
@@ -84,6 +53,7 @@
 %%HORDEDIR%%/graphics/mime/rpm.gif
 %%HORDEDIR%%/graphics/mime/script-asa.gif
 %%HORDEDIR%%/graphics/mime/script-asp.gif
+%%HORDEDIR%%/graphics/mime/script-js.gif
 %%HORDEDIR%%/graphics/mime/setup.gif
 %%HORDEDIR%%/graphics/mime/signed.gif
 %%HORDEDIR%%/graphics/mime/source-c.gif
@@ -95,6 +65,18 @@
 %%HORDEDIR%%/graphics/mime/xml.gif
 %%HORDEDIR%%/graphics/prefs.gif
 %%HORDEDIR%%/graphics/problem.gif
+%%HORDEDIR%%/graphics/tree/blank.gif
+%%HORDEDIR%%/graphics/tree/join.gif
+%%HORDEDIR%%/graphics/tree/joinbottom.gif
+%%HORDEDIR%%/graphics/tree/line.gif
+%%HORDEDIR%%/graphics/tree/minus.gif
+%%HORDEDIR%%/graphics/tree/minusbottom.gif
+%%HORDEDIR%%/graphics/tree/minusonly.gif
+%%HORDEDIR%%/graphics/tree/minustop.gif
+%%HORDEDIR%%/graphics/tree/plus.gif
+%%HORDEDIR%%/graphics/tree/plusbottom.gif
+%%HORDEDIR%%/graphics/tree/plusonly.gif
+%%HORDEDIR%%/graphics/tree/plustop.gif
 %%HORDEDIR%%/help.php
 %%HORDEDIR%%/index.php
 %%HORDEDIR%%/javascript.php
@@ -109,6 +91,7 @@
 %%HORDEDIR%%/lib/Cache.php
 %%HORDEDIR%%/lib/Cache/file.php
 %%HORDEDIR%%/lib/Category.php
+%%HORDEDIR%%/lib/CategoryTree.php
 %%HORDEDIR%%/lib/Category/sql.php
 %%HORDEDIR%%/lib/Data.php
 %%HORDEDIR%%/lib/Group.php
@@ -136,9 +119,11 @@
 %%HORDEDIR%%/lib/MIME/Viewer/zip.php
 %%HORDEDIR%%/lib/Maintenance.php
 %%HORDEDIR%%/lib/Menu.php
+%%HORDEDIR%%/lib/Notification/status.php
+%%HORDEDIR%%/lib/Notification.php
 %%HORDEDIR%%/lib/Perms.php
-%%HORDEDIR%%/lib/Perms/sql.php
 %%HORDEDIR%%/lib/Prefs.php
+%%HORDEDIR%%/lib/PrefsUI.php
 %%HORDEDIR%%/lib/Prefs/ldap.php
 %%HORDEDIR%%/lib/Prefs/session.php
 %%HORDEDIR%%/lib/Prefs/sql.php
@@ -154,21 +139,27 @@
 %%HORDEDIR%%/lib/version.php
 %%HORDEDIR%%/locale/.htaccess
 %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/da_DK/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/de_DE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/el_GR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/en_US/help.xml
 %%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/fr_FR/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/nl_NL/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/no_BOK/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/nb_NO/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/ru_koi/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/locale/ru_win/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/pt_PT/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
 %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/uk_UA/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/zh_CN/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/login.php
@@ -177,25 +168,30 @@
 %%HORDEDIR%%/po/.htaccess
 %%HORDEDIR%%/po/Makefile
 %%HORDEDIR%%/po/README
-%%HORDEDIR%%/po/README.WinToKoi
-%%HORDEDIR%%/po/WinToKoi.pl
+%%HORDEDIR%%/po/wintokoi.pl
 %%HORDEDIR%%/po/cs_CZ.po
+%%HORDEDIR%%/po/da_DK.po
 %%HORDEDIR%%/po/de_DE.po
 %%HORDEDIR%%/po/el_GR.po
 %%HORDEDIR%%/po/es_ES.po
+%%HORDEDIR%%/po/et_EE.po
 %%HORDEDIR%%/po/extract.pl
 %%HORDEDIR%%/po/fi_FI.po
 %%HORDEDIR%%/po/fr_FR.po
 %%HORDEDIR%%/po/it_IT.po
+%%HORDEDIR%%/po/ja_JP.po
 %%HORDEDIR%%/po/ko_KR.po
 %%HORDEDIR%%/po/nl_NL.po
-%%HORDEDIR%%/po/no_BOK.po
+%%HORDEDIR%%/po/nb_NO.po
 %%HORDEDIR%%/po/pl_PL.po
 %%HORDEDIR%%/po/pt_BR.po
-%%HORDEDIR%%/po/ru_koi.po
-%%HORDEDIR%%/po/ru_win.po
+%%HORDEDIR%%/po/pt_PT.po
+%%HORDEDIR%%/po/ru_RU.po
+%%HORDEDIR%%/po/ru_RU.KOI8-R.po
 %%HORDEDIR%%/po/shtool
+%%HORDEDIR%%/po/sk_SK.po
 %%HORDEDIR%%/po/sv_SE.po
+%%HORDEDIR%%/po/uk_UA.po
 %%HORDEDIR%%/po/xgettext.sh
 %%HORDEDIR%%/po/zh_CN.po
 %%HORDEDIR%%/po/zh_TW.po
@@ -205,12 +201,19 @@
 %%HORDEDIR%%/scripts/db/README
 %%HORDEDIR%%/scripts/db/auth.sql
 %%HORDEDIR%%/scripts/db/category.sql
+%%HORDEDIR%%/scripts/db/category_mysql.sql
 %%HORDEDIR%%/scripts/db/mysql_create.sql
 %%HORDEDIR%%/scripts/db/mysql_drop.sql
 %%HORDEDIR%%/scripts/db/pgsql_create.sql
 %%HORDEDIR%%/scripts/db/pgsql_drop.sql
 %%HORDEDIR%%/scripts/db/prefs.sql
 %%HORDEDIR%%/scripts/horde-rsync.sh
+%%HORDEDIR%%/scripts/ldap/gollem.schema
+%%HORDEDIR%%/scripts/ldap/horde.schema
+%%HORDEDIR%%/scripts/ldap/imp.schema
+%%HORDEDIR%%/scripts/ldap/kronolith.schema
+%%HORDEDIR%%/scripts/ldap/nag.schema
+%%HORDEDIR%%/scripts/ldap/turba.schema
 %%HORDEDIR%%/scripts/mime_mapping/Makefile
 %%HORDEDIR%%/scripts/mime_mapping/convert.pl
 %%HORDEDIR%%/scripts/mime_mapping/mime.types
@@ -218,10 +221,10 @@
 %%HORDEDIR%%/scripts/set_perms.sh.orig
 %%HORDEDIR%%/status.php
 %%HORDEDIR%%/templates/.htaccess
-%%HORDEDIR%%/templates/admin/user/add.inc
-%%HORDEDIR%%/templates/admin/user/list.inc
-%%HORDEDIR%%/templates/admin/user/noadd.inc
-%%HORDEDIR%%/templates/admin/user/nolist.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/data/csvmap.inc
@@ -261,6 +264,7 @@
 %%HORDEDIR%%/templates/wml/login/login.inc
 %%HORDEDIR%%/templates/wml/login/user.inc
 %%HORDEDIR%%/test.php
+%%HORDEDIR%%/util/css2horde.php
 %%HORDEDIR%%/util/special_characters.php
 %%HORDESBIN%%/horde_set_perms.sh
 etc/horde/httpd.conf.horde
@@ -273,30 +277,30 @@ etc/horde/httpd.conf.horde
 %%PORTDOCS%%share/doc/horde/INSTALL
 %%PORTDOCS%%share/doc/horde/README
 %%PORTDOCS%%@dirrm share/doc/horde
-@dirrm %%HORDEDIR%%/admin/css/graphics
-@dirrm %%HORDEDIR%%/admin/css/templates/colorpicker
-@dirrm %%HORDEDIR%%/admin/css/templates
-@dirrm %%HORDEDIR%%/admin/css
-@dirrm %%HORDEDIR%%/admin
 @dirrm %%HORDEDIR%%/config
 @dirrm %%HORDEDIR%%/graphics/alerts
 @dirrm %%HORDEDIR%%/graphics/mime
+@dirrm %%HORDEDIR%%/graphics/tree
 @dirrm %%HORDEDIR%%/graphics
 @dirrm %%HORDEDIR%%/lib/Auth
 @dirrm %%HORDEDIR%%/lib/Cache
 @dirrm %%HORDEDIR%%/lib/Category
 @dirrm %%HORDEDIR%%/lib/MIME/Viewer
 @dirrm %%HORDEDIR%%/lib/MIME
+@dirrm %%HORDEDIR%%/lib/Notification
 @dirrm %%HORDEDIR%%/lib/Prefs
-@dirrm %%HORDEDIR%%/lib/Perms
 @dirrm %%HORDEDIR%%/lib/Token
 @dirrm %%HORDEDIR%%/lib
 @dirrm %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/cs_CZ
+@dirrm %%HORDEDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/da_DK
 @dirrm %%HORDEDIR%%/locale/de_DE/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/de_DE
 @dirrm %%HORDEDIR%%/locale/el_GR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/el_GR
+@dirrm %%HORDEDIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/et_EE
 @dirrm %%HORDEDIR%%/locale/en_US
 @dirrm %%HORDEDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/es_ES
@@ -306,32 +310,40 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/fr_FR
 @dirrm %%HORDEDIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/it_IT
+@dirrm %%HORDEDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/ja_JP
 @dirrm %%HORDEDIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/ko_KR
 @dirrm %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/nl_NL
-@dirrm %%HORDEDIR%%/locale/no_BOK/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/no_BOK
+@dirrm %%HORDEDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/nb_NO
 @dirrm %%HORDEDIR%%/locale/pl_PL/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/pl_PL
 @dirrm %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/pt_BR
-@dirrm %%HORDEDIR%%/locale/ru_koi/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/ru_koi
-@dirrm %%HORDEDIR%%/locale/ru_win/LC_MESSAGES
-@dirrm %%HORDEDIR%%/locale/ru_win
+@dirrm %%HORDEDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/pt_PT
+@dirrm %%HORDEDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/ru_RU
+@dirrm %%HORDEDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/ru_RU.KOI8-R
+@dirrm %%HORDEDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/sk_SK
 @dirrm %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/sv_SE
+@dirrm %%HORDEDIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/uk_UA
 @dirrm %%HORDEDIR%%/locale/zh_CN/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/zh_CN
 @dirrm %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/zh_TW
 @dirrm %%HORDEDIR%%/locale
 @dirrm %%HORDEDIR%%/scripts/db
+@dirrm %%HORDEDIR%%/scripts/ldap
 @dirrm %%HORDEDIR%%/scripts/mime_mapping
 @dirrm %%HORDEDIR%%/scripts
-@dirrm %%HORDEDIR%%/templates/admin/user
-@dirrm %%HORDEDIR%%/templates/admin
+@dirrm %%HORDEDIR%%/templates/categorytree
 @dirrm %%HORDEDIR%%/templates/data
 @dirrm %%HORDEDIR%%/templates/help
 @dirrm %%HORDEDIR%%/templates/horde