Turba version H3 (2.2) is a major upgrade in the 2.x release series, including

these enhancements:
* The contact list can be sorted by multiple columns.
* Users can save their searches as Virtual Address Books.
* WCAG 1.0 Priority 2/Section 508 accessibility guidelines compliance.
* Improved default address book schema.
* Improved SyncML, WebDAV, and vCard support.
* Support for importing and exporting LDIF files.
* Support for address books based on favourite email recipients.
* Support for address books based on Horde Group membership.
* Database access can be split between read and write databases.
* More graceful operation if the calendar backend is not available.
* The IMSP backend now supports shared address books.
* Full Kolab webclient support.
* Advanced Search now renders custom contact field types.
* Improved address book management.
* Improved API support.
* and much, much more.

3 files changed, 106 insertions, 22 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index c47fd31f7fb..2da721e6b61 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/05/26 02:13:22 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/05/26 12:57:13 adrianp Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -10,7 +10,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://www.horde.org/turba/
 COMMENT=	Horde contact management application
 
-DEPENDS+=	horde>=3.0.0:../../www/horde
+DEPENDS+=	horde>=3.2:../../www/horde
 
 PKG_DESTDIR_SUPPORT=	destdir
 
@@ -20,7 +20,7 @@ DOCDIR=		${PREFIX}/share/doc/turba
 EGDIR=		${PREFIX}/share/examples/turba
 HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
-TURBAVER=	2.1.7
+TURBAVER=	2.2
 PAXDIRS=	lib locale po scripts templates themes
 USE_TOOLS+=	pax perl:run
 
@@ -44,7 +44,9 @@ REPLACE.php.old=	.*/bin/php
 REPLACE.php.new=	${PREFIX}/bin/php
 REPLACE_FILES.php=	scripts/import_vcards.php \
 			scripts/upgrades/create_default_histories.php \
-			scripts/upgrades/public_to_horde_share.php
+			scripts/upgrades/public_to_horde_share.php \
+			scripts/import_squirrelmail_abook.php \
+			scripts/upgrades/2.1_to_2.2_sql_schema.php
 
 CONF_FILES=		${EGDIR}/turba.conf ${PKG_SYSCONFDIR}/turba.conf
 CONF_FILES_PERMS+=	${TURBADIR}/config/sources.php.dist \
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index b0db3f77708..2030c937535 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/01/10 23:19:10 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/05/26 12:57:13 adrianp Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -6,39 +6,70 @@ 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/hooks.php.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/contact.php
 share/horde/turba/data.php
 share/horde/turba/delete.php
-share/horde/turba/display.php
+share/horde/turba/deletefile.php
 share/horde/turba/edit.php
 share/horde/turba/index.php
 share/horde/turba/lib/Block/minisearch.php
 share/horde/turba/lib/Block/tree_menu.php
+share/horde/turba/lib/Data/ldif.php
 share/horde/turba/lib/Driver.php
+share/horde/turba/lib/Driver/favourites.php
+share/horde/turba/lib/Driver/group.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/share.php
 share/horde/turba/lib/Driver/sql.php
+share/horde/turba/lib/Driver/vbook.php
+share/horde/turba/lib/Forms/AddContact.php
+share/horde/turba/lib/Forms/Contact.php
+share/horde/turba/lib/Forms/CreateAddressBook.php
+share/horde/turba/lib/Forms/DeleteAddressBook.php
+share/horde/turba/lib/Forms/EditAddressBook.php
+share/horde/turba/lib/Forms/EditContact.php
 share/horde/turba/lib/Group.php
 share/horde/turba/lib/List.php
 share/horde/turba/lib/ListView.php
+share/horde/turba/lib/Maintenance/Task/upgradelists.php
+share/horde/turba/lib/Maintenance/Task/upgradeprefs.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
+share/horde/turba/lib/Views/Browse.php
+share/horde/turba/lib/Views/Contact.php
+share/horde/turba/lib/Views/DeleteContact.php
+share/horde/turba/lib/Views/EditContact.php
 share/horde/turba/lib/api.php
 share/horde/turba/lib/base.php
 share/horde/turba/lib/prefs.php
