Update to 2.1

> Major changes compared to the Turba H3 (2.0) versions are:
>     * Submenu with address books and "Add" and "Search" entries in sidebar.
>     * Distribution lists can contain contacts from multiple sources.
>     * Shared address books.
>     * Paged browse view.
>     * Add files and threaded comments to contacts.
>     * Edit several contacts at once.
>     * Improved CSV import.
>     * Keep names optionally unformatted.
>     * Export more than one vCard at once.
>     * New language: Icelandic.
>     * Drop cached searches.
>     * Compatible with PHP 5.1.
>     * Improved MS-SQL support.
>     * Permissions managed completely though administration interface.
>     * Permission to restrict number of contacts.
>     * Command line script to batch import vCards.

3 files changed, 39 insertions, 19 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index c8584f07c54..84ec387eee0 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/02/14 23:06:47 seb Exp $
+# $NetBSD: Makefile,v 1.14 2006/03/08 23:54:27 adrianp Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
-PKGREVISION=	3
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/turba/
 
@@ -18,13 +17,13 @@ DOCDIR=		${PREFIX}/share/doc/turba
 EGDIR=		${PREFIX}/share/examples/turba
 HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
-TURBAVER=	2.0.5
+TURBAVER=	2.1
 PAXDIRS=	lib locale po scripts templates themes
 USE_TOOLS+=	perl:run
 
-MESSAGE_SUBST+=	TURBADIR=${TURBADIR}
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-REPLACE_PERL=	${WRKSRC}/scripts/ldap/addou.pl
+MESSAGE_SUBST+=	TURBADIR=${TURBADIR:Q}
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+REPLACE_PERL+=	${WRKSRC}/scripts/ldap/addou.pl
 
 PKG_SYSCONFSUBDIR?=	httpd
 
@@ -32,7 +31,7 @@ SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
 SUBST_FILES.files=	turba.conf.dist
 SUBST_SED.files=	-e "s|@TURBADIR@|${TURBADIR}|g"
-SUBST_MESSAGE.files=	"Fixing configuration files."
+SUBST_MESSAGE.files=	Fixing configuration files.
 
 CONF_FILES=		${EGDIR}/turba.conf ${PKG_SYSCONFDIR}/turba.conf
 CONF_FILES_PERMS+=	${TURBADIR}/config/sources.php.dist \
@@ -75,15 +74,15 @@ do-install:
 .	endfor
 
 .	for d in ${PAXDIRS}
