4 files changed, 31 insertions, 320 deletions

diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index 4462944fa04d..f90b0cd6f687 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -6,31 +6,32 @@
 #
 
 PORTNAME=	ingo
-PORTVERSION=	1.2.5
-DISTVERSIONSUFFIX=
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	mail www
+PORTVERSION=	2.0.3
+CATEGORIES=	mail www pear
+PKGNAMEPREFIX=	horde-
 
-MAINTAINER=	beech@FreeBSD.org
-COMMENT=	Email-filter management application
+MAINTAINER=	mm@FreeBSD.org
+COMMENT=	Horde email filter rules manager
 
-#-----------------------------------------------------------------------
-# You may define this option:
-#
-# - WITH_SIEVE	: if you run timsieved (with Cyrus).
-#
-#-----------------------------------------------------------------------
-
-.if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved)
-RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
-.endif
+LICENSE=	ASL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		Rewrite in progress
-USE_PHP=	imap
-USE_HORDE=	base pkg-message
-USE_GETTEXT=	yes
-PORTDOCS=	README CHANGES CREDITS INSTALL RELEASE_NOTES TODO
+USE_PHP=	gettext
+USE_HORDE_BUILD=	Horde_Role
+USE_HORDE_RUN=	Horde_Role \
+		horde \
+		Horde_Auth \
+		Horde_Autoloader \
+		Horde_Core \
+		Horde_Exception \
+		Horde_Group \
+		Horde_Form \
+		Horde_Imap_Client \
+		Horde_Mime \
+		Horde_Perms \
+		Horde_Share \
+		Horde_Util
 
-.include "${.CURDIR}/../../www/horde-base/bsd.horde.mk"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
index 84413168c29f..f7b24c3f11cf 100644
--- a/mail/horde4-ingo/distinfo
+++ b/mail/horde4-ingo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ingo-h3-1.2.5.tar.gz) = b6b5084ef44d94b55e79e155ca65d47bd922fc1c6759e3a0ffc07f7423e47457
-SIZE (ingo-h3-1.2.5.tar.gz) = 2041667
+SHA256 (Horde/ingo-2.0.3.tgz) = 3fbb465a8d0041e5b922698673a3dec4cf8b23284c09fd426ed0f10b23478042
+SIZE (Horde/ingo-2.0.3.tgz) = 1694740
diff --git a/mail/horde4-ingo/pkg-descr b/mail/horde4-ingo/pkg-descr
index 382bea7a8f2d..cbfaa2d979d9 100644
--- a/mail/horde4-ingo/pkg-descr
+++ b/mail/horde4-ingo/pkg-descr
@@ -1,7 +1,5 @@
-Ingo is an email-filter management application.
+Ingo is an email-filter management application. It is fully internationalized,
+integrated with Horde and the IMP Webmail client, and supports both server-side
+(Sieve, procmail) and client-side (IMAP) message filtering.
 
