aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2002-01-20 00:58:09 +0800
committerijliao <ijliao@FreeBSD.org>2002-01-20 00:58:09 +0800
commit1faad42c855b3caa03381cb30514127a0d85e1df (patch)
tree9e1aea4f81965485ae3a62fba79e8226342fa841
parent119bdffcb7c219a6c205de25e411c44a034cec96 (diff)
downloadfreebsd-ports-gnome-1faad42c855b3caa03381cb30514127a0d85e1df.tar.gz
freebsd-ports-gnome-1faad42c855b3caa03381cb30514127a0d85e1df.tar.zst
freebsd-ports-gnome-1faad42c855b3caa03381cb30514127a0d85e1df.zip
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
-rw-r--r--deskutils/horde-kronolith/Makefile3
-rw-r--r--deskutils/horde4-kronolith/Makefile3
-rw-r--r--deskutils/kronolith/Makefile3
-rw-r--r--mail/horde-turba/Makefile11
-rw-r--r--mail/horde-turba/distinfo2
-rw-r--r--mail/horde-turba/files/patch-ab28
-rw-r--r--mail/horde-turba/pkg-plist15
-rw-r--r--mail/horde4-turba/Makefile11
-rw-r--r--mail/horde4-turba/distinfo2
-rw-r--r--mail/horde4-turba/files/patch-ab28
-rw-r--r--mail/horde4-turba/pkg-plist15
-rw-r--r--mail/imp-devel/Makefile27
-rw-r--r--mail/imp-devel/distinfo2
-rw-r--r--mail/imp-devel/files/patch-ab10
-rw-r--r--mail/imp-devel/files/patch-ac11
-rw-r--r--mail/imp-devel/pkg-descr10
-rw-r--r--mail/imp-devel/pkg-message8
-rw-r--r--mail/imp-devel/pkg-plist40
-rw-r--r--mail/imp3/Makefile27
-rw-r--r--mail/imp3/distinfo2
-rw-r--r--mail/imp3/files/patch-ab10
-rw-r--r--mail/imp3/files/patch-ac11
-rw-r--r--mail/imp3/pkg-descr10
-rw-r--r--mail/imp3/pkg-message8
-rw-r--r--mail/imp3/pkg-plist40
-rw-r--r--mail/turba/Makefile11
-rw-r--r--mail/turba/distinfo2
-rw-r--r--mail/turba/files/patch-ab28
-rw-r--r--mail/turba/pkg-plist15
-rw-r--r--www/horde-devel/Makefile12
-rw-r--r--www/horde-devel/distinfo2
-rw-r--r--www/horde-devel/files/patch-ab74
-rw-r--r--www/horde-devel/files/patch-ac196
-rw-r--r--www/horde-devel/pkg-descr5
-rw-r--r--www/horde-devel/pkg-plist433
-rw-r--r--www/horde2/Makefile12
-rw-r--r--www/horde2/distinfo2
-rw-r--r--www/horde2/files/patch-ab74
-rw-r--r--www/horde2/files/patch-ac196
-rw-r--r--www/horde2/pkg-descr5
-rw-r--r--www/horde2/pkg-plist433
41 files changed, 1229 insertions, 608 deletions
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 41ebd8a46071..8a7cdc23a0aa 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kronolith
PORTVERSION= 0.0.3.011209
+PORTREVISION= 1
CATEGORIES= deskutils www
MASTER_SITES= http://pompo.net/horde/kronolith/
@@ -56,6 +57,8 @@ do-install:
@${CP} -p ${FILESDIR}/httpd.conf.kronolith ${HORDE_INC}
@${PERL} -pi -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:g" \
${HORDE_INC}/httpd.conf.kronolith
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTKRONOLITH::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index 41ebd8a46071..8a7cdc23a0aa 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kronolith
PORTVERSION= 0.0.3.011209
+PORTREVISION= 1
CATEGORIES= deskutils www
MASTER_SITES= http://pompo.net/horde/kronolith/
@@ -56,6 +57,8 @@ do-install:
@${CP} -p ${FILESDIR}/httpd.conf.kronolith ${HORDE_INC}
@${PERL} -pi -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:g" \
${HORDE_INC}/httpd.conf.kronolith
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTKRONOLITH::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/deskutils/kronolith/Makefile b/deskutils/kronolith/Makefile
index 41ebd8a46071..8a7cdc23a0aa 100644
--- a/deskutils/kronolith/Makefile
+++ b/deskutils/kronolith/Makefile
@@ -7,6 +7,7 @@
PORTNAME= kronolith
PORTVERSION= 0.0.3.011209
+PORTREVISION= 1
CATEGORIES= deskutils www
MASTER_SITES= http://pompo.net/horde/kronolith/
@@ -56,6 +57,8 @@ do-install:
@${CP} -p ${FILESDIR}/httpd.conf.kronolith ${HORDE_INC}
@${PERL} -pi -e "s:/home/httpd/html/horde/kronolith:${KRONOLITHDIR}:g" \
${HORDE_INC}/httpd.conf.kronolith
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTKRONOLITH::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 9817644a2a1c..71c28da81532 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -7,9 +7,9 @@
PORTNAME= turba
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -96,8 +96,8 @@ pre-install:
do-install:
@${MKDIR} ${TURBADIR}
@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/templates ${WRKSRC}/po ${TURBADIR}
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -107,7 +107,10 @@ do-install:
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index 95ed0497fa57..b160954d3a12 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
+MD5 (turba-1.0.tar.gz) = 8d70570cd66f9921a7466c699e58f5be
diff --git a/mail/horde-turba/files/patch-ab b/mail/horde-turba/files/patch-ab
index f76a7c518225..5cc76966a8a9 100644
--- a/mail/horde-turba/files/patch-ab
+++ b/mail/horde-turba/files/patch-ab
@@ -1,14 +1,14 @@
---- config/sources.php.dist.orig Sun Nov 4 01:42:12 2001
-+++ config/sources.php.dist Sun Nov 18 17:25:08 2001
-@@ -83,21 +83,25 @@
- 'title' => 'Local SQL',
+--- config/sources.php.dist.orig Tue Jan 1 13:58:34 2002
++++ config/sources.php.dist Thu Jan 3 18:04:12 2002
+@@ -92,21 +92,25 @@
+ 'title' => 'My Addressbook',
'type' => 'sql',
'params' => array(
- 'phptype' => 'pgsql',
- 'hostspec' => '',
- 'username' => '',
- 'password' => '',
-+// 'phptype' => 'pgsql',
++// 'phptype' => 'pgsql',
+ 'phptype' => 'mysql',
+ 'hostspec' => 'localhost',
+ 'username' => 'hordemgr',
@@ -18,18 +18,18 @@
- 'tty' => '',
- 'port' => '5432',
- 'protocol' => 'unix',
-+// 'tty' => '',
++// 'tty' => '',
+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+// 'port' => '5432',
-+// 'port' => '3306',
-+// 'protocol' => 'unix',
++// 'port' => '5432',
++// 'port' => '3306',
++// 'protocol' => 'unix',
'table' => 'turba_objects'
),
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
- 'name' => 'object_name',
-+ 'alias' => 'object_alias',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeAddress',
- 'workAddress' => 'object_workAddress',
+ 'name' => 'object_name',
++ 'alias' => 'object_alias',
+ 'email' => 'object_email',
+ 'homeAddress' => 'object_homeAddress',
+ 'workAddress' => 'object_workAddress',
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index ca31e90a6f06..5bc52ab2ec51 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -8,6 +8,7 @@
%%TURBADIR%%/addobject.php
%%TURBADIR%%/addobjectaction.php
%%TURBADIR%%/advanced.php
+%%TURBADIR%%/config/.htaccess
%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.php
@@ -23,7 +24,6 @@
%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/config/turba.dt
%%TURBADIR%%/data.php
%%TURBADIR%%/deleteobject.php
%%TURBADIR%%/displayobject.php
@@ -34,6 +34,7 @@
%%TURBADIR%%/graphics/search.gif
%%TURBADIR%%/graphics/turba.gif
%%TURBADIR%%/index.php
+%%TURBADIR%%/lib/.htaccess
%%TURBADIR%%/lib/AbstractObject.php
%%TURBADIR%%/lib/Driver.php
%%TURBADIR%%/lib/Driver/ldap.php
@@ -54,14 +55,17 @@
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
%%TURBADIR%%/lib/version.php
+%%TURBADIR%%/locale/.htaccess
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/no_BOK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ru_koi/LC_MESSAGES/turba.mo
@@ -70,6 +74,7 @@
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
%%TURBADIR%%/menu.php
+%%TURBADIR%%/po/.htaccess
%%TURBADIR%%/po/Makefile
%%TURBADIR%%/po/README
%%TURBADIR%%/po/cs_CZ.po
@@ -77,10 +82,12 @@
%%TURBADIR%%/po/el_GR.po
%%TURBADIR%%/po/es_ES.po
%%TURBADIR%%/po/extract.pl
+%%TURBADIR%%/po/fi_FI.po
%%TURBADIR%%/po/fr_FR.po
%%TURBADIR%%/po/it_IT.po
%%TURBADIR%%/po/ko_KR.po
%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/no_BOK.po
%%TURBADIR%%/po/pl_PL.po
%%TURBADIR%%/po/pt_BR.po
%%TURBADIR%%/po/ru_koi.po
@@ -90,9 +97,11 @@
%%TURBADIR%%/po/xgettext.sh
%%TURBADIR%%/po/zh_CN.po
%%TURBADIR%%/po/zh_TW.po
+%%TURBADIR%%/scripts/.htaccess
%%TURBADIR%%/scripts/drivers/turba.sql
%%TURBADIR%%/search.php
%%TURBADIR%%/status.php
+%%TURBADIR%%/templates/.htaccess
%%TURBADIR%%/templates/add/add.inc
%%TURBADIR%%/templates/add/noadd.inc
%%TURBADIR%%/templates/add/select.inc
@@ -136,6 +145,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/el_GR
@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/fr_FR
@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
@@ -144,6 +155,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/ko_KR
@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/no_BOK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/no_BOK
@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/pl_PL
@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 9817644a2a1c..71c28da81532 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -7,9 +7,9 @@
PORTNAME= turba
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -96,8 +96,8 @@ pre-install:
do-install:
@${MKDIR} ${TURBADIR}
@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/templates ${WRKSRC}/po ${TURBADIR}
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -107,7 +107,10 @@ do-install:
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
index 95ed0497fa57..b160954d3a12 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
+MD5 (turba-1.0.tar.gz) = 8d70570cd66f9921a7466c699e58f5be
diff --git a/mail/horde4-turba/files/patch-ab b/mail/horde4-turba/files/patch-ab
index f76a7c518225..5cc76966a8a9 100644
--- a/mail/horde4-turba/files/patch-ab
+++ b/mail/horde4-turba/files/patch-ab
@@ -1,14 +1,14 @@
---- config/sources.php.dist.orig Sun Nov 4 01:42:12 2001
-+++ config/sources.php.dist Sun Nov 18 17:25:08 2001
-@@ -83,21 +83,25 @@
- 'title' => 'Local SQL',
+--- config/sources.php.dist.orig Tue Jan 1 13:58:34 2002
++++ config/sources.php.dist Thu Jan 3 18:04:12 2002
+@@ -92,21 +92,25 @@
+ 'title' => 'My Addressbook',
'type' => 'sql',
'params' => array(
- 'phptype' => 'pgsql',
- 'hostspec' => '',
- 'username' => '',
- 'password' => '',
-+// 'phptype' => 'pgsql',
++// 'phptype' => 'pgsql',
+ 'phptype' => 'mysql',
+ 'hostspec' => 'localhost',
+ 'username' => 'hordemgr',
@@ -18,18 +18,18 @@
- 'tty' => '',
- 'port' => '5432',
- 'protocol' => 'unix',
-+// 'tty' => '',
++// 'tty' => '',
+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+// 'port' => '5432',
-+// 'port' => '3306',
-+// 'protocol' => 'unix',
++// 'port' => '5432',
++// 'port' => '3306',
++// 'protocol' => 'unix',
'table' => 'turba_objects'
),
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
- 'name' => 'object_name',
-+ 'alias' => 'object_alias',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeAddress',
- 'workAddress' => 'object_workAddress',
+ 'name' => 'object_name',
++ 'alias' => 'object_alias',
+ 'email' => 'object_email',
+ 'homeAddress' => 'object_homeAddress',
+ 'workAddress' => 'object_workAddress',
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index ca31e90a6f06..5bc52ab2ec51 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -8,6 +8,7 @@
%%TURBADIR%%/addobject.php
%%TURBADIR%%/addobjectaction.php
%%TURBADIR%%/advanced.php
+%%TURBADIR%%/config/.htaccess
%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.php
@@ -23,7 +24,6 @@
%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/config/turba.dt
%%TURBADIR%%/data.php
%%TURBADIR%%/deleteobject.php
%%TURBADIR%%/displayobject.php
@@ -34,6 +34,7 @@
%%TURBADIR%%/graphics/search.gif
%%TURBADIR%%/graphics/turba.gif
%%TURBADIR%%/index.php
+%%TURBADIR%%/lib/.htaccess
%%TURBADIR%%/lib/AbstractObject.php
%%TURBADIR%%/lib/Driver.php
%%TURBADIR%%/lib/Driver/ldap.php
@@ -54,14 +55,17 @@
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
%%TURBADIR%%/lib/version.php
+%%TURBADIR%%/locale/.htaccess
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/no_BOK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ru_koi/LC_MESSAGES/turba.mo
@@ -70,6 +74,7 @@
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
%%TURBADIR%%/menu.php
+%%TURBADIR%%/po/.htaccess
%%TURBADIR%%/po/Makefile
%%TURBADIR%%/po/README
%%TURBADIR%%/po/cs_CZ.po
@@ -77,10 +82,12 @@
%%TURBADIR%%/po/el_GR.po
%%TURBADIR%%/po/es_ES.po
%%TURBADIR%%/po/extract.pl
+%%TURBADIR%%/po/fi_FI.po
%%TURBADIR%%/po/fr_FR.po
%%TURBADIR%%/po/it_IT.po
%%TURBADIR%%/po/ko_KR.po
%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/no_BOK.po
%%TURBADIR%%/po/pl_PL.po
%%TURBADIR%%/po/pt_BR.po
%%TURBADIR%%/po/ru_koi.po
@@ -90,9 +97,11 @@
%%TURBADIR%%/po/xgettext.sh
%%TURBADIR%%/po/zh_CN.po
%%TURBADIR%%/po/zh_TW.po
+%%TURBADIR%%/scripts/.htaccess
%%TURBADIR%%/scripts/drivers/turba.sql
%%TURBADIR%%/search.php
%%TURBADIR%%/status.php
+%%TURBADIR%%/templates/.htaccess
%%TURBADIR%%/templates/add/add.inc
%%TURBADIR%%/templates/add/noadd.inc
%%TURBADIR%%/templates/add/select.inc
@@ -136,6 +145,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/el_GR
@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/fr_FR
@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
@@ -144,6 +155,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/ko_KR
@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/no_BOK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/no_BOK
@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/pl_PL
@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
diff --git a/mail/imp-devel/Makefile b/mail/imp-devel/Makefile
index 67c72f2f61b2..a772447c5fb7 100644
--- a/mail/imp-devel/Makefile
+++ b/mail/imp-devel/Makefile
@@ -7,10 +7,10 @@
PORTNAME= imp
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/
PKGNAMESUFFIX= -devel
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -37,6 +37,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
# - WITHOUT_SSL : if you have not installed c-client WITH_SSL;
#
+# - WITH_VALID_CERT : if you own a valid SSL certificate;
+#
# - WITHOUT_TURBA : if you do not want adressbooks;
#
# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
@@ -113,9 +115,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
.endif
NO_BUILD= yes
-DOCS= COPYING README docs/CHANGES docs/CREDITS \
- docs/INSTALL docs/SECURITY docs/FEATURES \
- docs/PACKAGES
+DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php filter.txt header.txt html.php menu.php \
mime_drivers.php motd.php prefs.php servers.php \
trailer.txt
@@ -164,6 +164,7 @@ pre-install:
${ECHO_MSG} "" ; \
${FALSE} ; \
fi
+.if !defined(BATCH)
.if !defined(WITHOUT_SSL)
@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
${ECHO_MSG} "" ; \
@@ -172,6 +173,7 @@ pre-install:
${FALSE} ; \
fi
.endif
+.endif
.if !defined(WITHOUT_LDAP)
.if defined(WITH_LDAP1)
@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
@@ -238,7 +240,20 @@ do-install:
.endfor
@${PERL} -pi -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
- @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" ${IMPDIR}/compose.php
+ @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
+ ${IMPDIR}/compose.php
+.if defined(WITHOUT_SSL)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap:;s:%%IMAPPORT%%:143:" \
+ ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
+.if defined(WITH_VALID_CERT)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
+ ${CONFDIR}/servers.php
+.endif
+.endif
.if !defined(WITHOUT_ASPELL)
@${PERL} -pi -e "s:\/\* BEGBSDASPELL::;s:ENDBSDASPELL \*\/::" \
${CONFDIR}/mime_drivers.php
@@ -274,6 +289,8 @@ do-install:
# Provide a link to IMP from Turba
.if !defined(WITHOUT_TURBA)
@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
+ @${PERL} -pi -e "s:apps'] = array\(\):apps'] = array('turba'):" \
+ ${CONFDIR}/conf.php
.endif
.if !defined(NOPORTDOCS)
@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${WRKSRC}/docs/SECURITY
diff --git a/mail/imp-devel/distinfo b/mail/imp-devel/distinfo
index 793e07b66041..7745bb27ad36 100644
--- a/mail/imp-devel/distinfo
+++ b/mail/imp-devel/distinfo
@@ -1 +1 @@
-MD5 (imp-3.0-RC3.tar.gz) = f02ecd032f3a3c17f96ab575bf5b6f61
+MD5 (imp-3.0.tar.gz) = d941d7b11231c771fb801ae8010e7271
diff --git a/mail/imp-devel/files/patch-ab b/mail/imp-devel/files/patch-ab
index ee535e400968..7c274c3fb977 100644
--- a/mail/imp-devel/files/patch-ab
+++ b/mail/imp-devel/files/patch-ab
@@ -1,5 +1,5 @@
--- config/servers.php.dist.orig Fri Jun 22 20:08:14 2001
-+++ config/servers.php.dist Fri Nov 16 23:46:19 2001
++++ config/servers.php.dist Tue Dec 18 23:08:00 2001
@@ -31,7 +31,7 @@
* is on.
*
@@ -14,11 +14,13 @@
$servers['imap'] = array(
'name' => 'IMAP Server',
- 'server' => 'imap.example.com',
+- 'protocol' => 'imap',
+- 'port' => 143,
+- 'folders' => 'mail/',
+// 'server' => 'imap.example.com',
+ 'server' => 'localhost',
- 'protocol' => 'imap',
- 'port' => 143,
-- 'folders' => 'mail/',
++ 'protocol' => '%%PROTOCOL%%',
++ 'port' => %%IMAPPORT%%,
+ 'folders' => 'Mail/',
'namespace' => '',
'maildomain' => 'example.com',
diff --git a/mail/imp-devel/files/patch-ac b/mail/imp-devel/files/patch-ac
new file mode 100644
index 000000000000..a7a34acdf937
--- /dev/null
+++ b/mail/imp-devel/files/patch-ac
@@ -0,0 +1,11 @@
+--- config/prefs.php.dist.orig Sun Dec 23 18:24:39 2001
++++ config/prefs.php.dist Thu Jan 3 20:57:38 2002
+@@ -444,7 +444,7 @@
+
+ // addressbook(s) to use when expanding addresses
+ $_prefs['search_sources'] = array(
+- 'value' => '',
++ 'value' => 'localsql',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'implicit'
diff --git a/mail/imp-devel/pkg-descr b/mail/imp-devel/pkg-descr
index 52e93a82e191..7aa00a473a1b 100644
--- a/mail/imp-devel/pkg-descr
+++ b/mail/imp-devel/pkg-descr
@@ -1,13 +1,9 @@
-IMP 3 is currently in heavy development. Features that have been added
+IMP 3 is the new stable version of IMP. Features that have been added
include searching; a new, flexible preferences system; a hierarchical
folder tree; and more.
It requires PHP4. You should use it if you want to take advantage of
-PHP4s built-in session handling and improved speed; if you want access
-to features such as the interactive spell checker and folder searching;
-or if you want to contribute a major piece to the code.
-
-This code branch continues the trend of 2.2 by being slimmer, cleaner,
-and better designed code than the previous version.
+PHP4s built-in session handling and improved speed or if you want access
+to features such as the interactive spell checker and folder searching.
WWW: http://www.horde.org/imp/
diff --git a/mail/imp-devel/pkg-message b/mail/imp-devel/pkg-message
index a13b440f15f9..4ca4e8caccdf 100644
--- a/mail/imp-devel/pkg-message
+++ b/mail/imp-devel/pkg-message
@@ -15,8 +15,8 @@ IMP requires an IMAP server. If you want to install one on this
machine, you may install the ports mail/cyrus-imapd, or
mail/imap-uw, or mail/courier-imap.
-Please refer to the file %%DOCSDIR%%/SECURITY
-on how to secure the IMP installation.
-It is at least recommended that you change the default database
-password used by horde and imp.
+To secure your installation, it is at least recommended that you change
+the default database password used by horde and imp.
+Then, you might change the 'session.save_path' setting in php.ini to a
+directory only readable and writeable by your webserver.
************************************************************************
diff --git a/mail/imp-devel/pkg-plist b/mail/imp-devel/pkg-plist
index 7382ae313ddb..2a5334368c84 100644
--- a/mail/imp-devel/pkg-plist
+++ b/mail/imp-devel/pkg-plist
@@ -1,12 +1,10 @@
%%PORTDOCS%%share/doc/imp/CHANGES
%%PORTDOCS%%share/doc/imp/COPYING
%%PORTDOCS%%share/doc/imp/CREDITS
-%%PORTDOCS%%share/doc/imp/FEATURES
%%PORTDOCS%%share/doc/imp/INSTALL
-%%PORTDOCS%%share/doc/imp/PACKAGES
%%PORTDOCS%%share/doc/imp/README
-%%PORTDOCS%%share/doc/imp/SECURITY
%%IMPDIR%%/compose.php
+%%IMPDIR%%/config/.htaccess
%%IMPDIR%%/config/conf.php
%%IMPDIR%%/config/conf.php.dist
%%IMPDIR%%/config/filter.txt
@@ -15,7 +13,6 @@
%%IMPDIR%%/config/header.txt.dist
%%IMPDIR%%/config/html.php
%%IMPDIR%%/config/html.php.dist
-%%IMPDIR%%/config/imp.dt
%%IMPDIR%%/config/menu.php
%%IMPDIR%%/config/menu.php.dist
%%IMPDIR%%/config/mime_drivers.php
@@ -25,6 +22,7 @@
%%IMPDIR%%/config/motd.php.dist
%%IMPDIR%%/config/prefs.php
%%IMPDIR%%/config/prefs.php.dist
+%%IMPDIR%%/config/prefs.php.dist.orig
%%IMPDIR%%/config/servers.php
%%IMPDIR%%/config/servers.php.dist
%%IMPDIR%%/config/servers.php.dist.orig
@@ -86,6 +84,7 @@
%%IMPDIR%%/identities.php
%%IMPDIR%%/index.php
%%IMPDIR%%/intro.php
+%%IMPDIR%%/lib/.htaccess
%%IMPDIR%%/lib/Folder.php
%%IMPDIR%%/lib/IMP.php
%%IMPDIR%%/lib/Identity/IMP.php
@@ -100,30 +99,47 @@
%%IMPDIR%%/lib/api.php
%%IMPDIR%%/lib/base.php
%%IMPDIR%%/lib/version.php
+%%IMPDIR%%/locale/.htaccess
%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/cs_CZ/help.xml
%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/de_DE/help.xml
%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/en_EN/help.xml
+%%IMPDIR%%/locale/el_GR/help.xml
+%%IMPDIR%%/locale/en_US/help.xml
%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/es_ES/help.xml
+%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fi_FI/help.xml
%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/fr_FR/help.xml
%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/it_IT/help.xml
%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ko_KR/help.xml
%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/nl_NL/help.xml
%%IMPDIR%%/locale/no_BOK/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/no_BOK/help.xml
%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pl_PL/help.xml
%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pt_BR/help.xml
%%IMPDIR%%/locale/ru_win/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ru_win/help.xml
+%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/sv_SE/help.xml
%%IMPDIR%%/locale/uk/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/uk/help.xml
%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_CN/help.xml
%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_TW/help.xml
%%IMPDIR%%/login.php
%%IMPDIR%%/mailbox.php
%%IMPDIR%%/menu.php
%%IMPDIR%%/message.php
+%%IMPDIR%%/po/.htaccess
%%IMPDIR%%/po/Makefile
%%IMPDIR%%/po/README
%%IMPDIR%%/po/cs_CZ.po
@@ -131,6 +147,7 @@
%%IMPDIR%%/po/el_GR.po
%%IMPDIR%%/po/es_ES.po
%%IMPDIR%%/po/extract.pl
+%%IMPDIR%%/po/fi_FI.po
%%IMPDIR%%/po/fr_FR.po
%%IMPDIR%%/po/it_IT.po
%%IMPDIR%%/po/ko_KR.po
@@ -140,17 +157,23 @@
%%IMPDIR%%/po/pt_BR.po
%%IMPDIR%%/po/ru_win.po
%%IMPDIR%%/po/shtool
+%%IMPDIR%%/po/sv_SE.po
%%IMPDIR%%/po/uk.po
%%IMPDIR%%/po/xgettext.sh
%%IMPDIR%%/po/zh_CN.po
%%IMPDIR%%/po/zh_TW.po
%%IMPDIR%%/prefs.php
%%IMPDIR%%/redirect.php
+%%IMPDIR%%/scripts/.htaccess
%%IMPDIR%%/scripts/Imp.reg
+%%IMPDIR%%/scripts/custom_login.php
%%IMPDIR%%/scripts/imp-cleanup.cron
+%%IMPDIR%%/scripts/imp2horde.pl
+%%IMPDIR%%/scripts/imp2turba.pl
%%IMPDIR%%/search.php
%%IMPDIR%%/spelling.php
%%IMPDIR%%/status.php
+%%IMPDIR%%/templates/.htaccess
%%IMPDIR%%/templates/common-footer.inc
%%IMPDIR%%/templates/common-header.inc
%%IMPDIR%%/templates/compose/bounce.inc
@@ -194,7 +217,6 @@
%%IMPDIR%%/templates/message/navbar.inc
%%IMPDIR%%/templates/message/navbar_aux_bottom.inc
%%IMPDIR%%/templates/message/navbar_aux_top.inc
-%%IMPDIR%%/templates/prefs/filters.inc
%%IMPDIR%%/templates/prefs/folderselect.inc
%%IMPDIR%%/templates/prefs/identityselect.inc
%%IMPDIR%%/templates/prefs/sourceselect.inc
@@ -220,9 +242,11 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/de_DE
@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/en_EN
+@dirrm %%IMPDIR%%/locale/en_US
@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/es_ES
+@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/fi_FI
@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/fr_FR
@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -239,6 +263,8 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/pt_BR
@dirrm %%IMPDIR%%/locale/ru_win/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/ru_win
+@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/sv_SE
@dirrm %%IMPDIR%%/locale/uk/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/uk
@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index 67c72f2f61b2..a772447c5fb7 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -7,10 +7,10 @@
PORTNAME= imp
PORTVERSION= 3.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/imp/tarballs/
PKGNAMESUFFIX= -devel
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -37,6 +37,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
#
# - WITHOUT_SSL : if you have not installed c-client WITH_SSL;
#
+# - WITH_VALID_CERT : if you own a valid SSL certificate;
+#
# - WITHOUT_TURBA : if you do not want adressbooks;
#
# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine;
@@ -113,9 +115,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell
.endif
NO_BUILD= yes
-DOCS= COPYING README docs/CHANGES docs/CREDITS \
- docs/INSTALL docs/SECURITY docs/FEATURES \
- docs/PACKAGES
+DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
CONFFILE= conf.php filter.txt header.txt html.php menu.php \
mime_drivers.php motd.php prefs.php servers.php \
trailer.txt
@@ -164,6 +164,7 @@ pre-install:
${ECHO_MSG} "" ; \
${FALSE} ; \
fi
+.if !defined(BATCH)
.if !defined(WITHOUT_SSL)
@if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \
${ECHO_MSG} "" ; \
@@ -172,6 +173,7 @@ pre-install:
${FALSE} ; \
fi
.endif
+.endif
.if !defined(WITHOUT_LDAP)
.if defined(WITH_LDAP1)
@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
@@ -238,7 +240,20 @@ do-install:
.endfor
@${PERL} -pi -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
@${PERL} -pi -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
- @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" ${IMPDIR}/compose.php
+ @${PERL} -pi -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \
+ ${IMPDIR}/compose.php
+.if defined(WITHOUT_SSL)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap:;s:%%IMAPPORT%%:143:" \
+ ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%IMAPPORT%%:993:" ${CONFDIR}/servers.php
+.if defined(WITH_VALID_CERT)
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl:" ${CONFDIR}/servers.php
+.else
+ @${PERL} -pi -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \
+ ${CONFDIR}/servers.php
+.endif
+.endif
.if !defined(WITHOUT_ASPELL)
@${PERL} -pi -e "s:\/\* BEGBSDASPELL::;s:ENDBSDASPELL \*\/::" \
${CONFDIR}/mime_drivers.php
@@ -274,6 +289,8 @@ do-install:
# Provide a link to IMP from Turba
.if !defined(WITHOUT_TURBA)
@${PERL} -pi -e "s://UNCOMMENTWHENINSTIMP::" ${TURBADIR}/config/conf.php
+ @${PERL} -pi -e "s:apps'] = array\(\):apps'] = array('turba'):" \
+ ${CONFDIR}/conf.php
.endif
.if !defined(NOPORTDOCS)
@${PERL} -pi -e "s:/home/httpd/html/horde/imp:${IMPDIR}:g" ${WRKSRC}/docs/SECURITY
diff --git a/mail/imp3/distinfo b/mail/imp3/distinfo
index 793e07b66041..7745bb27ad36 100644
--- a/mail/imp3/distinfo
+++ b/mail/imp3/distinfo
@@ -1 +1 @@
-MD5 (imp-3.0-RC3.tar.gz) = f02ecd032f3a3c17f96ab575bf5b6f61
+MD5 (imp-3.0.tar.gz) = d941d7b11231c771fb801ae8010e7271
diff --git a/mail/imp3/files/patch-ab b/mail/imp3/files/patch-ab
index ee535e400968..7c274c3fb977 100644
--- a/mail/imp3/files/patch-ab
+++ b/mail/imp3/files/patch-ab
@@ -1,5 +1,5 @@
--- config/servers.php.dist.orig Fri Jun 22 20:08:14 2001
-+++ config/servers.php.dist Fri Nov 16 23:46:19 2001
++++ config/servers.php.dist Tue Dec 18 23:08:00 2001
@@ -31,7 +31,7 @@
* is on.
*
@@ -14,11 +14,13 @@
$servers['imap'] = array(
'name' => 'IMAP Server',
- 'server' => 'imap.example.com',
+- 'protocol' => 'imap',
+- 'port' => 143,
+- 'folders' => 'mail/',
+// 'server' => 'imap.example.com',
+ 'server' => 'localhost',
- 'protocol' => 'imap',
- 'port' => 143,
-- 'folders' => 'mail/',
++ 'protocol' => '%%PROTOCOL%%',
++ 'port' => %%IMAPPORT%%,
+ 'folders' => 'Mail/',
'namespace' => '',
'maildomain' => 'example.com',
diff --git a/mail/imp3/files/patch-ac b/mail/imp3/files/patch-ac
new file mode 100644
index 000000000000..a7a34acdf937
--- /dev/null
+++ b/mail/imp3/files/patch-ac
@@ -0,0 +1,11 @@
+--- config/prefs.php.dist.orig Sun Dec 23 18:24:39 2001
++++ config/prefs.php.dist Thu Jan 3 20:57:38 2002
+@@ -444,7 +444,7 @@
+
+ // addressbook(s) to use when expanding addresses
+ $_prefs['search_sources'] = array(
+- 'value' => '',
++ 'value' => 'localsql',
+ 'locked' => false,
+ 'shared' => false,
+ 'type' => 'implicit'
diff --git a/mail/imp3/pkg-descr b/mail/imp3/pkg-descr
index 52e93a82e191..7aa00a473a1b 100644
--- a/mail/imp3/pkg-descr
+++ b/mail/imp3/pkg-descr
@@ -1,13 +1,9 @@
-IMP 3 is currently in heavy development. Features that have been added
+IMP 3 is the new stable version of IMP. Features that have been added
include searching; a new, flexible preferences system; a hierarchical
folder tree; and more.
It requires PHP4. You should use it if you want to take advantage of
-PHP4s built-in session handling and improved speed; if you want access
-to features such as the interactive spell checker and folder searching;
-or if you want to contribute a major piece to the code.
-
-This code branch continues the trend of 2.2 by being slimmer, cleaner,
-and better designed code than the previous version.
+PHP4s built-in session handling and improved speed or if you want access
+to features such as the interactive spell checker and folder searching.
WWW: http://www.horde.org/imp/
diff --git a/mail/imp3/pkg-message b/mail/imp3/pkg-message
index a13b440f15f9..4ca4e8caccdf 100644
--- a/mail/imp3/pkg-message
+++ b/mail/imp3/pkg-message
@@ -15,8 +15,8 @@ IMP requires an IMAP server. If you want to install one on this
machine, you may install the ports mail/cyrus-imapd, or
mail/imap-uw, or mail/courier-imap.
-Please refer to the file %%DOCSDIR%%/SECURITY
-on how to secure the IMP installation.
-It is at least recommended that you change the default database
-password used by horde and imp.
+To secure your installation, it is at least recommended that you change
+the default database password used by horde and imp.
+Then, you might change the 'session.save_path' setting in php.ini to a
+directory only readable and writeable by your webserver.
************************************************************************
diff --git a/mail/imp3/pkg-plist b/mail/imp3/pkg-plist
index 7382ae313ddb..2a5334368c84 100644
--- a/mail/imp3/pkg-plist
+++ b/mail/imp3/pkg-plist
@@ -1,12 +1,10 @@
%%PORTDOCS%%share/doc/imp/CHANGES
%%PORTDOCS%%share/doc/imp/COPYING
%%PORTDOCS%%share/doc/imp/CREDITS
-%%PORTDOCS%%share/doc/imp/FEATURES
%%PORTDOCS%%share/doc/imp/INSTALL
-%%PORTDOCS%%share/doc/imp/PACKAGES
%%PORTDOCS%%share/doc/imp/README
-%%PORTDOCS%%share/doc/imp/SECURITY
%%IMPDIR%%/compose.php
+%%IMPDIR%%/config/.htaccess
%%IMPDIR%%/config/conf.php
%%IMPDIR%%/config/conf.php.dist
%%IMPDIR%%/config/filter.txt
@@ -15,7 +13,6 @@
%%IMPDIR%%/config/header.txt.dist
%%IMPDIR%%/config/html.php
%%IMPDIR%%/config/html.php.dist
-%%IMPDIR%%/config/imp.dt
%%IMPDIR%%/config/menu.php
%%IMPDIR%%/config/menu.php.dist
%%IMPDIR%%/config/mime_drivers.php
@@ -25,6 +22,7 @@
%%IMPDIR%%/config/motd.php.dist
%%IMPDIR%%/config/prefs.php
%%IMPDIR%%/config/prefs.php.dist
+%%IMPDIR%%/config/prefs.php.dist.orig
%%IMPDIR%%/config/servers.php
%%IMPDIR%%/config/servers.php.dist
%%IMPDIR%%/config/servers.php.dist.orig
@@ -86,6 +84,7 @@
%%IMPDIR%%/identities.php
%%IMPDIR%%/index.php
%%IMPDIR%%/intro.php
+%%IMPDIR%%/lib/.htaccess
%%IMPDIR%%/lib/Folder.php
%%IMPDIR%%/lib/IMP.php
%%IMPDIR%%/lib/Identity/IMP.php
@@ -100,30 +99,47 @@
%%IMPDIR%%/lib/api.php
%%IMPDIR%%/lib/base.php
%%IMPDIR%%/lib/version.php
+%%IMPDIR%%/locale/.htaccess
%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/cs_CZ/help.xml
%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/de_DE/help.xml
%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo
-%%IMPDIR%%/locale/en_EN/help.xml
+%%IMPDIR%%/locale/el_GR/help.xml
+%%IMPDIR%%/locale/en_US/help.xml
%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/es_ES/help.xml
+%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/fi_FI/help.xml
%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/fr_FR/help.xml
%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/it_IT/help.xml
%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ko_KR/help.xml
%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
%%IMPDIR%%/locale/nl_NL/help.xml
%%IMPDIR%%/locale/no_BOK/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/no_BOK/help.xml
%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pl_PL/help.xml
%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/pt_BR/help.xml
%%IMPDIR%%/locale/ru_win/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/ru_win/help.xml
+%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/sv_SE/help.xml
%%IMPDIR%%/locale/uk/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/uk/help.xml
%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_CN/help.xml
%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo
+%%IMPDIR%%/locale/zh_TW/help.xml
%%IMPDIR%%/login.php
%%IMPDIR%%/mailbox.php
%%IMPDIR%%/menu.php
%%IMPDIR%%/message.php
+%%IMPDIR%%/po/.htaccess
%%IMPDIR%%/po/Makefile
%%IMPDIR%%/po/README
%%IMPDIR%%/po/cs_CZ.po
@@ -131,6 +147,7 @@
%%IMPDIR%%/po/el_GR.po
%%IMPDIR%%/po/es_ES.po
%%IMPDIR%%/po/extract.pl
+%%IMPDIR%%/po/fi_FI.po
%%IMPDIR%%/po/fr_FR.po
%%IMPDIR%%/po/it_IT.po
%%IMPDIR%%/po/ko_KR.po
@@ -140,17 +157,23 @@
%%IMPDIR%%/po/pt_BR.po
%%IMPDIR%%/po/ru_win.po
%%IMPDIR%%/po/shtool
+%%IMPDIR%%/po/sv_SE.po
%%IMPDIR%%/po/uk.po
%%IMPDIR%%/po/xgettext.sh
%%IMPDIR%%/po/zh_CN.po
%%IMPDIR%%/po/zh_TW.po
%%IMPDIR%%/prefs.php
%%IMPDIR%%/redirect.php
+%%IMPDIR%%/scripts/.htaccess
%%IMPDIR%%/scripts/Imp.reg
+%%IMPDIR%%/scripts/custom_login.php
%%IMPDIR%%/scripts/imp-cleanup.cron
+%%IMPDIR%%/scripts/imp2horde.pl
+%%IMPDIR%%/scripts/imp2turba.pl
%%IMPDIR%%/search.php
%%IMPDIR%%/spelling.php
%%IMPDIR%%/status.php
+%%IMPDIR%%/templates/.htaccess
%%IMPDIR%%/templates/common-footer.inc
%%IMPDIR%%/templates/common-header.inc
%%IMPDIR%%/templates/compose/bounce.inc
@@ -194,7 +217,6 @@
%%IMPDIR%%/templates/message/navbar.inc
%%IMPDIR%%/templates/message/navbar_aux_bottom.inc
%%IMPDIR%%/templates/message/navbar_aux_top.inc
-%%IMPDIR%%/templates/prefs/filters.inc
%%IMPDIR%%/templates/prefs/folderselect.inc
%%IMPDIR%%/templates/prefs/identityselect.inc
%%IMPDIR%%/templates/prefs/sourceselect.inc
@@ -220,9 +242,11 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/de_DE
@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/el_GR
-@dirrm %%IMPDIR%%/locale/en_EN
+@dirrm %%IMPDIR%%/locale/en_US
@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/es_ES
+@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/fi_FI
@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/fr_FR
@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES
@@ -239,6 +263,8 @@ etc/horde/httpd.conf.imp
@dirrm %%IMPDIR%%/locale/pt_BR
@dirrm %%IMPDIR%%/locale/ru_win/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/ru_win
+@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%IMPDIR%%/locale/sv_SE
@dirrm %%IMPDIR%%/locale/uk/LC_MESSAGES
@dirrm %%IMPDIR%%/locale/uk
@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 9817644a2a1c..71c28da81532 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -7,9 +7,9 @@
PORTNAME= turba
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3
MAINTAINER= thierry@thomas.as
@@ -96,8 +96,8 @@ pre-install:
do-install:
@${MKDIR} ${TURBADIR}
@${CP} -Rp ${WRKSRC}/config ${WRKSRC}/graphics ${WRKSRC}/lib ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${TURBADIR}
- @${CP} -Rp ${WRKSRC}/po ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${TURBADIR}
+ @${CP} -Rp ${WRKSRC}/templates ${WRKSRC}/po ${TURBADIR}
@${CP} -p ${WRKSRC}/*.php ${TURBADIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
@@ -107,7 +107,10 @@ do-install:
@${CHOWN} -R www:www ${TURBADIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC}
- @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \
+ ${HORDE_INC}/httpd.conf.turba
+ @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \
+ ${HORDEDIR}/config/registry.php
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCS}
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 95ed0497fa57..b160954d3a12 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.0-RC3.tar.gz) = 9fc7d02714f25221e54352c1c4a360fa
+MD5 (turba-1.0.tar.gz) = 8d70570cd66f9921a7466c699e58f5be
diff --git a/mail/turba/files/patch-ab b/mail/turba/files/patch-ab
index f76a7c518225..5cc76966a8a9 100644
--- a/mail/turba/files/patch-ab
+++ b/mail/turba/files/patch-ab
@@ -1,14 +1,14 @@
---- config/sources.php.dist.orig Sun Nov 4 01:42:12 2001
-+++ config/sources.php.dist Sun Nov 18 17:25:08 2001
-@@ -83,21 +83,25 @@
- 'title' => 'Local SQL',
+--- config/sources.php.dist.orig Tue Jan 1 13:58:34 2002
++++ config/sources.php.dist Thu Jan 3 18:04:12 2002
+@@ -92,21 +92,25 @@
+ 'title' => 'My Addressbook',
'type' => 'sql',
'params' => array(
- 'phptype' => 'pgsql',
- 'hostspec' => '',
- 'username' => '',
- 'password' => '',
-+// 'phptype' => 'pgsql',
++// 'phptype' => 'pgsql',
+ 'phptype' => 'mysql',
+ 'hostspec' => 'localhost',
+ 'username' => 'hordemgr',
@@ -18,18 +18,18 @@
- 'tty' => '',
- 'port' => '5432',
- 'protocol' => 'unix',
-+// 'tty' => '',
++// 'tty' => '',
+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+// 'port' => '5432',
-+// 'port' => '3306',
-+// 'protocol' => 'unix',
++// 'port' => '5432',
++// 'port' => '3306',
++// 'protocol' => 'unix',
'table' => 'turba_objects'
),
'map' => array(
'__key' => 'object_id',
'__owner' => 'owner_id',
- 'name' => 'object_name',
-+ 'alias' => 'object_alias',
- 'email' => 'object_email',
- 'homeAddress' => 'object_homeAddress',
- 'workAddress' => 'object_workAddress',
+ 'name' => 'object_name',
++ 'alias' => 'object_alias',
+ 'email' => 'object_email',
+ 'homeAddress' => 'object_homeAddress',
+ 'workAddress' => 'object_workAddress',
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index ca31e90a6f06..5bc52ab2ec51 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -8,6 +8,7 @@
%%TURBADIR%%/addobject.php
%%TURBADIR%%/addobjectaction.php
%%TURBADIR%%/advanced.php
+%%TURBADIR%%/config/.htaccess
%%TURBADIR%%/config/attributes.php
%%TURBADIR%%/config/attributes.php.dist
%%TURBADIR%%/config/conf.php
@@ -23,7 +24,6 @@
%%TURBADIR%%/config/sources.php
%%TURBADIR%%/config/sources.php.dist
%%TURBADIR%%/config/sources.php.dist.orig
-%%TURBADIR%%/config/turba.dt
%%TURBADIR%%/data.php
%%TURBADIR%%/deleteobject.php
%%TURBADIR%%/displayobject.php
@@ -34,6 +34,7 @@
%%TURBADIR%%/graphics/search.gif
%%TURBADIR%%/graphics/turba.gif
%%TURBADIR%%/index.php
+%%TURBADIR%%/lib/.htaccess
%%TURBADIR%%/lib/AbstractObject.php
%%TURBADIR%%/lib/Driver.php
%%TURBADIR%%/lib/Driver/ldap.php
@@ -54,14 +55,17 @@
%%TURBADIR%%/lib/api.php
%%TURBADIR%%/lib/base.php
%%TURBADIR%%/lib/version.php
+%%TURBADIR%%/locale/.htaccess
%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/no_BOK/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/ru_koi/LC_MESSAGES/turba.mo
@@ -70,6 +74,7 @@
%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo
%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo
%%TURBADIR%%/menu.php
+%%TURBADIR%%/po/.htaccess
%%TURBADIR%%/po/Makefile
%%TURBADIR%%/po/README
%%TURBADIR%%/po/cs_CZ.po
@@ -77,10 +82,12 @@
%%TURBADIR%%/po/el_GR.po
%%TURBADIR%%/po/es_ES.po
%%TURBADIR%%/po/extract.pl
+%%TURBADIR%%/po/fi_FI.po
%%TURBADIR%%/po/fr_FR.po
%%TURBADIR%%/po/it_IT.po
%%TURBADIR%%/po/ko_KR.po
%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/no_BOK.po
%%TURBADIR%%/po/pl_PL.po
%%TURBADIR%%/po/pt_BR.po
%%TURBADIR%%/po/ru_koi.po
@@ -90,9 +97,11 @@
%%TURBADIR%%/po/xgettext.sh
%%TURBADIR%%/po/zh_CN.po
%%TURBADIR%%/po/zh_TW.po
+%%TURBADIR%%/scripts/.htaccess
%%TURBADIR%%/scripts/drivers/turba.sql
%%TURBADIR%%/search.php
%%TURBADIR%%/status.php
+%%TURBADIR%%/templates/.htaccess
%%TURBADIR%%/templates/add/add.inc
%%TURBADIR%%/templates/add/noadd.inc
%%TURBADIR%%/templates/add/select.inc
@@ -136,6 +145,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/el_GR
@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/es_ES
+@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/fi_FI
@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/fr_FR
@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
@@ -144,6 +155,8 @@ etc/horde/httpd.conf.turba
@dirrm %%TURBADIR%%/locale/ko_KR
@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/no_BOK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/no_BOK
@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
@dirrm %%TURBADIR%%/locale/pl_PL
@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES
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