-		cd ${WRKSRC}/${d} && ${PAX} -rwpma . ${TURBADIR}/${d}
+		@cd ${WRKSRC}/${d} && ${PAX} -rwpma . ${TURBADIR}/${d}
 .	endfor
 
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${TURBADIR}/config
 	${INSTALL_DATA} ${WRKSRC}/*.php ${TURBADIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TURBADIR}
-	${FIND} ${TURBADIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${TURBADIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config
-	${CHMOD} 0750 ${TURBADIR}/config
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TURBADIR}
+	@${FIND} ${TURBADIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+	@${FIND} ${TURBADIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
+	@${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config
+	@${CHMOD} 0750 ${TURBADIR}/config
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index 4223fd4d155..53a6f7fb0d9 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/02/14 23:06:47 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/08 23:54:27 adrianp Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -6,10 +6,12 @@ share/doc/turba/RELEASE_NOTES
 share/doc/turba/UPGRADING
 share/examples/turba/turba.conf
 share/horde/turba/add.php
+share/horde/turba/addressbooks.php
 share/horde/turba/browse.php
 share/horde/turba/config/attributes.php.dist
 share/horde/turba/config/conf.xml.dist
 share/horde/turba/config/menu.php.dist
+share/horde/turba/config/mime_drivers.php.dist
 share/horde/turba/config/prefs.php.dist
 share/horde/turba/config/sources.php.dist
 share/horde/turba/data.php
@@ -19,16 +21,19 @@ share/horde/turba/edit.php
 share/horde/turba/index.php
 share/horde/turba/lib/AbstractObject.php
 share/horde/turba/lib/Block/minisearch.php
+share/horde/turba/lib/Block/tree_menu.php
 share/horde/turba/lib/Driver.php
 share/horde/turba/lib/Driver/imsp.php
 share/horde/turba/lib/Driver/kolab.php
 share/horde/turba/lib/Driver/ldap.php
+share/horde/turba/lib/Driver/null.php
 share/horde/turba/lib/Driver/prefs.php
 share/horde/turba/lib/Driver/sql.php
 share/horde/turba/lib/Group.php
 share/horde/turba/lib/List.php
 share/horde/turba/lib/ListView.php
 share/horde/turba/lib/Object.php
+share/horde/turba/lib/Object/Group.php
 share/horde/turba/lib/ObjectView.php
 share/horde/turba/lib/Renderer.php
 share/horde/turba/lib/Turba.php
@@ -49,11 +54,13 @@ share/horde/turba/locale/es_ES/LC_MESSAGES/turba.mo
 share/horde/turba/locale/es_ES/help.xml
 share/horde/turba/locale/et_EE/LC_MESSAGES/turba.mo
 share/horde/turba/locale/fa_IR/LC_MESSAGES/turba.mo
+share/horde/turba/locale/fa_IR/help.xml
 share/horde/turba/locale/fi_FI/LC_MESSAGES/turba.mo
 share/horde/turba/locale/fi_FI/help.xml
 share/horde/turba/locale/fr_FR/LC_MESSAGES/turba.mo
 share/horde/turba/locale/gl_ES/LC_MESSAGES/turba.mo
 share/horde/turba/locale/hu_HU/LC_MESSAGES/turba.mo
+share/horde/turba/locale/is_IS/LC_MESSAGES/turba.mo
 share/horde/turba/locale/it_IT/LC_MESSAGES/turba.mo
 share/horde/turba/locale/ja_JP/LC_MESSAGES/turba.mo
 share/horde/turba/locale/ko_KR/LC_MESSAGES/turba.mo
@@ -75,6 +82,7 @@ share/horde/turba/locale/sk_SK/help.xml
 share/horde/turba/locale/sl_SI/LC_MESSAGES/turba.mo
 share/horde/turba/locale/sv_SE/LC_MESSAGES/turba.mo
 share/horde/turba/locale/tr_TR/LC_MESSAGES/turba.mo
+share/horde/turba/locale/tr_TR/help.xml
 share/horde/turba/locale/uk_UA/LC_MESSAGES/turba.mo
 share/horde/turba/locale/zh_CN/LC_MESSAGES/turba.mo
 share/horde/turba/locale/zh_TW/LC_MESSAGES/turba.mo
@@ -94,6 +102,7 @@ share/horde/turba/po/fi_FI.po
 share/horde/turba/po/fr_FR.po
 share/horde/turba/po/gl_ES.po
 share/horde/turba/po/hu_HU.po
+share/horde/turba/po/is_IS.po
 share/horde/turba/po/it_IT.po
 share/horde/turba/po/ja_JP.po
 share/horde/turba/po/ko_KR.po
@@ -117,10 +126,12 @@ share/horde/turba/po/uk_UA.po
 share/horde/turba/po/zh_CN.po
 share/horde/turba/po/zh_TW.po
 share/horde/turba/scripts/Turba.reg
+share/horde/turba/scripts/import_vcards.php
 share/horde/turba/scripts/ldap/addou
 share/horde/turba/scripts/ldap/addou.pl
 share/horde/turba/scripts/ldap/core.schema.patch
 share/horde/turba/scripts/ldap/rfc2739.schema
+share/horde/turba/scripts/sql/turba_objects.mssql.sql
 share/horde/turba/scripts/sql/turba_objects.mysql.sql
 share/horde/turba/scripts/sql/turba_objects.oci8.sql
 share/horde/turba/scripts/sql/turba_objects.pgsql.sql
@@ -128,7 +139,9 @@ share/horde/turba/scripts/sql/turba_objects.sql
 share/horde/turba/scripts/sql/turba_weddingguests.sql
 share/horde/turba/scripts/upgrades/1.2_to_2.0.sql
 share/horde/turba/scripts/upgrades/2004-10-26_create_default_histories.php
+share/horde/turba/scripts/upgrades/public_to_horde_share.php
 share/horde/turba/search.php
+share/horde/turba/templates/addressbooks.inc
 share/horde/turba/templates/block/minisearch.inc
 share/horde/turba/templates/browse/actions.inc
 share/horde/turba/templates/browse/column_footers.inc
@@ -138,14 +151,16 @@ share/horde/turba/templates/browse/footer.inc
 share/horde/turba/templates/browse/footerAlpha.inc
 share/horde/turba/templates/browse/header.inc
 share/horde/turba/templates/browse/javascript.inc
+share/horde/turba/templates/browse/row.inc
 share/horde/turba/templates/browse/search.inc
 share/horde/turba/templates/browse/search_criteria.inc
-share/horde/turba/templates/browse/select.inc
 share/horde/turba/templates/common-header.inc
 share/horde/turba/templates/data/export.inc
 share/horde/turba/templates/data/import.inc
 share/horde/turba/templates/menu.inc
+share/horde/turba/templates/prefs/addressbookselect.inc
 share/horde/turba/templates/prefs/columnselect.inc
+share/horde/turba/templates/prefs/imsp_opt.inc
 share/horde/turba/test.php
 share/horde/turba/themes/graphics/contact.png
 share/horde/turba/themes/graphics/favicon.ico
@@ -154,10 +169,13 @@ share/horde/turba/themes/graphics/menu/browse.png
 share/horde/turba/themes/graphics/menu/new.png
 share/horde/turba/themes/graphics/new.png
 share/horde/turba/themes/graphics/turba.png
+share/horde/turba/themes/ideas/screen.css
 share/horde/turba/themes/screen.css
 share/horde/turba/vcard.php
+share/horde/turba/view.php
 @dirrm share/horde/turba/themes/graphics/menu
 @dirrm share/horde/turba/themes/graphics
+@dirrm share/horde/turba/themes/ideas
 @dirrm share/horde/turba/themes
 @dirrm share/horde/turba/templates/prefs
 @dirrm share/horde/turba/templates/data
@@ -240,7 +258,10 @@ share/horde/turba/vcard.php
 @dirrm share/horde/turba/locale/bg_BG
 @dirrm share/horde/turba/locale/ar_SY/LC_MESSAGES
 @dirrm share/horde/turba/locale/ar_SY
+@dirrm share/horde/turba/locale/is_IS/LC_MESSAGES
+@dirrm share/horde/turba/locale/is_IS
 @dirrm share/horde/turba/locale
+@dirrm share/horde/turba/lib/Object
 @dirrm share/horde/turba/lib/Driver
 @dirrm share/horde/turba/lib/Block
 @dirrm share/horde/turba/lib
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 70d9ae3def7..8b31c49c878 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/12/21 05:36:44 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2006/03/08 23:54:27 adrianp Exp $
 
-SHA1 (turba-h3-2.0.5.tar.gz) = 93a3b0cef662593e046cf9150fac06ada58a5dfd
-RMD160 (turba-h3-2.0.5.tar.gz) = 8b115f1c0d03dde84f11bd668060f55e3b5dd416
-Size (turba-h3-2.0.5.tar.gz) = 1420141 bytes
+SHA1 (turba-h3-2.1.tar.gz) = c41ec328d9ce11661ce851c37f31a0dc8823ade2
+RMD160 (turba-h3-2.1.tar.gz) = 87c86156b6e5d33715c8051d2f991ec97c7597ef
+Size (turba-h3-2.1.tar.gz) = 1450847 bytes