-It is fully internationalized, integrated with Horde and the IMP Webmail
-client, and supports both server-side (Sieve, procmail) and client-side
-(IMAP) rule creation.
-
-WWW: http://horde.org/ingo/
+WWW: http://www.horde.org/apps/ingo/
diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist
deleted file mode 100644
index 057aa799106d..000000000000
--- a/mail/horde4-ingo/pkg-plist
+++ /dev/null
@@ -1,288 +0,0 @@
-%%HORDIR%%/blacklist.php
-%%HORDIR%%/config/.htaccess
-%%HORDIR%%/config/backends.php.dist
-%%HORDIR%%/config/conf.xml
-%%HORDIR%%/config/fields.php.dist
-%%HORDIR%%/config/hooks.php.dist
-%%HORDIR%%/config/prefs.php.dist
-%%HORDIR%%/filters.php
-%%HORDIR%%/forward.php
-%%HORDIR%%/index.php
-%%HORDIR%%/js/prototype.js
-%%HORDIR%%/js/src/prototype.js
-%%HORDIR%%/js/src/stripe.js
-%%HORDIR%%/js/stripe.js
-%%HORDIR%%/lib/Block/overview.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/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/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
-%%HORDIR%%/lib/base.php
-%%HORDIR%%/lib/tests/MaildropTest.php
-%%HORDIR%%/lib/tests/ProcmailTest.php
-%%HORDIR%%/lib/tests/ScriptTest.php
-%%HORDIR%%/lib/tests/SieveTest.php
-%%HORDIR%%/lib/tests/TestBase.php
-%%HORDIR%%/lib/tests/_data/from_spammer
-%%HORDIR%%/lib/tests/_data/not_from_spammer
-%%HORDIR%%/lib/version.php
-%%HORDIR%%/locale/ca_ES/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ca_ES/help.xml
-%%HORDIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/da_DK/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/de_DE/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/de_DE/help.xml
-%%HORDIR%%/locale/el_GR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/en_US/help.xml
-%%HORDIR%%/locale/es_ES/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/es_ES/help.xml
-%%HORDIR%%/locale/et_EE/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/eu_ES/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/eu_ES/help.xml
-%%HORDIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo
-%%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
-%%HORDIR%%/locale/ko_KR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/lt_LT/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/lv_LV/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/lv_LV/help.xml
-%%HORDIR%%/locale/nb_NO/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/nl_NL/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/pl_PL/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/pt_PT/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/ru_RU/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/sk_SK/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/sl_SI/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/tr_TR/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/uk_UA/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/zh_CN/LC_MESSAGES/ingo.mo
-%%HORDIR%%/locale/zh_TW/LC_MESSAGES/ingo.mo
-%%HORDIR%%/po/README
-%%HORDIR%%/po/ca_ES.po
-%%HORDIR%%/po/cs_CZ.po
-%%HORDIR%%/po/da_DK.po
-%%HORDIR%%/po/de_DE.po
-%%HORDIR%%/po/el_GR.po
-%%HORDIR%%/po/es_ES.po
-%%HORDIR%%/po/et_EE.po
-%%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
-%%HORDIR%%/po/ja_JP.po
-%%HORDIR%%/po/ko_KR.po
-%%HORDIR%%/po/lt_LT.po
-%%HORDIR%%/po/lv_LV.po
-%%HORDIR%%/po/nb_NO.po
-%%HORDIR%%/po/nl_NL.po
-%%HORDIR%%/po/pl_PL.po
-%%HORDIR%%/po/pt_BR.po
-%%HORDIR%%/po/pt_PT.po
-%%HORDIR%%/po/ro_RO.po
-%%HORDIR%%/po/ru_RU.po
-%%HORDIR%%/po/sk_SK.po
-%%HORDIR%%/po/sl_SI.po
-%%HORDIR%%/po/sv_SE.po
-%%HORDIR%%/po/tr_TR.po
-%%HORDIR%%/po/uk_UA.po
-%%HORDIR%%/po/zh_CN.po
-%%HORDIR%%/po/zh_TW.po
-%%HORDIR%%/rule.php
-%%HORDIR%%/script.php
-%%HORDIR%%/scripts/.htaccess
-%%HORDIR%%/scripts/ingo-postfix-policyd
-%%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
-%%HORDIR%%/scripts/upgrades/convert_datatree_shares_to_sql.php
-%%HORDIR%%/scripts/upgrades/convert_imp_filters.php
-%%HORDIR%%/scripts/upgrades/convert_prefs_to_sql.php
-%%HORDIR%%/spam.php
-%%HORDIR%%/templates/blacklist/blacklist.inc
-%%HORDIR%%/templates/common-header.inc
-%%HORDIR%%/templates/filters/filter-none.inc
-%%HORDIR%%/templates/filters/filter.html
-%%HORDIR%%/templates/filters/footer.inc
-%%HORDIR%%/templates/filters/header.inc
-%%HORDIR%%/templates/filters/settings.inc
-%%HORDIR%%/templates/javascript/new_folder.js
-%%HORDIR%%/templates/menu.inc
-%%HORDIR%%/templates/rule/filter.inc
-%%HORDIR%%/templates/rule/footer.inc
-%%HORDIR%%/templates/rule/header.inc
-%%HORDIR%%/templates/script/activate.inc
-%%HORDIR%%/templates/script/footer.inc
-%%HORDIR%%/templates/script/header.inc
-%%HORDIR%%/templates/script/script.inc
-%%HORDIR%%/templates/whitelist/whitelist.inc
-%%HORDIR%%/test.php
-%%HORDIR%%/themes/graphics/blacklist.png
-%%HORDIR%%/themes/graphics/copy.png
-%%HORDIR%%/themes/graphics/disable.png
-%%HORDIR%%/themes/graphics/enable.png
-%%HORDIR%%/themes/graphics/favicon.ico
-%%HORDIR%%/themes/graphics/forward.png
-%%HORDIR%%/themes/graphics/ingo.png
-%%HORDIR%%/themes/graphics/script.png
-%%HORDIR%%/themes/graphics/spam.png
-%%HORDIR%%/themes/graphics/vacation.png
-%%HORDIR%%/themes/graphics/whitelist.png
-%%HORDIR%%/themes/screen.css
-%%HORDIR%%/themes/silver/graphics/blacklist.png
-%%HORDIR%%/themes/silver/graphics/copy.png
-%%HORDIR%%/themes/silver/graphics/disable.png
-%%HORDIR%%/themes/silver/graphics/enable.png
-%%HORDIR%%/themes/silver/graphics/favicon.ico
-%%HORDIR%%/themes/silver/graphics/forward.png
-%%HORDIR%%/themes/silver/graphics/ingo.png
-%%HORDIR%%/themes/silver/graphics/script.png
-%%HORDIR%%/themes/silver/graphics/spam.png
-%%HORDIR%%/themes/silver/graphics/vacation.png
-%%HORDIR%%/themes/silver/graphics/whitelist.png
-%%HORDIR%%/themes/silver/themed_graphics
-%%HORDIR%%/themes/tango-blue/graphics/blacklist.png
-%%HORDIR%%/themes/tango-blue/graphics/copy.png
-%%HORDIR%%/themes/tango-blue/graphics/disable.png
-%%HORDIR%%/themes/tango-blue/graphics/enable.png
-%%HORDIR%%/themes/tango-blue/graphics/favicon.ico
-%%HORDIR%%/themes/tango-blue/graphics/forward.png
-%%HORDIR%%/themes/tango-blue/graphics/ingo.png
-%%HORDIR%%/themes/tango-blue/graphics/script.png
-%%HORDIR%%/themes/tango-blue/graphics/spam.png
-%%HORDIR%%/themes/tango-blue/graphics/vacation.png
-%%HORDIR%%/themes/tango-blue/graphics/whitelist.png
-%%HORDIR%%/themes/tango-blue/themed_graphics
-%%HORDIR%%/vacation.php
-%%HORDIR%%/whitelist.php
-@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/Storage
-@dirrm %%HORDIR%%/lib/UI/VarRenderer
-@dirrm %%HORDIR%%/lib/UI
-@dirrm %%HORDIR%%/lib/tests/_data
-@dirrm %%HORDIR%%/lib/tests
-@dirrm %%HORDIR%%/lib
-@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%%