5 files changed, 98 insertions, 22 deletions

diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index df1f9d61dbb1..60127d2838e2 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	1.1
-PORTREVISION=	3
+PORTVERSION=	1.2
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.au.horde.org/pub/horde/turba/			\
@@ -19,8 +18,6 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 MAINTAINER=	thierry@pompo.net
 COMMENT=	The Horde contact management application
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 #-----------------------------------------------------------------------
 # You may define these options:
 #
@@ -46,9 +43,11 @@ RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 
+LDD=		/usr/bin/ldd
+
 REINPLACE_ARGS=	-i.beforeTurba
 DOCS=		COPYING README docs/CHANGES docs/CREDITS \
-		docs/INSTALL docs/turba.dia docs/turba.pdf
+		docs/INSTALL docs/LDAP docs/UPDATE docs/turba.dia docs/turba.pdf
 CONFFILE=	attributes.php conf.php html.php menu.php \
 		prefs.php sources.php
 SUB_DIRS=	config graphics lib locale scripts templates po
@@ -63,18 +62,19 @@ TURBADIR=	${PREFIX}/${LTURBADIR}
 CONFDIR=	${TURBADIR}/config
 
 HORDE_INC=	${LOCALBASE}/etc/horde
+PHPSO?=		${LOCALBASE}/libexec/apache/libphp4.so
 
 pre-install:
 .if !defined(WITHOUT_LDAP)
 .if defined(WITH_LDAP1)
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
 	    ${ECHO_MSG} "" ; \
 	    ${FALSE} ; \
 	fi
 .else
-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.2"; then \
+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.2"; then \
 	    ${ECHO_MSG} "" ; \
 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \
 	    ${ECHO_MSG} "" ; \
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index 9b728689ffda..7b0acd968a67 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.1.tar.gz) = 1b5b3cdf1eeb80fe8a1e9a2ae9000723
+MD5 (turba-1.2.tar.gz) = 7c082cdbeb499eef99ff4dbf6b3608f5
diff --git a/mail/horde-turba/files/patch-ab b/mail/horde-turba/files/patch-ab
index 195d806b3b34..4cfdc762ef3d 100644
--- a/mail/horde-turba/files/patch-ab
+++ b/mail/horde-turba/files/patch-ab
@@ -1,6 +1,6 @@
---- 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 @@
+--- config/sources.php.dist.orig	Mon Feb 10 02:14:22 2003
++++ config/sources.php.dist	Tue Feb 25 21:51:29 2003
+@@ -140,10 +140,11 @@
      'title' => 'My Addressbook',
      'type' => 'sql',
      'params' => array(
@@ -14,3 +14,35 @@
          'database' => 'horde',
          'table' => 'turba_objects'
      ),
