- Update to 2.2.1

6 files changed, 34 insertions, 14 deletions

diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 597f7d1358f1..235d9e467169 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.2
-DISTVERSIONSUFFIX=	-rc3
-PORTREVISION=	1
+PORTVERSION=	2.2.1
+DISTVERSIONSUFFIX=
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo
index af3a09b619c2..1298b911d1fa 100644
--- a/mail/horde-turba/distinfo
+++ b/mail/horde-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.2-rc3.tar.gz) = 2c44c85510b7b24599a725ca0271fc25
-SHA256 (turba-h3-2.2-rc3.tar.gz) = 0641a5f9603b80f4eb6b5b9932179ce03251ba115be8bc5103e8ba8cf432b822
-SIZE (turba-h3-2.2-rc3.tar.gz) = 2158573
+MD5 (turba-h3-2.2.1.tar.gz) = 9fd4cefb58cebc8a199f3c6ff1622a92
+SHA256 (turba-h3-2.2.1.tar.gz) = a05db7d75de92192901714c144dfbc59f704705cbd32781735d20349b068d6f2
+SIZE (turba-h3-2.2.1.tar.gz) = 2245123
diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist
index 29c830b771a3..bdf1cdd719d6 100644
--- a/mail/horde-turba/pkg-plist
+++ b/mail/horde-turba/pkg-plist
@@ -4,6 +4,7 @@
 %%HORDIR%%/addressbooks/edit.php
 %%HORDIR%%/addressbooks/index.php
 %%HORDIR%%/browse.php
+%%HORDIR%%/bug5476.phpt
 %%HORDIR%%/config/.htaccess
 %%HORDIR%%/config/attributes.php.dist
 %%HORDIR%%/config/conf.xml
@@ -20,12 +21,14 @@
 %%HORDIR%%/index.php
 %%HORDIR%%/js/QuickFinder.js
 %%HORDIR%%/js/contact_tabs.js
+%%HORDIR%%/js/dragdrop.js
 %%HORDIR%%/js/effects.js
 %%HORDIR%%/js/prototype.js
 %%HORDIR%%/js/redbox.js
 %%HORDIR%%/js/scriptaculous.js
 %%HORDIR%%/js/src/QuickFinder.js
 %%HORDIR%%/js/src/contact_tabs.js
+%%HORDIR%%/js/src/dragdrop.js
 %%HORDIR%%/js/src/effects.js
 %%HORDIR%%/js/src/prototype.js
 %%HORDIR%%/js/src/redbox.js
@@ -76,6 +79,7 @@
 %%HORDIR%%/lib/tests/ListViewTest.php
 %%HORDIR%%/lib/tests/TestBase.php
 %%HORDIR%%/lib/tests/ViewBrowseTest.php
+%%HORDIR%%/lib/tests/bug_6518.phpt
 %%HORDIR%%/lib/tests/import.ldif
 %%HORDIR%%/lib/tests/importCRLF.ldif
 %%HORDIR%%/lib/tests/ldif_exportFile.phpt
@@ -186,12 +190,16 @@
 %%HORDIR%%/scripts/sql/turba.pgsql.sql
 %%HORDIR%%/scripts/sql/turba.sql
 %%HORDIR%%/scripts/sql/turba.xml
-%%HORDIR%%/scripts/sql/turba_weddingguests.sql
 %%HORDIR%%/scripts/upgrades/1.1_to_1.2.sql
 %%HORDIR%%/scripts/upgrades/1.2_to_2.0.oci8.sql
 %%HORDIR%%/scripts/upgrades/1.2_to_2.0.sql
+%%HORDIR%%/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.mssql.sql
+%%HORDIR%%/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
+%%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/2007-06-17_flatten_shares.php
+%%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
 %%HORDIR%%/scripts/upgrades/create_default_histories.php
 %%HORDIR%%/scripts/upgrades/public_to_horde_share.php
 %%HORDIR%%/search.php
@@ -234,6 +242,7 @@
 %%HORDIR%%/themes/graphics/za_secondary.png
 %%HORDIR%%/themes/ideas/screen.css
 %%HORDIR%%/themes/screen.css
+%%HORDIR%%/themes/silver/graphics/az.png
 %%HORDIR%%/themes/silver/graphics/az_secondary.png
 %%HORDIR%%/themes/silver/graphics/contact.png
 %%HORDIR%%/themes/silver/graphics/favicon.ico
@@ -242,7 +251,9 @@
 %%HORDIR%%/themes/silver/graphics/menu/new.png
 %%HORDIR%%/themes/silver/graphics/new.png
 %%HORDIR%%/themes/silver/graphics/turba.png
+%%HORDIR%%/themes/silver/graphics/za.png
 %%HORDIR%%/themes/silver/graphics/za_secondary.png
