4 files changed, 104 insertions, 110 deletions

diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 665f1c6aba82..480aa1a1a747 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ingo
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 DISTVERSIONSUFFIX=
 PORTEPOCH=	1
 CATEGORIES=	mail www
diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo
index 974b1efb2ab1..6ab6d3b4923e 100644
--- a/mail/horde-ingo/distinfo
+++ b/mail/horde-ingo/distinfo
@@ -1,3 +1,3 @@
-MD5 (ingo-h3-1.2.2.tar.gz) = 2b7f59ca72c6c2a074212c5f551fe824
-SHA256 (ingo-h3-1.2.2.tar.gz) = 71213327918315eefa3464599ad9a47c1af50e72e329c6ab0dc1d92911c426de
-SIZE (ingo-h3-1.2.2.tar.gz) = 1945296
+MD5 (ingo-h3-1.2.3.tar.gz) = f17547019c9db2e47b393724be67197c
+SHA256 (ingo-h3-1.2.3.tar.gz) = 4a0938793d5fe26e1fc553d5e0e5a08ca9c5df15e2b452921af0dbe2c8c0dfa3
+SIZE (ingo-h3-1.2.3.tar.gz) = 2025409
diff --git a/mail/horde-ingo/files/patch-lib_Script_procmail.php b/mail/horde-ingo/files/patch-lib_Script_procmail.php
deleted file mode 100644
index ffd93ad90241..000000000000
--- a/mail/horde-ingo/files/patch-lib_Script_procmail.php
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/Script/procmail.php.orig	2008-05-05 09:22:21.000000000 -0800
-+++ lib/Script/procmail.php	2008-06-29 16:56:12.000000000 -0800
-@@ -470,9 +470,6 @@
-             $this->_action[] = '{';
-             foreach ($params['action-value']['addresses'] as $address) {
-                 if (!empty($address)) {
--                    $this->_action[] = '  FILEDATE=`test -f ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' && '
--                        . $this->_params['ls'] . ' -lcn --time-style=+%s ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' | '
--                        . 'awk \'{ print $6 + (' . $days * 86400 . ') }\'`';
-                     $this->_action[] = '  DATE=`' . $this->_params['date'] . ' +%s`';
-                     $this->_action[] = '  DUMMY=`test -f ${VACATION_DIR:-.}/\'.vacation.' . $address . '\' && '
-                         . 'test $FILEDATE -le $DATE && '
diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist
index 914e301efa6c..057aa799106d 100644
--- a/mail/horde-ingo/pkg-plist
+++ b/mail/horde-ingo/pkg-plist
@@ -13,26 +13,26 @@
 %%HORDIR%%/js/src/stripe.js
 %%HORDIR%%/js/stripe.js
 %%HORDIR%%/lib/Block/overview.php
-%%HORDIR%%/lib/Driver.php
 %%HORDIR%%/lib/Driver/ldap.php
 %%HORDIR%%/lib/Driver/null.php
 %%HORDIR%%/lib/Driver/sivtest.php
 %%HORDIR%%/lib/Driver/timsieved.php
 %%HORDIR%%/lib/Driver/vfs.php
+%%HORDIR%%/lib/Driver.php
 %%HORDIR%%/lib/IMAP/Search.php
 %%HORDIR%%/lib/Ingo.php
-%%HORDIR%%/lib/Script.php
-%%HORDIR%%/lib/Script/imap.php
 %%HORDIR%%/lib/Script/imap/live.php
 %%HORDIR%%/lib/Script/imap/mock.php
+%%HORDIR%%/lib/Script/imap.php
 %%HORDIR%%/lib/Script/maildrop.php
 %%HORDIR%%/lib/Script/procmail.php
 %%HORDIR%%/lib/Script/sieve.php
+%%HORDIR%%/lib/Script.php
 %%HORDIR%%/lib/Session.php
-%%HORDIR%%/lib/Storage.php
 %%HORDIR%%/lib/Storage/mock.php
 %%HORDIR%%/lib/Storage/prefs.php
 %%HORDIR%%/lib/Storage/sql.php
+%%HORDIR%%/lib/Storage.php
 %%HORDIR%%/lib/Template.php
 %%HORDIR%%/lib/UI/VarRenderer/ingo.php
 %%HORDIR%%/lib/api.php
@@ -62,6 +62,8 @@
 %%HORDIR%%/locale/fi_FI/help.xml
 %%HORDIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo
 %%HORDIR%%/locale/fr_FR/help.xml
+%%HORDIR%%/locale/hr_HR/LC_MESSAGES/ingo.mo
+%%HORDIR%%/locale/hr_HR/help.xml
 %%HORDIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo
 %%HORDIR%%/locale/it_IT/LC_MESSAGES/ingo.mo
 %%HORDIR%%/locale/ja_JP/LC_MESSAGES/ingo.mo
@@ -94,6 +96,7 @@
 %%HORDIR%%/po/eu_ES.po
 %%HORDIR%%/po/fi_FI.po
 %%HORDIR%%/po/fr_FR.po
+%%HORDIR%%/po/hr_HR.po
 %%HORDIR%%/po/hu_HU.po
 %%HORDIR%%/po/ingo.pot
 %%HORDIR%%/po/it_IT.po
@@ -122,6 +125,7 @@
 %%HORDIR%%/scripts/sql/ingo.oci8.sql
 %%HORDIR%%/scripts/sql/ingo.sql
 %%HORDIR%%/scripts/sql/ingo.xml
+%%HORDIR%%/scripts/upgrades/1.2.1_to_1.2.2.pgsql.sql
 %%HORDIR%%/scripts/upgrades/1.2.1_to_1.2.2.sql
 %%HORDIR%%/scripts/upgrades/1.2_to_1.2.1.sql
 %%HORDIR%%/scripts/upgrades/2008-09-23_fix_group_uid.sql
@@ -185,98 +189,100 @@
 %%HORDIR%%/themes/tango-blue/themed_graphics
 %%HORDIR%%/vacation.php
 %%HORDIR%%/whitelist.php
-@dirrm %%HORDIR%%/themes/tango-blue/graphics
-@dirrm %%HORDIR%%/themes/tango-blue
-@dirrm %%HORDIR%%/themes/silver/graphics
-@dirrm %%HORDIR%%/themes/silver
-@dirrm %%HORDIR%%/themes/graphics
-@dirrm %%HORDIR%%/themes
-@dirrm %%HORDIR%%/templates/whitelist
-@dirrm %%HORDIR%%/templates/script
-@dirrm %%HORDIR%%/templates/rule
-@dirrm %%HORDIR%%/templates/javascript
-@dirrm %%HORDIR%%/templates/filters
-@dirrm %%HORDIR%%/templates/blacklist
-@dirrm %%HORDIR%%/templates
-@dirrm %%HORDIR%%/scripts/upgrades
-@dirrm %%HORDIR%%/scripts/sql
-@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/nl_NL/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nl_NL
-@dirrm %%HORDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/nb_NO
-@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/hu_HU/LC_MESSAGES
-@dirrm %%HORDIR%%/locale/hu_HU
-@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/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
-@dirrm %%HORDIR%%/lib/tests/_data
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib/UI/VarRenderer
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib/Storage
+@dirrmtry %%HORDIR%%/config
+@dirrm %%HORDIR%%/js/src
+@dirrm %%HORDIR%%/js
+@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Driver
+@dirrm %%HORDIR%%/lib/IMAP
 @dirrm %%HORDIR%%/lib/Script/imap
 @dirrm %%HORDIR%%/lib/Script
-@dirrm %%HORDIR%%/lib/IMAP
-@dirrm %%HORDIR%%/lib/Driver
-@dirrm %%HORDIR%%/lib/Block
+@dirrm %%HORDIR%%/lib/Storage
+@dirrm %%HORDIR%%/lib/UI/VarRenderer
+@dirrm %%HORDIR%%/lib/UI
+@dirrm %%HORDIR%%/lib/tests/_data
+@dirrm %%HORDIR%%/lib/tests
 @dirrm %%HORDIR%%/lib
-@dirrm %%HORDIR%%/js/src
-@dirrm %%HORDIR%%/js
-@dirrmtry %%HORDIR%%/config
+@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/fi_FI/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fi_FI
+@dirrm %%HORDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/fr_FR
+@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/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/nb_NO/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nb_NO
+@dirrm %%HORDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%HORDIR%%/locale/nl_NL
+@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/sql
+@dirrm %%HORDIR%%/scripts/upgrades
+@dirrm %%HORDIR%%/scripts
+@dirrm %%HORDIR%%/templates/blacklist
+@dirrm %%HORDIR%%/templates/filters
+@dirrm %%HORDIR%%/templates/javascript
+@dirrm %%HORDIR%%/templates/rule
+@dirrm %%HORDIR%%/templates/script
+@dirrm %%HORDIR%%/templates/whitelist
+@dirrm %%HORDIR%%/templates
+@dirrm %%HORDIR%%/themes/graphics
+@dirrm %%HORDIR%%/themes/silver/graphics
+@dirrm %%HORDIR%%/themes/silver
+@dirrm %%HORDIR%%/themes/tango-blue/graphics
+@dirrm %%HORDIR%%/themes/tango-blue
+@dirrm %%HORDIR%%/themes
 @dirrmtry %%HORDIR%%
 @dirrmtry %%HORBAS%%