+share/horde/turba/lib/tests/ApiTest.php
+share/horde/turba/lib/tests/BrowsePageTest.php
+share/horde/turba/lib/tests/DriverTest.php
+share/horde/turba/lib/tests/GroupTest.php
+share/horde/turba/lib/tests/ListTest.php
+share/horde/turba/lib/tests/ListViewTest.php
+share/horde/turba/lib/tests/TestBase.php
+share/horde/turba/lib/tests/ViewBrowseTest.php
+share/horde/turba/lib/tests/bug_6518.phpt
+share/horde/turba/lib/tests/import.ldif
+share/horde/turba/lib/tests/importCRLF.ldif
+share/horde/turba/lib/tests/ldif_exportFile.phpt
+share/horde/turba/lib/tests/ldif_importFile.phpt
+share/horde/turba/lib/tests/ldif_importFileCRLF.phpt
+share/horde/turba/lib/tests/tohash.phpt
 share/horde/turba/lib/tests/tovcard.phpt
 share/horde/turba/lib/version.php
 share/horde/turba/locale/ar_SY/LC_MESSAGES/turba.mo
@@ -128,61 +159,107 @@ 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_squirrelmail_abook.php
 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/test.xml
 share/horde/turba/scripts/sql/turba.mssql.sql
-share/horde/turba/scripts/sql/turba.mysql.sql
 share/horde/turba/scripts/sql/turba.oci8.sql
 share/horde/turba/scripts/sql/turba.pgsql.sql
 share/horde/turba/scripts/sql/turba.sql
-share/horde/turba/scripts/sql/turba_weddingguests.sql
 share/horde/turba/scripts/sql/turba.xml
 share/horde/turba/scripts/upgrades/1.1_to_1.2.sql
 share/horde/turba/scripts/upgrades/1.2_to_2.0.oci8.sql
 share/horde/turba/scripts/upgrades/1.2_to_2.0.sql
+share/horde/turba/scripts/upgrades/2.1_to_${PKGVERSION}_add_sql_share_tables.mssql.sql
+share/horde/turba/scripts/upgrades/2.1_to_${PKGVERSION}_add_sql_share_tables.oci8.sql
+share/horde/turba/scripts/upgrades/2.1_to_${PKGVERSION}_add_sql_share_tables.pgsql.sql
+share/horde/turba/scripts/upgrades/2.1_to_${PKGVERSION}_add_sql_share_tables.sql
+share/horde/turba/scripts/upgrades/2.1_to_${PKGVERSION}_sql_schema.php
+share/horde/turba/scripts/upgrades/2007-06-17_flatten_shares.php
+share/horde/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
 share/horde/turba/scripts/upgrades/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/addressbook_list.php
 share/horde/turba/templates/block/minisearch.inc
 share/horde/turba/templates/browse/actions.inc
 share/horde/turba/templates/browse/column_footers.inc
 share/horde/turba/templates/browse/column_headers.inc
 share/horde/turba/templates/browse/contactrow.inc
-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/search_vbook.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/list/alphaPager.inc
+share/horde/turba/templates/list/numPager.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/bluewhite/screen.css
+share/horde/turba/themes/graphics/az.png
+share/horde/turba/themes/graphics/az_secondary.png
 share/horde/turba/themes/graphics/contact.png
 share/horde/turba/themes/graphics/favicon.ico
 share/horde/turba/themes/graphics/group.png
 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/redbox_spinner.gif
+share/horde/turba/themes/graphics/search.png
 share/horde/turba/themes/graphics/turba.png
+share/horde/turba/themes/graphics/za.png
+share/horde/turba/themes/graphics/za_secondary.png
 share/horde/turba/themes/ideas/screen.css
 share/horde/turba/themes/screen.css