+%%HORDIR%%/themes/silver/screen.css
 %%HORDIR%%/themes/silver/themed_graphics
 %%HORDIR%%/themes/tango-blue/graphics/az_secondary.png
 %%HORDIR%%/themes/tango-blue/graphics/contact.png
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 597f7d1358f1..235d9e467169 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	2.2
-DISTVERSIONSUFFIX=	-rc3
-PORTREVISION=	1
+PORTVERSION=	2.2.1
+DISTVERSIONSUFFIX=
 CATEGORIES=	mail www
 
 MAINTAINER=	beech@FreeBSD.org
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
index af3a09b619c2..1298b911d1fa 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1,3 +1,3 @@
-MD5 (turba-h3-2.2-rc3.tar.gz) = 2c44c85510b7b24599a725ca0271fc25
-SHA256 (turba-h3-2.2-rc3.tar.gz) = 0641a5f9603b80f4eb6b5b9932179ce03251ba115be8bc5103e8ba8cf432b822
-SIZE (turba-h3-2.2-rc3.tar.gz) = 2158573
+MD5 (turba-h3-2.2.1.tar.gz) = 9fd4cefb58cebc8a199f3c6ff1622a92
+SHA256 (turba-h3-2.2.1.tar.gz) = a05db7d75de92192901714c144dfbc59f704705cbd32781735d20349b068d6f2
+SIZE (turba-h3-2.2.1.tar.gz) = 2245123
diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist
index 29c830b771a3..bdf1cdd719d6 100644
--- a/mail/horde4-turba/pkg-plist
+++ b/mail/horde4-turba/pkg-plist
@@ -4,6 +4,7 @@
 %%HORDIR%%/addressbooks/edit.php
 %%HORDIR%%/addressbooks/index.php
 %%HORDIR%%/browse.php
+%%HORDIR%%/bug5476.phpt
 %%HORDIR%%/config/.htaccess
 %%HORDIR%%/config/attributes.php.dist
 %%HORDIR%%/config/conf.xml
@@ -20,12 +21,14 @@
 %%HORDIR%%/index.php
 %%HORDIR%%/js/QuickFinder.js
 %%HORDIR%%/js/contact_tabs.js
+%%HORDIR%%/js/dragdrop.js
 %%HORDIR%%/js/effects.js
 %%HORDIR%%/js/prototype.js
 %%HORDIR%%/js/redbox.js
 %%HORDIR%%/js/scriptaculous.js
 %%HORDIR%%/js/src/QuickFinder.js
 %%HORDIR%%/js/src/contact_tabs.js
+%%HORDIR%%/js/src/dragdrop.js
 %%HORDIR%%/js/src/effects.js
 %%HORDIR%%/js/src/prototype.js
 %%HORDIR%%/js/src/redbox.js
@@ -76,6 +79,7 @@
 %%HORDIR%%/lib/tests/ListViewTest.php
 %%HORDIR%%/lib/tests/TestBase.php
 %%HORDIR%%/lib/tests/ViewBrowseTest.php
+%%HORDIR%%/lib/tests/bug_6518.phpt
 %%HORDIR%%/lib/tests/import.ldif
 %%HORDIR%%/lib/tests/importCRLF.ldif
 %%HORDIR%%/lib/tests/ldif_exportFile.phpt
@@ -186,12 +190,16 @@
 %%HORDIR%%/scripts/sql/turba.pgsql.sql
 %%HORDIR%%/scripts/sql/turba.sql
 %%HORDIR%%/scripts/sql/turba.xml
-%%HORDIR%%/scripts/sql/turba_weddingguests.sql
 %%HORDIR%%/scripts/upgrades/1.1_to_1.2.sql
 %%HORDIR%%/scripts/upgrades/1.2_to_2.0.oci8.sql
 %%HORDIR%%/scripts/upgrades/1.2_to_2.0.sql
+%%HORDIR%%/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.mssql.sql
+%%HORDIR%%/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
+%%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/2007-06-17_flatten_shares.php
+%%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
 %%HORDIR%%/scripts/upgrades/create_default_histories.php
 %%HORDIR%%/scripts/upgrades/public_to_horde_share.php
 %%HORDIR%%/search.php
@@ -234,6 +242,7 @@
 %%HORDIR%%/themes/graphics/za_secondary.png
 %%HORDIR%%/themes/ideas/screen.css
 %%HORDIR%%/themes/screen.css
+%%HORDIR%%/themes/silver/graphics/az.png
 %%HORDIR%%/themes/silver/graphics/az_secondary.png
 %%HORDIR%%/themes/silver/graphics/contact.png
 %%HORDIR%%/themes/silver/graphics/favicon.ico
@@ -242,7 +251,9 @@
 %%HORDIR%%/themes/silver/graphics/menu/new.png
 %%HORDIR%%/themes/silver/graphics/new.png
 %%HORDIR%%/themes/silver/graphics/turba.png
+%%HORDIR%%/themes/silver/graphics/za.png
 %%HORDIR%%/themes/silver/graphics/za_secondary.png
+%%HORDIR%%/themes/silver/screen.css
 %%HORDIR%%/themes/silver/themed_graphics
 %%HORDIR%%/themes/tango-blue/graphics/az_secondary.png
 %%HORDIR%%/themes/tango-blue/graphics/contact.png