- Update to 2.3.3

3 files changed, 121 insertions, 114 deletions

diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index d896ac1bff9c..9e7fbec79640 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 DISTVERSIONSUFFIX=
 CATEGORIES=	mail www
 
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index 3486f0974032..a9049f95927d 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.3.2.tar.gz) = bd750be150c171c84ec83e6473d4e443
-SHA256 (turba-h3-2.3.2.tar.gz) = 3dc9b64adacc01cb0fe0fae98c99795e7341264230604fd96a86efd925f7f256
-SIZE (turba-h3-2.3.2.tar.gz) = 2409997
+MD5 (turba-h3-2.3.3.tar.gz) = 340047741ba93a9ad2660d9061cb15bb
+SHA256 (turba-h3-2.3.3.tar.gz) = e1d5bfb1d71aad8efdadfd3fad75ff7c8234d26dbaf2576dcd3d9978abccf874
+SIZE (turba-h3-2.3.3.tar.gz) = 2511548
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index 18ea201e1302..515fc0b5a300 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -38,7 +38,6 @@
 %%HORDIR%%/lib/Block/minisearch.php
 %%HORDIR%%/lib/Block/tree_menu.php
 %%HORDIR%%/lib/Data/ldif.php
-%%HORDIR%%/lib/Driver.php
 %%HORDIR%%/lib/Driver/favourites.php
 %%HORDIR%%/lib/Driver/group.php
 %%HORDIR%%/lib/Driver/imsp.php
@@ -49,6 +48,7 @@
 %%HORDIR%%/lib/Driver/share.php
 %%HORDIR%%/lib/Driver/sql.php
 %%HORDIR%%/lib/Driver/vbook.php
+%%HORDIR%%/lib/Driver.php
 %%HORDIR%%/lib/Forms/AddContact.php
 %%HORDIR%%/lib/Forms/Contact.php
 %%HORDIR%%/lib/Forms/CreateAddressBook.php
@@ -60,8 +60,8 @@
 %%HORDIR%%/lib/ListView.php
 %%HORDIR%%/lib/Maintenance/Task/upgradelists.php
 %%HORDIR%%/lib/Maintenance/Task/upgradeprefs.php
-%%HORDIR%%/lib/Object.php
 %%HORDIR%%/lib/Object/Group.php
+%%HORDIR%%/lib/Object.php
 %%HORDIR%%/lib/Turba.php
 %%HORDIR%%/lib/Views/Browse.php
 %%HORDIR%%/lib/Views/Contact.php
@@ -113,6 +113,8 @@
 %%HORDIR%%/locale/fr_FR/LC_MESSAGES/turba.mo
 %%HORDIR%%/locale/fr_FR/help.xml
 %%HORDIR%%/locale/gl_ES/LC_MESSAGES/turba.mo
+%%HORDIR%%/locale/hr_HR/LC_MESSAGES/turba.mo
+%%HORDIR%%/locale/hr_HR/help.xml
 %%HORDIR%%/locale/hu_HU/LC_MESSAGES/turba.mo
 %%HORDIR%%/locale/is_IS/LC_MESSAGES/turba.mo
 %%HORDIR%%/locale/it_IT/LC_MESSAGES/turba.mo
@@ -157,6 +159,7 @@
 %%HORDIR%%/po/fi_FI.po
 %%HORDIR%%/po/fr_FR.po
 %%HORDIR%%/po/gl_ES.po
+%%HORDIR%%/po/hr_HR.po
 %%HORDIR%%/po/hu_HU.po
 %%HORDIR%%/po/is_IS.po
 %%HORDIR%%/po/it_IT.po
@@ -204,8 +207,10 @@
 %%HORDIR%%/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.pgsql.sql
 %%HORDIR%%/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.sql
 %%HORDIR%%/scripts/upgrades/2.1_to_2.2_sql_schema.php
+%%HORDIR%%/scripts/upgrades/2.2.1_to_2.3.oci8.sql
 %%HORDIR%%/scripts/upgrades/2.2.1_to_2.3.pgsql.sql
 %%HORDIR%%/scripts/upgrades/2.2.1_to_2.3.sql
+%%HORDIR%%/scripts/upgrades/2.3_to_2.3.3.pgsql.sql
 %%HORDIR%%/scripts/upgrades/2007-06-17_flatten_shares.php
 %%HORDIR%%/scripts/upgrades/2008-09-23_fix_group_uid.sql
 %%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
@@ -276,117 +281,119 @@
 %%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/vcard.php
 %%HORDIR%%/view.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics/menu
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
+@dirrm %%HORDIR%%/addressbooks
+@dirrmtry %%HORDIR%%/config
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Data
+@dirrm %%HORDIR%%/lib/Driver
+@dirrm %%HORDIR%%/lib/Forms
+@dirrm %%HORDIR%%/lib/Maintenance/Task
+@dirrm %%HORDIR%%/lib/Maintenance
+@dirrm %%HORDIR%%/lib/Object
+@dirrm %%HORDIR%%/lib/Views
+@dirrm %%HORDIR%%/lib/tests
+@dirrm %%HORDIR%%/lib
+@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ar_SY
+@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/bg_BG
+@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ca_ES
+@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/cs_CZ
+@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/da_DK
+@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/de_DE
+@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/el_GR
+@dirrm %%HORDIR%%/locale/en_US
+@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/es_ES
+@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/et_EE
+@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/eu_ES
+@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fa_IR
+@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/gl_ES
+@dirrm %%HORDIR%%/locale/hr_HR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hr_HR
+@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/hu_HU
+@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/is_IS
+@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/it_IT
+@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ja_JP
+@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ko_KR
+@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lt_LT
+@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/lv_LV
+@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/mk_MK
+@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nn_NO
+@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pl_PL
+@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_BR
+@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/pt_PT
+@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ro_RO
+@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/ru_RU
+@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sk_SK
+@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sl_SI
+@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/sv_SE
+@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/tr_TR
+@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/uk_UA
+@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_CN
+@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/zh_TW
+@dirrm %%HORDIR%%/locale
+@dirrm %%HORDIR%%/po
+@dirrm %%HORDIR%%/scripts/ldap
+@dirrm %%HORDIR%%/scripts/sql
+@dirrm %%HORDIR%%/scripts/upgrades
+@dirrm %%HORDIR%%/scripts
+@dirrm %%HORDIR%%/templates/block
+@dirrm %%HORDIR%%/templates/browse
+@dirrm %%HORDIR%%/templates/data
+@dirrm %%HORDIR%%/templates/list
+@dirrm %%HORDIR%%/templates/prefs
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes/graphics/menu
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/ideas
 @dirrm %%HORDIR%%/themes/silver/graphics/menu
 @dirrm %%HORDIR%%/themes/silver/graphics
 @dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/ideas
-@dirrm %%HORDIR%%/themes/graphics/menu
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes/bluewhite
+@dirrm %%HORDIR%%/themes/tango-blue/graphics/menu
+@dirrm %%HORDIR%%/themes/tango-blue/graphics
+@dirrm %%HORDIR%%/themes/tango-blue
 @dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/prefs
-@dirrm %%HORDIR%%/templates/list
-@dirrm %%HORDIR%%/templates/data
-@dirrm %%HORDIR%%/templates/browse
-@dirrm %%HORDIR%%/templates/block
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@dirrm %%HORDIR%%/scripts/ldap
-@dirrm %%HORDIR%%/scripts
-@dirrm %%HORDIR%%/po
-@dirrm %%HORDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_TW
-@dirrm %%HORDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/zh_CN
-@dirrm %%HORDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/uk_UA
-@dirrm %%HORDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/tr_TR
-@dirrm %%HORDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sv_SE
-@dirrm %%HORDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sl_SI
-@dirrm %%HORDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/sk_SK
-@dirrm %%HORDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ru_RU
-@dirrm %%HORDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ro_RO
-@dirrm %%HORDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_PT
-@dirrm %%HORDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pt_BR
-@dirrm %%HORDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/pl_PL
-@dirrm %%HORDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nn_NO
-@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@dirrm %%HORDIR%%/locale/mk_MK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/mk_MK
-@dirrm %%HORDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lv_LV
-@dirrm %%HORDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/lt_LT
-@dirrm %%HORDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ko_KR
-@dirrm %%HORDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ja_JP
-@dirrm %%HORDIR%%/locale/it_IT/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/it_IT
-@dirrm %%HORDIR%%/locale/is_IS/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/is_IS
-@dirrm %%HORDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@dirrm %%HORDIR%%/locale/gl_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/gl_ES
-@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fr_FR
-@dirrm %%HORDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fi_FI
-@dirrm %%HORDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/fa_IR
-@dirrm %%HORDIR%%/locale/eu_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/eu_ES
-@dirrm %%HORDIR%%/locale/et_EE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/et_EE
-@dirrm %%HORDIR%%/locale/es_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/es_ES
-@dirrm %%HORDIR%%/locale/en_US
-@dirrm %%HORDIR%%/locale/el_GR/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/el_GR
-@dirrm %%HORDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/de_DE
-@dirrm %%HORDIR%%/locale/da_DK/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/da_DK
-@dirrm %%HORDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/cs_CZ
-@dirrm %%HORDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ca_ES
-@dirrm %%HORDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/bg_BG
-@dirrm %%HORDIR%%/locale/ar_SY/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/ar_SY
-@dirrm %%HORDIR%%/locale
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/Views
-@dirrm %%HORDIR%%/lib/Object
-@dirrm %%HORDIR%%/lib/Maintenance/Task
-@dirrm %%HORDIR%%/lib/Maintenance
-@dirrm %%HORDIR%%/lib/Forms
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib/Data
-@dirrm %%HORDIR%%/lib/Block
-@dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrmtry %%HORDIR%%/config
-@dirrm %%HORDIR%%/addressbooks
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%