18 files changed, 69 insertions, 52 deletions

diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index e8aaf0a9a54e..1aa5bc003ab9 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imp
-PORTVERSION=	5.0.24
+PORTVERSION=	6.0.2
 CATEGORIES=	mail www pear
 PKGNAMEPREFIX=	horde-
 
@@ -34,6 +34,7 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Image \
 		Horde_Imap_Client \
 		Horde_Itip \
+		Horde_ListHeaders \
 		Horde_LoginTasks \
 		Horde_Mail \
 		Horde_Mime \
diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo
index e4e083d277b1..d17e5234e991 100644
--- a/mail/horde4-imp/distinfo
+++ b/mail/horde4-imp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/imp-5.0.24.tgz) = b8bc12c71cb3a02c00d5793350e755bb075f60d7d6ea687922974dbd8bd4afd0
-SIZE (Horde/imp-5.0.24.tgz) = 4872160
+SHA256 (Horde/imp-6.0.2.tgz) = 7932d68c9c9d6505618fbee935cdfcffc64b0869fb05634290fd8799e2e67aac
+SIZE (Horde/imp-6.0.2.tgz) = 4876821
diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile
index ea3817d41a8b..2812e0ca2a0c 100644
--- a/mail/horde4-ingo/Makefile
+++ b/mail/horde4-ingo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ingo
-PORTVERSION=	2.0.10
+PORTVERSION=	3.0.1
 CATEGORIES=	mail www pear
 PKGNAMEPREFIX=	horde-
 
@@ -34,8 +34,9 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Share \
 		Horde_Util
 
-RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
-RUN_DEPENDS+=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+# Optional but we want it
+RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve \
+		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo
index 786acc575b76..bbe9f9bd43a0 100644
--- a/mail/horde4-ingo/distinfo
+++ b/mail/horde4-ingo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/ingo-2.0.10.tgz) = 8a9747dd5ac51d707e182f2676beceede4555a71ba03ef3b8923650ae6140c9e
-SIZE (Horde/ingo-2.0.10.tgz) = 1493676
+SHA256 (Horde/ingo-3.0.1.tgz) = 5fbcf61414ddc36f9f059bba7b2897734bc4999c4d4671fffc1d8553ba0da1d4
+SIZE (Horde/ingo-3.0.1.tgz) = 1520952
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index 42bf30e418a9..0d1e014b007a 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turba
-PORTVERSION=	3.0.16
+PORTVERSION=	4.0.1
 PKGNAMEPREFIX=	horde-
 CATEGORIES=	mail www pear
 
@@ -18,9 +18,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LATEST_LINK=	horde4-${PORTNAME}
 
-OPTIONS=	FACEBOOK "Support connections with Facebook" Off \
-		IMSP "Support IMSP addressbooks" Off \
-		LDAP "Support LDAP Addressbooks" Off
+OPTIONS_DEFINE=	FACEBOOK IMSP LDAP
+FACEBOOK_DESC=	Support connections with Facebook
+IMSP_DSC=	Support IMSP addressbooks
+LDAP_DESC=	Support LDAP Addressbooks
 
 USE_PHP=	gettext hash json
 USE_HORDE_BUILD=	Horde_Role
@@ -49,15 +50,15 @@ USE_HORDE_RUN=	Horde_Role \
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_FACEBOOK)
+.if ${PORT_OPTIONS:MFACEBOOK}
 USE_HORDE_RUN+=	Horde_Service_Facebook
 .endif
 
-.if defined(WITH_IMSP)
+.if ${PORT_OPTIONS:MIMSP}
 USE_HORDE_RUN+=	Horde_Imsp
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_HORDE_RUN+=	Horde_Ldap
 .endif
 
diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo
index 0d0516fafe95..de7a2e4fdf0a 100644
--- a/mail/horde4-turba/distinfo
+++ b/mail/horde4-turba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/turba-3.0.16.tgz) = f57cc40028e223d9f27dfa6a5c470908478dc7263c40b8b807a3fdbcfe37f517
-SIZE (Horde/turba-3.0.16.tgz) = 1958009
+SHA256 (Horde/turba-4.0.1.tgz) = 31e5161b9f76689a2020bf44307ed78037b69e2e5c0f6b2977aec0991cbb2003
+SIZE (Horde/turba-4.0.1.tgz) = 1977868
diff --git a/mail/horde4-webmail/Makefile b/mail/horde4-webmail/Makefile
index 9c150f79de45..22f0dc1e4152 100644
--- a/mail/horde4-webmail/Makefile
+++ b/mail/horde4-webmail/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	webmail
-PORTVERSION=	4.0.9
+PORTVERSION=	5.0.2
 CATEGORIES=	mail www pear
 PKGNAMEPREFIX=	horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Groupware Webmail Edition
 
-CONFLICTS=	horde-groupware-4*
+CONFLICTS=	horde-groupware-[456]*
 
 LATEST_LINK=	horde4-${PORTNAME}
 
@@ -27,8 +27,7 @@ USE_HORDE_RUN=	Horde_Role \
 		mnemo \
 		nag \
 		timeobjects \
-		turba \
-		Horde_Core
+		turba
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/mail/horde4-webmail/distinfo b/mail/horde4-webmail/distinfo
index 32a6ad39dca1..b712314970e7 100644
--- a/mail/horde4-webmail/distinfo
+++ b/mail/horde4-webmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/webmail-4.0.9.tgz) = a0876decef394575adb68a17ff7031a6de879b525663cacfe7f60f699cfb01fc
-SIZE (Horde/webmail-4.0.9.tgz) = 88995
+SHA256 (Horde/webmail-5.0.2.tgz) = ff16da8cb49a974cfd2aaaa6878167cc816ca9e1be1d5c232046980bfac45302
+SIZE (Horde/webmail-5.0.2.tgz) = 101561
diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile
index bf6e3920ae56..accaf8db76d4 100644
--- a/mail/pear-Horde_Imap_Client/Makefile
+++ b/mail/pear-Horde_Imap_Client/Makefile
@@ -5,31 +5,37 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Imap_Client
-PORTVERSION=	1.5.11
+PORTVERSION=	2.3.2
 CATEGORIES=	mail www pear
 PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde IMAP abstraction interface
 
-OPTIONS=	IMAP "Require PHP imap extension" On \
-		MBSTRING "Require PHP mbstring extension" On \
-		SASL "Support SASL Authentication" On
-
 USE_PHP=	hash
-USE_HORDE_RUN=	Horde_Exception Horde_Mime Horde_Util
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Mail \
+		Horde_Mime \
+		Horde_Stream \
+		Horde_Util
+
+OPTIONS_DEFAULT=	IMAP MBSTRING SASL
+OPTIONS_DEFINE=		IMAP MBSTRING SASL
+IMAP_DESC=	Require PHP imap extension
+MBSTRING_DESC=	Require PHP mbstring extension
+SASL_DESC=	Support SASL Authentication
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_IMAP)
+.if ${PORT_OPTIONS:MIMAP}
 USE_PHP+=	imap
 .endif
 
-.if !defined(WITHOUT_MBSTRING)
+.if ${PORT_OPTIONS:MMBSTRING}
 USE_PHP+=	mbstring
 .endif
 
-.if !defined(WITHOUT_SASL)
+.if ${PORT_OPTIONS:MSASL}
 RUN_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
 .endif
 
diff --git a/mail/pear-Horde_Imap_Client/distinfo b/mail/pear-Horde_Imap_Client/distinfo
index 0791e06823d2..ac73a34678e1 100644
--- a/mail/pear-Horde_Imap_Client/distinfo
+++ b/mail/pear-Horde_Imap_Client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Imap_Client-1.5.11.tgz) = bd836ac59b489db04c8065b4f203d45a810005e6b7f4edf3b756ca7d53899de4
-SIZE (Horde/Horde_Imap_Client-1.5.11.tgz) = 140516
+SHA256 (Horde/Horde_Imap_Client-2.3.2.tgz) = e2875c04c0e107d9adbf861842341cb7f0a56ffb79a382ca694209dd7bd1c381
+SIZE (Horde/Horde_Imap_Client-2.3.2.tgz) = 156419
diff --git a/mail/pear-Horde_Kolab_Storage/Makefile b/mail/pear-Horde_Kolab_Storage/Makefile
index fe5aad615774..a3de21fa5337 100644
--- a/mail/pear-Horde_Kolab_Storage/Makefile
+++ b/mail/pear-Horde_Kolab_Storage/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Kolab_Storage
-PORTVERSION=	1.1.0
+PORTVERSION=	2.0.2
 CATEGORIES=	mail www pear
 
 MAINTAINER=	horde@FreeBSD.org
@@ -19,8 +19,8 @@ USE_HORDE_RUN=	Horde_Cache \
 		Horde_Support \
 		Horde_Util
 
-# Not required but we want it
-USE_PHP=	imap
+# Optional but we want it
+USE_PHP+=	imap
 USE_HORDE_RUN+=	Horde_Imap_Client
 
 .include <bsd.port.pre.mk>
diff --git a/mail/pear-Horde_Kolab_Storage/distinfo b/mail/pear-Horde_Kolab_Storage/distinfo
index 4eac380ade14..4c6fdc00f80f 100644
--- a/mail/pear-Horde_Kolab_Storage/distinfo
+++ b/mail/pear-Horde_Kolab_Storage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Kolab_Storage-1.1.0.tgz) = f3b63d152efd081c092d5d4ae3209a5a5e4a12fe3ecd8bbc3a9a5eb0beb6c71d
-SIZE (Horde/Horde_Kolab_Storage-1.1.0.tgz) = 152905
+SHA256 (Horde/Horde_Kolab_Storage-2.0.2.tgz) = 5421725f50ff757e7c2f3c6a02bbc0db581d8ea830a36882fa6c55edff78e55e
+SIZE (Horde/Horde_Kolab_Storage-2.0.2.tgz) = 170184
diff --git a/mail/pear-Horde_Mail/Makefile b/mail/pear-Horde_Mail/Makefile
index 84f74846a1be..426ad501e314 100644
--- a/mail/pear-Horde_Mail/Makefile
+++ b/mail/pear-Horde_Mail/Makefile
@@ -5,15 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Mail
-PORTVERSION=	1.2.0
+PORTVERSION=	2.0.2
 CATEGORIES=	mail www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Mail Library
 
-USE_HORDE_RUN=	Horde_Exception
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Stream_Filter
 
-# Not required but we want it
+# Disabled due to circular dependency
+#USE_HORDE_RUN+=	Horde_Mime
+
+# Optional but we want it
 RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
 
 .include <bsd.port.pre.mk>
diff --git a/mail/pear-Horde_Mail/distinfo b/mail/pear-Horde_Mail/distinfo
index 510eabd69fc3..e84e14f52995 100644
--- a/mail/pear-Horde_Mail/distinfo
+++ b/mail/pear-Horde_Mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Mail-1.2.0.tgz) = c44f03cb7b9c161d895dd62932320a3dd994cea99279c8275035390490b1a725
-SIZE (Horde/Horde_Mail-1.2.0.tgz) = 23402
+SHA256 (Horde/Horde_Mail-2.0.2.tgz) = 22521b3a0e23c4c96c21c31715e46ada6a5fe72129703cd3d09e50e43e15bbea
+SIZE (Horde/Horde_Mail-2.0.2.tgz) = 28191
diff --git a/mail/pear-Horde_Mime/Makefile b/mail/pear-Horde_Mime/Makefile
index 3a84c65ca99b..713b34a2ff5a 100644
--- a/mail/pear-Horde_Mime/Makefile
+++ b/mail/pear-Horde_Mime/Makefile
@@ -5,14 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Mime
-PORTVERSION=	1.6.2
+PORTVERSION=	2.0.1
 CATEGORIES=	mail www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde MIME Library
 
-USE_HORDE_RUN=	Horde_Exception Horde_Mail Horde_Stream_Filter Horde_Support \
-		Horde_Text_Flowed Horde_Translation Horde_Util
+USE_HORDE_RUN=	Horde_Exception \
+		Horde_Mail \
+		Horde_Stream_Filter \
+		Horde_Support \
+		Horde_Text_Flowed \
+		Horde_Translation \
+		Horde_Util
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/mail/pear-Horde_Mime/distinfo b/mail/pear-Horde_Mime/distinfo
index 29626b8a9ac4..2bf7e81c38ce 100644
--- a/mail/pear-Horde_Mime/distinfo
+++ b/mail/pear-Horde_Mime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Mime-1.6.2.tgz) = 9d360c598f542677a6d6268bb4e0d20397f001766c775dba7cb4c1aeaebb22d4
-SIZE (Horde/Horde_Mime-1.6.2.tgz) = 85354
+SHA256 (Horde/Horde_Mime-2.0.1.tgz) = 477df72f5d95f5b83d697518bd2e528c6c12d26a134b6a9d21b3b1dedfba025b
+SIZE (Horde/Horde_Mime-2.0.1.tgz) = 85581
diff --git a/mail/pear-Horde_Mime_Viewer/Makefile b/mail/pear-Horde_Mime_Viewer/Makefile
index b432da7ec73d..44b1780d8b37 100644
--- a/mail/pear-Horde_Mime_Viewer/Makefile
+++ b/mail/pear-Horde_Mime_Viewer/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	Horde_Mime_Viewer
-PORTVERSION=	1.0.9
+PORTVERSION=	2.0.1
 CATEGORIES=	mail www pear
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/mail/pear-Horde_Mime_Viewer/distinfo b/mail/pear-Horde_Mime_Viewer/distinfo
index ca9c0888ea67..cd1f8aad33aa 100644
--- a/mail/pear-Horde_Mime_Viewer/distinfo
+++ b/mail/pear-Horde_Mime_Viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Mime_Viewer-1.0.9.tgz) = 36312e931ef48fce3b36d87912a42cf238deb3d58263483929f517d6598c4f80
-SIZE (Horde/Horde_Mime_Viewer-1.0.9.tgz) = 144082
+SHA256 (Horde/Horde_Mime_Viewer-2.0.1.tgz) = 824c8863fd3718b14565823d73750e4e99aa28f4698d4a7d7a2b2fc74d2289e6
+SIZE (Horde/Horde_Mime_Viewer-2.0.1.tgz) = 144709