Changes 1.2.5:

* Fix procmail vacation rule if no dates are set
* Fix filtering only unseen message if rule should filter all messages in
  IMAP driver

Changes 1.2.4:
* Correctly escape addresses in procmail driver
* Fix procmail scripts when using composite headers
* Support some non-standard Date: headers in Sieve vacation rules
* Support composite header rules with IMAP backends
* Fix unconditional debug output with Net_Sieve earlier than 1.2.0
* Add Sieve configuration to use UTF-8 encoded folder names (for Dovecot)

Changes 1.2.3:
* Log Sieve communication with DEBUG log level.
* Fix Oracle SQL scripts.
* Add Croatian translation
* Add PostgreSQL-specific upgrade script
* Fix procmail vacation rule
* Prevent deadlock with vacation rule in maildrop driver

3 files changed, 22 insertions, 19 deletions

diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index f20374c2960..f9d19fd70c2 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/07/17 18:00:17 adrianp Exp $
+# $NetBSD: Makefile,v 1.17 2010/11/10 12:50:20 adam Exp $
 
 DISTNAME=	ingo-h3-${INGOVER}
 PKGNAME=	ingo-${INGOVER}
@@ -22,14 +22,14 @@ DOCDIR=		${PREFIX}/share/doc/ingo
 EGDIR=		${PREFIX}/share/examples/ingo
 HORDEDIR=	${PREFIX}/share/horde
 INGODIR=	${HORDEDIR}/ingo
-INGOVER=	1.2.1
+INGOVER=	1.2.5
 PAXDIRS=	lib locale po scripts templates themes
 
-MESSAGE_SUBST+=	INGODIR=${INGODIR:Q}
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=	INGODIR=${INGODIR}
+MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 PKG_SYSCONFSUBDIR?=	httpd
-USE_PKGINSTALL=		YES
+USE_PKGINSTALL=		yes
 
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
@@ -40,7 +40,7 @@ SUBST_MESSAGE.files=	Fixing configuration files.
 REPLACE_INTERPRETER+=	php
 REPLACE.php.old=	.*/bin/php
 REPLACE.php.new=	${PREFIX}/bin/php
-REPLACE_FILES.php=      scripts/upgrades/convert_prefs_to_sql.php
+REPLACE_FILES.php=	scripts/upgrades/convert_prefs_to_sql.php
 
 PKG_USERS_VARS+=	APACHE_USER
 BUILD_DEFS=		APACHE_USER
@@ -76,15 +76,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/INSTALL ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/RELEASE_NOTES ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/UPGRADING ${DESTDIR}${DOCDIR}
-
-.	for d in ${PAXDIRS}
+.for d in ${PAXDIRS}
 		${INSTALL_DATA_DIR} ${DESTDIR}${INGODIR}/${d:Q}
-.	endfor
-
-.	for d in ${PAXDIRS}
+.endfor
+.for d in ${PAXDIRS}
 		cd ${WRKSRC}/${d:Q} && pax -rwpma . ${DESTDIR}${INGODIR}/${d:Q}
-.	endfor
-
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/config/*.dist ${DESTDIR}${INGODIR}/config
 	${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${INGODIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${INGODIR}
diff --git a/mail/ingo/PLIST b/mail/ingo/PLIST
index 5e90da854ce..1fdc60e0420 100644
--- a/mail/ingo/PLIST
+++ b/mail/ingo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:45:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/11/10 12:50:20 adam Exp $
 share/doc/ingo/INSTALL
 share/doc/ingo/README
 share/doc/ingo/RELEASE_NOTES
@@ -56,13 +56,15 @@ share/horde/ingo/locale/el_GR/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/en_US/help.xml
 share/horde/ingo/locale/es_ES/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/es_ES/help.xml
+share/horde/ingo/locale/et_EE/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/eu_ES/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/eu_ES/help.xml
-share/horde/ingo/locale/et_EE/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/fi_FI/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/fi_FI/help.xml
 share/horde/ingo/locale/fr_FR/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/fr_FR/help.xml
+share/horde/ingo/locale/hr_HR/LC_MESSAGES/ingo.mo
+share/horde/ingo/locale/hr_HR/help.xml
 share/horde/ingo/locale/hu_HU/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/it_IT/LC_MESSAGES/ingo.mo
 share/horde/ingo/locale/ja_JP/LC_MESSAGES/ingo.mo
@@ -95,6 +97,7 @@ share/horde/ingo/po/et_EE.po
 share/horde/ingo/po/eu_ES.po
 share/horde/ingo/po/fi_FI.po
 share/horde/ingo/po/fr_FR.po
+share/horde/ingo/po/hr_HR.po
 share/horde/ingo/po/hu_HU.po
 share/horde/ingo/po/ingo.pot
 share/horde/ingo/po/it_IT.po
@@ -122,7 +125,10 @@ share/horde/ingo/scripts/ingo-postfix-policyd
 share/horde/ingo/scripts/sql/ingo.oci8.sql
 share/horde/ingo/scripts/sql/ingo.sql
 share/horde/ingo/scripts/sql/ingo.xml
+share/horde/ingo/scripts/upgrades/1.2.1_to_1.2.2.pgsql.sql
+share/horde/ingo/scripts/upgrades/1.2.1_to_1.2.2.sql
 share/horde/ingo/scripts/upgrades/1.2_to_1.2.1.sql
+share/horde/ingo/scripts/upgrades/2008-09-23_fix_group_uid.sql
 share/horde/ingo/scripts/upgrades/convert_datatree_shares_to_sql.php
 share/horde/ingo/scripts/upgrades/convert_imp_filters.php
 share/horde/ingo/scripts/upgrades/convert_prefs_to_sql.php
diff --git a/mail/ingo/distinfo b/mail/ingo/distinfo
index 4504c51882f..c78b76cac73 100644
--- a/mail/ingo/distinfo
+++ b/mail/ingo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2008/10/12 12:04:50 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2010/11/10 12:50:20 adam Exp $
 
-SHA1 (ingo-h3-1.2.1.tar.gz) = 11eb2f179dbc9acede316a3226bc59d647081ab6
-RMD160 (ingo-h3-1.2.1.tar.gz) = eae9ec1afdc70388a227014131f166d0043ac5cb
-Size (ingo-h3-1.2.1.tar.gz) = 1882501 bytes
+SHA1 (ingo-h3-1.2.5.tar.gz) = be629e6e54ab7f24b1ff13b2ee5b84896fc8f1b5
+RMD160 (ingo-h3-1.2.5.tar.gz) = 1e9eeeaa672be1677c330096b04eaab0fdeb4152
+Size (ingo-h3-1.2.5.tar.gz) = 2041667 bytes