+@@ -181,6 +182,7 @@
+  * A local address book in an LDAP directory. This implements a public
+  * (shared) address book.
+  */
++/*
+ $cfgSources['localldap'] = array(
+     'title' => 'Shared Directory',
+     'type' => 'ldap',
+@@ -219,6 +221,7 @@
+     'admin' => array(),
+     'export' => true
+ );
++*/
+ 
+ /**
+  * A personal adressbook. This assumes that the login is
+@@ -229,6 +232,7 @@
+  */
+ 
+ // First we need to get the uid.
++/*
+ $uid = Auth::getAuth();
+ preg_match('/(^.*)@/', $uid, $uid);
+ $uid = $uid[1];
+@@ -284,6 +288,7 @@
+     'admin' => array($uid),
+     'export' => true
+ );
++*/
+ 
+ /**
+  * A preferences-based adressbook. This will always be private. You
diff --git a/mail/horde-turba/pkg-message b/mail/horde-turba/pkg-message
index 85ffa7b6262b..f7cbdecc9737 100644
--- a/mail/horde-turba/pkg-message
+++ b/mail/horde-turba/pkg-message
@@ -11,6 +11,12 @@ sources.php.
 
 You have to create a table in your database; please see
 %%TURBADIR%%/scripts/drivers.
+You might create a LDAP schema: please see the doc LDAP.
+
+WARNING! if you are upgrading from Turba v. 1.1, you have to alter your
+******** schemas. Please read the doc UPDATE. An example is given for
+         MySQL in %%TURBADIR%%/scripts/drivers/:
+         - mysql_upgrade_1.1_to_1.2.sql.
 
 To protect your configuration files, you have to restart Apache.
 ************************************************************************
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index 16813d6a8c7d..0fd8edc857c5 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -2,7 +2,9 @@
 %%PORTDOCS%%share/doc/turba/COPYING
 %%PORTDOCS%%share/doc/turba/CREDITS
 %%PORTDOCS%%share/doc/turba/INSTALL
+%%PORTDOCS%%share/doc/turba/LDAP
 %%PORTDOCS%%share/doc/turba/README
+%%PORTDOCS%%share/doc/turba/UPDATE
 %%PORTDOCS%%share/doc/turba/turba.dia
 %%PORTDOCS%%share/doc/turba/turba.pdf
 %%TURBADIR%%/addobject.php
@@ -31,9 +33,12 @@
 %%TURBADIR%%/editobject.php
 %%TURBADIR%%/editobjectaction.php
 %%TURBADIR%%/graphics/add.gif
+%%TURBADIR%%/graphics/checkbox.gif
+%%TURBADIR%%/graphics/close.gif
 %%TURBADIR%%/graphics/down.gif
 %%TURBADIR%%/graphics/group.gif
 %%TURBADIR%%/graphics/lhand.gif
+%%TURBADIR%%/graphics/map.gif
 %%TURBADIR%%/graphics/rhand.gif
 %%TURBADIR%%/graphics/search.gif
 %%TURBADIR%%/graphics/turba.gif
@@ -44,6 +49,7 @@
 %%TURBADIR%%/lib/AbstractObject.php
 %%TURBADIR%%/lib/Driver.php
 %%TURBADIR%%/lib/Driver/ldap.php
+%%TURBADIR%%/lib/Driver/prefs.php
 %%TURBADIR%%/lib/Driver/sql.php
 %%TURBADIR%%/lib/Group.php
 %%TURBADIR%%/lib/List.php
@@ -62,18 +68,25 @@
 %%TURBADIR%%/lib/base.php
 %%TURBADIR%%/lib/version.php
 %%TURBADIR%%/locale/.htaccess
+%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/de_DE/help.xml
 %%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/en_US/help.xml
 %%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/fi_FI/help.xml
 %%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/lt_LT/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/lv_LV/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
@@ -82,6 +95,7 @@
 %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/sk_SK/help.xml
 %%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo
@@ -92,6 +106,8 @@
 %%TURBADIR%%/po/.htaccess
 %%TURBADIR%%/po/Makefile
 %%TURBADIR%%/po/README
+%%TURBADIR%%/po/bg_BG.po
+%%TURBADIR%%/po/ca_ES.po
 %%TURBADIR%%/po/cs_CZ.po
 %%TURBADIR%%/po/da_DK.po
 %%TURBADIR%%/po/de_DE.po
@@ -105,6 +121,8 @@
 %%TURBADIR%%/po/it_IT.po
 %%TURBADIR%%/po/ja_JP.po
 %%TURBADIR%%/po/ko_KR.po
+%%TURBADIR%%/po/lt_LT.po
+%%TURBADIR%%/po/lv_LV.po
 %%TURBADIR%%/po/nb_NO.po
 %%TURBADIR%%/po/nl_NL.po
 %%TURBADIR%%/po/nn_NO.po
@@ -117,13 +135,21 @@
 %%TURBADIR%%/po/sk_SK.po
 %%TURBADIR%%/po/sl_SI.po
 %%TURBADIR%%/po/sv_SE.po
+%%TURBADIR%%/po/turba.pot
 %%TURBADIR%%/po/uk_UA.po
 %%TURBADIR%%/po/xgettext.sh
 %%TURBADIR%%/po/zh_CN.po
 %%TURBADIR%%/po/zh_TW.po
 %%TURBADIR%%/prefs.php
 %%TURBADIR%%/scripts/.htaccess
+%%TURBADIR%%/scripts/Turba.reg
+%%TURBADIR%%/scripts/drivers/mysql_create.sql
+%%TURBADIR%%/scripts/drivers/mysql_upgrade_1.1_to_1.2.sql
+%%TURBADIR%%/scripts/drivers/pgsql_create.sql
 %%TURBADIR%%/scripts/drivers/turba.sql
+%%TURBADIR%%/scripts/ldap/addou
+%%TURBADIR%%/scripts/ldap/addou.pl
+%%TURBADIR%%/scripts/ldap/core.schema.patch
 %%TURBADIR%%/search.php
 %%TURBADIR%%/status.php
 %%TURBADIR%%/templates/.htaccess
@@ -134,8 +160,15 @@
 %%TURBADIR%%/templates/advanced/foot.inc
 %%TURBADIR%%/templates/advanced/head.inc
 %%TURBADIR%%/templates/advanced/results_head.inc
-%%TURBADIR%%/templates/browse/foot.inc
-%%TURBADIR%%/templates/browse/head.inc
+%%TURBADIR%%/templates/browse/actions.inc
+%%TURBADIR%%/templates/browse/column_footers.inc
+%%TURBADIR%%/templates/browse/column_headers.inc
+%%TURBADIR%%/templates/browse/contactrow.inc
+%%TURBADIR%%/templates/browse/footer.inc
+%%TURBADIR%%/templates/browse/header.inc
+%%TURBADIR%%/templates/browse/javascript.inc
+%%TURBADIR%%/templates/browse/search.inc
+%%TURBADIR%%/templates/browse/select.inc
 %%TURBADIR%%/templates/common-footer.inc
 %%TURBADIR%%/templates/common-header.inc
 %%TURBADIR%%/templates/data/export.inc
@@ -145,16 +178,13 @@
 %%TURBADIR%%/templates/index/css.inc
 %%TURBADIR%%/templates/index/notconfigured.inc
 %%TURBADIR%%/templates/menu/menu.inc
+%%TURBADIR%%/templates/miniwindow/frames.inc
+%%TURBADIR%%/templates/miniwindow/menu.inc
 %%TURBADIR%%/templates/prefs/columnselect.inc
 %%TURBADIR%%/templates/search/foot.inc
 %%TURBADIR%%/templates/search/head.inc
 %%TURBADIR%%/templates/search/row.inc
-%%TURBADIR%%/templates/wml/common-footer.inc
-%%TURBADIR%%/templates/wml/common-header.inc
-%%TURBADIR%%/templates/wml/menu/menu.inc
-%%TURBADIR%%/templates/wml/search/foot.inc
-%%TURBADIR%%/templates/wml/search/head.inc
-%%TURBADIR%%/templates/wml/search/row.inc
+%%TURBADIR%%/miniwindow.php
 etc/horde/httpd.conf.turba
 %%PORTDOCS%%@dirrm share/doc/turba
 @dirrm %%TURBADIR%%/config
@@ -164,6 +194,10 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/lib/ListView
 @dirrm %%TURBADIR%%/lib/ObjectView
 @dirrm %%TURBADIR%%/lib
+@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/bg_BG
+@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ca_ES
 @dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/cs_CZ
 @dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES
@@ -172,6 +206,7 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/locale/de_DE
 @dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/el_GR
+@dirrm %%TURBADIR%%/locale/en_US
 @dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/es_ES
 @dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES
@@ -188,6 +223,10 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/locale/ja_JP
 @dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/ko_KR
+@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lt_LT
+@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/lv_LV
 @dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/nb_NO
 @dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@@ -219,6 +258,7 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/locale
 @dirrm %%TURBADIR%%/po
 @dirrm %%TURBADIR%%/scripts/drivers
+@dirrm %%TURBADIR%%/scripts/ldap
 @dirrm %%TURBADIR%%/scripts
 @dirrm %%TURBADIR%%/templates/add
 @dirrm %%TURBADIR%%/templates/advanced
@@ -228,11 +268,9 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/templates/edit
 @dirrm %%TURBADIR%%/templates/index
 @dirrm %%TURBADIR%%/templates/menu
+@dirrm %%TURBADIR%%/templates/miniwindow
 @dirrm %%TURBADIR%%/templates/prefs
 @dirrm %%TURBADIR%%/templates/search
-@dirrm %%TURBADIR%%/templates/wml/menu
-@dirrm %%TURBADIR%%/templates/wml/search
-@dirrm %%TURBADIR%%/templates/wml
 @dirrm %%TURBADIR%%/templates
 @dirrm %%TURBADIR%%
 @unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi