horde-devel from 2.0 RC3 to 2.0;

turba from 1.0 RC3 to 1.0;
imp-devel from 3.0 RC3 to 1.0

12 files changed, 952 insertions, 492 deletions

diff --git a/www/horde-devel/Makefile b/www/horde-devel/Makefile
index b476c1d6abe2..cc1b51a61484 100644
--- a/www/horde-devel/Makefile
+++ b/www/horde-devel/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	horde
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
 
 MAINTAINER=	thierry@thomas.as
 
@@ -34,8 +34,8 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libssl.so:${PORTSDIR}/www/apache13-mod
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
 NO_BUILD=	yes
-DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS docs/CREDITS \
-		docs/HELP docs/INSTALL docs/LISTS docs/SOURCE
+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
 
@@ -94,13 +94,17 @@ do-install:
 			${CONFDIR}/horde.php ; \
 		${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
 	fi
+	@${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \
+		${HORDEDIR}/lib/Auth/mcal.php
 .for FILE in ${CONFFILE}
 	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
 	fi
 .endfor
 	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
-	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" ${HORDESBIN}/horde_set_perms.sh
+	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \
+		${HORDESBIN}/horde_set_perms.sh
+	@${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh
 	@(if [ -f ${APACHE_CONF} ] ; then \
 	    ${MKDIR} ${HORDE_INC} ; \
 	    ${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \
diff --git a/www/horde-devel/distinfo b/www/horde-devel/distinfo
index 42bbf809d2e6..f5f679ed8103 100644
--- a/www/horde-devel/distinfo
+++ b/www/horde-devel/distinfo
@@ -1 +1 @@
-MD5 (horde-2.0-RC3.tar.gz) = 3e19caa323b075520b9dc5fc90a94475
+MD5 (horde-2.0.tar.gz) = 039d760ebf282dca33ab6081179c2be0
diff --git a/www/horde-devel/files/patch-ab b/www/horde-devel/files/patch-ab
index 387a52ef0ebf..1b2f203e7ee3 100644
--- a/www/horde-devel/files/patch-ab
+++ b/www/horde-devel/files/patch-ab
@@ -1,47 +1,48 @@
---- config/horde.php.dist.orig	Tue Nov 27 13:36:00 2001
-+++ config/horde.php.dist	Tue Dec  4 21:37:30 2001
-@@ -78,7 +78,7 @@
+--- 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');
  
  // 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,
-@@ -99,6 +99,10 @@
- 
- // What log driver should we use? Valid values are 'file', 'mcal',
- // 'sql', and 'syslog'.
-+// 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
- $conf['log']['type'] = 'file';
- 
- // What is the name of the log? For the 'file' driver, this is the
-@@ -106,7 +110,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;
+ /* 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
+  */
 -$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,
-@@ -131,7 +135,7 @@
- // (meaning use system defaults and don't save any user preferences),
- // '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,
+@@ -148,7 +153,7 @@
+  * '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.
-@@ -140,12 +144,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.
+ /* 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. 
+  */
 -// $conf['prefs']['params']['phptype'] = 'mysql';
 -// $conf['prefs']['params']['hostspec'] = 'localhost';
 -// $conf['prefs']['params']['username'] = 'horde';
@@ -57,3 +58,12 @@
  
  
  /**
+@@ -216,7 +221,7 @@
+  * 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');
+ 
+ /**
diff --git a/www/horde-devel/files/patch-ac b/www/horde-devel/files/patch-ac
index 3c6711021697..29f56e72a9eb 100644
--- a/www/horde-devel/files/patch-ac
+++ b/www/horde-devel/files/patch-ac
@@ -1,13 +1,193 @@
---- config/registry.php.dist.orig	Mon Oct 29 02:35:33 2001
-+++ config/registry.php.dist	Fri Nov 16 23:16:28 2001
-@@ -1,8 +1,8 @@
- <?php
- // $Horde: horde/config/registry.php.dist,v 1.52 2001/10/29 01:35:33 chuck Exp $
- 
+--- config/registry.php.dist.orig	Sun Dec 23 03:22:14 2001
++++ config/registry.php.dist	Tue Dec 25 13:11:34 2001
+@@ -20,8 +20,8 @@
+  *   IMP or Gollem handle the authentication for Horde. This avoids the
+  *   "double login" while accessing IMP.
+  */
 -// $this->registry['auth']['login'] = 'imp';
 -// $this->registry['auth']['logout'] = 'imp';
 +//UNCOMMENTWHENINSTIMP$this->registry['auth']['login'] = 'imp';
 +//UNCOMMENTWHENINSTIMP$this->registry['auth']['logout'] = 'imp';
- // $this->registry['auth']['login'] = 'gollem';
- // $this->registry['auth']['logout'] = 'gollem';
+ 
+ /* mail: Handler for sending mail. */
  $this->registry['mail']['compose'] = 'imp';
+@@ -62,32 +62,103 @@
+     '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',
+-//     'name' => _("Mail"),
+-//     'allow_guests' => true,
+-//     'show' => true
+-// );
+-
+-// $this->applications['turba'] = array(
+-//     'fileroot' => dirname(__FILE__) . '/../turba',
+-//     'webroot' => $this->applications['horde']['webroot'] . '/turba',
+-//     'icon' => '/horde/turba/graphics/turba.gif',
+-//     'name' => _("Addressbook"),
+-//     'allow_guests' => false,
+-//     'show' => true
+-// );
+-
+-// $this->applications['chora'] = array(
+-//     'fileroot' => dirname(__FILE__) . '/../chora',
+-//     'webroot' => $this->applications['horde']['webroot'] . '/chora',
+-//     'icon' => '/horde/chora/graphics/chora.gif',
+-//     'name' => _("CVS"),
+-//     'allow_guests' => true,
+-//     '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    'name' => _("Mail"),
++//UNCOMMENTWHENINSTIMP    'allow_guests' => false,
++//UNCOMMENTWHENINSTIMP    'show' => true
++//UNCOMMENTWHENINSTIMP);
++
++//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    '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 );
++ 
++//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    'show' => true
++//UNCOMMENTWHENINSTGOLLEM);
++
++//UNCOMMENTWHENINSTNIC$this->applications['nic'] = array(
++//UNCOMMENTWHENINSTNIC    'fileroot' => dirname(__FILE__) . '/../nic',
++//UNCOMMENTWHENINSTNIC    'webroot' => '/horde/nic',
++//UNCOMMENTWHENINSTNIC    'icon' => '/horde/nic/graphics/nic.gif',
++//UNCOMMENTWHENINSTNIC    'name' => _("Network"),
++//UNCOMMENTWHENINSTNIC    'allow_guests' => true,
++//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    'name' => _("Calendar"),
++//UNCOMMENTWHENINSTKRONOLITH    'allow_guests' => false,
++//UNCOMMENTWHENINSTKRONOLITH    'show' => true
++//UNCOMMENTWHENINSTKRONOLITH);
++
++//UNCOMMENTWHENINSTJONAH$this->applications['jonah'] = array(
++//UNCOMMENTWHENINSTJONAH    'fileroot' => dirname(__FILE__) . '/../jonah',
++//UNCOMMENTWHENINSTJONAH    'webroot' => '/horde/jonah',
++//UNCOMMENTWHENINSTJONAH    'icon' => '/horde/jonah/graphics/jonah.gif',
++//UNCOMMENTWHENINSTJONAH    'name' => _("Headlines"),
++//UNCOMMENTWHENINSTJONAH    'allow_guests' => true,
++//UNCOMMENTWHENINSTJONAH    'show' => true
++//UNCOMMENTWHENINSTJONAH);
++
++//UNCOMMENTWHENINSTTROLL$this->applications['troll'] = array(
++//UNCOMMENTWHENINSTTROLL    'fileroot' => dirname(__FILE__) . '/../troll',
++//UNCOMMENTWHENINSTTROLL    'webroot' => '/horde/troll',
++//UNCOMMENTWHENINSTTROLL    'icon' => '/horde/troll/graphics/troll.gif',
++//UNCOMMENTWHENINSTTROLL    'name' => _("News"),
++//UNCOMMENTWHENINSTTROLL    'allow_guests' => true,
++//UNCOMMENTWHENINSTTROLL    'show' => true
++//UNCOMMENTWHENINSTTROLL);
++
++//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    '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    'name' => _("Tasks"),
++//UNCOMMENTWHENINSTNAG    'allow_guests' => true,
++//UNCOMMENTWHENINSTNAG    'show' => true
++//UNCOMMENTWHENINSTNAG);
++
++//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);
+ 
+ 
+ /** 
+@@ -144,6 +215,49 @@
+     'function' => 'turbaGetFields',
+     'args' => array('addressbook'),
+     'type' => 'array'
++);
++
++$this->services['kronolith']['horde']['summary'] = array( 
++    'file' => '%application%/lib/api.php',
++    'function' => 'kronolithSummary',
++    'args' => array(),
++    'type' => 'string'
++);
++
++$this->services['nag']['tasks']['list'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'nagListTasks',
++    'args' => array('sortby', 'sortdir'),
++    'type' => 'array'
++);
++$this->services['nag']['tasks']['search'] = array(
++    'link' => "%application%/search.php"
++);
++$this->services['nag']['tasks']['show'] = array(
++    'link' => "%application%/view.php?task=|task|"
++);
++$this->services['nag']['tasks']['add'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'nagAddTask',
++    'args' => array('name', 'description', 'due'),
++    'type' => 'integer'
++);
++$this->services['nag']['horde']['summary'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'nagSummary',
++    'args' => array(),
++    'type' => 'string'
++);
++$this->services['nic']['net']['finger'] = array(
++    'link' => "%application%/finger.php?address=|address|"
++);
++
++
++$this->services['whups']['horde']['summary'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'whupsSummary',
++    'args' => array(),
++    'type' => 'string'
+ );
+ 
+ $this->services['default']['mail']['compose'] = array(
diff --git a/www/horde-devel/pkg-descr b/www/horde-devel/pkg-descr
index 1bbede97877c..296d9852610c 100644
--- a/www/horde-devel/pkg-descr
+++ b/www/horde-devel/pkg-descr
@@ -1,10 +1,11 @@
-Horde-devel is a massive upgrade of the Horde Application Framework.
+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 used by these ports: mail/imp, mail/turba and devel/chora.
+Horde is used by these ports: mail/imp, mail/turba, devel/chora,
+deskutils/kronolith, deskutils/nag, www/jonah and net/nic.
 
 WWW: http://www.horde.org/
diff --git a/www/horde-devel/pkg-plist b/www/horde-devel/pkg-plist
index ea42f9c31784..549cb374773b 100644
--- a/www/horde-devel/pkg-plist
+++ b/www/horde-devel/pkg-plist
@@ -1,43 +1,114 @@
+%%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
+%%HORDEDIR%%/config/horde.php.dist.orig
+%%HORDEDIR%%/config/html.php
+%%HORDEDIR%%/config/html.php.dist
+%%HORDEDIR%%/config/lang.php
+%%HORDEDIR%%/config/lang.php.dist
+%%HORDEDIR%%/config/mime_drivers.php
+%%HORDEDIR%%/config/mime_drivers.php.dist
+%%HORDEDIR%%/config/mime_mapping.php
+%%HORDEDIR%%/config/mime_mapping.php.dist
+%%HORDEDIR%%/config/motd.php
+%%HORDEDIR%%/config/motd.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/help.gif
+%%HORDEDIR%%/graphics/home.gif
+%%HORDEDIR%%/graphics/keyboard.gif
+%%HORDEDIR%%/graphics/login.gif
+%%HORDEDIR%%/graphics/logout.gif
+%%HORDEDIR%%/graphics/mime/audio.gif
+%%HORDEDIR%%/graphics/mime/binary.gif
+%%HORDEDIR%%/graphics/mime/compressed.gif
+%%HORDEDIR%%/graphics/mime/csv.gif
+%%HORDEDIR%%/graphics/mime/deb.gif
+%%HORDEDIR%%/graphics/mime/encryption.gif
+%%HORDEDIR%%/graphics/mime/executable.gif
+%%HORDEDIR%%/graphics/mime/html.gif
+%%HORDEDIR%%/graphics/mime/image.gif
+%%HORDEDIR%%/graphics/mime/inf.gif
+%%HORDEDIR%%/graphics/mime/mail.gif
+%%HORDEDIR%%/graphics/mime/makefile.gif
+%%HORDEDIR%%/graphics/mime/msexcel.gif
+%%HORDEDIR%%/graphics/mime/msi.gif
+%%HORDEDIR%%/graphics/mime/msp.gif
+%%HORDEDIR%%/graphics/mime/mspowerpoint.gif
+%%HORDEDIR%%/graphics/mime/msword.gif
+%%HORDEDIR%%/graphics/mime/pdf.gif
+%%HORDEDIR%%/graphics/mime/php.gif
+%%HORDEDIR%%/graphics/mime/readme.gif
+%%HORDEDIR%%/graphics/mime/rpm.gif
+%%HORDEDIR%%/graphics/mime/script-asa.gif
+%%HORDEDIR%%/graphics/mime/script-asp.gif
+%%HORDEDIR%%/graphics/mime/setup.gif
+%%HORDEDIR%%/graphics/mime/signed.gif
+%%HORDEDIR%%/graphics/mime/source-c.gif
+%%HORDEDIR%%/graphics/mime/source-h.gif
+%%HORDEDIR%%/graphics/mime/source-java.gif
+%%HORDEDIR%%/graphics/mime/text.gif
+%%HORDEDIR%%/graphics/mime/unknown.gif
+%%HORDEDIR%%/graphics/mime/vcard.gif
+%%HORDEDIR%%/graphics/mime/xml.gif
+%%HORDEDIR%%/graphics/prefs.gif
+%%HORDEDIR%%/graphics/problem.gif
 %%HORDEDIR%%/help.php
 %%HORDEDIR%%/index.php
-%%HORDEDIR%%/login.php
-%%HORDEDIR%%/maintenance.php
-%%HORDEDIR%%/menu.php
-%%HORDEDIR%%/problem.php
-%%HORDEDIR%%/status.php
-%%HORDEDIR%%/test.php
-%%HORDEDIR%%/lib/Auth/imap.php
+%%HORDEDIR%%/javascript.php
+%%HORDEDIR%%/lib/.htaccess
+%%HORDEDIR%%/lib/Auth.php
 %%HORDEDIR%%/lib/Auth/ftp.php
+%%HORDEDIR%%/lib/Auth/imap.php
 %%HORDEDIR%%/lib/Auth/ldap.php
 %%HORDEDIR%%/lib/Auth/mcal.php
 %%HORDEDIR%%/lib/Auth/sql.php
-%%HORDEDIR%%/lib/Cache/file.php
-%%HORDEDIR%%/lib/Category/sql.php
-%%HORDEDIR%%/lib/Maintenance.php
-%%HORDEDIR%%/lib/MIME/Viewer/default.php
-%%HORDEDIR%%/lib/MIME/Viewer/enscript.php
-%%HORDEDIR%%/lib/MIME/Viewer/excel.php
-%%HORDEDIR%%/lib/MIME/Viewer/msword.php
-%%HORDEDIR%%/lib/MIME/Viewer/php.php
-%%HORDEDIR%%/lib/MIME/Viewer/rar.php
-%%HORDEDIR%%/lib/MIME/Viewer/tgz.php
-%%HORDEDIR%%/lib/MIME/Viewer/vcard.php
-%%HORDEDIR%%/lib/MIME/Magic.php
-%%HORDEDIR%%/lib/MIME/Message.php
-%%HORDEDIR%%/lib/MIME/Part.php
-%%HORDEDIR%%/lib/MIME/Structure.php
-%%HORDEDIR%%/lib/MIME/Viewer.php
-%%HORDEDIR%%/lib/Prefs/ldap.php
-%%HORDEDIR%%/lib/Prefs/session.php
-%%HORDEDIR%%/lib/Prefs/sql.php
-%%HORDEDIR%%/lib/Perms/sql.php
-%%HORDEDIR%%/lib/Token/file.php
-%%HORDEDIR%%/lib/Token/sql.php
-%%HORDEDIR%%/lib/Auth.php
 %%HORDEDIR%%/lib/Browser.php
 %%HORDEDIR%%/lib/Cache.php
+%%HORDEDIR%%/lib/Cache/file.php
 %%HORDEDIR%%/lib/Category.php
+%%HORDEDIR%%/lib/Category/sql.php
 %%HORDEDIR%%/lib/Data.php
 %%HORDEDIR%%/lib/Group.php
 %%HORDEDIR%%/lib/Help.php
@@ -45,127 +116,53 @@
 %%HORDEDIR%%/lib/Identity.php
 %%HORDEDIR%%/lib/Lang.php
 %%HORDEDIR%%/lib/MIME.php
+%%HORDEDIR%%/lib/MIME/Magic.php
+%%HORDEDIR%%/lib/MIME/Message.php
+%%HORDEDIR%%/lib/MIME/Part.php
+%%HORDEDIR%%/lib/MIME/Structure.php
+%%HORDEDIR%%/lib/MIME/Viewer.php
+%%HORDEDIR%%/lib/MIME/Viewer/deb.php
+%%HORDEDIR%%/lib/MIME/Viewer/default.php
+%%HORDEDIR%%/lib/MIME/Viewer/enscript.php
+%%HORDEDIR%%/lib/MIME/Viewer/msexcel.php
+%%HORDEDIR%%/lib/MIME/Viewer/mspowerpoint.php
+%%HORDEDIR%%/lib/MIME/Viewer/msword.php
+%%HORDEDIR%%/lib/MIME/Viewer/php.php
+%%HORDEDIR%%/lib/MIME/Viewer/rar.php
+%%HORDEDIR%%/lib/MIME/Viewer/rpm.php
+%%HORDEDIR%%/lib/MIME/Viewer/tgz.php
+%%HORDEDIR%%/lib/MIME/Viewer/vcard.php
+%%HORDEDIR%%/lib/MIME/Viewer/zip.php
+%%HORDEDIR%%/lib/Maintenance.php
 %%HORDEDIR%%/lib/Menu.php
 %%HORDEDIR%%/lib/Perms.php
+%%HORDEDIR%%/lib/Perms/sql.php
 %%HORDEDIR%%/lib/Prefs.php
+%%HORDEDIR%%/lib/Prefs/ldap.php
+%%HORDEDIR%%/lib/Prefs/session.php
+%%HORDEDIR%%/lib/Prefs/sql.php
 %%HORDEDIR%%/lib/Registry.php
 %%HORDEDIR%%/lib/Secret.php
 %%HORDEDIR%%/lib/Serialize.php
 %%HORDEDIR%%/lib/SessionCache.php
 %%HORDEDIR%%/lib/Text.php
 %%HORDEDIR%%/lib/Token.php
+%%HORDEDIR%%/lib/Token/file.php
+%%HORDEDIR%%/lib/Token/sql.php
 %%HORDEDIR%%/lib/base.php
 %%HORDEDIR%%/lib/version.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/hordebadge.gif
-%%HORDEDIR%%/graphics/keyboard.gif
-%%HORDEDIR%%/graphics/login.gif
-%%HORDEDIR%%/graphics/logout.gif
-%%HORDEDIR%%/graphics/mime/audio.gif
-%%HORDEDIR%%/graphics/mime/binary.gif
-%%HORDEDIR%%/graphics/mime/compressed.gif
-%%HORDEDIR%%/graphics/mime/csv.gif
-%%HORDEDIR%%/graphics/mime/deb.gif
-%%HORDEDIR%%/graphics/mime/encryption.gif
-%%HORDEDIR%%/graphics/mime/excel.gif
-%%HORDEDIR%%/graphics/mime/html.gif
-%%HORDEDIR%%/graphics/mime/image.gif
-%%HORDEDIR%%/graphics/mime/mail.gif
-%%HORDEDIR%%/graphics/mime/msword.gif
-%%HORDEDIR%%/graphics/mime/pdf.gif
-%%HORDEDIR%%/graphics/mime/php.gif
-%%HORDEDIR%%/graphics/mime/powerpoint.gif
-%%HORDEDIR%%/graphics/mime/signed.gif
-%%HORDEDIR%%/graphics/mime/text.gif
-%%HORDEDIR%%/graphics/prefs.gif
-%%HORDEDIR%%/graphics/problem.gif
-%%HORDEDIR%%/graphics/help.gif
-%%HORDEDIR%%/config/html.php.dist
-%%HORDEDIR%%/config/lang.php
-%%HORDEDIR%%/config/lang.php.dist
-%%HORDEDIR%%/config/mime_drivers.php.dist
-%%HORDEDIR%%/config/mime_mapping.php.dist
-%%HORDEDIR%%/config/motd.php.dist
-%%HORDEDIR%%/config/horde.php
-%%HORDEDIR%%/config/horde.php.dist
-%%HORDEDIR%%/config/horde.php.dist.orig
-%%HORDEDIR%%/config/html.php
-%%HORDEDIR%%/config/mime_drivers.php
-%%HORDEDIR%%/config/mime_mapping.php
-%%HORDEDIR%%/config/motd.php
-%%HORDEDIR%%/config/registry.php
-%%HORDEDIR%%/config/registry.php.dist
-%%HORDEDIR%%/config/registry.php.dist.orig
-%%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/data/csvmap.inc
-%%HORDEDIR%%/templates/data/datemap.inc
-%%HORDEDIR%%/templates/horde/modules.inc
-%%HORDEDIR%%/templates/problem/javascript.inc
-%%HORDEDIR%%/templates/problem/problem.inc
-%%HORDEDIR%%/templates/help/footer.inc
-%%HORDEDIR%%/templates/help/header.inc
-%%HORDEDIR%%/templates/help/index.inc
-%%HORDEDIR%%/templates/help/menu.inc
-%%HORDEDIR%%/templates/maintenance/confirm_bottom.inc
-%%HORDEDIR%%/templates/maintenance/confirm_middle.inc
-%%HORDEDIR%%/templates/maintenance/confirm_top.inc
-%%HORDEDIR%%/templates/maintenance/javascript.inc
-%%HORDEDIR%%/templates/prefs/textarea.inc
-%%HORDEDIR%%/templates/prefs/checkbox.inc
-%%HORDEDIR%%/templates/prefs/end.inc
-%%HORDEDIR%%/templates/prefs/enum.inc
-%%HORDEDIR%%/templates/prefs/link.inc
-%%HORDEDIR%%/templates/prefs/number.inc
-%%HORDEDIR%%/templates/prefs/overview.inc
-%%HORDEDIR%%/templates/prefs/select.inc
-%%HORDEDIR%%/templates/prefs/text.inc
-%%HORDEDIR%%/templates/prefs/begin.inc
-%%HORDEDIR%%/templates/index/css.inc
-%%HORDEDIR%%/templates/index/floating_index.inc
-%%HORDEDIR%%/templates/index/frames_index.inc
-%%HORDEDIR%%/templates/index/notconfigured.inc
-%%HORDEDIR%%/templates/index/wap.inc
-%%HORDEDIR%%/templates/javascript/open_help_win.js
-%%HORDEDIR%%/templates/login/login.inc
-%%HORDEDIR%%/templates/login/user.inc
-%%HORDEDIR%%/templates/wml/login/login.inc
-%%HORDEDIR%%/templates/wml/login/user.inc
-%%HORDEDIR%%/templates/wml/common-footer.inc
-%%HORDEDIR%%/templates/wml/common-header.inc
-%%HORDEDIR%%/templates/wml/doctype.inc
-%%HORDEDIR%%/templates/common-header.inc
-%%HORDEDIR%%/templates/common-footer.inc
-%%HORDEDIR%%/scripts/db/mysql_drop.sql
-%%HORDEDIR%%/scripts/db/README
-%%HORDEDIR%%/scripts/db/category.sql
-%%HORDEDIR%%/scripts/db/mysql_create.sql
-%%HORDEDIR%%/scripts/db/auth.sql
-%%HORDEDIR%%/scripts/db/pgsql_create.sql
-%%HORDEDIR%%/scripts/db/prefs.sql
-%%HORDEDIR%%/scripts/horde-rsync.sh
-%%HORDEDIR%%/scripts/mime_mapping/Makefile
-%%HORDEDIR%%/scripts/mime_mapping/convert.pl
-%%HORDEDIR%%/scripts/mime_mapping/mime.types
-%%HORDEDIR%%/scripts/set_perms.sh
-%%HORDEDIR%%/scripts/set_perms.sh.orig
-%%HORDEDIR%%/scripts/SCRIPTS
+%%HORDEDIR%%/locale/.htaccess
 %%HORDEDIR%%/locale/cs_CZ/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/en_EN/help.xml
+%%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/ko_KR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/no_BOK/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
@@ -173,53 +170,25 @@
 %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/zh_CN/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/util/special_characters.php
-%%HORDEDIR%%/admin/user.php
-%%HORDEDIR%%/admin/css/graphics/color_picker.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbT.gif
-%%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/behavior.js
-%%HORDEDIR%%/admin/css/find.php
-%%HORDEDIR%%/admin/css/index.php
+%%HORDEDIR%%/login.php
+%%HORDEDIR%%/maintenance.php
+%%HORDEDIR%%/menu.php
+%%HORDEDIR%%/po/.htaccess
 %%HORDEDIR%%/po/Makefile
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/README.WinToKoi
 %%HORDEDIR%%/po/WinToKoi.pl
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/de_DE.po
+%%HORDEDIR%%/po/el_GR.po
 %%HORDEDIR%%/po/es_ES.po
 %%HORDEDIR%%/po/extract.pl
+%%HORDEDIR%%/po/fi_FI.po
 %%HORDEDIR%%/po/fr_FR.po
-%%HORDEDIR%%/po/el_GR.po
 %%HORDEDIR%%/po/it_IT.po
 %%HORDEDIR%%/po/ko_KR.po
 %%HORDEDIR%%/po/nl_NL.po
+%%HORDEDIR%%/po/no_BOK.po
 %%HORDEDIR%%/po/pl_PL.po
 %%HORDEDIR%%/po/pt_BR.po
 %%HORDEDIR%%/po/ru_koi.po
@@ -229,57 +198,109 @@
 %%HORDEDIR%%/po/xgettext.sh
 %%HORDEDIR%%/po/zh_CN.po
 %%HORDEDIR%%/po/zh_TW.po
+%%HORDEDIR%%/problem.php
+%%HORDEDIR%%/scripts/.htaccess
+%%HORDEDIR%%/scripts/SCRIPTS
+%%HORDEDIR%%/scripts/db/README
+%%HORDEDIR%%/scripts/db/auth.sql
+%%HORDEDIR%%/scripts/db/category.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/mime_mapping/Makefile
+%%HORDEDIR%%/scripts/mime_mapping/convert.pl
+%%HORDEDIR%%/scripts/mime_mapping/mime.types
+%%HORDEDIR%%/scripts/set_perms.sh
+%%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/common-footer.inc
+%%HORDEDIR%%/templates/common-header.inc
+%%HORDEDIR%%/templates/data/csvmap.inc
+%%HORDEDIR%%/templates/data/datemap.inc
+%%HORDEDIR%%/templates/help/footer.inc
+%%HORDEDIR%%/templates/help/header.inc
+%%HORDEDIR%%/templates/help/index.inc
+%%HORDEDIR%%/templates/help/menu.inc
+%%HORDEDIR%%/templates/horde/modules.inc
+%%HORDEDIR%%/templates/index/css.inc
+%%HORDEDIR%%/templates/index/floating_index.inc
+%%HORDEDIR%%/templates/index/frames_index.inc
+%%HORDEDIR%%/templates/index/notconfigured.inc
+%%HORDEDIR%%/templates/index/wap.inc
+%%HORDEDIR%%/templates/javascript/open_help_win.js
+%%HORDEDIR%%/templates/login/login.inc
+%%HORDEDIR%%/templates/login/user.inc
+%%HORDEDIR%%/templates/maintenance/confirm_bottom.inc
+%%HORDEDIR%%/templates/maintenance/confirm_middle.inc
+%%HORDEDIR%%/templates/maintenance/confirm_top.inc
+%%HORDEDIR%%/templates/maintenance/javascript.inc
+%%HORDEDIR%%/templates/prefs/begin.inc
+%%HORDEDIR%%/templates/prefs/checkbox.inc
+%%HORDEDIR%%/templates/prefs/end.inc
+%%HORDEDIR%%/templates/prefs/enum.inc
+%%HORDEDIR%%/templates/prefs/link.inc
+%%HORDEDIR%%/templates/prefs/number.inc
+%%HORDEDIR%%/templates/prefs/overview.inc
+%%HORDEDIR%%/templates/prefs/select.inc
+%%HORDEDIR%%/templates/prefs/text.inc
+%%HORDEDIR%%/templates/prefs/textarea.inc
+%%HORDEDIR%%/templates/problem/javascript.inc
+%%HORDEDIR%%/templates/problem/problem.inc
+%%HORDEDIR%%/templates/wml/common-footer.inc
+%%HORDEDIR%%/templates/wml/common-header.inc
+%%HORDEDIR%%/templates/wml/doctype.inc
+%%HORDEDIR%%/templates/wml/login/login.inc
+%%HORDEDIR%%/templates/wml/login/user.inc
+%%HORDEDIR%%/test.php
+%%HORDEDIR%%/util/special_characters.php
 %%HORDESBIN%%/horde_set_perms.sh
 etc/horde/httpd.conf.horde
 %%PORTDOCS%%share/doc/horde/CHANGES
 %%PORTDOCS%%share/doc/horde/CODING_STANDARDS
+%%PORTDOCS%%share/doc/horde/CONTRIBUTING
 %%PORTDOCS%%share/doc/horde/COPYING
 %%PORTDOCS%%share/doc/horde/CREDITS
-%%PORTDOCS%%share/doc/horde/HELP
+%%PORTDOCS%%share/doc/horde/HACKING
 %%PORTDOCS%%share/doc/horde/INSTALL
-%%PORTDOCS%%share/doc/horde/LISTS
 %%PORTDOCS%%share/doc/horde/README
-%%PORTDOCS%%share/doc/horde/SOURCE
 %%PORTDOCS%%@dirrm share/doc/horde
-@dirrm %%HORDEDIR%%/lib/MIME/Viewer
-@dirrm %%HORDEDIR%%/lib/MIME
+@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
 @dirrm %%HORDEDIR%%/lib/Auth
 @dirrm %%HORDEDIR%%/lib/Cache
 @dirrm %%HORDEDIR%%/lib/Category
+@dirrm %%HORDEDIR%%/lib/MIME/Viewer
+@dirrm %%HORDEDIR%%/lib/MIME
 @dirrm %%HORDEDIR%%/lib/Prefs
 @dirrm %%HORDEDIR%%/lib/Perms
 @dirrm %%HORDEDIR%%/lib/Token
 @dirrm %%HORDEDIR%%/lib
-@dirrm %%HORDEDIR%%/graphics/alerts
-@dirrm %%HORDEDIR%%/graphics/mime
-@dirrm %%HORDEDIR%%/graphics
-@dirrm %%HORDEDIR%%/config
-@dirrm %%HORDEDIR%%/templates/admin/user
-@dirrm %%HORDEDIR%%/templates/admin
-@dirrm %%HORDEDIR%%/templates/data
-@dirrm %%HORDEDIR%%/templates/horde
-@dirrm %%HORDEDIR%%/templates/problem
-@dirrm %%HORDEDIR%%/templates/help
-@dirrm %%HORDEDIR%%/templates/prefs
-@dirrm %%HORDEDIR%%/templates/index
-@dirrm %%HORDEDIR%%/templates/javascript
-@dirrm %%HORDEDIR%%/templates/login
-@dirrm %%HORDEDIR%%/templates/maintenance/
-@dirrm %%HORDEDIR%%/templates/wml/login
-@dirrm %%HORDEDIR%%/templates/wml
-@dirrm %%HORDEDIR%%/templates
-@dirrm %%HORDEDIR%%/scripts/mime_mapping
-@dirrm %%HORDEDIR%%/scripts/db
-@dirrm %%HORDEDIR%%/scripts
 @dirrm %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @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/en_EN
+@dirrm %%HORDEDIR%%/locale/en_US
 @dirrm %%HORDEDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/es_ES
+@dirrm %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/fi_FI
 @dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/fr_FR
 @dirrm %%HORDEDIR%%/locale/it_IT/LC_MESSAGES
@@ -288,6 +309,8 @@ etc/horde/httpd.conf.horde
 @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/pl_PL/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/pl_PL
 @dirrm %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES
@@ -303,12 +326,24 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/zh_TW
 @dirrm %%HORDEDIR%%/locale
+@dirrm %%HORDEDIR%%/scripts/db
+@dirrm %%HORDEDIR%%/scripts/mime_mapping
+@dirrm %%HORDEDIR%%/scripts
+@dirrm %%HORDEDIR%%/templates/admin/user
+@dirrm %%HORDEDIR%%/templates/admin
+@dirrm %%HORDEDIR%%/templates/data
+@dirrm %%HORDEDIR%%/templates/help
+@dirrm %%HORDEDIR%%/templates/horde
+@dirrm %%HORDEDIR%%/templates/index
+@dirrm %%HORDEDIR%%/templates/javascript
+@dirrm %%HORDEDIR%%/templates/login
+@dirrm %%HORDEDIR%%/templates/maintenance/
+@dirrm %%HORDEDIR%%/templates/prefs
+@dirrm %%HORDEDIR%%/templates/problem
+@dirrm %%HORDEDIR%%/templates/wml/login
+@dirrm %%HORDEDIR%%/templates/wml
+@dirrm %%HORDEDIR%%/templates
 @dirrm %%HORDEDIR%%/util
-@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%%/po
 @dirrm %%HORDEDIR%%
 @dirrm etc/horde
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index b476c1d6abe2..cc1b51a61484 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	horde
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
 
 MAINTAINER=	thierry@thomas.as
 
@@ -34,8 +34,8 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libssl.so:${PORTSDIR}/www/apache13-mod
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
 NO_BUILD=	yes
-DOCS=		COPYING README docs/CHANGES docs/CODING_STANDARDS docs/CREDITS \
-		docs/HELP docs/INSTALL docs/LISTS docs/SOURCE
+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
 
@@ -94,13 +94,17 @@ do-install:
 			${CONFDIR}/horde.php ; \
 		${PERL} -pi -e "s:/tmp/horde.log:${LOG_FILE}:g" ${CONFDIR}/horde.php ; \
 	fi
+	@${PERL} -pi -e "s:/etc/mpasswd:${LOCALBASE}/etc/mpasswd:g" \
+		${HORDEDIR}/lib/Auth/mcal.php
 .for FILE in ${CONFFILE}
 	@if [ ! -f ${CONFDIR}/${FILE} ]; then \
 	  ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
 	fi
 .endfor
 	@${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh
-	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" ${HORDESBIN}/horde_set_perms.sh
+	@${PERL} -pi -e "s:UPDATED_BY_THE_PORT:${HORDEDIR}/:g" \
+		${HORDESBIN}/horde_set_perms.sh
+	@${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh
 	@(if [ -f ${APACHE_CONF} ] ; then \
 	    ${MKDIR} ${HORDE_INC} ; \
 	    ${CP} -p ${FILESDIR}/httpd.conf.horde ${HORDE_INC} ; \
diff --git a/www/horde2/distinfo b/www/horde2/distinfo
index 42bbf809d2e6..f5f679ed8103 100644
--- a/www/horde2/distinfo
+++ b/www/horde2/distinfo
@@ -1 +1 @@
-MD5 (horde-2.0-RC3.tar.gz) = 3e19caa323b075520b9dc5fc90a94475
+MD5 (horde-2.0.tar.gz) = 039d760ebf282dca33ab6081179c2be0
diff --git a/www/horde2/files/patch-ab b/www/horde2/files/patch-ab
index 387a52ef0ebf..1b2f203e7ee3 100644
--- a/www/horde2/files/patch-ab
+++ b/www/horde2/files/patch-ab
@@ -1,47 +1,48 @@
---- config/horde.php.dist.orig	Tue Nov 27 13:36:00 2001
-+++ config/horde.php.dist	Tue Dec  4 21:37:30 2001
-@@ -78,7 +78,7 @@
+--- 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');
  
  // 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,
-@@ -99,6 +99,10 @@
- 
- // What log driver should we use? Valid values are 'file', 'mcal',
- // 'sql', and 'syslog'.
-+// 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
- $conf['log']['type'] = 'file';
- 
- // What is the name of the log? For the 'file' driver, this is the
-@@ -106,7 +110,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;
+ /* 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
+  */
 -$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,
-@@ -131,7 +135,7 @@
- // (meaning use system defaults and don't save any user preferences),
- // '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,
+@@ -148,7 +153,7 @@
+  * '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.
-@@ -140,12 +144,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.
+ /* 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. 
+  */
 -// $conf['prefs']['params']['phptype'] = 'mysql';
 -// $conf['prefs']['params']['hostspec'] = 'localhost';
 -// $conf['prefs']['params']['username'] = 'horde';
@@ -57,3 +58,12 @@
  
  
  /**
+@@ -216,7 +221,7 @@
+  * 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');
+ 
+ /**
diff --git a/www/horde2/files/patch-ac b/www/horde2/files/patch-ac
index 3c6711021697..29f56e72a9eb 100644
--- a/www/horde2/files/patch-ac
+++ b/www/horde2/files/patch-ac
@@ -1,13 +1,193 @@
---- config/registry.php.dist.orig	Mon Oct 29 02:35:33 2001
-+++ config/registry.php.dist	Fri Nov 16 23:16:28 2001
-@@ -1,8 +1,8 @@
- <?php
- // $Horde: horde/config/registry.php.dist,v 1.52 2001/10/29 01:35:33 chuck Exp $
- 
+--- config/registry.php.dist.orig	Sun Dec 23 03:22:14 2001
++++ config/registry.php.dist	Tue Dec 25 13:11:34 2001
+@@ -20,8 +20,8 @@
+  *   IMP or Gollem handle the authentication for Horde. This avoids the
+  *   "double login" while accessing IMP.
+  */
 -// $this->registry['auth']['login'] = 'imp';
 -// $this->registry['auth']['logout'] = 'imp';
 +//UNCOMMENTWHENINSTIMP$this->registry['auth']['login'] = 'imp';
 +//UNCOMMENTWHENINSTIMP$this->registry['auth']['logout'] = 'imp';
- // $this->registry['auth']['login'] = 'gollem';
- // $this->registry['auth']['logout'] = 'gollem';
+ 
+ /* mail: Handler for sending mail. */
  $this->registry['mail']['compose'] = 'imp';
+@@ -62,32 +62,103 @@
+     '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',
+-//     'name' => _("Mail"),
+-//     'allow_guests' => true,
+-//     'show' => true
+-// );
+-
+-// $this->applications['turba'] = array(
+-//     'fileroot' => dirname(__FILE__) . '/../turba',
+-//     'webroot' => $this->applications['horde']['webroot'] . '/turba',
+-//     'icon' => '/horde/turba/graphics/turba.gif',
+-//     'name' => _("Addressbook"),
+-//     'allow_guests' => false,
+-//     'show' => true
+-// );
+-
+-// $this->applications['chora'] = array(
+-//     'fileroot' => dirname(__FILE__) . '/../chora',
+-//     'webroot' => $this->applications['horde']['webroot'] . '/chora',
+-//     'icon' => '/horde/chora/graphics/chora.gif',
+-//     'name' => _("CVS"),
+-//     'allow_guests' => true,
+-//     '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    'name' => _("Mail"),
++//UNCOMMENTWHENINSTIMP    'allow_guests' => false,
++//UNCOMMENTWHENINSTIMP    'show' => true
++//UNCOMMENTWHENINSTIMP);
++
++//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    '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 );
++ 
++//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    'show' => true
++//UNCOMMENTWHENINSTGOLLEM);
++
++//UNCOMMENTWHENINSTNIC$this->applications['nic'] = array(
++//UNCOMMENTWHENINSTNIC    'fileroot' => dirname(__FILE__) . '/../nic',
++//UNCOMMENTWHENINSTNIC    'webroot' => '/horde/nic',
++//UNCOMMENTWHENINSTNIC    'icon' => '/horde/nic/graphics/nic.gif',
++//UNCOMMENTWHENINSTNIC    'name' => _("Network"),
++//UNCOMMENTWHENINSTNIC    'allow_guests' => true,
++//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    'name' => _("Calendar"),
++//UNCOMMENTWHENINSTKRONOLITH    'allow_guests' => false,
++//UNCOMMENTWHENINSTKRONOLITH    'show' => true
++//UNCOMMENTWHENINSTKRONOLITH);
++
++//UNCOMMENTWHENINSTJONAH$this->applications['jonah'] = array(
++//UNCOMMENTWHENINSTJONAH    'fileroot' => dirname(__FILE__) . '/../jonah',
++//UNCOMMENTWHENINSTJONAH    'webroot' => '/horde/jonah',
++//UNCOMMENTWHENINSTJONAH    'icon' => '/horde/jonah/graphics/jonah.gif',
++//UNCOMMENTWHENINSTJONAH    'name' => _("Headlines"),
++//UNCOMMENTWHENINSTJONAH    'allow_guests' => true,
++//UNCOMMENTWHENINSTJONAH    'show' => true
++//UNCOMMENTWHENINSTJONAH);
++
++//UNCOMMENTWHENINSTTROLL$this->applications['troll'] = array(
++//UNCOMMENTWHENINSTTROLL    'fileroot' => dirname(__FILE__) . '/../troll',
++//UNCOMMENTWHENINSTTROLL    'webroot' => '/horde/troll',
++//UNCOMMENTWHENINSTTROLL    'icon' => '/horde/troll/graphics/troll.gif',
++//UNCOMMENTWHENINSTTROLL    'name' => _("News"),
++//UNCOMMENTWHENINSTTROLL    'allow_guests' => true,
++//UNCOMMENTWHENINSTTROLL    'show' => true
++//UNCOMMENTWHENINSTTROLL);
++
++//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    '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    'name' => _("Tasks"),
++//UNCOMMENTWHENINSTNAG    'allow_guests' => true,
++//UNCOMMENTWHENINSTNAG    'show' => true
++//UNCOMMENTWHENINSTNAG);
++
++//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);
+ 
+ 
+ /** 
+@@ -144,6 +215,49 @@
+     'function' => 'turbaGetFields',
+     'args' => array('addressbook'),
+     'type' => 'array'
++);
++
++$this->services['kronolith']['horde']['summary'] = array( 
++    'file' => '%application%/lib/api.php',
++    'function' => 'kronolithSummary',
++    'args' => array(),
++    'type' => 'string'
++);
++
++$this->services['nag']['tasks']['list'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'nagListTasks',
++    'args' => array('sortby', 'sortdir'),
++    'type' => 'array'
++);
++$this->services['nag']['tasks']['search'] = array(
++    'link' => "%application%/search.php"
++);
++$this->services['nag']['tasks']['show'] = array(
++    'link' => "%application%/view.php?task=|task|"
++);
++$this->services['nag']['tasks']['add'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'nagAddTask',
++    'args' => array('name', 'description', 'due'),
++    'type' => 'integer'
++);
++$this->services['nag']['horde']['summary'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'nagSummary',
++    'args' => array(),
++    'type' => 'string'
++);
++$this->services['nic']['net']['finger'] = array(
++    'link' => "%application%/finger.php?address=|address|"
++);
++
++
++$this->services['whups']['horde']['summary'] = array(
++    'file' => '%application%/lib/api.php',
++    'function' => 'whupsSummary',
++    'args' => array(),
++    'type' => 'string'
+ );
+ 
+ $this->services['default']['mail']['compose'] = array(
diff --git a/www/horde2/pkg-descr b/www/horde2/pkg-descr
index 1bbede97877c..296d9852610c 100644
--- a/www/horde2/pkg-descr
+++ b/www/horde2/pkg-descr
@@ -1,10 +1,11 @@
-Horde-devel is a massive upgrade of the Horde Application Framework.
+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 used by these ports: mail/imp, mail/turba and devel/chora.
+Horde is used by these ports: mail/imp, mail/turba, devel/chora,
+deskutils/kronolith, deskutils/nag, www/jonah and net/nic.
 
 WWW: http://www.horde.org/
diff --git a/www/horde2/pkg-plist b/www/horde2/pkg-plist
index ea42f9c31784..549cb374773b 100644
--- a/www/horde2/pkg-plist
+++ b/www/horde2/pkg-plist
@@ -1,43 +1,114 @@
+%%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
+%%HORDEDIR%%/config/horde.php.dist.orig
+%%HORDEDIR%%/config/html.php
+%%HORDEDIR%%/config/html.php.dist
+%%HORDEDIR%%/config/lang.php
+%%HORDEDIR%%/config/lang.php.dist
+%%HORDEDIR%%/config/mime_drivers.php
+%%HORDEDIR%%/config/mime_drivers.php.dist
+%%HORDEDIR%%/config/mime_mapping.php
+%%HORDEDIR%%/config/mime_mapping.php.dist
+%%HORDEDIR%%/config/motd.php
+%%HORDEDIR%%/config/motd.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/help.gif
+%%HORDEDIR%%/graphics/home.gif
+%%HORDEDIR%%/graphics/keyboard.gif
+%%HORDEDIR%%/graphics/login.gif
+%%HORDEDIR%%/graphics/logout.gif
+%%HORDEDIR%%/graphics/mime/audio.gif
+%%HORDEDIR%%/graphics/mime/binary.gif
+%%HORDEDIR%%/graphics/mime/compressed.gif
+%%HORDEDIR%%/graphics/mime/csv.gif
+%%HORDEDIR%%/graphics/mime/deb.gif
+%%HORDEDIR%%/graphics/mime/encryption.gif
+%%HORDEDIR%%/graphics/mime/executable.gif
+%%HORDEDIR%%/graphics/mime/html.gif
+%%HORDEDIR%%/graphics/mime/image.gif
+%%HORDEDIR%%/graphics/mime/inf.gif
+%%HORDEDIR%%/graphics/mime/mail.gif
+%%HORDEDIR%%/graphics/mime/makefile.gif
+%%HORDEDIR%%/graphics/mime/msexcel.gif
+%%HORDEDIR%%/graphics/mime/msi.gif
+%%HORDEDIR%%/graphics/mime/msp.gif
+%%HORDEDIR%%/graphics/mime/mspowerpoint.gif
+%%HORDEDIR%%/graphics/mime/msword.gif
+%%HORDEDIR%%/graphics/mime/pdf.gif
+%%HORDEDIR%%/graphics/mime/php.gif
+%%HORDEDIR%%/graphics/mime/readme.gif
+%%HORDEDIR%%/graphics/mime/rpm.gif
+%%HORDEDIR%%/graphics/mime/script-asa.gif
+%%HORDEDIR%%/graphics/mime/script-asp.gif
+%%HORDEDIR%%/graphics/mime/setup.gif
+%%HORDEDIR%%/graphics/mime/signed.gif
+%%HORDEDIR%%/graphics/mime/source-c.gif
+%%HORDEDIR%%/graphics/mime/source-h.gif
+%%HORDEDIR%%/graphics/mime/source-java.gif
+%%HORDEDIR%%/graphics/mime/text.gif
+%%HORDEDIR%%/graphics/mime/unknown.gif
+%%HORDEDIR%%/graphics/mime/vcard.gif
+%%HORDEDIR%%/graphics/mime/xml.gif
+%%HORDEDIR%%/graphics/prefs.gif
+%%HORDEDIR%%/graphics/problem.gif
 %%HORDEDIR%%/help.php
 %%HORDEDIR%%/index.php
-%%HORDEDIR%%/login.php
-%%HORDEDIR%%/maintenance.php
-%%HORDEDIR%%/menu.php
-%%HORDEDIR%%/problem.php
-%%HORDEDIR%%/status.php
-%%HORDEDIR%%/test.php
-%%HORDEDIR%%/lib/Auth/imap.php
+%%HORDEDIR%%/javascript.php
+%%HORDEDIR%%/lib/.htaccess
+%%HORDEDIR%%/lib/Auth.php
 %%HORDEDIR%%/lib/Auth/ftp.php
+%%HORDEDIR%%/lib/Auth/imap.php
 %%HORDEDIR%%/lib/Auth/ldap.php
 %%HORDEDIR%%/lib/Auth/mcal.php
 %%HORDEDIR%%/lib/Auth/sql.php
-%%HORDEDIR%%/lib/Cache/file.php
-%%HORDEDIR%%/lib/Category/sql.php
-%%HORDEDIR%%/lib/Maintenance.php
-%%HORDEDIR%%/lib/MIME/Viewer/default.php
-%%HORDEDIR%%/lib/MIME/Viewer/enscript.php
-%%HORDEDIR%%/lib/MIME/Viewer/excel.php
-%%HORDEDIR%%/lib/MIME/Viewer/msword.php
-%%HORDEDIR%%/lib/MIME/Viewer/php.php
-%%HORDEDIR%%/lib/MIME/Viewer/rar.php
-%%HORDEDIR%%/lib/MIME/Viewer/tgz.php
-%%HORDEDIR%%/lib/MIME/Viewer/vcard.php
-%%HORDEDIR%%/lib/MIME/Magic.php
-%%HORDEDIR%%/lib/MIME/Message.php
-%%HORDEDIR%%/lib/MIME/Part.php
-%%HORDEDIR%%/lib/MIME/Structure.php
-%%HORDEDIR%%/lib/MIME/Viewer.php
-%%HORDEDIR%%/lib/Prefs/ldap.php
-%%HORDEDIR%%/lib/Prefs/session.php
-%%HORDEDIR%%/lib/Prefs/sql.php
-%%HORDEDIR%%/lib/Perms/sql.php
-%%HORDEDIR%%/lib/Token/file.php
-%%HORDEDIR%%/lib/Token/sql.php
-%%HORDEDIR%%/lib/Auth.php
 %%HORDEDIR%%/lib/Browser.php
 %%HORDEDIR%%/lib/Cache.php
+%%HORDEDIR%%/lib/Cache/file.php
 %%HORDEDIR%%/lib/Category.php
+%%HORDEDIR%%/lib/Category/sql.php
 %%HORDEDIR%%/lib/Data.php
 %%HORDEDIR%%/lib/Group.php
 %%HORDEDIR%%/lib/Help.php
@@ -45,127 +116,53 @@
 %%HORDEDIR%%/lib/Identity.php
 %%HORDEDIR%%/lib/Lang.php
 %%HORDEDIR%%/lib/MIME.php
+%%HORDEDIR%%/lib/MIME/Magic.php
+%%HORDEDIR%%/lib/MIME/Message.php
+%%HORDEDIR%%/lib/MIME/Part.php
+%%HORDEDIR%%/lib/MIME/Structure.php
+%%HORDEDIR%%/lib/MIME/Viewer.php
+%%HORDEDIR%%/lib/MIME/Viewer/deb.php
+%%HORDEDIR%%/lib/MIME/Viewer/default.php
+%%HORDEDIR%%/lib/MIME/Viewer/enscript.php
+%%HORDEDIR%%/lib/MIME/Viewer/msexcel.php
+%%HORDEDIR%%/lib/MIME/Viewer/mspowerpoint.php
+%%HORDEDIR%%/lib/MIME/Viewer/msword.php
+%%HORDEDIR%%/lib/MIME/Viewer/php.php
+%%HORDEDIR%%/lib/MIME/Viewer/rar.php
+%%HORDEDIR%%/lib/MIME/Viewer/rpm.php
+%%HORDEDIR%%/lib/MIME/Viewer/tgz.php
+%%HORDEDIR%%/lib/MIME/Viewer/vcard.php
+%%HORDEDIR%%/lib/MIME/Viewer/zip.php
+%%HORDEDIR%%/lib/Maintenance.php
 %%HORDEDIR%%/lib/Menu.php
 %%HORDEDIR%%/lib/Perms.php
+%%HORDEDIR%%/lib/Perms/sql.php
 %%HORDEDIR%%/lib/Prefs.php
+%%HORDEDIR%%/lib/Prefs/ldap.php
+%%HORDEDIR%%/lib/Prefs/session.php
+%%HORDEDIR%%/lib/Prefs/sql.php
 %%HORDEDIR%%/lib/Registry.php
 %%HORDEDIR%%/lib/Secret.php
 %%HORDEDIR%%/lib/Serialize.php
 %%HORDEDIR%%/lib/SessionCache.php
 %%HORDEDIR%%/lib/Text.php
 %%HORDEDIR%%/lib/Token.php
+%%HORDEDIR%%/lib/Token/file.php
+%%HORDEDIR%%/lib/Token/sql.php
 %%HORDEDIR%%/lib/base.php
 %%HORDEDIR%%/lib/version.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/hordebadge.gif
-%%HORDEDIR%%/graphics/keyboard.gif
-%%HORDEDIR%%/graphics/login.gif
-%%HORDEDIR%%/graphics/logout.gif
-%%HORDEDIR%%/graphics/mime/audio.gif
-%%HORDEDIR%%/graphics/mime/binary.gif
-%%HORDEDIR%%/graphics/mime/compressed.gif
-%%HORDEDIR%%/graphics/mime/csv.gif
-%%HORDEDIR%%/graphics/mime/deb.gif
-%%HORDEDIR%%/graphics/mime/encryption.gif
-%%HORDEDIR%%/graphics/mime/excel.gif
-%%HORDEDIR%%/graphics/mime/html.gif
-%%HORDEDIR%%/graphics/mime/image.gif
-%%HORDEDIR%%/graphics/mime/mail.gif
-%%HORDEDIR%%/graphics/mime/msword.gif
-%%HORDEDIR%%/graphics/mime/pdf.gif
-%%HORDEDIR%%/graphics/mime/php.gif
-%%HORDEDIR%%/graphics/mime/powerpoint.gif
-%%HORDEDIR%%/graphics/mime/signed.gif
-%%HORDEDIR%%/graphics/mime/text.gif
-%%HORDEDIR%%/graphics/prefs.gif
-%%HORDEDIR%%/graphics/problem.gif
-%%HORDEDIR%%/graphics/help.gif
-%%HORDEDIR%%/config/html.php.dist
-%%HORDEDIR%%/config/lang.php
-%%HORDEDIR%%/config/lang.php.dist
-%%HORDEDIR%%/config/mime_drivers.php.dist
-%%HORDEDIR%%/config/mime_mapping.php.dist
-%%HORDEDIR%%/config/motd.php.dist
-%%HORDEDIR%%/config/horde.php
-%%HORDEDIR%%/config/horde.php.dist
-%%HORDEDIR%%/config/horde.php.dist.orig
-%%HORDEDIR%%/config/html.php
-%%HORDEDIR%%/config/mime_drivers.php
-%%HORDEDIR%%/config/mime_mapping.php
-%%HORDEDIR%%/config/motd.php
-%%HORDEDIR%%/config/registry.php
-%%HORDEDIR%%/config/registry.php.dist
-%%HORDEDIR%%/config/registry.php.dist.orig
-%%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/data/csvmap.inc
-%%HORDEDIR%%/templates/data/datemap.inc
-%%HORDEDIR%%/templates/horde/modules.inc
-%%HORDEDIR%%/templates/problem/javascript.inc
-%%HORDEDIR%%/templates/problem/problem.inc
-%%HORDEDIR%%/templates/help/footer.inc
-%%HORDEDIR%%/templates/help/header.inc
-%%HORDEDIR%%/templates/help/index.inc
-%%HORDEDIR%%/templates/help/menu.inc
-%%HORDEDIR%%/templates/maintenance/confirm_bottom.inc
-%%HORDEDIR%%/templates/maintenance/confirm_middle.inc
-%%HORDEDIR%%/templates/maintenance/confirm_top.inc
-%%HORDEDIR%%/templates/maintenance/javascript.inc
-%%HORDEDIR%%/templates/prefs/textarea.inc
-%%HORDEDIR%%/templates/prefs/checkbox.inc
-%%HORDEDIR%%/templates/prefs/end.inc
-%%HORDEDIR%%/templates/prefs/enum.inc
-%%HORDEDIR%%/templates/prefs/link.inc
-%%HORDEDIR%%/templates/prefs/number.inc
-%%HORDEDIR%%/templates/prefs/overview.inc
-%%HORDEDIR%%/templates/prefs/select.inc
-%%HORDEDIR%%/templates/prefs/text.inc
-%%HORDEDIR%%/templates/prefs/begin.inc
-%%HORDEDIR%%/templates/index/css.inc
-%%HORDEDIR%%/templates/index/floating_index.inc
-%%HORDEDIR%%/templates/index/frames_index.inc
-%%HORDEDIR%%/templates/index/notconfigured.inc
-%%HORDEDIR%%/templates/index/wap.inc
-%%HORDEDIR%%/templates/javascript/open_help_win.js
-%%HORDEDIR%%/templates/login/login.inc
-%%HORDEDIR%%/templates/login/user.inc
-%%HORDEDIR%%/templates/wml/login/login.inc
-%%HORDEDIR%%/templates/wml/login/user.inc
-%%HORDEDIR%%/templates/wml/common-footer.inc
-%%HORDEDIR%%/templates/wml/common-header.inc
-%%HORDEDIR%%/templates/wml/doctype.inc
-%%HORDEDIR%%/templates/common-header.inc
-%%HORDEDIR%%/templates/common-footer.inc
-%%HORDEDIR%%/scripts/db/mysql_drop.sql
-%%HORDEDIR%%/scripts/db/README
-%%HORDEDIR%%/scripts/db/category.sql
-%%HORDEDIR%%/scripts/db/mysql_create.sql
-%%HORDEDIR%%/scripts/db/auth.sql
-%%HORDEDIR%%/scripts/db/pgsql_create.sql
-%%HORDEDIR%%/scripts/db/prefs.sql
-%%HORDEDIR%%/scripts/horde-rsync.sh
-%%HORDEDIR%%/scripts/mime_mapping/Makefile
-%%HORDEDIR%%/scripts/mime_mapping/convert.pl
-%%HORDEDIR%%/scripts/mime_mapping/mime.types
-%%HORDEDIR%%/scripts/set_perms.sh
-%%HORDEDIR%%/scripts/set_perms.sh.orig
-%%HORDEDIR%%/scripts/SCRIPTS
+%%HORDEDIR%%/locale/.htaccess
 %%HORDEDIR%%/locale/cs_CZ/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/en_EN/help.xml
+%%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/ko_KR/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/nl_NL/LC_MESSAGES/horde.mo
+%%HORDEDIR%%/locale/no_BOK/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
@@ -173,53 +170,25 @@
 %%HORDEDIR%%/locale/sv_SE/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/zh_CN/LC_MESSAGES/horde.mo
 %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES/horde.mo
-%%HORDEDIR%%/util/special_characters.php
-%%HORDEDIR%%/admin/user.php
-%%HORDEDIR%%/admin/css/graphics/color_picker.gif
-%%HORDEDIR%%/admin/css/templates/colorpicker/thumbT.gif
-%%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/behavior.js
-%%HORDEDIR%%/admin/css/find.php
-%%HORDEDIR%%/admin/css/index.php
+%%HORDEDIR%%/login.php
+%%HORDEDIR%%/maintenance.php
+%%HORDEDIR%%/menu.php
+%%HORDEDIR%%/po/.htaccess
 %%HORDEDIR%%/po/Makefile
 %%HORDEDIR%%/po/README
 %%HORDEDIR%%/po/README.WinToKoi
 %%HORDEDIR%%/po/WinToKoi.pl
 %%HORDEDIR%%/po/cs_CZ.po
 %%HORDEDIR%%/po/de_DE.po
+%%HORDEDIR%%/po/el_GR.po
 %%HORDEDIR%%/po/es_ES.po
 %%HORDEDIR%%/po/extract.pl
+%%HORDEDIR%%/po/fi_FI.po
 %%HORDEDIR%%/po/fr_FR.po
-%%HORDEDIR%%/po/el_GR.po
 %%HORDEDIR%%/po/it_IT.po
 %%HORDEDIR%%/po/ko_KR.po
 %%HORDEDIR%%/po/nl_NL.po
+%%HORDEDIR%%/po/no_BOK.po
 %%HORDEDIR%%/po/pl_PL.po
 %%HORDEDIR%%/po/pt_BR.po
 %%HORDEDIR%%/po/ru_koi.po
@@ -229,57 +198,109 @@
 %%HORDEDIR%%/po/xgettext.sh
 %%HORDEDIR%%/po/zh_CN.po
 %%HORDEDIR%%/po/zh_TW.po
+%%HORDEDIR%%/problem.php
+%%HORDEDIR%%/scripts/.htaccess
+%%HORDEDIR%%/scripts/SCRIPTS
+%%HORDEDIR%%/scripts/db/README
+%%HORDEDIR%%/scripts/db/auth.sql
+%%HORDEDIR%%/scripts/db/category.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/mime_mapping/Makefile
+%%HORDEDIR%%/scripts/mime_mapping/convert.pl
+%%HORDEDIR%%/scripts/mime_mapping/mime.types
+%%HORDEDIR%%/scripts/set_perms.sh
+%%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/common-footer.inc
+%%HORDEDIR%%/templates/common-header.inc
+%%HORDEDIR%%/templates/data/csvmap.inc
+%%HORDEDIR%%/templates/data/datemap.inc
+%%HORDEDIR%%/templates/help/footer.inc
+%%HORDEDIR%%/templates/help/header.inc
+%%HORDEDIR%%/templates/help/index.inc
+%%HORDEDIR%%/templates/help/menu.inc
+%%HORDEDIR%%/templates/horde/modules.inc
+%%HORDEDIR%%/templates/index/css.inc
+%%HORDEDIR%%/templates/index/floating_index.inc
+%%HORDEDIR%%/templates/index/frames_index.inc
+%%HORDEDIR%%/templates/index/notconfigured.inc
+%%HORDEDIR%%/templates/index/wap.inc
+%%HORDEDIR%%/templates/javascript/open_help_win.js
+%%HORDEDIR%%/templates/login/login.inc
+%%HORDEDIR%%/templates/login/user.inc
+%%HORDEDIR%%/templates/maintenance/confirm_bottom.inc
+%%HORDEDIR%%/templates/maintenance/confirm_middle.inc
+%%HORDEDIR%%/templates/maintenance/confirm_top.inc
+%%HORDEDIR%%/templates/maintenance/javascript.inc
+%%HORDEDIR%%/templates/prefs/begin.inc
+%%HORDEDIR%%/templates/prefs/checkbox.inc
+%%HORDEDIR%%/templates/prefs/end.inc
+%%HORDEDIR%%/templates/prefs/enum.inc
+%%HORDEDIR%%/templates/prefs/link.inc
+%%HORDEDIR%%/templates/prefs/number.inc
+%%HORDEDIR%%/templates/prefs/overview.inc
+%%HORDEDIR%%/templates/prefs/select.inc
+%%HORDEDIR%%/templates/prefs/text.inc
+%%HORDEDIR%%/templates/prefs/textarea.inc
+%%HORDEDIR%%/templates/problem/javascript.inc
+%%HORDEDIR%%/templates/problem/problem.inc
+%%HORDEDIR%%/templates/wml/common-footer.inc
+%%HORDEDIR%%/templates/wml/common-header.inc
+%%HORDEDIR%%/templates/wml/doctype.inc
+%%HORDEDIR%%/templates/wml/login/login.inc
+%%HORDEDIR%%/templates/wml/login/user.inc
+%%HORDEDIR%%/test.php
+%%HORDEDIR%%/util/special_characters.php
 %%HORDESBIN%%/horde_set_perms.sh
 etc/horde/httpd.conf.horde
 %%PORTDOCS%%share/doc/horde/CHANGES
 %%PORTDOCS%%share/doc/horde/CODING_STANDARDS
+%%PORTDOCS%%share/doc/horde/CONTRIBUTING
 %%PORTDOCS%%share/doc/horde/COPYING
 %%PORTDOCS%%share/doc/horde/CREDITS
-%%PORTDOCS%%share/doc/horde/HELP
+%%PORTDOCS%%share/doc/horde/HACKING
 %%PORTDOCS%%share/doc/horde/INSTALL
-%%PORTDOCS%%share/doc/horde/LISTS
 %%PORTDOCS%%share/doc/horde/README
-%%PORTDOCS%%share/doc/horde/SOURCE
 %%PORTDOCS%%@dirrm share/doc/horde
-@dirrm %%HORDEDIR%%/lib/MIME/Viewer
-@dirrm %%HORDEDIR%%/lib/MIME
+@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
 @dirrm %%HORDEDIR%%/lib/Auth
 @dirrm %%HORDEDIR%%/lib/Cache
 @dirrm %%HORDEDIR%%/lib/Category
+@dirrm %%HORDEDIR%%/lib/MIME/Viewer
+@dirrm %%HORDEDIR%%/lib/MIME
 @dirrm %%HORDEDIR%%/lib/Prefs
 @dirrm %%HORDEDIR%%/lib/Perms
 @dirrm %%HORDEDIR%%/lib/Token
 @dirrm %%HORDEDIR%%/lib
-@dirrm %%HORDEDIR%%/graphics/alerts
-@dirrm %%HORDEDIR%%/graphics/mime
-@dirrm %%HORDEDIR%%/graphics
-@dirrm %%HORDEDIR%%/config
-@dirrm %%HORDEDIR%%/templates/admin/user
-@dirrm %%HORDEDIR%%/templates/admin
-@dirrm %%HORDEDIR%%/templates/data
-@dirrm %%HORDEDIR%%/templates/horde
-@dirrm %%HORDEDIR%%/templates/problem
-@dirrm %%HORDEDIR%%/templates/help
-@dirrm %%HORDEDIR%%/templates/prefs
-@dirrm %%HORDEDIR%%/templates/index
-@dirrm %%HORDEDIR%%/templates/javascript
-@dirrm %%HORDEDIR%%/templates/login
-@dirrm %%HORDEDIR%%/templates/maintenance/
-@dirrm %%HORDEDIR%%/templates/wml/login
-@dirrm %%HORDEDIR%%/templates/wml
-@dirrm %%HORDEDIR%%/templates
-@dirrm %%HORDEDIR%%/scripts/mime_mapping
-@dirrm %%HORDEDIR%%/scripts/db
-@dirrm %%HORDEDIR%%/scripts
 @dirrm %%HORDEDIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/cs_CZ
 @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/en_EN
+@dirrm %%HORDEDIR%%/locale/en_US
 @dirrm %%HORDEDIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/es_ES
+@dirrm %%HORDEDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDEDIR%%/locale/fi_FI
 @dirrm %%HORDEDIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/fr_FR
 @dirrm %%HORDEDIR%%/locale/it_IT/LC_MESSAGES
@@ -288,6 +309,8 @@ etc/horde/httpd.conf.horde
 @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/pl_PL/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/pl_PL
 @dirrm %%HORDEDIR%%/locale/pt_BR/LC_MESSAGES
@@ -303,12 +326,24 @@ etc/horde/httpd.conf.horde
 @dirrm %%HORDEDIR%%/locale/zh_TW/LC_MESSAGES
 @dirrm %%HORDEDIR%%/locale/zh_TW
 @dirrm %%HORDEDIR%%/locale
+@dirrm %%HORDEDIR%%/scripts/db
+@dirrm %%HORDEDIR%%/scripts/mime_mapping
+@dirrm %%HORDEDIR%%/scripts
+@dirrm %%HORDEDIR%%/templates/admin/user
+@dirrm %%HORDEDIR%%/templates/admin
+@dirrm %%HORDEDIR%%/templates/data
+@dirrm %%HORDEDIR%%/templates/help
+@dirrm %%HORDEDIR%%/templates/horde
+@dirrm %%HORDEDIR%%/templates/index
+@dirrm %%HORDEDIR%%/templates/javascript
+@dirrm %%HORDEDIR%%/templates/login
+@dirrm %%HORDEDIR%%/templates/maintenance/
+@dirrm %%HORDEDIR%%/templates/prefs
+@dirrm %%HORDEDIR%%/templates/problem
+@dirrm %%HORDEDIR%%/templates/wml/login
+@dirrm %%HORDEDIR%%/templates/wml
+@dirrm %%HORDEDIR%%/templates
 @dirrm %%HORDEDIR%%/util
-@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%%/po
 @dirrm %%HORDEDIR%%
 @dirrm etc/horde