mail/turba: upgrading to 1.2.1 & removing IS_INTERACTIVE.

	- upgrading to 1.2.1 (See changelog at   <http://cvs.horde.org/diff.php/turba/docs/CHANGES?r1=1.61.2.53&;r2=1.61.2.59&ty=h>)
	- removing IS_INTERACTIVE.

PR:		ports/57113
Submitted by:	Thierry Thomas <thierry@pompo.net>

3 files changed, 28 insertions, 13 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 5f055a74a0de..1b0c0017f37e 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/				\
 		ftp://ftp.au.horde.org/pub/horde/turba/			\
@@ -26,15 +25,11 @@ COMMENT=	The Horde contact management application
 #
 #-----------------------------------------------------------------------
 
+RUN_DEPENDS=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
+
 .if !defined(WITHOUT_LDAP)
-.if exists(${LOCALBASE}/lib/libldap.so.1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
-.else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
+USE_OPENLDAP=	yes
 .endif
-.endif
-
-RUN_DEPENDS+=  ${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
@@ -64,6 +59,11 @@ PHPSO=		${LOCALBASE}/libexec/apache2/libphp4.so
 PHPSO=		${LOCALBASE}/libexec/apache/libphp4.so
 .endif
 
+post-patch:
+	@${RM} ${WRKSRC}/config/conf.php.dist.orig	\
+		${WRKSRC}/config/prefs.php.dist.orig	\
+		${WRKSRC}/config/sources.php.dist.orig
+
 pre-install:
 .if !defined(WITHOUT_LDAP)
 .if exists(${LOCALBASE}/lib/libldap.so.1)
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 7b0acd968a67..3614696de278 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1 +1 @@
-MD5 (turba-1.2.tar.gz) = 7c082cdbeb499eef99ff4dbf6b3608f5
+MD5 (turba-1.2.1.tar.gz) = 1101266f404db0f4639cf41c25a64c35
diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist
index 0fd8edc857c5..1bc144a09498 100644
--- a/mail/turba/pkg-plist
+++ b/mail/turba/pkg-plist
@@ -7,6 +7,7 @@
 %%PORTDOCS%%share/doc/turba/UPDATE
 %%PORTDOCS%%share/doc/turba/turba.dia
 %%PORTDOCS%%share/doc/turba/turba.pdf
+%%TURBADIR%%/add.php
 %%TURBADIR%%/addobject.php
 %%TURBADIR%%/addobjectaction.php
 %%TURBADIR%%/advanced.php
@@ -16,20 +17,20 @@
 %%TURBADIR%%/config/attributes.php.dist
 %%TURBADIR%%/config/conf.php
 %%TURBADIR%%/config/conf.php.dist
-%%TURBADIR%%/config/conf.php.dist.orig
 %%TURBADIR%%/config/html.php
 %%TURBADIR%%/config/html.php.dist
 %%TURBADIR%%/config/menu.php
 %%TURBADIR%%/config/menu.php.dist
 %%TURBADIR%%/config/prefs.php
 %%TURBADIR%%/config/prefs.php.dist
-%%TURBADIR%%/config/prefs.php.dist.orig
 %%TURBADIR%%/config/sources.php
 %%TURBADIR%%/config/sources.php.dist
-%%TURBADIR%%/config/sources.php.dist.orig
 %%TURBADIR%%/data.php
+%%TURBADIR%%/delete.php
 %%TURBADIR%%/deleteobject.php
+%%TURBADIR%%/display.php
 %%TURBADIR%%/displayobject.php
+%%TURBADIR%%/edit.php
 %%TURBADIR%%/editobject.php
 %%TURBADIR%%/editobjectaction.php
 %%TURBADIR%%/graphics/add.gif
@@ -68,6 +69,7 @@
 %%TURBADIR%%/lib/base.php
 %%TURBADIR%%/lib/version.php
 %%TURBADIR%%/locale/.htaccess
+%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo
@@ -81,18 +83,22 @@
 %%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/help.xml
 %%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/mk_MK/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/help.xml
 %%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo
 %%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo
+%%TURBADIR%%/locale/ro_RO/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
@@ -106,6 +112,7 @@
 %%TURBADIR%%/po/.htaccess
 %%TURBADIR%%/po/Makefile
 %%TURBADIR%%/po/README
+%%TURBADIR%%/po/ar_SY.po
 %%TURBADIR%%/po/bg_BG.po
 %%TURBADIR%%/po/ca_ES.po
 %%TURBADIR%%/po/cs_CZ.po
@@ -123,12 +130,14 @@
 %%TURBADIR%%/po/ko_KR.po
 %%TURBADIR%%/po/lt_LT.po
 %%TURBADIR%%/po/lv_LV.po
+%%TURBADIR%%/po/mk_MK.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
+%%TURBADIR%%/po/ro_RO.po
 %%TURBADIR%%/po/ru_RU.po
 %%TURBADIR%%/po/ru_RU.KOI8-R.po
 %%TURBADIR%%/po/shtool
@@ -194,6 +203,8 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/lib/ListView
 @dirrm %%TURBADIR%%/lib/ObjectView
 @dirrm %%TURBADIR%%/lib
+@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ar_SY
 @dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/bg_BG
 @dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES
@@ -227,6 +238,8 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/locale/lt_LT
 @dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/lv_LV
+@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/mk_MK
 @dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/nb_NO
 @dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES
@@ -239,6 +252,8 @@ etc/horde/httpd.conf.turba
 @dirrm %%TURBADIR%%/locale/pt_BR
 @dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/pt_PT
+@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%TURBADIR%%/locale/ro_RO
 @dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES
 @dirrm %%TURBADIR%%/locale/ru_RU
 @dirrm %%TURBADIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES