Update horde4 packages and applications to horde5

26 files changed, 84 insertions, 58 deletions

diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index e28fd2f8606b..89e17da0fb36 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	4.0.16
-PKGNAMEPREFIX=
+PORTVERSION=	5.0.2
 CATEGORIES=	www pear
+PKGNAMEPREFIX=
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Application Framework
@@ -17,10 +17,13 @@ CONFLICTS=	horde-3*
 
 RUN_DEPENDS=	${PEARDIR}/Net/DNS2.php:${PORTSDIR}/dns/pear-Net_DNS2
 
-OPTIONS=	FACEBOOK "Support connections to Facebook" Off \
-		ICONV "Depend on PHP iconv extension" On \
-		TWITTER "Support connections to Twitter" Off \
-		WEATHER "Support weather forecast display" Off
+OPTIONS_DEFAULT=	ICONV
+OPTIONS_DEFINE=	FACEBOOK ICONV TWITTER WEATHER
+
+FACEBOOK_DESC=	Support connections to Facebook
+ICONV_DESC=	Depend on PHP iconv extension
+TWITTER_DESC=	Support connections to Twitter
+WEATHER_DESC=	Support weather forecast display
 
 USE_PHP=	filter gettext hash
 
@@ -39,6 +42,7 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Http \
 		Horde_Image \
 		Horde_LoginTasks \
+		Horde_Mail \
 		Horde_Mime \
 		Horde_Nls \
 		Horde_Perms \
@@ -57,8 +61,7 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Vfs
 
 # Optional in package but we want them in
-USE_HORDE_RUN+=	Horde_DataTree \
-		Horde_Feed
+USE_HORDE_RUN+=	Horde_Feed
 
 .include <bsd.port.options.mk>
 
diff --git a/www/horde4-base/distinfo b/www/horde4-base/distinfo
index 60a4551af82b..86f03384915e 100644
--- a/www/horde4-base/distinfo
+++ b/www/horde4-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/horde-4.0.16.tgz) = 4cffa3356bb302cc5a2111e9074d18aee9abb75130b671156c6464fa7bf6a6b0
-SIZE (Horde/horde-4.0.16.tgz) = 3957844
+SHA256 (Horde/horde-5.0.2.tgz) = 34e1e68d86691e1103bbc821018d47f7cd4c78b0814175285b5031c7112e362c
+SIZE (Horde/horde-5.0.2.tgz) = 2852457
diff --git a/www/pear-Horde_Browser/Makefile b/www/pear-Horde_Browser/Makefile
index 8bbb6e469150..ff5e8af35e61 100644
--- a/www/pear-Horde_Browser/Makefile
+++ b/www/pear-Horde_Browser/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Browser
-PORTVERSION=	1.0.9
+PORTVERSION=	2.0.2
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/www/pear-Horde_Browser/distinfo b/www/pear-Horde_Browser/distinfo
index 727adaf353e9..03f26a6f1941 100644
--- a/www/pear-Horde_Browser/distinfo
+++ b/www/pear-Horde_Browser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Browser-1.0.9.tgz) = 02ac916141e3974f4fd0cb111b234598917efbb25604c97e386790b0780cfdd0
-SIZE (Horde/Horde_Browser-1.0.9.tgz) = 34891
+SHA256 (Horde/Horde_Browser-2.0.2.tgz) = af487d91ede6a9abb101644f166d93b2d37e76b3c9e3c4b628cb17ecaf358889
+SIZE (Horde/Horde_Browser-2.0.2.tgz) = 35481
diff --git a/www/pear-Horde_Editor/Makefile b/www/pear-Horde_Editor/Makefile
index a6b986aec8b1..cc92d14635b0 100644
--- a/www/pear-Horde_Editor/Makefile
+++ b/www/pear-Horde_Editor/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Editor
-PORTVERSION=	1.0.2
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
@@ -16,7 +16,6 @@ CONFLICTS=	horde-3*
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		Horde_Browser \
-		Horde_Core \
 		Horde_Exception \
 		Horde_Serialize
 
diff --git a/www/pear-Horde_Editor/distinfo b/www/pear-Horde_Editor/distinfo
index 3646d86c3fae..19edb005ed80 100644
--- a/www/pear-Horde_Editor/distinfo
+++ b/www/pear-Horde_Editor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Editor-1.0.2.tgz) = adfbe1d8581b13ea69082d481aea6125985fae460220d40ba914be2292ab35bf
-SIZE (Horde/Horde_Editor-1.0.2.tgz) = 592622
+SHA256 (Horde/Horde_Editor-2.0.1.tgz) = 6183bf324fbfa56d19357db8d3d487a41a0a6dbd84e1041c5c01f6b720882d94
+SIZE (Horde/Horde_Editor-2.0.1.tgz) = 734365
diff --git a/www/pear-Horde_Feed/Makefile b/www/pear-Horde_Feed/Makefile
index 91c8528867c7..770407280b37 100644
--- a/www/pear-Horde_Feed/Makefile
+++ b/www/pear-Horde_Feed/Makefile
@@ -5,14 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Feed
-PORTVERSION=	1.1.1
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Feed libraries
 
 USE_PHP=	dom
-USE_HORDE_RUN=	Horde_Exception Horde_Http Horde_Xml_Element
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Http \
+		Horde_Xml_Element
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Feed/distinfo b/www/pear-Horde_Feed/distinfo
index 9ebfca5f0a17..b149f840de8b 100644
--- a/www/pear-Horde_Feed/distinfo
+++ b/www/pear-Horde_Feed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Feed-1.1.1.tgz) = 6127885bb88d7e671c66a7098595d341fecda987f5b109fbc10cefc1d3c24405
-SIZE (Horde/Horde_Feed-1.1.1.tgz) = 1612244
+SHA256 (Horde/Horde_Feed-2.0.1.tgz) = 1a46b5f32f831202c9273dd2372a383963c0b7c36f1c3003a80580feb59ac5ac
+SIZE (Horde/Horde_Feed-2.0.1.tgz) = 1612317
diff --git a/www/pear-Horde_Form/Makefile b/www/pear-Horde_Form/Makefile
index 1d7fd7ef6b7e..2ec0ed7b258e 100644
--- a/www/pear-Horde_Form/Makefile
+++ b/www/pear-Horde_Form/Makefile
@@ -5,14 +5,21 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Form
-PORTVERSION=	1.1.0
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Form API
 
-USE_HORDE_RUN=	Horde_Core Horde_Date Horde_Exception Horde_Mime \
-		Horde_Nls Horde_Token Horde_Translation Horde_Util
+USE_HORDE_RUN=	Horde_Core \
+		Horde_Date \
+		Horde_Exception \
+		Horde_Mail \
+		Horde_Mime \
+		Horde_Nls \
+		Horde_Token \
+		Horde_Translation \
+		Horde_Util
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Form/distinfo b/www/pear-Horde_Form/distinfo
index 5c628437ca8e..616c77b3f6a1 100644
--- a/www/pear-Horde_Form/distinfo
+++ b/www/pear-Horde_Form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Form-1.1.0.tgz) = 5fc7050d4ff48e57f9289d793616eddf7ffc79f9bf8c671212b9219f643a037a
-SIZE (Horde/Horde_Form-1.1.0.tgz) = 186517
+SHA256 (Horde/Horde_Form-2.0.1.tgz) = 7c7542d49a6b2072d711452503c84ae7ca294dc235b3647e1b3048fe95f55b1e
+SIZE (Horde/Horde_Form-2.0.1.tgz) = 187141
diff --git a/www/pear-Horde_Http/Makefile b/www/pear-Horde_Http/Makefile
index d10144b53153..39f817c4c35b 100644
--- a/www/pear-Horde_Http/Makefile
+++ b/www/pear-Horde_Http/Makefile
@@ -5,13 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Http
-PORTVERSION=	1.1.1
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde HTTP libraries
 
-USE_HORDE_RUN=	Horde_Exception Horde_Support
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Support
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Http/distinfo b/www/pear-Horde_Http/distinfo
index 2c8524a7bc3a..bd2b33c8949a 100644
--- a/www/pear-Horde_Http/distinfo
+++ b/www/pear-Horde_Http/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Http-1.1.1.tgz) = 5c07ab9e3753fd55e0d58fd9a7e3097105135145a99001d62bfb119238f7afd1
-SIZE (Horde/Horde_Http-1.1.1.tgz) = 11967
+SHA256 (Horde/Horde_Http-2.0.1.tgz) = 01da1b4b88af93349cabf71f1409fb499a093dc88de4e3341fd9413a5dedb798
+SIZE (Horde/Horde_Http-2.0.1.tgz) = 12269
diff --git a/www/pear-Horde_Routes/Makefile b/www/pear-Horde_Routes/Makefile
index bc88e75306d9..84fe7bbd9025 100644
--- a/www/pear-Horde_Routes/Makefile
+++ b/www/pear-Horde_Routes/Makefile
@@ -5,14 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Routes
-PORTVERSION=	1.1.2
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 MASTER_SITES=	http://pear.horde.org/get/
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Routes URL mapping system
 
-USE_HORDE_RUN=	Horde_Exception
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Util
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Routes/distinfo b/www/pear-Horde_Routes/distinfo
index 28c73999ecbb..52cc4802e5c7 100644
--- a/www/pear-Horde_Routes/distinfo
+++ b/www/pear-Horde_Routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Routes-1.1.2.tgz) = ccb133d0b08e00f7b358b533cfa33e5593db85f816b8525dcd281b4552a18a4a
-SIZE (Horde/Horde_Routes-1.1.2.tgz) = 44669
+SHA256 (Horde/Horde_Routes-2.0.1.tgz) = e1f39cfcefe26c8e386bf12139dd4a072550ff792ac3ccadb140c0e94f104349
+SIZE (Horde/Horde_Routes-2.0.1.tgz) = 44892
diff --git a/www/pear-Horde_Service_Facebook/Makefile b/www/pear-Horde_Service_Facebook/Makefile
index c822bf997b45..4e9be33d777d 100644
--- a/www/pear-Horde_Service_Facebook/Makefile
+++ b/www/pear-Horde_Service_Facebook/Makefile
@@ -5,14 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Service_Facebook
-PORTVERSION=	1.1.3
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Facebook client
 
 USE_PHP=	json simplexml
-USE_HORDE_RUN=	Horde_Exception Horde_Http Horde_Translation
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Http \
+		Horde_Translation \
+		Horde_Support
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Service_Facebook/distinfo b/www/pear-Horde_Service_Facebook/distinfo
index 057169037509..736f4b242daf 100644
--- a/www/pear-Horde_Service_Facebook/distinfo
+++ b/www/pear-Horde_Service_Facebook/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Service_Facebook-1.1.3.tgz) = ab1bfcb58a01c7cb4401c4f0dff4d9064e20274122345f94aa9b285e24564ed2
-SIZE (Horde/Horde_Service_Facebook-1.1.3.tgz) = 32069
+SHA256 (Horde/Horde_Service_Facebook-2.0.1.tgz) = 044be57d83f8a5550e6db3dcbdf833a922a7560bcf639d72fa050db80606aa42
+SIZE (Horde/Horde_Service_Facebook-2.0.1.tgz) = 30391
diff --git a/www/pear-Horde_Service_Twitter/Makefile b/www/pear-Horde_Service_Twitter/Makefile
index e272a72fb7ed..27a8ba389e27 100644
--- a/www/pear-Horde_Service_Twitter/Makefile
+++ b/www/pear-Horde_Service_Twitter/Makefile
@@ -5,14 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Service_Twitter
-PORTVERSION=	1.1.4
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Twitter client
 
-USE_HORDE_RUN=	Horde_Controller Horde_Exception Horde_Http \
-		Horde_Oauth Horde_Url
+USE_HORDE_RUN=	Horde_Controller \
+		Horde_Exception \
+		Horde_Http \
+		Horde_Oauth \
+		Horde_Url
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Service_Twitter/distinfo b/www/pear-Horde_Service_Twitter/distinfo
index 11e63f9b9b35..31f091169769 100644
--- a/www/pear-Horde_Service_Twitter/distinfo
+++ b/www/pear-Horde_Service_Twitter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Service_Twitter-1.1.4.tgz) = f087693cecd0d8b58ee167f64861ef9d644ed0d6c31cdfc7d4a89dc230c1f9c7
-SIZE (Horde/Horde_Service_Twitter-1.1.4.tgz) = 9133
+SHA256 (Horde/Horde_Service_Twitter-2.0.1.tgz) = b0fe7bbc789c50261d23860fc7731c5cb3c7347368711de6d2ecdcdd7c023a0c
+SIZE (Horde/Horde_Service_Twitter-2.0.1.tgz) = 9221
diff --git a/www/pear-Horde_Service_UrlShortener/Makefile b/www/pear-Horde_Service_UrlShortener/Makefile
index 144b788467b7..1d3a382146a7 100644
--- a/www/pear-Horde_Service_UrlShortener/Makefile
+++ b/www/pear-Horde_Service_UrlShortener/Makefile
@@ -5,13 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Service_UrlShortener
-PORTVERSION=	1.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde URL shortening services interface
 
-USE_HORDE_RUN=	Horde_Exception Horde_Http Horde_Url
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Http \
+		Horde_Url
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Service_UrlShortener/distinfo b/www/pear-Horde_Service_UrlShortener/distinfo
index bb9ba4064bd4..347454200a27 100644
--- a/www/pear-Horde_Service_UrlShortener/distinfo
+++ b/www/pear-Horde_Service_UrlShortener/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Service_UrlShortener-1.0.0.tgz) = 6f08fb8c93f0da4c82e9486d6e295735202d506951752bcacc1ac17798b26217
-SIZE (Horde/Horde_Service_UrlShortener-1.0.0.tgz) = 1851
+SHA256 (Horde/Horde_Service_UrlShortener-2.0.1.tgz) = aea44bd1a02ec1dac51feae4bac81484881f200dcb497d9b94a991377a0ee3d0
+SIZE (Horde/Horde_Service_UrlShortener-2.0.1.tgz) = 1945
diff --git a/www/pear-Horde_Service_Weather/Makefile b/www/pear-Horde_Service_Weather/Makefile
index 84a86d002716..883b07a4540e 100644
--- a/www/pear-Horde_Service_Weather/Makefile
+++ b/www/pear-Horde_Service_Weather/Makefile
@@ -5,14 +5,18 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Service_Weather
-PORTVERSION=	1.1.3
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Weather Provider
 
 USE_HORDE_BUILD=	Horde_Role
-USE_HORDE_RUN=	Horde_Date Horde_Exception Horde_Http Horde_Url
+USE_HORDE_RUN=	Horde_Role \
+		Horde_Date \
+		Horde_Exception \
+		Horde_Http \
+		Horde_Url
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_Service_Weather/distinfo b/www/pear-Horde_Service_Weather/distinfo
index 9d0173fedd29..57fd2c4cf621 100644
--- a/www/pear-Horde_Service_Weather/distinfo
+++ b/www/pear-Horde_Service_Weather/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Service_Weather-1.1.3.tgz) = 1f38e7307dc9cff6a5e00add08adac209719209e088ea3856787a9a8095b94d9
-SIZE (Horde/Horde_Service_Weather-1.1.3.tgz) = 170760
+SHA256 (Horde/Horde_Service_Weather-2.0.1.tgz) = 045ad08db7e760e996874dd377f59616fb3fb11442c65f5cd0da0f05d9421131
+SIZE (Horde/Horde_Service_Weather-2.0.1.tgz) = 170486
diff --git a/www/pear-Horde_SessionHandler/Makefile b/www/pear-Horde_SessionHandler/Makefile
index 687ade9774a6..f955997e157b 100644
--- a/www/pear-Horde_SessionHandler/Makefile
+++ b/www/pear-Horde_SessionHandler/Makefile
@@ -5,13 +5,14 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_SessionHandler
-PORTVERSION=	1.0.6
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Session Handler API
 
-USE_HORDE_RUN=	Horde_Exception Horde_Util
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Util
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/www/pear-Horde_SessionHandler/distinfo b/www/pear-Horde_SessionHandler/distinfo
index f444449a53bb..acbd0bd744f8 100644
--- a/www/pear-Horde_SessionHandler/distinfo
+++ b/www/pear-Horde_SessionHandler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_SessionHandler-1.0.6.tgz) = d627480541411cde31e77a8195d3aeb2ed325042a93b0ca08ae53eca837bbd6e
-SIZE (Horde/Horde_SessionHandler-1.0.6.tgz) = 21113
+SHA256 (Horde/Horde_SessionHandler-2.0.1.tgz) = 102e0d785ff510fc56162b2c64522f38c18d71449600dde3a23ccb5d73523f04
+SIZE (Horde/Horde_SessionHandler-2.0.1.tgz) = 21078
diff --git a/www/pear-Horde_Template/Makefile b/www/pear-Horde_Template/Makefile
index 98c70f29bddf..1ccae7b81337 100644
--- a/www/pear-Horde_Template/Makefile
+++ b/www/pear-Horde_Template/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Horde_Template
-PORTVERSION=	1.0.1
+PORTVERSION=	2.0.1
 CATEGORIES=	www pear
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/www/pear-Horde_Template/distinfo b/www/pear-Horde_Template/distinfo
index 92cbd202e760..bcdc50dc7e24 100644
--- a/www/pear-Horde_Template/distinfo
+++ b/www/pear-Horde_Template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Template-1.0.1.tgz) = e0fe442c041ad62637a0fe06816320bbf7e0275b309f6208c333838183c3be1f
-SIZE (Horde/Horde_Template-1.0.1.tgz) = 14892
+SHA256 (Horde/Horde_Template-2.0.1.tgz) = 55d533db383820275ecd6d2fbba72bbeaeb1ac329805b354a3c4168e5331cee8
+SIZE (Horde/Horde_Template-2.0.1.tgz) = 14822