+share/horde/turba/themes/silver/graphics/az.png
+share/horde/turba/themes/silver/graphics/az_secondary.png
+share/horde/turba/themes/silver/graphics/contact.png
+share/horde/turba/themes/silver/graphics/favicon.ico
+share/horde/turba/themes/silver/graphics/group.png
+share/horde/turba/themes/silver/graphics/menu/browse.png
+share/horde/turba/themes/silver/graphics/menu/new.png
+share/horde/turba/themes/silver/graphics/new.png
+share/horde/turba/themes/silver/graphics/turba.png
+share/horde/turba/themes/silver/graphics/za.png
+share/horde/turba/themes/silver/graphics/za_secondary.png
+share/horde/turba/themes/silver/screen.css
+share/horde/turba/themes/silver/themed_graphics
+share/horde/turba/themes/tango-blue/graphics/az_secondary.png
+share/horde/turba/themes/tango-blue/graphics/contact.png
+share/horde/turba/themes/tango-blue/graphics/favicon.ico
+share/horde/turba/themes/tango-blue/graphics/group.png
+share/horde/turba/themes/tango-blue/graphics/menu/browse.png
+share/horde/turba/themes/tango-blue/graphics/menu/new.png
+share/horde/turba/themes/tango-blue/graphics/new.png
+share/horde/turba/themes/tango-blue/graphics/turba.png
+share/horde/turba/themes/tango-blue/graphics/za_secondary.png
+share/horde/turba/themes/tango-blue/themed_graphics
 share/horde/turba/vcard.php
 share/horde/turba/view.php
+@dirrm share/horde/turba/themes/tango-blue/graphics/menu
+@dirrm share/horde/turba/themes/tango-blue/graphics
+@dirrm share/horde/turba/themes/tango-blue
+@dirrm share/horde/turba/themes/silver/graphics/menu
+@dirrm share/horde/turba/themes/silver/graphics
+@dirrm share/horde/turba/themes/silver
+@dirrm share/horde/turba/themes/ideas
 @dirrm share/horde/turba/themes/graphics/menu
 @dirrm share/horde/turba/themes/graphics
-@dirrm share/horde/turba/themes/ideas
+@dirrm share/horde/turba/themes/bluewhite
 @dirrm share/horde/turba/themes
 @dirrm share/horde/turba/templates/prefs
+@dirrm share/horde/turba/templates/list
 @dirrm share/horde/turba/templates/data
 @dirrm share/horde/turba/templates/browse
 @dirrm share/horde/turba/templates/block
@@ -234,6 +311,8 @@ share/horde/turba/view.php
 @dirrm share/horde/turba/locale/ja_JP
 @dirrm share/horde/turba/locale/it_IT/LC_MESSAGES
 @dirrm share/horde/turba/locale/it_IT
+@dirrm share/horde/turba/locale/is_IS/LC_MESSAGES
+@dirrm share/horde/turba/locale/is_IS
 @dirrm share/horde/turba/locale/hu_HU/LC_MESSAGES
 @dirrm share/horde/turba/locale/hu_HU
 @dirrm share/horde/turba/locale/gl_ES/LC_MESSAGES
@@ -263,13 +342,16 @@ share/horde/turba/view.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/tests
+@dirrm share/horde/turba/lib/Views
 @dirrm share/horde/turba/lib/Object
+@dirrm share/horde/turba/lib/Maintenance/Task
+@dirrm share/horde/turba/lib/Maintenance
+@dirrm share/horde/turba/lib/Forms
 @dirrm share/horde/turba/lib/Driver
+@dirrm share/horde/turba/lib/Data
 @dirrm share/horde/turba/lib/Block
-@dirrm share/horde/turba/lib/tests
 @dirrm share/horde/turba/lib
 @unexec ${RMDIR} %D/share/horde/turba/config 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/horde/turba 2>/dev/null || ${TRUE}
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 74c530812ed..7cec18c618f 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/02/19 21:45:39 adrianp Exp $
+$NetBSD: distinfo,v 1.12 2008/05/26 12:57:13 adrianp Exp $
 
-SHA1 (turba-h3-2.1.7.tar.gz) = 09c71250a54d74fccbf4129587a382b7a7010a0e
-RMD160 (turba-h3-2.1.7.tar.gz) = d74745a2fce27d0e202eef09ea9adeb3e4a34b04
-Size (turba-h3-2.1.7.tar.gz) = 1868115 bytes
+SHA1 (turba-h3-2.2.tar.gz) = cb0a5830877396fa307c2b42bc9f45d5861f182b
+RMD160 (turba-h3-2.2.tar.gz) = 70fbb3587403e891fecc8852493d80fa143eb5a1
+Size (turba-h3-2.2.tar.gz) = 2247092 bytes