4 files changed, 23 insertions, 36 deletions

diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index eb592f783f2f..de7e2932ba40 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	turba
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
-MASTER_SITES=	ftp://ftp.horde.org/pub/turba/tarballs/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RC3
+MASTER_SITES=	ftp://ftp.horde.org/pub/turba/tarballs/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	thierry@pompo.net
 
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index f5df25373dbf..9b728689ffda 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.1-RC3.tar.gz) = b4f2cced9c830f55049897c6b5386e8b
+MD5 (turba-1.1.tar.gz) = 1b5b3cdf1eeb80fe8a1e9a2ae9000723
diff --git a/mail/horde-turba/files/patch-ab b/mail/horde-turba/files/patch-ab
index c2361cdecf8e..195d806b3b34 100644
--- a/mail/horde-turba/files/patch-ab
+++ b/mail/horde-turba/files/patch-ab
@@ -1,37 +1,16 @@
---- config/sources.php.dist.orig	Thu Apr 25 01:08:44 2002
-+++ config/sources.php.dist	Sun May 19 00:50:20 2002
-@@ -137,22 +137,26 @@
+--- config/sources.php.dist.orig	Thu Jun  6 16:06:36 2002
++++ config/sources.php.dist	Tue Jun 11 19:28:01 2002
+@@ -134,10 +134,11 @@
      'title' => 'My Addressbook',
      'type' => 'sql',
      'params' => array(
--        'phptype' => 'pgsql',
--        'hostspec' => '',
--        'username' => '',
--        'password' => '',
 +//      'phptype' => 'pgsql',
-+        'phptype' => 'mysql',
-+        'hostspec' => 'localhost',
+         'phptype' => 'mysql',
+         'hostspec' => 'localhost',
+-        'username' => 'horde',
+-        'password' => '*****',
 +        'username' => 'hordemgr',
 +        'password' => 'hordemgr',
          'database' => 'horde',
-         'options' => '',
--        'tty' => '',
--        'port' => '5432',
--        'protocol' => 'unix',
--        'socket' => '',
-+//      'tty' => '',
-+// Default port: 5432 for pgsql (PostGres), 3306 for mysql
-+//      'port' => '5432',
-+//      'port' => '3306',
-+//      'protocol' => 'unix',
-+//      'socket' => '',
          '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',
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index ed01e81e37ab..16813d6a8c7d 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -70,11 +70,13 @@
 %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo
-%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
@@ -99,11 +101,13 @@
 %%TURBADIR%%/po/extract.pl
 %%TURBADIR%%/po/fi_FI.po
 %%TURBADIR%%/po/fr_FR.po
+%%TURBADIR%%/po/hu_HU.po
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
 %%TURBADIR%%/po/ko_KR.po
-%%TURBADIR%%/po/nl_NL.po
 %%TURBADIR%%/po/nb_NO.po
+%%TURBADIR%%/po/nl_NL.po
+%%TURBADIR%%/po/nn_NO.po
 %%TURBADIR%%/po/pl_PL.po
 %%TURBADIR%%/po/pt_BR.po
 %%TURBADIR%%/po/pt_PT.po
@@ -176,16 +180,20 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/locale/fi_FI
 @dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/fr_FR
+@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/hu_HU
 @dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/it_IT
 @dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/ja_JP
 @dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/ko_KR
-@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%TURBADIR%%/locale/nl_NL
 @dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/nb_NO
+@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nl_NL
+@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/nn_NO
 @dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/pl_PL
 @dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES