Update truba to 2.3.6.

(while here, set LICENSE=apache-1.1.)

------
v2.3.6
------

[mjr] Fix issue that caused erroneous file listings for objects in sources
      without a __uid value.
[jan] Allow to export photo/logo fields to vCard without MIME type.
[jan] Support X-EPOCSECONDNAME fields of Nokia phones.
[jan] Add upgrade scripts for next-generation SQL share driver.
[jan] Fix splitting up names when exporting to N properties of vCards.
[jan] Only set the encoding parameter for binary data in vCards, if data is not
      empty (Bug #9413).
[jan] Fix searching for fields matching an email address if using 'emails'
      attribute instead of 'email' (Bug #9472).
[jan] Use personal address books first if determining the default one (Valentin
      Vidic, Request #9367).
[jan] Use name format preference not only for paging, but for sorting too
      (Request #8806).
[jan] Fix photo corruption when exporting to vCard 3.0 (Bug #9100).


------
v2.3.5
------

[jan] Correctly export FN vCard property if 'alternative_name' is set, but not
      'name' (Bug #9207).
[jan] Fix import of addresses from LDIF (Axel Jurak, Bug #9215).
[jan] Speed up browsing of long address books.


------
v2.3.4
------

[jan] Remove deleted contacts from distribution lists in the same address book.
[mjr] Allow creation of default, personal address book when other read-only
      sources are present.
[mjr] Log in history when deleting all of a user's contacts (Bug #8755).
[jan] Only export non-empty fields if exporting manually.
[jan] Add export to vCard 3.0.
[jan] Only synchronize those fields that are supported by the client
      (Request #6658, requires Horde 3.3.7).


------
v2.3.3
------

[jan] Fix syntax of MSSQL scripts (Bug #8664).
[jan] Add preference for the name format to use for sorting (Request #6721).
[jan] Condense whitespace in composite fields (Request #8654).
[jan] Add and fix Oracle-specific SQL scripts.
[jan] Add Croatian translation (Matej Vela <matej.vela@carnet.hr>,
      Iva Rumora <iva.rumora@zg.t-com.hr>).
[mjr] Fix permission checking for virtual address books.
[jan] Update deleted attributes during synchronization (lst_hoe02@kwsoft.de,
      Request #6658).
[jan] Support X-ANNIVERSARY, X-CHILDREN, and X-SPOUSE vCard fields
      (Request #8074).
[jan] Fix copying and moving of image fields (Ryu <ryu@ryux.org>, Bug #8523).
[jan] Don't return an error on empty LDAP search results (Bug #8595).
[jan] Replace PHP5-only code from the LDIF exporter (Bug #8586).


------
v2.3.2
------

[mms] Upgrade prototype.js to v1.6.1.
[jan] Fix synchronization with output compression enabled (Bug #7769).
[mjr] Fix contacts being deleted during synchronization when moved from one
      address book to another (ryu@ryux.org, Bug #8487).
[mjr] Add new API method for retrieving the default share for a source.
[jan] Don't overwrite the compositing fields, when importing composite fields.
[cjh] Fix searches for multiple strict fields and at least one non-strict field
      (tinu@humbapa.ch, Bug #7876).
[mjr] Specific timeobject categories are now only advertised when they are
      present in a configured source.

3 files changed, 16 insertions, 9 deletions

diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 5f0de4240dc..26876bff244 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2011/09/16 05:46:25 obache Exp $
+# $NetBSD: Makefile,v 1.36 2012/02/23 11:46:07 obache Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
-PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/turba/ \
 		ftp://ftp.horde.org/pub/turba/
@@ -10,8 +9,9 @@ MASTER_SITES=	http://ftp.horde.org/pub/turba/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.horde.org/turba/
 COMMENT=	Horde contact management application
+LICENSE=	apache-1.1
 
-DEPENDS+=	horde>=3.2:../../www/horde
+DEPENDS+=	horde>=3.3.7:../../www/horde
 
 PKG_DESTDIR_SUPPORT=	destdir
 
@@ -21,7 +21,7 @@ DOCDIR=		${PREFIX}/share/doc/turba
 EGDIR=		${PREFIX}/share/examples/turba
 HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
-TURBAVER=	2.3.1
+TURBAVER=	2.3.6
 PAXDIRS=	addressbooks lib locale po scripts templates themes js
 USE_TOOLS+=	pax perl:run
 
diff --git a/mail/turba/PLIST b/mail/turba/PLIST
index e758e1db288..e9177ac89ba 100644
--- a/mail/turba/PLIST
+++ b/mail/turba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2012/02/23 11:37:19 obache Exp $
+@comment $NetBSD: PLIST,v 1.19 2012/02/23 11:46:07 obache Exp $
 share/doc/turba/INSTALL
 share/doc/turba/LDAP
 share/doc/turba/README
@@ -117,6 +117,8 @@ share/horde/turba/locale/fi_FI/help.xml
 share/horde/turba/locale/fr_FR/LC_MESSAGES/turba.mo
 share/horde/turba/locale/fr_FR/help.xml
 share/horde/turba/locale/gl_ES/LC_MESSAGES/turba.mo
+share/horde/turba/locale/hr_HR/LC_MESSAGES/turba.mo
+share/horde/turba/locale/hr_HR/help.xml
 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
@@ -160,6 +162,7 @@ share/horde/turba/po/fa_IR.po
 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/hr_HR.po
 share/horde/turba/po/hu_HU.po
 share/horde/turba/po/is_IS.po
 share/horde/turba/po/it_IT.po
@@ -206,13 +209,17 @@ share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql
 share/horde/turba/scripts/upgrades/2.1_to_2.2_sql_schema.php
+share/horde/turba/scripts/upgrades/2.2.1_to_2.3.oci8.sql
 share/horde/turba/scripts/upgrades/2.2.1_to_2.3.pgsql.sql
 share/horde/turba/scripts/upgrades/2.2.1_to_2.3.sql
+share/horde/turba/scripts/upgrades/2.3_to_2.3.3.pgsql.sql
 share/horde/turba/scripts/upgrades/2007-06-17_flatten_shares.php
 share/horde/turba/scripts/upgrades/2008-09-23_fix_group_uid.sql
 share/horde/turba/scripts/upgrades/convert_datatree_shares_to_sql.php
+share/horde/turba/scripts/upgrades/convert_sql_shares_to_sqlng.php
 share/horde/turba/scripts/upgrades/create_default_histories.php
 share/horde/turba/scripts/upgrades/public_to_horde_share.php
+share/horde/turba/scripts/upgrades/sharesng.sql
 share/horde/turba/search.php
 share/horde/turba/templates/addressbook_list.php
 share/horde/turba/templates/block/minisearch.inc
diff --git a/mail/turba/distinfo b/mail/turba/distinfo
index 8fb87b7828c..9e1dfa4a50c 100644
--- a/mail/turba/distinfo
+++ b/mail/turba/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2008/12/15 23:19:35 adrianp Exp $
+$NetBSD: distinfo,v 1.16 2012/02/23 11:46:07 obache Exp $
 
-SHA1 (turba-h3-2.3.1.tar.gz) = dc40c389575e405f071828586c1772c4bc27cd04
-RMD160 (turba-h3-2.3.1.tar.gz) = 315e896ebbceefe6a87eafcc26eac020a36380be
-Size (turba-h3-2.3.1.tar.gz) = 2363301 bytes
+SHA1 (turba-h3-2.3.6.tar.gz) = afc1615d460b7e982918dd1557728adffa7750a6
+RMD160 (turba-h3-2.3.6.tar.gz) = 8ced7174546b5946c9676757d60fe8b0449d9701
+Size (turba-h3-2.3.6.tar.gz) = 2580295 bytes