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

4 files changed, 36 insertions, 20 deletions

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