aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-12-12 15:16:56 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-12-12 15:16:56 +0000
commitcd4b5e26f1f107f63d1df5461afe8a66829dc3ec (patch)
tree3fb7d6080e4c46250a144599804046174e893258
parent17ceff765800de56a99184d5868cc6c54dd38812 (diff)
downloadports-cd4b5e26f1f107f63d1df5461afe8a66829dc3ec.tar.gz
ports-cd4b5e26f1f107f63d1df5461afe8a66829dc3ec.zip
Notes
-rw-r--r--archivers/pear-Horde_Compress/Makefile13
-rw-r--r--archivers/pear-Horde_Compress/distinfo4
-rw-r--r--comms/pear-Horde_ActiveSync/Makefile9
-rw-r--r--comms/pear-Horde_ActiveSync/distinfo4
-rw-r--r--comms/pear-Horde_SyncMl/Makefile14
-rw-r--r--comms/pear-Horde_SyncMl/distinfo4
-rw-r--r--databases/pear-Horde_Db/Makefile20
-rw-r--r--databases/pear-Horde_Db/distinfo4
-rw-r--r--databases/pear-Horde_Imsp/Makefile2
-rw-r--r--databases/pear-Horde_Imsp/distinfo4
-rw-r--r--databases/pear-Horde_Memcache/Makefile2
-rw-r--r--databases/pear-Horde_Memcache/distinfo4
-rw-r--r--deskutils/horde4-groupware/Makefile7
-rw-r--r--deskutils/horde4-groupware/distinfo4
-rw-r--r--deskutils/horde4-kronolith/Makefile17
-rw-r--r--deskutils/horde4-kronolith/distinfo4
-rw-r--r--deskutils/horde4-mnemo/Makefile10
-rw-r--r--deskutils/horde4-mnemo/distinfo4
-rw-r--r--deskutils/horde4-nag/Makefile4
-rw-r--r--deskutils/horde4-nag/distinfo4
-rw-r--r--devel/horde4-content/Makefile4
-rw-r--r--devel/horde4-content/distinfo4
-rw-r--r--devel/horde4-timeobjects/Makefile2
-rw-r--r--devel/horde4-timeobjects/distinfo4
-rw-r--r--devel/pear-Horde_Alarm/Makefile5
-rw-r--r--devel/pear-Horde_Alarm/distinfo4
-rw-r--r--devel/pear-Horde_Argv/Makefile2
-rw-r--r--devel/pear-Horde_Argv/distinfo4
-rw-r--r--devel/pear-Horde_Autoloader/Makefile2
-rw-r--r--devel/pear-Horde_Autoloader/distinfo4
-rw-r--r--devel/pear-Horde_Autoloader_Cache/Makefile3
-rw-r--r--devel/pear-Horde_Autoloader_Cache/distinfo4
-rw-r--r--devel/pear-Horde_Cache/Makefile11
-rw-r--r--devel/pear-Horde_Cache/distinfo4
-rw-r--r--devel/pear-Horde_Cli/Makefile2
-rw-r--r--devel/pear-Horde_Cli/distinfo4
-rw-r--r--devel/pear-Horde_Constraint/Makefile2
-rw-r--r--devel/pear-Horde_Constraint/distinfo4
-rw-r--r--devel/pear-Horde_Controller/Makefile7
-rw-r--r--devel/pear-Horde_Controller/distinfo4
-rw-r--r--devel/pear-Horde_Core/Makefile13
-rw-r--r--devel/pear-Horde_Core/distinfo4
-rw-r--r--devel/pear-Horde_Data/Makefile11
-rw-r--r--devel/pear-Horde_Data/distinfo4
-rw-r--r--devel/pear-Horde_DataTree/Makefile4
-rw-r--r--devel/pear-Horde_Date/Makefile14
-rw-r--r--devel/pear-Horde_Date/distinfo4
-rw-r--r--devel/pear-Horde_Date_Parser/Makefile5
-rw-r--r--devel/pear-Horde_Date_Parser/distinfo4
-rw-r--r--devel/pear-Horde_Exception/Makefile4
-rw-r--r--devel/pear-Horde_Exception/distinfo4
-rw-r--r--devel/pear-Horde_History/Makefile5
-rw-r--r--devel/pear-Horde_History/distinfo4
-rw-r--r--devel/pear-Horde_Icalendar/Makefile11
-rw-r--r--devel/pear-Horde_Icalendar/distinfo4
-rw-r--r--devel/pear-Horde_Injector/Makefile2
-rw-r--r--devel/pear-Horde_Injector/distinfo4
-rw-r--r--devel/pear-Horde_Itip/Makefile5
-rw-r--r--devel/pear-Horde_Itip/distinfo4
-rw-r--r--devel/pear-Horde_Lock/Makefile5
-rw-r--r--devel/pear-Horde_Lock/distinfo4
-rw-r--r--devel/pear-Horde_LoginTasks/Makefile2
-rw-r--r--devel/pear-Horde_LoginTasks/distinfo4
-rw-r--r--devel/pear-Horde_Nls/Makefile14
-rw-r--r--devel/pear-Horde_Nls/distinfo4
-rw-r--r--devel/pear-Horde_Notification/Makefile5
-rw-r--r--devel/pear-Horde_Notification/distinfo4
-rw-r--r--devel/pear-Horde_Prefs/Makefile8
-rw-r--r--devel/pear-Horde_Prefs/distinfo4
-rw-r--r--devel/pear-Horde_Rdo/Makefile5
-rw-r--r--devel/pear-Horde_Rdo/distinfo4
-rw-r--r--devel/pear-Horde_Scheduler/Makefile6
-rw-r--r--devel/pear-Horde_Scheduler/distinfo4
-rw-r--r--devel/pear-Horde_Serialize/Makefile5
-rw-r--r--devel/pear-Horde_Serialize/distinfo4
-rw-r--r--devel/pear-Horde_Stream_Filter/Makefile2
-rw-r--r--devel/pear-Horde_Stream_Filter/distinfo4
-rw-r--r--devel/pear-Horde_Stream_Wrapper/Makefile2
-rw-r--r--devel/pear-Horde_Stream_Wrapper/distinfo4
-rw-r--r--devel/pear-Horde_Support/Makefile5
-rw-r--r--devel/pear-Horde_Support/distinfo4
-rw-r--r--devel/pear-Horde_Thrift/Makefile2
-rw-r--r--devel/pear-Horde_Thrift/distinfo4
-rw-r--r--devel/pear-Horde_Token/Makefile7
-rw-r--r--devel/pear-Horde_Token/distinfo4
-rw-r--r--devel/pear-Horde_Translation/Makefile4
-rw-r--r--devel/pear-Horde_Translation/distinfo4
-rw-r--r--devel/pear-Horde_Tree/Makefile6
-rw-r--r--devel/pear-Horde_Tree/distinfo4
-rw-r--r--devel/pear-Horde_Util/Makefile3
-rw-r--r--devel/pear-Horde_Util/distinfo4
-rw-r--r--devel/pear-Horde_View/Makefile6
-rw-r--r--devel/pear-Horde_View/distinfo4
-rw-r--r--ftp/horde4-gollem/Makefile14
-rw-r--r--ftp/horde4-gollem/distinfo4
-rw-r--r--graphics/pear-Horde_Image/Makefile12
-rw-r--r--graphics/pear-Horde_Image/distinfo4
-rw-r--r--mail/horde4-imp/Makefile3
-rw-r--r--mail/horde4-imp/distinfo4
-rw-r--r--mail/horde4-ingo/Makefile7
-rw-r--r--mail/horde4-ingo/distinfo4
-rw-r--r--mail/horde4-turba/Makefile15
-rw-r--r--mail/horde4-turba/distinfo4
-rw-r--r--mail/horde4-webmail/Makefile7
-rw-r--r--mail/horde4-webmail/distinfo4
-rw-r--r--mail/pear-Horde_Imap_Client/Makefile24
-rw-r--r--mail/pear-Horde_Imap_Client/distinfo4
-rw-r--r--mail/pear-Horde_Kolab_Storage/Makefile6
-rw-r--r--mail/pear-Horde_Kolab_Storage/distinfo4
-rw-r--r--mail/pear-Horde_Mail/Makefile10
-rw-r--r--mail/pear-Horde_Mail/distinfo4
-rw-r--r--mail/pear-Horde_Mime/Makefile11
-rw-r--r--mail/pear-Horde_Mime/distinfo4
-rw-r--r--mail/pear-Horde_Mime_Viewer/Makefile2
-rw-r--r--mail/pear-Horde_Mime_Viewer/distinfo4
-rw-r--r--net/pear-Horde_Kolab_Server/Makefile10
-rw-r--r--net/pear-Horde_Kolab_Server/distinfo4
-rw-r--r--net/pear-Horde_Kolab_Session/Makefile8
-rw-r--r--net/pear-Horde_Kolab_Session/distinfo4
-rw-r--r--net/pear-Horde_Ldap/Makefile5
-rw-r--r--net/pear-Horde_Ldap/distinfo4
-rw-r--r--net/pear-Horde_Rpc/Makefile19
-rw-r--r--net/pear-Horde_Rpc/distinfo4
-rw-r--r--net/pear-Horde_Scribe/Makefile3
-rw-r--r--net/pear-Horde_Scribe/distinfo4
-rw-r--r--net/pear-Horde_Url/Makefile2
-rw-r--r--net/pear-Horde_Url/distinfo4
-rw-r--r--security/pear-Horde_Auth/Makefile2
-rw-r--r--security/pear-Horde_Auth/distinfo4
-rw-r--r--security/pear-Horde_Crypt/Makefile14
-rw-r--r--security/pear-Horde_Crypt/distinfo4
-rw-r--r--security/pear-Horde_Group/Makefile5
-rw-r--r--security/pear-Horde_Group/distinfo4
-rw-r--r--security/pear-Horde_Perms/Makefile7
-rw-r--r--security/pear-Horde_Perms/distinfo4
-rw-r--r--security/pear-Horde_Secret/Makefile9
-rw-r--r--security/pear-Horde_Secret/distinfo4
-rw-r--r--security/pear-Horde_Share/Makefile12
-rw-r--r--security/pear-Horde_Share/distinfo4
-rw-r--r--sysutils/pear-Horde_Log/Makefile10
-rw-r--r--sysutils/pear-Horde_Log/distinfo4
-rw-r--r--sysutils/pear-Horde_Vfs/Makefile11
-rw-r--r--sysutils/pear-Horde_Vfs/distinfo4
-rw-r--r--textproc/pear-Horde_Kolab_Format/Makefile2
-rw-r--r--textproc/pear-Horde_Kolab_Format/distinfo4
-rw-r--r--textproc/pear-Horde_Pdf/Makefile2
-rw-r--r--textproc/pear-Horde_Pdf/distinfo4
-rw-r--r--textproc/pear-Horde_SpellChecker/Makefile5
-rw-r--r--textproc/pear-Horde_SpellChecker/distinfo4
-rw-r--r--textproc/pear-Horde_Text_Diff/Makefile5
-rw-r--r--textproc/pear-Horde_Text_Diff/distinfo4
-rw-r--r--textproc/pear-Horde_Text_Filter/Makefile5
-rw-r--r--textproc/pear-Horde_Text_Filter/distinfo4
-rw-r--r--textproc/pear-Horde_Text_Filter_Csstidy/Makefile2
-rw-r--r--textproc/pear-Horde_Text_Filter_Csstidy/distinfo4
-rw-r--r--textproc/pear-Horde_Text_Flowed/Makefile2
-rw-r--r--textproc/pear-Horde_Text_Flowed/distinfo4
-rw-r--r--textproc/pear-Horde_Xml_Element/Makefile2
-rw-r--r--textproc/pear-Horde_Xml_Element/distinfo4
-rw-r--r--textproc/pear-Horde_Xml_Wbxml/Makefile2
-rw-r--r--textproc/pear-Horde_Xml_Wbxml/distinfo4
-rw-r--r--www/horde4-base/Makefile19
-rw-r--r--www/horde4-base/distinfo4
-rw-r--r--www/pear-Horde_Browser/Makefile2
-rw-r--r--www/pear-Horde_Browser/distinfo4
-rw-r--r--www/pear-Horde_Editor/Makefile3
-rw-r--r--www/pear-Horde_Editor/distinfo4
-rw-r--r--www/pear-Horde_Feed/Makefile6
-rw-r--r--www/pear-Horde_Feed/distinfo4
-rw-r--r--www/pear-Horde_Form/Makefile13
-rw-r--r--www/pear-Horde_Form/distinfo4
-rw-r--r--www/pear-Horde_Http/Makefile5
-rw-r--r--www/pear-Horde_Http/distinfo4
-rw-r--r--www/pear-Horde_Routes/Makefile5
-rw-r--r--www/pear-Horde_Routes/distinfo4
-rw-r--r--www/pear-Horde_Service_Facebook/Makefile7
-rw-r--r--www/pear-Horde_Service_Facebook/distinfo4
-rw-r--r--www/pear-Horde_Service_Twitter/Makefile9
-rw-r--r--www/pear-Horde_Service_Twitter/distinfo4
-rw-r--r--www/pear-Horde_Service_UrlShortener/Makefile6
-rw-r--r--www/pear-Horde_Service_UrlShortener/distinfo4
-rw-r--r--www/pear-Horde_Service_Weather/Makefile8
-rw-r--r--www/pear-Horde_Service_Weather/distinfo4
-rw-r--r--www/pear-Horde_SessionHandler/Makefile5
-rw-r--r--www/pear-Horde_SessionHandler/distinfo4
-rw-r--r--www/pear-Horde_Template/Makefile2
-rw-r--r--www/pear-Horde_Template/distinfo4
187 files changed, 587 insertions, 429 deletions
diff --git a/archivers/pear-Horde_Compress/Makefile b/archivers/pear-Horde_Compress/Makefile
index aacc373c7f9c..b936707aac9d 100644
--- a/archivers/pear-Horde_Compress/Makefile
+++ b/archivers/pear-Horde_Compress/Makefile
@@ -5,20 +5,25 @@
# $FreeBSD$
PORTNAME= Horde_Compress
-PORTVERSION= 1.0.8
+PORTVERSION= 2.0.1
CATEGORIES= archivers www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Compression API
-OPTIONS= ZLIB "Depend on PHP zlib extension" On
+OPTIONS_DEFAULT= ZLIB
+OPTIONS_DEFINE= ZLIB
+ZLIB_DESC= Depend on PHP zlib extension
-USE_HORDE_RUN= Horde_Exception Horde_Translation Horde_Util Horde_Stream_Filter
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Translation \
+ Horde_Util \
+ Horde_Stream_Filter
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
USE_PHP+= zlib
.endif
diff --git a/archivers/pear-Horde_Compress/distinfo b/archivers/pear-Horde_Compress/distinfo
index 73400ff46f62..385e933abec5 100644
--- a/archivers/pear-Horde_Compress/distinfo
+++ b/archivers/pear-Horde_Compress/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Compress-1.0.8.tgz) = 3b91a83135c4be929d00693f24e3fe29c2945958a58cae7a7705d1b355e130a7
-SIZE (Horde/Horde_Compress-1.0.8.tgz) = 34433
+SHA256 (Horde/Horde_Compress-2.0.1.tgz) = 413714b223ba26b82fc873baa7ecef52b5ecf3c764c303c7a86375527faeae3f
+SIZE (Horde/Horde_Compress-2.0.1.tgz) = 34794
diff --git a/comms/pear-Horde_ActiveSync/Makefile b/comms/pear-Horde_ActiveSync/Makefile
index db16453ec270..a91027abaeb5 100644
--- a/comms/pear-Horde_ActiveSync/Makefile
+++ b/comms/pear-Horde_ActiveSync/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= Horde_ActiveSync
-PORTVERSION= 1.2.7
+PORTVERSION= 2.0.8
CATEGORIES= comms www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde ActiveSync Server Library
-USE_HORDE_RUN= Horde_Date Horde_Exception Horde_Support Horde_Util
+USE_HORDE_RUN= Horde_Date \
+ Horde_Exception \
+ Horde_Icalendar \
+ Horde_Mime \
+ Horde_Support \
+ Horde_Util
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/comms/pear-Horde_ActiveSync/distinfo b/comms/pear-Horde_ActiveSync/distinfo
index 68bf072f7f82..acd7fb331123 100644
--- a/comms/pear-Horde_ActiveSync/distinfo
+++ b/comms/pear-Horde_ActiveSync/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_ActiveSync-1.2.7.tgz) = d086c3c25e686c61f432c3fe578e1a7ef4e231066730838443d3d91405b7a62f
-SIZE (Horde/Horde_ActiveSync-1.2.7.tgz) = 88805
+SHA256 (Horde/Horde_ActiveSync-2.0.8.tgz) = f5c72711599f23d6c9f0320d0eeccd6e1746db56e4ef8c55c102d2f6cf13ad33
+SIZE (Horde/Horde_ActiveSync-2.0.8.tgz) = 154578
diff --git a/comms/pear-Horde_SyncMl/Makefile b/comms/pear-Horde_SyncMl/Makefile
index 151244fe830f..006c9157a184 100644
--- a/comms/pear-Horde_SyncMl/Makefile
+++ b/comms/pear-Horde_SyncMl/Makefile
@@ -5,14 +5,22 @@
# $FreeBSD$
PORTNAME= Horde_SyncMl
-PORTVERSION= 1.0.9
+PORTVERSION= 2.0.1
CATEGORIES= comms www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde API for processing SyncML requests
-USE_HORDE_RUN= Horde_Date Horde_Icalendar Horde_Log Horde_Support \
- Horde_Util Horde_Xml_Wbxml Horde_Translation Horde_Auth \
+USE_HORDE_RUN= Horde_Date \
+ Horde_Icalendar \
+ Horde_Log \
+ Horde_Support \
+ Horde_Util \
+ Horde_Xml_Wbxml \
+ Horde_Translation \
+
+# optional but we want it
+USE_HORDE_RUN+= Horde_Auth \
Horde_Core
.include <bsd.port.pre.mk>
diff --git a/comms/pear-Horde_SyncMl/distinfo b/comms/pear-Horde_SyncMl/distinfo
index 1eaa18b080fd..c3fc8b948027 100644
--- a/comms/pear-Horde_SyncMl/distinfo
+++ b/comms/pear-Horde_SyncMl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_SyncMl-1.0.9.tgz) = 37abda1f4ec2a64dd0f3893f76af7f7f586c2d66a374f8551bfab21fcee7fd95
-SIZE (Horde/Horde_SyncMl-1.0.9.tgz) = 133687
+SHA256 (Horde/Horde_SyncMl-2.0.1.tgz) = 744da58dbd777533bf27e5df97e8025d40206314fc0d225b8a0967641be0774f
+SIZE (Horde/Horde_SyncMl-2.0.1.tgz) = 134062
diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile
index 7fdfd3d78a37..5e864ac90b13 100644
--- a/databases/pear-Horde_Db/Makefile
+++ b/databases/pear-Horde_Db/Makefile
@@ -5,30 +5,34 @@
# $FreeBSD$
PORTNAME= Horde_Db
-PORTVERSION= 1.2.2
+PORTVERSION= 2.0.1
CATEGORIES= databases www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Database Libraries
-OPTIONS= MYSQL "Depend on mysql PHP extension" On \
- MYSQLI "Depend on mysqli PHP extension" Off \
- PDO "Depend on PDO PHP extension" Off
+OPTIONS_DEFAULT= MYSQL
+OPTIONS_DEFINE= MYSQL MYSQLI PDO
+MYSQL_DESC= Depend on mysql PHP extension
+MYSQLI_DESC= Depend on mysqli PHP extension
+PDO_DESC= Depend on PDO PHP extension
-USE_HORDE_RUN= Horde_Date Horde_Exception Horde_Support
+USE_HORDE_RUN= Horde_Date \
+ Horde_Exception \
+ Horde_Support
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
USE_PHP+= mysql
.endif
-.if defined(WITH_MYSQLI)
+.if ${PORT_OPTIONS:MMYSQLI}
USE_PHP+= mysqli
.endif
-.if defined(WITH_PDO)
+.if ${PORT_OPTIONS:MPDO}
USE_PHP+= pdo
.endif
diff --git a/databases/pear-Horde_Db/distinfo b/databases/pear-Horde_Db/distinfo
index adcd49da9e57..8b387e50b890 100644
--- a/databases/pear-Horde_Db/distinfo
+++ b/databases/pear-Horde_Db/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Db-1.2.2.tgz) = dbaec76cce81db0203d355bc9df1ff1ba40409d0437f258648153e511f15e68a
-SIZE (Horde/Horde_Db-1.2.2.tgz) = 107322
+SHA256 (Horde/Horde_Db-2.0.1.tgz) = 5014725ab3766d720b4bc96bf04580a8180c4cd4205738f5f463e52af44cc504
+SIZE (Horde/Horde_Db-2.0.1.tgz) = 106771
diff --git a/databases/pear-Horde_Imsp/Makefile b/databases/pear-Horde_Imsp/Makefile
index 956e1b7ea7af..09d902336f25 100644
--- a/databases/pear-Horde_Imsp/Makefile
+++ b/databases/pear-Horde_Imsp/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Imsp
-PORTVERSION= 1.0.6
+PORTVERSION= 2.0.1
CATEGORIES= databases www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/databases/pear-Horde_Imsp/distinfo b/databases/pear-Horde_Imsp/distinfo
index ec808e54ddcf..3ca288abaa6a 100644
--- a/databases/pear-Horde_Imsp/distinfo
+++ b/databases/pear-Horde_Imsp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Imsp-1.0.6.tgz) = 7db2d21ca26fa1d09d565d83dc8763a2fe08ac96a8ca9789d553e073ae0b811d
-SIZE (Horde/Horde_Imsp-1.0.6.tgz) = 32357
+SHA256 (Horde/Horde_Imsp-2.0.1.tgz) = 588f1356a6be518ca658c9be537c27071caa6f8de71beeaa9a0089f514f8ed05
+SIZE (Horde/Horde_Imsp-2.0.1.tgz) = 32826
diff --git a/databases/pear-Horde_Memcache/Makefile b/databases/pear-Horde_Memcache/Makefile
index ed8cea7cd6b7..b0ab6df03c02 100644
--- a/databases/pear-Horde_Memcache/Makefile
+++ b/databases/pear-Horde_Memcache/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Memcache
-PORTVERSION= 1.1.1
+PORTVERSION= 2.0.1
CATEGORIES= databases www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/databases/pear-Horde_Memcache/distinfo b/databases/pear-Horde_Memcache/distinfo
index 786648378ff7..c1f0e5f503de 100644
--- a/databases/pear-Horde_Memcache/distinfo
+++ b/databases/pear-Horde_Memcache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Memcache-1.1.1.tgz) = 37cf827e29bf45d314326af594c830297483a15b8e5350f6af546a308301fadd
-SIZE (Horde/Horde_Memcache-1.1.1.tgz) = 13684
+SHA256 (Horde/Horde_Memcache-2.0.1.tgz) = 40e39d7ca449a1bf5e1af9d1160d7fe5ea1af098db3646547568d021ccf0a644
+SIZE (Horde/Horde_Memcache-2.0.1.tgz) = 13771
diff --git a/deskutils/horde4-groupware/Makefile b/deskutils/horde4-groupware/Makefile
index f86bcc0644e6..8dd92f207428 100644
--- a/deskutils/horde4-groupware/Makefile
+++ b/deskutils/horde4-groupware/Makefile
@@ -5,14 +5,14 @@
# $FreeBSD$
PORTNAME= groupware
-PORTVERSION= 4.0.9
+PORTVERSION= 5.0.2
CATEGORIES= deskutils www pear
PKGNAMEPREFIX= horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Groupware
-CONFLICTS= horde-webmail-4*
+CONFLICTS= horde-webmail-[456]*
LATEST_LINK= horde4-${PORTNAME}
@@ -24,8 +24,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/deskutils/horde4-groupware/distinfo b/deskutils/horde4-groupware/distinfo
index 2b776aafcfaa..88e258bfe02b 100644
--- a/deskutils/horde4-groupware/distinfo
+++ b/deskutils/horde4-groupware/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/groupware-4.0.9.tgz) = e6b25ba46d6c41147e47530ea8b40a2df04f5054aa45830d5d587890f9f77274
-SIZE (Horde/groupware-4.0.9.tgz) = 64103
+SHA256 (Horde/groupware-5.0.2.tgz) = ef51a1efa40f175b45cd1aa905d40ec151e3e290da8eb9fbd3b1e512ff1a131c
+SIZE (Horde/groupware-5.0.2.tgz) = 72603
diff --git a/deskutils/horde4-kronolith/Makefile b/deskutils/horde4-kronolith/Makefile
index d90a364c389a..ab5959e7a627 100644
--- a/deskutils/horde4-kronolith/Makefile
+++ b/deskutils/horde4-kronolith/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kronolith
-PORTVERSION= 3.0.18
+PORTVERSION= 4.0.2
CATEGORIES= deskutils www pear
PKGNAMEPREFIX= horde-
@@ -18,9 +18,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LATEST_LINK= horde4-${PORTNAME}
-OPTIONS= DATE_HOLIDAYS "Install PEAR Date_Holidays" On \
- TIMEOBJECTS "Install Horde timeobjects" On \
- XMLWRITER "Depend on PHP xmlwriter extension" Off
+OPTIONS_DEFAULT= DATE_HOLIDAYS TIMEOBJECTS
+OPTIONS_DEFINE= DATE_HOLIDAYS TIMEOBJECTS XMLWRITER
+DATE_HOLIDAYS_DESC= Depend on PEAR Date_Holidays
+TIMEOBJECTS_DESC= Depenbd on Horde timeobjects
+XMLWRITER_DESC= Depend on PHP xmlwriter extension
USE_PHP= gettext json simplexml
USE_HORDE_BUILD= Horde_Role
@@ -51,21 +53,22 @@ USE_HORDE_RUN= Horde_Role \
Horde_Share \
Horde_Support \
Horde_Text_Filter \
+ Horde_Timezone \
Horde_Url \
Horde_Util \
Horde_View
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_DATE_HOLIDAYS)
+.if ${PORT_OPTIONS:MDATE_HOLIDAYS}
RUN_DEPENDS+= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
.endif
-.if !defined(WITHOUT_TIMEOBJECTS)
+.if ${PORT_OPTIONS:MTIMEOBJECTS
USE_HORDE_RUN+= timeobjects
.endif
-.if defined(WITH_XMLWRITER)
+.if ${PORT_OPTIONS:MXMLWRITER}
USE_PHP+= xmlwriter
.endif
diff --git a/deskutils/horde4-kronolith/distinfo b/deskutils/horde4-kronolith/distinfo
index c3ffb5e2f6b8..e6ab1853295f 100644
--- a/deskutils/horde4-kronolith/distinfo
+++ b/deskutils/horde4-kronolith/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/kronolith-3.0.18.tgz) = 9a3a00e25e3e4aef8ecdf759d59bd386558b91333974bfbcb055f83b1f5e66dc
-SIZE (Horde/kronolith-3.0.18.tgz) = 2530538
+SHA256 (Horde/kronolith-4.0.2.tgz) = f99a981db7420b13d2b7353a362045492bd678e917497d27415d12a17238f28b
+SIZE (Horde/kronolith-4.0.2.tgz) = 2518556
diff --git a/deskutils/horde4-mnemo/Makefile b/deskutils/horde4-mnemo/Makefile
index 705fe8ebccd9..7ad3e4d62f7a 100644
--- a/deskutils/horde4-mnemo/Makefile
+++ b/deskutils/horde4-mnemo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mnemo
-PORTVERSION= 3.0.7
+PORTVERSION= 4.0.1
CATEGORIES= deskutils www pear
PKGNAMEPREFIX= horde-
@@ -18,8 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LATEST_LINK= horde4-${PORTNAME}
-OPTIONS= PDF "Support PDF generation" On
-
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
@@ -40,9 +38,13 @@ USE_HORDE_RUN= Horde_Role \
Horde_Text_Filter \
Horde_Util
+OPTIONS_DEFAULT= PDF
+OPTIONS_DEFINE= PDF
+PDF_DESC= Support PDF generation
+
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_PDF)
+.if ${PORT_OPTIONS:MPDF}
USE_HORDE_RUN+= Horde_Pdf
.endif
diff --git a/deskutils/horde4-mnemo/distinfo b/deskutils/horde4-mnemo/distinfo
index 28e7f7c9486f..8bb0b49ca82a 100644
--- a/deskutils/horde4-mnemo/distinfo
+++ b/deskutils/horde4-mnemo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/mnemo-3.0.7.tgz) = 2f7f1bff0e1b29ea6759f7e9a645b20021dad4db234df89b40cddf5a3fc75db2
-SIZE (Horde/mnemo-3.0.7.tgz) = 1212201
+SHA256 (Horde/mnemo-4.0.1.tgz) = 076dc67c8877092f3bb4439edee075ca81427c13abe96e2e3bfc4362f76b6443
+SIZE (Horde/mnemo-4.0.1.tgz) = 1223590
diff --git a/deskutils/horde4-nag/Makefile b/deskutils/horde4-nag/Makefile
index bf629b1934c4..4d735108c0f3 100644
--- a/deskutils/horde4-nag/Makefile
+++ b/deskutils/horde4-nag/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= nag
-PORTVERSION= 3.0.9
+PORTVERSION= 4.0.1
CATEGORIES= deskutils www pear
PKGNAMEPREFIX= horde-
@@ -21,6 +21,7 @@ LATEST_LINK= horde4-${PORTNAME}
USE_PHP= gettext
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
+ content \
horde \
Horde_Auth \
Horde_Core \
@@ -32,6 +33,7 @@ USE_HORDE_RUN= Horde_Role \
Horde_Group \
Horde_History \
Horde_Icalendar \
+ Horde_Mail \
Horde_Mime \
Horde_Perms \
Horde_Prefs \
diff --git a/deskutils/horde4-nag/distinfo b/deskutils/horde4-nag/distinfo
index 2286e3e587c4..3696224157bd 100644
--- a/deskutils/horde4-nag/distinfo
+++ b/deskutils/horde4-nag/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/nag-3.0.9.tgz) = bd91bccaa56aca7de83bb4c7504d22f35beffc7486d7f99107c5613b6382cfcc
-SIZE (Horde/nag-3.0.9.tgz) = 1636546
+SHA256 (Horde/nag-4.0.1.tgz) = b9a8bdbf8db170d80b876aca7a4239f4a33774267451391df1167379c8adf9cc
+SIZE (Horde/nag-4.0.1.tgz) = 1660291
diff --git a/devel/horde4-content/Makefile b/devel/horde4-content/Makefile
index 4b09d1d352d4..d44f1b018941 100644
--- a/devel/horde4-content/Makefile
+++ b/devel/horde4-content/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= content
-PORTVERSION= 1.0.3
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
PKGNAMEPREFIX= horde-
@@ -15,7 +15,7 @@ COMMENT= Horde tagging application
LATEST_LINK= horde4-${PORTNAME}
-USE_PHP= gettext
+USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
Horde_Core \
diff --git a/devel/horde4-content/distinfo b/devel/horde4-content/distinfo
index 5e15bdf8940f..63961f86f5b8 100644
--- a/devel/horde4-content/distinfo
+++ b/devel/horde4-content/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/content-1.0.3.tgz) = d44a916f9753ad620346b164ccd0973ff4efcc7c462d416476cd1a1616786f43
-SIZE (Horde/content-1.0.3.tgz) = 20895
+SHA256 (Horde/content-2.0.1.tgz) = e6ff97d72fb5093da1e8db3daa00d9908444ce2de5d52fcf04c5519bd94cce70
+SIZE (Horde/content-2.0.1.tgz) = 21221
diff --git a/devel/horde4-timeobjects/Makefile b/devel/horde4-timeobjects/Makefile
index c39b3fad1c77..6b6bba19fd34 100644
--- a/devel/horde4-timeobjects/Makefile
+++ b/devel/horde4-timeobjects/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= timeobjects
-PORTVERSION= 1.0.7
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
PKGNAMEPREFIX= horde-
diff --git a/devel/horde4-timeobjects/distinfo b/devel/horde4-timeobjects/distinfo
index a619d401081b..c5838110467a 100644
--- a/devel/horde4-timeobjects/distinfo
+++ b/devel/horde4-timeobjects/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/timeobjects-1.0.7.tgz) = 79aa04e32e0b9223c8212d3ad8299aac77749df4a29b88ec33803896449a1886
-SIZE (Horde/timeobjects-1.0.7.tgz) = 222689
+SHA256 (Horde/timeobjects-2.0.1.tgz) = 6794bba8dbd6cbb768ac713b493bc504b8b6697cec10adfdf51d8342954ffe94
+SIZE (Horde/timeobjects-2.0.1.tgz) = 271250
diff --git a/devel/pear-Horde_Alarm/Makefile b/devel/pear-Horde_Alarm/Makefile
index 1c5f173fb6bf..5e9485d85086 100644
--- a/devel/pear-Horde_Alarm/Makefile
+++ b/devel/pear-Horde_Alarm/Makefile
@@ -5,10 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Alarm
-PORTVERSION= 1.0.8
-PORTREVISION= 1
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mm/Horde
+PORTVERSION= 2.0.2
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Alarm/distinfo b/devel/pear-Horde_Alarm/distinfo
index 3ac9aef1cdbe..6d34cc3a7810 100644
--- a/devel/pear-Horde_Alarm/distinfo
+++ b/devel/pear-Horde_Alarm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Alarm-1.0.8.tgz) = 3eed0aaf29671d28dd51b19f56bed97cb14c7d75ff6ec74654eada20c00e2e95
-SIZE (Horde/Horde_Alarm-1.0.8.tgz) = 33876
+SHA256 (Horde/Horde_Alarm-2.0.2.tgz) = c179f1d3eaa2128a092be9f3f2d96571df7f1ced7a017f8e4e92faafad1d18d5
+SIZE (Horde/Horde_Alarm-2.0.2.tgz) = 33899
diff --git a/devel/pear-Horde_Argv/Makefile b/devel/pear-Horde_Argv/Makefile
index 29aadd015c4d..55df5149eb2f 100644
--- a/devel/pear-Horde_Argv/Makefile
+++ b/devel/pear-Horde_Argv/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Argv
-PORTVERSION= 1.0.5
+PORTVERSION= 2.0.2
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Argv/distinfo b/devel/pear-Horde_Argv/distinfo
index c59c4f27f842..c7948a0ca167 100644
--- a/devel/pear-Horde_Argv/distinfo
+++ b/devel/pear-Horde_Argv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Argv-1.0.5.tgz) = 528b3d2f314aedb477ad2f8381712f066fc8e7eed7255a40069919fd8c0c3d7a
-SIZE (Horde/Horde_Argv-1.0.5.tgz) = 46423
+SHA256 (Horde/Horde_Argv-2.0.2.tgz) = 96cd34567410bc34b3c700081b6c49af9a9abd97d4144416a0b64696bed78054
+SIZE (Horde/Horde_Argv-2.0.2.tgz) = 47240
diff --git a/devel/pear-Horde_Autoloader/Makefile b/devel/pear-Horde_Autoloader/Makefile
index 249213c47420..b159ea2d38b1 100644
--- a/devel/pear-Horde_Autoloader/Makefile
+++ b/devel/pear-Horde_Autoloader/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= Horde_Autoloader
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Autoloader/distinfo b/devel/pear-Horde_Autoloader/distinfo
index 023c98a058e9..2a0372d2bc13 100644
--- a/devel/pear-Horde_Autoloader/distinfo
+++ b/devel/pear-Horde_Autoloader/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Autoloader-1.0.1.tgz) = 47fc5a24f5045fe0d7fd90ea90a3f87474f58717f4f22c149e370515c3dacda1
-SIZE (Horde/Horde_Autoloader-1.0.1.tgz) = 13652
+SHA256 (Horde/Horde_Autoloader-2.0.1.tgz) = 4b2ab2bfb2c8c0f18f18ba5d934e47dafbcfacf32657d8ef58b63bb87288ae7b
+SIZE (Horde/Horde_Autoloader-2.0.1.tgz) = 14202
diff --git a/devel/pear-Horde_Autoloader_Cache/Makefile b/devel/pear-Horde_Autoloader_Cache/Makefile
index b0ba6c86507e..4f7f4c8bb317 100644
--- a/devel/pear-Horde_Autoloader_Cache/Makefile
+++ b/devel/pear-Horde_Autoloader_Cache/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= Horde_Autoloader_Cache
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Autoloader Cache
USE_HORDE_RUN= Horde_Autoloader
+USE_PHP= json
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Autoloader_Cache/distinfo b/devel/pear-Horde_Autoloader_Cache/distinfo
index eb18edf662e9..924c4fa61091 100644
--- a/devel/pear-Horde_Autoloader_Cache/distinfo
+++ b/devel/pear-Horde_Autoloader_Cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Autoloader_Cache-1.0.1.tgz) = 2b23a2a88e56a183adef8b86dfab7d87be25fbcd67c3672c360872df5087bb0f
-SIZE (Horde/Horde_Autoloader_Cache-1.0.1.tgz) = 11524
+SHA256 (Horde/Horde_Autoloader_Cache-2.0.1.tgz) = afd14891a960c780ff3dbe1ef2c3ac2365e871af7fc9bb06e95644f72edcdafe
+SIZE (Horde/Horde_Autoloader_Cache-2.0.1.tgz) = 11762
diff --git a/devel/pear-Horde_Cache/Makefile b/devel/pear-Horde_Cache/Makefile
index 552e93dbc17d..1a1337a718a0 100644
--- a/devel/pear-Horde_Cache/Makefile
+++ b/devel/pear-Horde_Cache/Makefile
@@ -5,26 +5,27 @@
# $FreeBSD$
PORTNAME= Horde_Cache
-PORTVERSION= 1.0.6
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Caching API
-OPTIONS= APC "Require APC PHP extension" Off \
- MEMCACHE "Enable Memcache support" Off \
+OPTIONS_DEFINE= APC MEMCACHE
+APC_DESC= Require APC PHP extension
+MEMCACHE_DESC= Enable Memcache support
USE_HORDE_RUN= Horde_Exception Horde_Util
USE_PHP= hash
.include <bsd.port.pre.mk>
-.if defined(WITH_APC)
+.if ${PORT_OPTIONS:MAPC}
USE_PHP+= apc
.endif
-.if defined(WITH_MEMCACHE)
+.if ${PORT_OPTIONS:MMEMCACHE}
USE_HORDE_RUN+= Horde_Memcache
.endif
diff --git a/devel/pear-Horde_Cache/distinfo b/devel/pear-Horde_Cache/distinfo
index 3acdcbdb5179..642f27dd17fe 100644
--- a/devel/pear-Horde_Cache/distinfo
+++ b/devel/pear-Horde_Cache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Cache-1.0.6.tgz) = a3399fde3f1757d5d2638682dff80b4e6c1a449f16edeed9f923bec0e63c8275
-SIZE (Horde/Horde_Cache-1.0.6.tgz) = 18683
+SHA256 (Horde/Horde_Cache-2.0.1.tgz) = 88031120525ff76c8dca9a552200705fe9625d8bf8d1d1024ff88b3b58166c57
+SIZE (Horde/Horde_Cache-2.0.1.tgz) = 18863
diff --git a/devel/pear-Horde_Cli/Makefile b/devel/pear-Horde_Cli/Makefile
index c1a32daf8b52..e7cfd8d71000 100644
--- a/devel/pear-Horde_Cli/Makefile
+++ b/devel/pear-Horde_Cli/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Cli
-PORTVERSION= 1.0.4
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Cli/distinfo b/devel/pear-Horde_Cli/distinfo
index afeaabf62068..2aee802ec5c7 100644
--- a/devel/pear-Horde_Cli/distinfo
+++ b/devel/pear-Horde_Cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Cli-1.0.4.tgz) = 9c813214079e1ec62571374be9ad333e79597f791edb655c3c2e9f7c1441be73
-SIZE (Horde/Horde_Cli-1.0.4.tgz) = 24935
+SHA256 (Horde/Horde_Cli-2.0.1.tgz) = 93c8df3b82b67e10689960949d5d7548f5e135237a87dd404963fb9e0a0f4a6c
+SIZE (Horde/Horde_Cli-2.0.1.tgz) = 25951
diff --git a/devel/pear-Horde_Constraint/Makefile b/devel/pear-Horde_Constraint/Makefile
index a02d7bd3ccab..140fd3fed6e1 100644
--- a/devel/pear-Horde_Constraint/Makefile
+++ b/devel/pear-Horde_Constraint/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Constraint
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Constraint/distinfo b/devel/pear-Horde_Constraint/distinfo
index d1ad8d41e262..05d2c4edc79b 100644
--- a/devel/pear-Horde_Constraint/distinfo
+++ b/devel/pear-Horde_Constraint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Constraint-1.0.1.tgz) = 7d9f69721d19a575d2345e76fd10d7e511c53920df20326ca499ca3a075ca638
-SIZE (Horde/Horde_Constraint-1.0.1.tgz) = 4862
+SHA256 (Horde/Horde_Constraint-2.0.1.tgz) = bd959fbbeaac0519ec6de8dc7c5e33ab01858e20997be68b895b4305d2b87b19
+SIZE (Horde/Horde_Constraint-2.0.1.tgz) = 5003
diff --git a/devel/pear-Horde_Controller/Makefile b/devel/pear-Horde_Controller/Makefile
index 109438e35821..91b708690bd8 100644
--- a/devel/pear-Horde_Controller/Makefile
+++ b/devel/pear-Horde_Controller/Makefile
@@ -5,13 +5,16 @@
# $FreeBSD$
PORTNAME= Horde_Controller
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Controller libraries
-USE_HORDE_RUN= Horde_Exception Horde_Injector Horde_Log Horde_Support \
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Injector \
+ Horde_Log \
+ Horde_Support \
Horde_Util
.include <bsd.port.pre.mk>
diff --git a/devel/pear-Horde_Controller/distinfo b/devel/pear-Horde_Controller/distinfo
index d4859bb4e9c5..b8d35456850c 100644
--- a/devel/pear-Horde_Controller/distinfo
+++ b/devel/pear-Horde_Controller/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Controller-1.0.2.tgz) = 23bf6ba421c7ed398eb353dada16f061149a8de352a16442dd2335947ea4aa97
-SIZE (Horde/Horde_Controller-1.0.2.tgz) = 10550
+SHA256 (Horde/Horde_Controller-2.0.1.tgz) = d1abe7afbf017d4f08a3bd078cd91f026721c605c3b024ba55c575d64c46816a
+SIZE (Horde/Horde_Controller-2.0.1.tgz) = 10566
diff --git a/devel/pear-Horde_Core/Makefile b/devel/pear-Horde_Core/Makefile
index 8de7a1418e51..656a81fb6c4d 100644
--- a/devel/pear-Horde_Core/Makefile
+++ b/devel/pear-Horde_Core/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Core
-PORTVERSION= 1.9.3
+PORTVERSION= 2.1.0
CATEGORIES= devel www pear
PKGNAMEPREFIX= pear-
@@ -14,9 +14,10 @@ COMMENT= Horde Core Framework libraries
CONFLICTS= horde-3*
-OPTIONS= KOLAB "Enable Kolab server support" Off \
- LZF "Depend on lzf PHP extension" Off \
- SOCKETS "Depend on sockets PHP extension" Off
+OPTONS_DEFINE= KOLAB LZF SOCKETS
+KOLAB_DESC= Enable Kolab server support
+LZF_DESC= Depend on lzf PHP extension
+SOCKETS_DESC= Depend on sockets PHP extension
USE_PHP= session
@@ -71,11 +72,11 @@ USE_HORDE_RUN+= Horde_Kolab_Server \
Horde_Kolab_Storage
.endif
-.if defined(WITH_LZF)
+.if ${PORT_OPTIONS:MLZF}
RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf
.endif
-.if defined(WITH_SOCKETS)
+.if ${PORT_OPTIONS:MSOCKETS}
USE_PHP+= sockets
.endif
diff --git a/devel/pear-Horde_Core/distinfo b/devel/pear-Horde_Core/distinfo
index 3e2d165f3934..3f606e29b37a 100644
--- a/devel/pear-Horde_Core/distinfo
+++ b/devel/pear-Horde_Core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Core-1.9.3.tgz) = 0fff8ce481406ec6cdaa8a042cf10906736af8a8fe86c0dbafde1fc5367a46db
-SIZE (Horde/Horde_Core-1.9.3.tgz) = 496306
+SHA256 (Horde/Horde_Core-2.1.0.tgz) = f201fd11fbd08563c5296ffa83b05dcb903b3c958afe92a8f914a85d2ae3b3ed
+SIZE (Horde/Horde_Core-2.1.0.tgz) = 1370132
diff --git a/devel/pear-Horde_Data/Makefile b/devel/pear-Horde_Data/Makefile
index b3004f38dd97..22ebc1527f5b 100644
--- a/devel/pear-Horde_Data/Makefile
+++ b/devel/pear-Horde_Data/Makefile
@@ -5,14 +5,19 @@
# $FreeBSD$
PORTNAME= Horde_Data
-PORTVERSION= 1.0.7
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Data API
-USE_HORDE_RUN= Horde_Browser Horde_Exception Horde_Icalendar Horde_Mime \
- Horde_Translation Horde_Util
+USE_HORDE_RUN= Horde_Browser \
+ Horde_Exception \
+ Horde_Icalendar \
+ Horde_Mail \
+ Horde_Mime \
+ Horde_Translation \
+ Horde_Util
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Data/distinfo b/devel/pear-Horde_Data/distinfo
index eb188004f43e..fac8b50ecfe6 100644
--- a/devel/pear-Horde_Data/distinfo
+++ b/devel/pear-Horde_Data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Data-1.0.7.tgz) = f0dbca40580c16f2ed7e50962254c3bc2e580deb4ed4b3eb14f8316fee0d7100
-SIZE (Horde/Horde_Data-1.0.7.tgz) = 32828
+SHA256 (Horde/Horde_Data-2.0.1.tgz) = 711e1e70753cddc07c0bad62eb53f7b61c0d9c91a8acb55dcb7abd44e78c6101
+SIZE (Horde/Horde_Data-2.0.1.tgz) = 41338
diff --git a/devel/pear-Horde_DataTree/Makefile b/devel/pear-Horde_DataTree/Makefile
index b7de2334893a..971826e516d1 100644
--- a/devel/pear-Horde_DataTree/Makefile
+++ b/devel/pear-Horde_DataTree/Makefile
@@ -5,14 +5,12 @@
# $FreeBSD$
PORTNAME= Horde_DataTree
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde DataTree API
-USE_HORDE_RUN= Horde_Core Horde_Exception Horde_Serialize Horde_Util
-
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-Horde_Date/Makefile b/devel/pear-Horde_Date/Makefile
index 94b0d281fbde..fdaa6cdad2db 100644
--- a/devel/pear-Horde_Date/Makefile
+++ b/devel/pear-Horde_Date/Makefile
@@ -6,14 +6,24 @@
#
PORTNAME= Horde_Date
-PORTVERSION= 1.0.12
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Date package
-USE_HORDE_RUN= Horde_Exception Horde_Nls Horde_Translation
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Nls \
+ Horde_Translation
+
+OPTIONS_DEFINE= CALENDAR
+CALENDAR_DESC= Depend on calendar PHP extension
.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MSOCKETS}
+USE_PHP+= calendar
+.endif
+
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-Horde_Date/distinfo b/devel/pear-Horde_Date/distinfo
index a0a73041548d..a4643dc6a619 100644
--- a/devel/pear-Horde_Date/distinfo
+++ b/devel/pear-Horde_Date/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Date-1.0.12.tgz) = db0b703a86b6c07b0967b30d07a655119053100da54c527cc7263d68f022692b
-SIZE (Horde/Horde_Date-1.0.12.tgz) = 57408
+SHA256 (Horde/Horde_Date-2.0.1.tgz) = cfc179e89838534b7b0c6fe30824ed69d0d48a516fb7b31bd8524e13a6cade1f
+SIZE (Horde/Horde_Date-2.0.1.tgz) = 58339
diff --git a/devel/pear-Horde_Date_Parser/Makefile b/devel/pear-Horde_Date_Parser/Makefile
index 6902b89a1913..609dad4bca99 100644
--- a/devel/pear-Horde_Date_Parser/Makefile
+++ b/devel/pear-Horde_Date_Parser/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Date_Parser
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Date Parser
-USE_HORDE_RUN= Horde_Date Horde_Support
+USE_HORDE_RUN= Horde_Date \
+ Horde_Support
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Date_Parser/distinfo b/devel/pear-Horde_Date_Parser/distinfo
index 001636fb43cb..554fd80e1e80 100644
--- a/devel/pear-Horde_Date_Parser/distinfo
+++ b/devel/pear-Horde_Date_Parser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Date_Parser-1.0.2.tgz) = a4cbf943381e3afd589ea34dcc497ee75e74c8dd3682667da3ec5828e6586eee
-SIZE (Horde/Horde_Date_Parser-1.0.2.tgz) = 29028
+SHA256 (Horde/Horde_Date_Parser-2.0.1.tgz) = 388e77fb099d297b76eac89af4fc6409a52e55862b5e963e76757d93a5ce11de
+SIZE (Horde/Horde_Date_Parser-2.0.1.tgz) = 29128
diff --git a/devel/pear-Horde_Exception/Makefile b/devel/pear-Horde_Exception/Makefile
index c8ecd002ca9e..a9ef7c99dbd5 100644
--- a/devel/pear-Horde_Exception/Makefile
+++ b/devel/pear-Horde_Exception/Makefile
@@ -5,12 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Exception
-PORTVERSION= 1.0.9
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Exception Handler
+USE_HORDE_RUN= Horde_Translation
+
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-Horde_Exception/distinfo b/devel/pear-Horde_Exception/distinfo
index 0e95751f7e56..02230db6c8d9 100644
--- a/devel/pear-Horde_Exception/distinfo
+++ b/devel/pear-Horde_Exception/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Exception-1.0.9.tgz) = 6cfa6634d8569ce368ecd647017ae42f206176d73a808a3827c2457c7ed0f485
-SIZE (Horde/Horde_Exception-1.0.9.tgz) = 23680
+SHA256 (Horde/Horde_Exception-2.0.1.tgz) = 9156062ca02db9d30fcb8279a62b19db4e704e2071840b366d06a0526c512617
+SIZE (Horde/Horde_Exception-2.0.1.tgz) = 23874
diff --git a/devel/pear-Horde_History/Makefile b/devel/pear-Horde_History/Makefile
index 2bafa57f0cae..4f0c8039a250 100644
--- a/devel/pear-Horde_History/Makefile
+++ b/devel/pear-Horde_History/Makefile
@@ -6,13 +6,14 @@
#
PORTNAME= Horde_History
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde API for tracking the history of an object
-USE_HORDE_RUN= Horde_Db Horde_Exception
+USE_HORDE_RUN= Horde_Db \
+ Horde_Exception
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_History/distinfo b/devel/pear-Horde_History/distinfo
index db18a25500fb..6487bf8a7f84 100644
--- a/devel/pear-Horde_History/distinfo
+++ b/devel/pear-Horde_History/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_History-1.0.1.tgz) = e53bc41573591c95a4a06ab42934627569c4e41a96ad0008040443a61065d677
-SIZE (Horde/Horde_History-1.0.1.tgz) = 17228
+SHA256 (Horde/Horde_History-2.0.1.tgz) = 9227ba4c6c42073346b340780ccff73301a84253e8ea1ef80a55d6af2c014469
+SIZE (Horde/Horde_History-2.0.1.tgz) = 17168
diff --git a/devel/pear-Horde_Icalendar/Makefile b/devel/pear-Horde_Icalendar/Makefile
index f91c97ff3081..bd579c8e4210 100644
--- a/devel/pear-Horde_Icalendar/Makefile
+++ b/devel/pear-Horde_Icalendar/Makefile
@@ -5,14 +5,19 @@
# $FreeBSD$
PORTNAME= Horde_Icalendar
-PORTVERSION= 1.1.2
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde iCalendar API
-USE_HORDE_RUN= Horde_Date Horde_Exception Horde_Mime Horde_Support \
- Horde_Translation Horde_Util
+USE_HORDE_RUN= Horde_Date \
+ Horde_Exception \
+ Horde_Mail \
+ Horde_Mime \
+ Horde_Support \
+ Horde_Translation \
+ Horde_Util
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Icalendar/distinfo b/devel/pear-Horde_Icalendar/distinfo
index 425af9b45e55..2c8d08fc62ec 100644
--- a/devel/pear-Horde_Icalendar/distinfo
+++ b/devel/pear-Horde_Icalendar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Icalendar-1.1.2.tgz) = ec641001afa39de18d66d1c7a4d1636c7100562954df09e870803f2daa4faed1
-SIZE (Horde/Horde_Icalendar-1.1.2.tgz) = 97938
+SHA256 (Horde/Horde_Icalendar-2.0.1.tgz) = b31cb60323eb9139073e309ee0b369fe9bb88d61bee35ec0bd52a81630ba1f49
+SIZE (Horde/Horde_Icalendar-2.0.1.tgz) = 103856
diff --git a/devel/pear-Horde_Injector/Makefile b/devel/pear-Horde_Injector/Makefile
index 03f2baf91d0c..6a236dea7384 100644
--- a/devel/pear-Horde_Injector/Makefile
+++ b/devel/pear-Horde_Injector/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Injector
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Injector/distinfo b/devel/pear-Horde_Injector/distinfo
index 1ec7619be677..d1e7ccc6931c 100644
--- a/devel/pear-Horde_Injector/distinfo
+++ b/devel/pear-Horde_Injector/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Injector-1.0.1.tgz) = c28467752f7e8751720e937e841dc61255f1b4c83f1898e90f1a61d436dd5a7e
-SIZE (Horde/Horde_Injector-1.0.1.tgz) = 21477
+SHA256 (Horde/Horde_Injector-2.0.1.tgz) = 32ad3376cd457fb6b7722a1d27471bcb1a0655180a507ef4dd6ec2301b3958f7
+SIZE (Horde/Horde_Injector-2.0.1.tgz) = 21538
diff --git a/devel/pear-Horde_Itip/Makefile b/devel/pear-Horde_Itip/Makefile
index 367e8f00ddc6..716c56e23c62 100644
--- a/devel/pear-Horde_Itip/Makefile
+++ b/devel/pear-Horde_Itip/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Itip
-PORTVERSION= 1.0.7
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde iTip invitation response handling
-USE_HORDE_RUN= Horde_Icalendar Horde_Mime
+USE_HORDE_RUN= Horde_Icalendar \
+ Horde_Mime
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Itip/distinfo b/devel/pear-Horde_Itip/distinfo
index a4540ad0bd11..b353e7315b6d 100644
--- a/devel/pear-Horde_Itip/distinfo
+++ b/devel/pear-Horde_Itip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Itip-1.0.7.tgz) = 92d20a03193fe9c8e37e847d872318fdc1817b08822451bb58198a7c09e2b5a2
-SIZE (Horde/Horde_Itip-1.0.7.tgz) = 33447
+SHA256 (Horde/Horde_Itip-2.0.1.tgz) = 29943ba551b0db7abb8a091efb05af07271d8bf2f2c5656b372084e1aacd993f
+SIZE (Horde/Horde_Itip-2.0.1.tgz) = 34023
diff --git a/devel/pear-Horde_Lock/Makefile b/devel/pear-Horde_Lock/Makefile
index eaf857f20261..5185f5bb6238 100644
--- a/devel/pear-Horde_Lock/Makefile
+++ b/devel/pear-Horde_Lock/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Lock
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Resource Locking System
-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/devel/pear-Horde_Lock/distinfo b/devel/pear-Horde_Lock/distinfo
index 6a5e923263b9..bd2daaa078ec 100644
--- a/devel/pear-Horde_Lock/distinfo
+++ b/devel/pear-Horde_Lock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Lock-1.0.1.tgz) = 975817f12a4eb71b0b16754c5dcbd0724d2fabedffd07bb511f84320fcda2de8
-SIZE (Horde/Horde_Lock-1.0.1.tgz) = 13853
+SHA256 (Horde/Horde_Lock-2.0.1.tgz) = a7a8fec2e3d2ac08f11e4fc404e7d1fcf8621c2e815508f7259fd996c24562fa
+SIZE (Horde/Horde_Lock-2.0.1.tgz) = 14011
diff --git a/devel/pear-Horde_LoginTasks/Makefile b/devel/pear-Horde_LoginTasks/Makefile
index 031a7b1c5ebe..90008522f5a4 100644
--- a/devel/pear-Horde_LoginTasks/Makefile
+++ b/devel/pear-Horde_LoginTasks/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_LoginTasks
-PORTVERSION= 1.0.3
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_LoginTasks/distinfo b/devel/pear-Horde_LoginTasks/distinfo
index ea7c73b9d4c6..5ae79bf538ff 100644
--- a/devel/pear-Horde_LoginTasks/distinfo
+++ b/devel/pear-Horde_LoginTasks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_LoginTasks-1.0.3.tgz) = 5d89c790b46c10c74640e41bbbfb62020b9b724d272ae5eab3f54c7d191ae7b5
-SIZE (Horde/Horde_LoginTasks-1.0.3.tgz) = 29283
+SHA256 (Horde/Horde_LoginTasks-2.0.1.tgz) = 409c057aebf6d0d208862cfc43d73c333959da9ebb4cd23fc3929405fc39bcdc
+SIZE (Horde/Horde_LoginTasks-2.0.1.tgz) = 29789
diff --git a/devel/pear-Horde_Nls/Makefile b/devel/pear-Horde_Nls/Makefile
index b20147e7cfdd..dcd6c445b8b7 100644
--- a/devel/pear-Horde_Nls/Makefile
+++ b/devel/pear-Horde_Nls/Makefile
@@ -5,27 +5,29 @@
# $FreeBSD$
PORTNAME= Horde_Nls
-PORTVERSION= 1.1.7
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MASTER_SITES= http://pear.horde.org/get/
PKGNAMEPREFIX= pear-
-OPTIONS= GEOIP "Depend on geoip PHP extension" Off
-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Native Language Support
-USE_HORDE_RUN= Horde_Translation Horde_Util
+USE_HORDE_RUN= Horde_Translation \
+ Horde_Util
+
+OPTIONS_DEFINE= GEOIP
+GEOIP_DESC= Depend on geoip PHP extension
.include <bsd.port.options.mk>
-.if defined(WITH_GEOIP)
+.if ${PORT_OPTIONS:MGEOIP}
USE_PHP= yes
.endif
.include <bsd.port.pre.mk>
-.if defined(WITH_GEOIP)
+.if ${PORT_OPTIONS:MGEOIP}
RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip
.endif
diff --git a/devel/pear-Horde_Nls/distinfo b/devel/pear-Horde_Nls/distinfo
index 3e38a6a8f9aa..56cd07256431 100644
--- a/devel/pear-Horde_Nls/distinfo
+++ b/devel/pear-Horde_Nls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Nls-1.1.7.tgz) = 38d96306e9534090c1e97bfaff2b518d5e783323f4d698d03c0aa428a3964593
-SIZE (Horde/Horde_Nls-1.1.7.tgz) = 427098
+SHA256 (Horde/Horde_Nls-2.0.1.tgz) = 5b2c7daf1b227beadbc551add5c0cd82453dccf4d91c1420c2955e0ba0f980cd
+SIZE (Horde/Horde_Nls-2.0.1.tgz) = 428118
diff --git a/devel/pear-Horde_Notification/Makefile b/devel/pear-Horde_Notification/Makefile
index ad5fa984cf2c..9a4e48197c0b 100644
--- a/devel/pear-Horde_Notification/Makefile
+++ b/devel/pear-Horde_Notification/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Notification
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Notification System
-USE_HORDE_RUN= Horde_Exception Horde_Util
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Util
USE_PHP= gettext
.include <bsd.port.pre.mk>
diff --git a/devel/pear-Horde_Notification/distinfo b/devel/pear-Horde_Notification/distinfo
index beedf8ad0ab1..545bd546b18e 100644
--- a/devel/pear-Horde_Notification/distinfo
+++ b/devel/pear-Horde_Notification/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Notification-1.0.1.tgz) = 0f46124c1fc0e83c9f14ded7475c7cdb8371fcd31aaa0a74dc4c72a468cccbba
-SIZE (Horde/Horde_Notification-1.0.1.tgz) = 20922
+SHA256 (Horde/Horde_Notification-2.0.1.tgz) = c525dca33d972458147eb75cac01f5b2d548528bdc191da87a0062f0c03fb4de
+SIZE (Horde/Horde_Notification-2.0.1.tgz) = 20868
diff --git a/devel/pear-Horde_Prefs/Makefile b/devel/pear-Horde_Prefs/Makefile
index 417f150011c6..c09710a285f5 100644
--- a/devel/pear-Horde_Prefs/Makefile
+++ b/devel/pear-Horde_Prefs/Makefile
@@ -5,13 +5,17 @@
# $FreeBSD$
PORTNAME= Horde_Prefs
-PORTVERSION= 1.1.8
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Preferences API
-USE_HORDE_RUN= Horde_Exception Horde_Mime Horde_Translation Horde_Util
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Mail \
+ Horde_Mime \
+ Horde_Translation \
+ Horde_Util
USE_PHP= json
.include <bsd.port.pre.mk>
diff --git a/devel/pear-Horde_Prefs/distinfo b/devel/pear-Horde_Prefs/distinfo
index 6025670d0416..b8e9dcdc385f 100644
--- a/devel/pear-Horde_Prefs/distinfo
+++ b/devel/pear-Horde_Prefs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Prefs-1.1.8.tgz) = 7ccb325bc3b6773d5b366cd581fd211bb0bbfbe2d9cd252ca7b31fde1522343d
-SIZE (Horde/Horde_Prefs-1.1.8.tgz) = 50993
+SHA256 (Horde/Horde_Prefs-2.0.1.tgz) = 8bd647bfc1b4b3ef5ae1aa6b6db864e15b395693b1afe93110d283154cc572a8
+SIZE (Horde/Horde_Prefs-2.0.1.tgz) = 52140
diff --git a/devel/pear-Horde_Rdo/Makefile b/devel/pear-Horde_Rdo/Makefile
index 36ab8bd92cc1..c63d397d6b58 100644
--- a/devel/pear-Horde_Rdo/Makefile
+++ b/devel/pear-Horde_Rdo/Makefile
@@ -5,14 +5,15 @@
# $FreeBSD$
PORTNAME= Horde_Rdo
-PORTVERSION= 1.2.0
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MASTER_SITES= http://pear.horde.org/get/
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Rampage Data Objects
-USE_HORDE_RUN= Horde_Db
+USE_HORDE_RUN= Horde_Db \
+ Horde_Exception
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Rdo/distinfo b/devel/pear-Horde_Rdo/distinfo
index 8d4edbdb3ac1..72d72e8955af 100644
--- a/devel/pear-Horde_Rdo/distinfo
+++ b/devel/pear-Horde_Rdo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Rdo-1.2.0.tgz) = d78da3738c545c448b2393b8e0c6cca2a680d2c3726aa67f4d265faaf04386d7
-SIZE (Horde/Horde_Rdo-1.2.0.tgz) = 30666
+SHA256 (Horde/Horde_Rdo-2.0.1.tgz) = cfd8fe4ee05bca41e5fd2ff9632f072f5873fda780de39a5f59963e06df81b6b
+SIZE (Horde/Horde_Rdo-2.0.1.tgz) = 34304
diff --git a/devel/pear-Horde_Scheduler/Makefile b/devel/pear-Horde_Scheduler/Makefile
index 2ac6154bc900..fc98d5f4a316 100644
--- a/devel/pear-Horde_Scheduler/Makefile
+++ b/devel/pear-Horde_Scheduler/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
PORTNAME= Horde_Scheduler
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Scheduler System
-USE_HORDE_RUN= Horde_Core Horde_Util Horde_Vfs
+USE_HORDE_RUN= Horde_Core \
+ Horde_Util \
+ Horde_Vfs
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Scheduler/distinfo b/devel/pear-Horde_Scheduler/distinfo
index bee72739a026..51951bf22562 100644
--- a/devel/pear-Horde_Scheduler/distinfo
+++ b/devel/pear-Horde_Scheduler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Scheduler-1.0.1.tgz) = 57f875d93d194cbaa06ba2b769efb4556219093721ac8ad778edb3ca9c87d97e
-SIZE (Horde/Horde_Scheduler-1.0.1.tgz) = 13904
+SHA256 (Horde/Horde_Scheduler-2.0.1.tgz) = 8f7383e32854fb33d50842713009db331c77d40bc28896e225c0c4f60f7d5e7c
+SIZE (Horde/Horde_Scheduler-2.0.1.tgz) = 13985
diff --git a/devel/pear-Horde_Serialize/Makefile b/devel/pear-Horde_Serialize/Makefile
index 89b7cb8df60a..2e7507c9ec84 100644
--- a/devel/pear-Horde_Serialize/Makefile
+++ b/devel/pear-Horde_Serialize/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Serialize
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Data Encapulation 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/devel/pear-Horde_Serialize/distinfo b/devel/pear-Horde_Serialize/distinfo
index 43380d6d487f..78e476740244 100644
--- a/devel/pear-Horde_Serialize/distinfo
+++ b/devel/pear-Horde_Serialize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Serialize-1.0.2.tgz) = 3b18591d5434569aadcb68db6da5c5f37af5b928ddbf5e2fbd1f3a2255e9caf0
-SIZE (Horde/Horde_Serialize-1.0.2.tgz) = 16017
+SHA256 (Horde/Horde_Serialize-2.0.1.tgz) = 8950696776d5397f617a637101eac2d6f58d0a9d3b3b09d98c8d567788562aea
+SIZE (Horde/Horde_Serialize-2.0.1.tgz) = 15953
diff --git a/devel/pear-Horde_Stream_Filter/Makefile b/devel/pear-Horde_Stream_Filter/Makefile
index 22fb55a763a2..40907ae9d2dd 100644
--- a/devel/pear-Horde_Stream_Filter/Makefile
+++ b/devel/pear-Horde_Stream_Filter/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= Horde_Stream_Filter
-PORTVERSION= 1.1.0
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Stream_Filter/distinfo b/devel/pear-Horde_Stream_Filter/distinfo
index 6767df731387..d7d5e42a2507 100644
--- a/devel/pear-Horde_Stream_Filter/distinfo
+++ b/devel/pear-Horde_Stream_Filter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Stream_Filter-1.1.0.tgz) = b600adc3910917c62dff03deea638e7715e76430803aeac97524d3ca21447e48
-SIZE (Horde/Horde_Stream_Filter-1.1.0.tgz) = 12272
+SHA256 (Horde/Horde_Stream_Filter-2.0.1.tgz) = 10dcea7c12e21a065bf31eb1dd598afc69dbe7670f412af56340a820facd2928
+SIZE (Horde/Horde_Stream_Filter-2.0.1.tgz) = 13146
diff --git a/devel/pear-Horde_Stream_Wrapper/Makefile b/devel/pear-Horde_Stream_Wrapper/Makefile
index c3ab2633b1f9..2a71b92590ab 100644
--- a/devel/pear-Horde_Stream_Wrapper/Makefile
+++ b/devel/pear-Horde_Stream_Wrapper/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= Horde_Stream_Wrapper
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Stream_Wrapper/distinfo b/devel/pear-Horde_Stream_Wrapper/distinfo
index 7e8082bd7c03..7a37073b236b 100644
--- a/devel/pear-Horde_Stream_Wrapper/distinfo
+++ b/devel/pear-Horde_Stream_Wrapper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Stream_Wrapper-1.0.1.tgz) = f1f9dd089afa5bfcbe37a1236b255890039e73e170f0859761b1bfed038e3aa4
-SIZE (Horde/Horde_Stream_Wrapper-1.0.1.tgz) = 11727
+SHA256 (Horde/Horde_Stream_Wrapper-2.0.1.tgz) = ee839d9f15f7326555ad3a6619c012e92b677c43c730bcf845718acfd7f94aa1
+SIZE (Horde/Horde_Stream_Wrapper-2.0.1.tgz) = 11808
diff --git a/devel/pear-Horde_Support/Makefile b/devel/pear-Horde_Support/Makefile
index 8fba379fc9da..0179906205f1 100644
--- a/devel/pear-Horde_Support/Makefile
+++ b/devel/pear-Horde_Support/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Support
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.2
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde support package
-USE_HORDE_RUN= Horde_Exception Horde_Stream_Wrapper
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Stream_Wrapper
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Support/distinfo b/devel/pear-Horde_Support/distinfo
index 31f25bdbeab6..84402d5686b0 100644
--- a/devel/pear-Horde_Support/distinfo
+++ b/devel/pear-Horde_Support/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Support-1.0.2.tgz) = dce517a936c83aae9a384ccaf0203621c75e0e21330e0f5ad5d48dbb4bf12d06
-SIZE (Horde/Horde_Support-1.0.2.tgz) = 22284
+SHA256 (Horde/Horde_Support-2.0.2.tgz) = afb123800931ca776c0585055453022c9da29d8eb3a9771722dde652ee0b77f0
+SIZE (Horde/Horde_Support-2.0.2.tgz) = 23100
diff --git a/devel/pear-Horde_Thrift/Makefile b/devel/pear-Horde_Thrift/Makefile
index 18f7bc8bdb19..40d0397d371f 100644
--- a/devel/pear-Horde_Thrift/Makefile
+++ b/devel/pear-Horde_Thrift/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Thrift
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/devel/pear-Horde_Thrift/distinfo b/devel/pear-Horde_Thrift/distinfo
index 2b601361f4f6..b85757f7185e 100644
--- a/devel/pear-Horde_Thrift/distinfo
+++ b/devel/pear-Horde_Thrift/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Thrift-1.0.1.tgz) = 22dff7f8f87d761a492b990094af0fe3690d0c0801f67be0d23986a164b106c8
-SIZE (Horde/Horde_Thrift-1.0.1.tgz) = 22514
+SHA256 (Horde/Horde_Thrift-2.0.1.tgz) = 7a3419f1d2bfc59b6e4a43dc564ad24a7f1fcc4b34f74785f1ddc31d752d3456
+SIZE (Horde/Horde_Thrift-2.0.1.tgz) = 22602
diff --git a/devel/pear-Horde_Token/Makefile b/devel/pear-Horde_Token/Makefile
index ccfe0e61cd40..a380c0b31f85 100644
--- a/devel/pear-Horde_Token/Makefile
+++ b/devel/pear-Horde_Token/Makefile
@@ -5,13 +5,16 @@
# $FreeBSD$
PORTNAME= Horde_Token
-PORTVERSION= 1.1.7
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Token API
-USE_HORDE_RUN= Horde_Exception Horde_Translation Horde_Url Horde_Util
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Translation \
+ Horde_Url \
+ Horde_Util
USE_PHP= hash
.include <bsd.port.pre.mk>
diff --git a/devel/pear-Horde_Token/distinfo b/devel/pear-Horde_Token/distinfo
index 651f066a49ac..49b089937906 100644
--- a/devel/pear-Horde_Token/distinfo
+++ b/devel/pear-Horde_Token/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Token-1.1.7.tgz) = 1aea5b465007cfd48554a0ade987f40c83be04af6ec0f58ab1549495ab3003ae
-SIZE (Horde/Horde_Token-1.1.7.tgz) = 28439
+SHA256 (Horde/Horde_Token-2.0.1.tgz) = 43d048904473feece4492148596e083055d1552455c6111587f738c544dce27f
+SIZE (Horde/Horde_Token-2.0.1.tgz) = 29067
diff --git a/devel/pear-Horde_Translation/Makefile b/devel/pear-Horde_Translation/Makefile
index 4dc7f800ce45..e70da6db69f5 100644
--- a/devel/pear-Horde_Translation/Makefile
+++ b/devel/pear-Horde_Translation/Makefile
@@ -5,14 +5,12 @@
# $FreeBSD$
PORTNAME= Horde_Translation
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde translation library
-USE_HORDE_RUN= Horde_Exception
-
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-Horde_Translation/distinfo b/devel/pear-Horde_Translation/distinfo
index bd2ddb46e8e1..c2245819bbf3 100644
--- a/devel/pear-Horde_Translation/distinfo
+++ b/devel/pear-Horde_Translation/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Translation-1.0.2.tgz) = d467fe13ed6c237f04328c128e9729c2935b58d10525acff463cf54370f3c669
-SIZE (Horde/Horde_Translation-1.0.2.tgz) = 13483
+SHA256 (Horde/Horde_Translation-2.0.1.tgz) = 136112e94f641cc62aa59f93f6e4949e494b24c23a1a481a92ba1fe380448494
+SIZE (Horde/Horde_Translation-2.0.1.tgz) = 13636
diff --git a/devel/pear-Horde_Tree/Makefile b/devel/pear-Horde_Tree/Makefile
index 90638cad9a9f..e2a8d062485a 100644
--- a/devel/pear-Horde_Tree/Makefile
+++ b/devel/pear-Horde_Tree/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
PORTNAME= Horde_Tree
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Tree API
-USE_HORDE_RUN= Horde_Exception Horde_Url Horde_Util
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Url \
+ Horde_Util
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Tree/distinfo b/devel/pear-Horde_Tree/distinfo
index a0fc07b24914..08edb2171c70 100644
--- a/devel/pear-Horde_Tree/distinfo
+++ b/devel/pear-Horde_Tree/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Tree-1.0.1.tgz) = a93117b9bb2a74585c5bdb0b027dc73e13275360f237d73b16d34d36ebac0c59
-SIZE (Horde/Horde_Tree-1.0.1.tgz) = 14635
+SHA256 (Horde/Horde_Tree-2.0.1.tgz) = f6600fa13444d247d50b2f384fbaf490aa45570cacb588495d81f53eec4d64f4
+SIZE (Horde/Horde_Tree-2.0.1.tgz) = 15893
diff --git a/devel/pear-Horde_Util/Makefile b/devel/pear-Horde_Util/Makefile
index ccb13fabb23a..5f775dab03b5 100644
--- a/devel/pear-Horde_Util/Makefile
+++ b/devel/pear-Horde_Util/Makefile
@@ -5,14 +5,13 @@
# $FreeBSD$
PORTNAME= Horde_Util
-PORTVERSION= 1.4.0
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Utility Libraries
USE_PHP= dom
-USE_HORDE_RUN= Horde_Url
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_Util/distinfo b/devel/pear-Horde_Util/distinfo
index af079b37f5c2..528d6b30704c 100644
--- a/devel/pear-Horde_Util/distinfo
+++ b/devel/pear-Horde_Util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Util-1.4.0.tgz) = 73f37f6cae212ed33303b22cd546c0d4cf8a90fa160968e73d3fd86a1396d8bc
-SIZE (Horde/Horde_Util-1.4.0.tgz) = 40110
+SHA256 (Horde/Horde_Util-2.0.1.tgz) = d185bc41bfa7489591a6ecac120295ed25fd87b1c813f7316c342d3f7fb1c41c
+SIZE (Horde/Horde_Util-2.0.1.tgz) = 31643
diff --git a/devel/pear-Horde_View/Makefile b/devel/pear-Horde_View/Makefile
index 9f076fcae1dc..b38f9499c169 100644
--- a/devel/pear-Horde_View/Makefile
+++ b/devel/pear-Horde_View/Makefile
@@ -5,13 +5,15 @@
# $FreeBSD$
PORTNAME= Horde_View
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde View API
-USE_HORDE_RUN= Horde_Exception Horde_Support Horde_Util
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Support \
+ Horde_Util
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/devel/pear-Horde_View/distinfo b/devel/pear-Horde_View/distinfo
index da0c11f2c0a5..04a998c10874 100644
--- a/devel/pear-Horde_View/distinfo
+++ b/devel/pear-Horde_View/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_View-1.0.1.tgz) = c761c1ee08ef3def8a4062e951e61419b39190758661c2ff1517a8abb1ccb04d
-SIZE (Horde/Horde_View-1.0.1.tgz) = 43536
+SHA256 (Horde/Horde_View-2.0.1.tgz) = 7dd96b6f48e259f176754b872e020569e1e142ba6504003ee86db9a13c5f700e
+SIZE (Horde/Horde_View-2.0.1.tgz) = 43640
diff --git a/ftp/horde4-gollem/Makefile b/ftp/horde4-gollem/Makefile
index efcacf8153c4..059071ba5aad 100644
--- a/ftp/horde4-gollem/Makefile
+++ b/ftp/horde4-gollem/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gollem
-PORTVERSION= 2.0.2
+DISTVERSION= 3.0.0RC1
CATEGORIES= ftp www pear
PKGNAMEPREFIX= horde-
@@ -16,29 +16,31 @@ COMMENT= Horde Web-based File Manager
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LATEST_LINK= horde4-${PORTNAME}
+LATEST_LINK= horde5-${PORTNAME}
USE_PHP= gettext json
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
horde \
Horde_Auth \
- Horde_Browser \
Horde_Cache \
Horde_Core \
- Horde_Db \
Horde_Editor \
Horde_Exception \
Horde_Mime \
Horde_Mime_Viewer \
- Horde_Notification \
Horde_Perms \
Horde_Secret \
Horde_Serialize \
Horde_Support \
Horde_Url \
Horde_Util \
- Horde_Vfs
+ Horde_Vfs \
+ Horde_View
+
+# Optional but we want it
+USE_HORDE_RUN+= Horde_Db \
+ Horde_Share
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/ftp/horde4-gollem/distinfo b/ftp/horde4-gollem/distinfo
index 538f343e1fe3..7c7a9289ca72 100644
--- a/ftp/horde4-gollem/distinfo
+++ b/ftp/horde4-gollem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/gollem-2.0.2.tgz) = 232b34060b664bf2b43befec935d02dc3209b5c3ff1673aa2a611f9f84cac0c6
-SIZE (Horde/gollem-2.0.2.tgz) = 1165035
+SHA256 (Horde/gollem-3.0.0RC1.tgz) = 7d9aec8a48b34e6d848788cf393b64b721bd1a5aa863122c2b627ee537441bdf
+SIZE (Horde/gollem-3.0.0RC1.tgz) = 1071511
diff --git a/graphics/pear-Horde_Image/Makefile b/graphics/pear-Horde_Image/Makefile
index 569c40cebb4b..8f9ff5ae626c 100644
--- a/graphics/pear-Horde_Image/Makefile
+++ b/graphics/pear-Horde_Image/Makefile
@@ -5,20 +5,24 @@
# $FreeBSD$
PORTNAME= Horde_Image
-PORTVERSION= 1.0.10
+PORTVERSION= 2.0.1
CATEGORIES= graphics www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Image API
-OPTIONS= GD "Depend on PHP gd extension" Off
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Support \
+ Horde_Translation \
+ Horde_Util
-USE_HORDE_RUN= Horde_Exception Horde_Support Horde_Translation Horde_Util
+OPTIONS_DEFINE= GD
+GD_DESC= Depend on PHP gd extension
.include <bsd.port.pre.mk>
-.if defined(WITH_GD)
+.if ${PORT_OPTIONS:MGD}
USE_PHP+= gd
.endif
diff --git a/graphics/pear-Horde_Image/distinfo b/graphics/pear-Horde_Image/distinfo
index f0deca5e60d4..1ad7f2a3cb73 100644
--- a/graphics/pear-Horde_Image/distinfo
+++ b/graphics/pear-Horde_Image/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Image-1.0.10.tgz) = bd6c0621cd2036355cd13ad4665dbee1407bcff5969a9bea4faa016bd47c70de
-SIZE (Horde/Horde_Image-1.0.10.tgz) = 764536
+SHA256 (Horde/Horde_Image-2.0.1.tgz) = f3b5229940cd93255548223562740348b83b03becdb10e91f66a45844feb62b8
+SIZE (Horde/Horde_Image-2.0.1.tgz) = 764550
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
diff --git a/net/pear-Horde_Kolab_Server/Makefile b/net/pear-Horde_Kolab_Server/Makefile
index 148c364d1038..771120d98b93 100644
--- a/net/pear-Horde_Kolab_Server/Makefile
+++ b/net/pear-Horde_Kolab_Server/Makefile
@@ -6,25 +6,27 @@
#
PORTNAME= Horde_Kolab_Server
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= net www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for manipulating the Kolab user database
-OPTIONS= LDAP "Enable LDAP support" On
-
USE_PHP= hash
USE_HORDE_RUN= Horde_Auth \
Horde_Exception
+OPTIONS_DEFAULT= LDAP
+OPTIONS_DEFINE= LDAP
+LDAP_DESC= Enable LDAP support
+
# Not required but we want it
USE_HORDE_RUN+= Horde_Date
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
USE_HORDE_RUN+= Horde_Ldap
.endif
diff --git a/net/pear-Horde_Kolab_Server/distinfo b/net/pear-Horde_Kolab_Server/distinfo
index 0e1be867a38a..22bb43f931ef 100644
--- a/net/pear-Horde_Kolab_Server/distinfo
+++ b/net/pear-Horde_Kolab_Server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Kolab_Server-1.0.2.tgz) = fa212afe27fe519192b6941652f93e510c94d873e5077acf673d1d1a06a33eac
-SIZE (Horde/Horde_Kolab_Server-1.0.2.tgz) = 101876
+SHA256 (Horde/Horde_Kolab_Server-2.0.1.tgz) = 38ba3928c5341e10b3fc9ddffba8673532862498d1bef5f24c895791db95fe34
+SIZE (Horde/Horde_Kolab_Server-2.0.1.tgz) = 101817
diff --git a/net/pear-Horde_Kolab_Session/Makefile b/net/pear-Horde_Kolab_Session/Makefile
index d8eba45ff3b0..50a7ecc70d61 100644
--- a/net/pear-Horde_Kolab_Session/Makefile
+++ b/net/pear-Horde_Kolab_Session/Makefile
@@ -5,14 +5,16 @@
# $FreeBSD$
PORTNAME= Horde_Kolab_Session
-PORTVERSION= 1.1.1
+PORTVERSION= 2.0.1
CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for managing an active Kolab session
-USE_HORDE_RUN= Horde_Exception \
- Horde_Kolab_Server \
+USE_HORDE_RUN= Horde_Exception
+
+# Optional but we want it
+USE_HORDE_RUN+= Horde_Kolab_Server \
Horde_Log
.include <bsd.port.pre.mk>
diff --git a/net/pear-Horde_Kolab_Session/distinfo b/net/pear-Horde_Kolab_Session/distinfo
index 3986fac175dc..f9c99a68cf19 100644
--- a/net/pear-Horde_Kolab_Session/distinfo
+++ b/net/pear-Horde_Kolab_Session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Kolab_Session-1.1.1.tgz) = c90aa46927e901341ea311b2f24a4e1beb8d0d1070a489090964badb3f618a31
-SIZE (Horde/Horde_Kolab_Session-1.1.1.tgz) = 21207
+SHA256 (Horde/Horde_Kolab_Session-2.0.1.tgz) = 8097f7ae46405c05148e9af49a006f700149ba85576b6b1cb4e7412b4781a8be
+SIZE (Horde/Horde_Kolab_Session-2.0.1.tgz) = 21181
diff --git a/net/pear-Horde_Ldap/Makefile b/net/pear-Horde_Ldap/Makefile
index 20477a53a24d..5c251e1dda1a 100644
--- a/net/pear-Horde_Ldap/Makefile
+++ b/net/pear-Horde_Ldap/Makefile
@@ -5,14 +5,15 @@
# $FreeBSD$
PORTNAME= Horde_Ldap
-PORTVERSION= 1.1.5
+PORTVERSION= 2.0.1
CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde LDAP libraries
USE_PHP= ldap
-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/net/pear-Horde_Ldap/distinfo b/net/pear-Horde_Ldap/distinfo
index e9e36f7f30e6..4bf09f4683d4 100644
--- a/net/pear-Horde_Ldap/distinfo
+++ b/net/pear-Horde_Ldap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Ldap-1.1.5.tgz) = 2fbb66aa7fb9642e0eb2f97d92d733519ae30f07fa061690ce8173ef578157aa
-SIZE (Horde/Horde_Ldap-1.1.5.tgz) = 63232
+SHA256 (Horde/Horde_Ldap-2.0.1.tgz) = b7d4699c8c9f07bf027c09e6fd9585c56398246a24eee5816418329fd264bcfd
+SIZE (Horde/Horde_Ldap-2.0.1.tgz) = 63212
diff --git a/net/pear-Horde_Rpc/Makefile b/net/pear-Horde_Rpc/Makefile
index bc853bff032a..ab2dace1422b 100644
--- a/net/pear-Horde_Rpc/Makefile
+++ b/net/pear-Horde_Rpc/Makefile
@@ -5,15 +5,26 @@
# $FreeBSD$
PORTNAME= Horde_Rpc
-PORTVERSION= 1.0.4
+PORTVERSION= 2.0.1
CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde RPC API
-USE_HORDE_RUN= Horde_ActiveSync Horde_Core Horde_Exception Horde_Lock \
- Horde_Perms Horde_Serialize Horde_Support Horde_SyncMl \
- Horde_Translation Horde_Util Horde_Xml_Element Horde_Http
+USE_HORDE_RUN= Horde_Core \
+ Horde_Exception \
+ Horde_Perms \
+ Horde_Serialize \
+ Horde_Support \
+ Horde_Translation \
+ Horde_Util \
+ Horde_Xml_Element
+
+# Optional but we want it
+USE_HORDE_RUN+= Horde_ActiveSync \
+ Horde_Lock \
+ Horde_SyncMl \
+ Horde_Http
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/net/pear-Horde_Rpc/distinfo b/net/pear-Horde_Rpc/distinfo
index a4187d24997a..a9257f911781 100644
--- a/net/pear-Horde_Rpc/distinfo
+++ b/net/pear-Horde_Rpc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Rpc-1.0.4.tgz) = b5b790684aee6adfd6e05a0a3cf6c2934396b9b772c331ae482ad233b8883a5d
-SIZE (Horde/Horde_Rpc-1.0.4.tgz) = 60359
+SHA256 (Horde/Horde_Rpc-2.0.1.tgz) = 049fc13e69bd08e09ef4ad3ef2c2418f397981bb8c942e472b4ea50773fb837d
+SIZE (Horde/Horde_Rpc-2.0.1.tgz) = 61268
diff --git a/net/pear-Horde_Scribe/Makefile b/net/pear-Horde_Scribe/Makefile
index 297a983a30b0..0b101ab34229 100644
--- a/net/pear-Horde_Scribe/Makefile
+++ b/net/pear-Horde_Scribe/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Scribe
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 2.0.1
CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/net/pear-Horde_Scribe/distinfo b/net/pear-Horde_Scribe/distinfo
index b6b6cb1908ed..ff28530b471a 100644
--- a/net/pear-Horde_Scribe/distinfo
+++ b/net/pear-Horde_Scribe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Scribe-1.0.2.tgz) = 4cad50e19aebde1c514956ba31ef06da66b1e696055510234395b349e6bc9611
-SIZE (Horde/Horde_Scribe-1.0.2.tgz) = 4944
+SHA256 (Horde/Horde_Scribe-2.0.1.tgz) = b0feb0d51f4dcd907f28793fef68eaddb00022aa1bd6c3f55ff28c48a92b2be1
+SIZE (Horde/Horde_Scribe-2.0.1.tgz) = 5021
diff --git a/net/pear-Horde_Url/Makefile b/net/pear-Horde_Url/Makefile
index fc191a35b9dd..d684e0956457 100644
--- a/net/pear-Horde_Url/Makefile
+++ b/net/pear-Horde_Url/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Url
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/net/pear-Horde_Url/distinfo b/net/pear-Horde_Url/distinfo
index 1a44d20457a0..7ec38831962e 100644
--- a/net/pear-Horde_Url/distinfo
+++ b/net/pear-Horde_Url/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Url-1.0.2.tgz) = 51adb65a5c733c53616de9c328c15a260ed04e35e4a8c8f1cca62bfe58fee76d
-SIZE (Horde/Horde_Url-1.0.2.tgz) = 14233
+SHA256 (Horde/Horde_Url-2.0.1.tgz) = 2c63a71385f53fadcc2286e8dc15d93bb7ec89211f4d4f2e50ca78c561b2f787
+SIZE (Horde/Horde_Url-2.0.1.tgz) = 14938
diff --git a/security/pear-Horde_Auth/Makefile b/security/pear-Horde_Auth/Makefile
index 9d382cb07171..51e698d9a1d9 100644
--- a/security/pear-Horde_Auth/Makefile
+++ b/security/pear-Horde_Auth/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Auth
-PORTVERSION= 1.4.10
+PORTVERSION= 2.0.1
CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/security/pear-Horde_Auth/distinfo b/security/pear-Horde_Auth/distinfo
index bdea67f07dec..2f5dbb809d96 100644
--- a/security/pear-Horde_Auth/distinfo
+++ b/security/pear-Horde_Auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Auth-1.4.10.tgz) = bf096b2df080239ed117d288cea6b33f01af4723d3b3175b848e8a61abd196f3
-SIZE (Horde/Horde_Auth-1.4.10.tgz) = 50863
+SHA256 (Horde/Horde_Auth-2.0.1.tgz) = f4608367014519be48ae8cad91b9991ca93b7723a4a907fc38511da674acd0d9
+SIZE (Horde/Horde_Auth-2.0.1.tgz) = 51522
diff --git a/security/pear-Horde_Crypt/Makefile b/security/pear-Horde_Crypt/Makefile
index 3fbd1df5cf0f..a5f091d4d73d 100644
--- a/security/pear-Horde_Crypt/Makefile
+++ b/security/pear-Horde_Crypt/Makefile
@@ -6,22 +6,26 @@
#
PORTNAME= Horde_Crypt
-PORTVERSION= 1.1.2
+PORTVERSION= 2.1.0
CATEGORIES= security www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Cryptography API
-OPTIONS= BCMATH "Depend on bcmath PHP extension" Off
+OPTIONS_DEFINE= BCMATH
+BCMATH_DESC= Depend on bcmath PHP extension
-USE_HORDE_RUN= Horde_Exception Horde_Mime Horde_Stream_Filter \
- Horde_Translation Horde_Util
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Mime \
+ Horde_Stream_Filter \
+ Horde_Translation \
+ Horde_Util
USE_PHP= hash openssl
.include <bsd.port.pre.mk>
-.if defined(WITH_BCMATH)
+.if ${PORT_OPTIONS:MBCMATH}
USE_PHP+= bcmath
.endif
diff --git a/security/pear-Horde_Crypt/distinfo b/security/pear-Horde_Crypt/distinfo
index f82c01f3d988..9fce4e9dae6c 100644
--- a/security/pear-Horde_Crypt/distinfo
+++ b/security/pear-Horde_Crypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Crypt-1.1.2.tgz) = 60970cd8633704bc5c921dbc60fcde8411dbe0bd7952f194bc0c0d9579dffa13
-SIZE (Horde/Horde_Crypt-1.1.2.tgz) = 137391
+SHA256 (Horde/Horde_Crypt-2.1.0.tgz) = 5320b12b86104bb84c47aedc885c966d9aaa5f6d9bfd58a50d5accbdfe8b5b35
+SIZE (Horde/Horde_Crypt-2.1.0.tgz) = 141387
diff --git a/security/pear-Horde_Group/Makefile b/security/pear-Horde_Group/Makefile
index 817248d5dfeb..ed00187a8a62 100644
--- a/security/pear-Horde_Group/Makefile
+++ b/security/pear-Horde_Group/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Group
-PORTVERSION= 1.0.5
+PORTVERSION= 2.0.1
CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde User Groups System
-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/security/pear-Horde_Group/distinfo b/security/pear-Horde_Group/distinfo
index 31c94b6f4532..5cc1b8df9b46 100644
--- a/security/pear-Horde_Group/distinfo
+++ b/security/pear-Horde_Group/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Group-1.0.5.tgz) = eaed91b77bafef1a9c39a98719f8e05419809f351a922726e46edbecbe209608
-SIZE (Horde/Horde_Group-1.0.5.tgz) = 20737
+SHA256 (Horde/Horde_Group-2.0.1.tgz) = aae02c410af7fb668946f2841360f06d7947b6c8f8274610b256661d0d836f5e
+SIZE (Horde/Horde_Group-2.0.1.tgz) = 20110
diff --git a/security/pear-Horde_Perms/Makefile b/security/pear-Horde_Perms/Makefile
index 6a9567c6f960..6691782d77a0 100644
--- a/security/pear-Horde_Perms/Makefile
+++ b/security/pear-Horde_Perms/Makefile
@@ -5,13 +5,16 @@
# $FreeBSD$
PORTNAME= Horde_Perms
-PORTVERSION= 1.0.7
+PORTVERSION= 2.0.1
CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Permissions System
-USE_HORDE_RUN= Horde_Db Horde_Exception Horde_Group Horde_Util \
+USE_HORDE_RUN= Horde_Db \
+ Horde_Exception \
+ Horde_Group \
+ Horde_Util \
Horde_Translation
.include <bsd.port.pre.mk>
diff --git a/security/pear-Horde_Perms/distinfo b/security/pear-Horde_Perms/distinfo
index 734117663fc9..68b716a9f6a6 100644
--- a/security/pear-Horde_Perms/distinfo
+++ b/security/pear-Horde_Perms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Perms-1.0.7.tgz) = 727b43fb8a494acc23efa05fa11bacd38aa013768278bd329ec4117d8eb75e00
-SIZE (Horde/Horde_Perms-1.0.7.tgz) = 39525
+SHA256 (Horde/Horde_Perms-2.0.1.tgz) = 16a691e2b197864940c081f426f2f514eff5f0e6bb9598c599328cf9037ac903
+SIZE (Horde/Horde_Perms-2.0.1.tgz) = 36838
diff --git a/security/pear-Horde_Secret/Makefile b/security/pear-Horde_Secret/Makefile
index a7490b04f701..55480bf21df6 100644
--- a/security/pear-Horde_Secret/Makefile
+++ b/security/pear-Horde_Secret/Makefile
@@ -6,15 +6,16 @@
#
PORTNAME= Horde_Secret
-PORTVERSION= 1.0.4
+PORTVERSION= 2.0.2
CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Secret Encryption API
-RUN_DEPENDS= ${PEARDIR}/Crypt/Blowfish.php:${PORTSDIR}/security/pear-Crypt_Blowfish
-
-USE_HORDE_RUN= Horde_Exception
+USE_HORDE_RUN= Horde_Crypt_Blowfish \
+ Horde_Exception \
+ Horde_Support
+
USE_PHP= hash
.include <bsd.port.pre.mk>
diff --git a/security/pear-Horde_Secret/distinfo b/security/pear-Horde_Secret/distinfo
index da93a67d6b03..a647a9b8b845 100644
--- a/security/pear-Horde_Secret/distinfo
+++ b/security/pear-Horde_Secret/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Secret-1.0.4.tgz) = 8ab3bc550a099011896bd23206e893f4ed33c4da40c2ba9f613988b0dbae5222
-SIZE (Horde/Horde_Secret-1.0.4.tgz) = 13282
+SHA256 (Horde/Horde_Secret-2.0.2.tgz) = e9a41c1000d72a6353b0d177239a6b9aa714a14b81910615a585c53148126d98
+SIZE (Horde/Horde_Secret-2.0.2.tgz) = 13470
diff --git a/security/pear-Horde_Share/Makefile b/security/pear-Horde_Share/Makefile
index 7748bb326cc6..c9e901aa3ed2 100644
--- a/security/pear-Horde_Share/Makefile
+++ b/security/pear-Horde_Share/Makefile
@@ -5,14 +5,20 @@
# $FreeBSD$
PORTNAME= Horde_Share
-PORTVERSION= 1.3.0
+PORTVERSION= 2.0.1
CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Shared Permissions System
-USE_HORDE_RUN= Horde_Db Horde_Exception Horde_Group Horde_Perms \
- Horde_Support Horde_Translation Horde_Url Horde_Util
+USE_HORDE_RUN= Horde_Db \
+ Horde_Exception \
+ Horde_Group \
+ Horde_Perms \
+ Horde_Support \
+ Horde_Translation \
+ Horde_Url \
+ Horde_Util
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
diff --git a/security/pear-Horde_Share/distinfo b/security/pear-Horde_Share/distinfo
index 961cb3663431..5ee9fbff2cc5 100644
--- a/security/pear-Horde_Share/distinfo
+++ b/security/pear-Horde_Share/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Share-1.3.0.tgz) = 28d1748cff8fba6bb9632a23c0f7dd5dd61ea8950d3ea99672dc8e8b95d093b8
-SIZE (Horde/Horde_Share-1.3.0.tgz) = 61693
+SHA256 (Horde/Horde_Share-2.0.1.tgz) = fb365487d7c3706118766f4d78a833e19b0d636f2992b31f3ec0ad31588e63de
+SIZE (Horde/Horde_Share-2.0.1.tgz) = 59443
diff --git a/sysutils/pear-Horde_Log/Makefile b/sysutils/pear-Horde_Log/Makefile
index c9b819c3f56d..ac5050b2eac3 100644
--- a/sysutils/pear-Horde_Log/Makefile
+++ b/sysutils/pear-Horde_Log/Makefile
@@ -5,20 +5,22 @@
# $FreeBSD$
PORTNAME= Horde_Log
-PORTVERSION= 1.1.2
+PORTVERSION= 2.0.1
CATEGORIES= sysutils www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Logging library
-OPTIONS= SCRIBE "Enable scribe support" Off
+OPTIONS_DEFINE= SCRIBE
+SCRIBE_DESC= Enable scribe support
-USE_HORDE_RUN= Horde_Constraint Horde_Exception
+USE_HORDE_RUN= Horde_Constraint \
+ Horde_Exception
.include <bsd.port.pre.mk>
-.if defined(WITH_SCRIBE)
+.if ${PORT_OPTIONS:MSCRIBE}
USE_HORDE+= Horde_Scribe
.endif
diff --git a/sysutils/pear-Horde_Log/distinfo b/sysutils/pear-Horde_Log/distinfo
index 838e46e9047b..b7829f233f22 100644
--- a/sysutils/pear-Horde_Log/distinfo
+++ b/sysutils/pear-Horde_Log/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Log-1.1.2.tgz) = d901aa8b6fa90a494d917fc532cac23b2be544e0fb1cdaec1cbc6d3142801a25
-SIZE (Horde/Horde_Log-1.1.2.tgz) = 13612
+SHA256 (Horde/Horde_Log-2.0.1.tgz) = 29835bcf084a62b9bb3bb287863f6137d40819d1ddb4e14563cedf0e79e03447
+SIZE (Horde/Horde_Log-2.0.1.tgz) = 13832
diff --git a/sysutils/pear-Horde_Vfs/Makefile b/sysutils/pear-Horde_Vfs/Makefile
index ee79d8d4c6ae..8030fa1cf36d 100644
--- a/sysutils/pear-Horde_Vfs/Makefile
+++ b/sysutils/pear-Horde_Vfs/Makefile
@@ -5,20 +5,23 @@
# $FreeBSD$
PORTNAME= Horde_Vfs
-PORTVERSION= 1.0.9
+PORTVERSION= 2.0.3
CATEGORIES= sysutils www pear
PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Virtual File System API
-OPTIONS= FTP "Depend on FTP PHP extension" Off
+USE_HORDE_RUN= Horde_Exception \
+ Horde_Translation \
+ Horde_Util
-USE_HORDE_RUN= Horde_Exception Horde_Translation Horde_Util
+OPTIONS_DEFINE= FTP
+FTP_DESC= Depend on FTP PHP extension
.include <bsd.port.pre.mk>
-.if defined(WITH_FTP)
+.if ${PORT_OPTIONS:MFTP}
USE_PHP+= ftp
.endif
diff --git a/sysutils/pear-Horde_Vfs/distinfo b/sysutils/pear-Horde_Vfs/distinfo
index d19ab420933f..3c11e9287c18 100644
--- a/sysutils/pear-Horde_Vfs/distinfo
+++ b/sysutils/pear-Horde_Vfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Vfs-1.0.9.tgz) = 4fb64bc0d55cd78d0134a0f5ff1abbedc80f2331124ec4a73ff07a0b62cd8a5f
-SIZE (Horde/Horde_Vfs-1.0.9.tgz) = 66766
+SHA256 (Horde/Horde_Vfs-2.0.3.tgz) = 7277f9883b14a6e5ebf6e5edf09c98d2f83230208cf05382baf1a126dfbb16db
+SIZE (Horde/Horde_Vfs-2.0.3.tgz) = 69319
diff --git a/textproc/pear-Horde_Kolab_Format/Makefile b/textproc/pear-Horde_Kolab_Format/Makefile
index f4ca08a61cdc..f9779d2bf723 100644
--- a/textproc/pear-Horde_Kolab_Format/Makefile
+++ b/textproc/pear-Horde_Kolab_Format/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Kolab_Format
-PORTVERSION= 1.1.2
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_Kolab_Format/distinfo b/textproc/pear-Horde_Kolab_Format/distinfo
index d11dc6572f63..901312018d43 100644
--- a/textproc/pear-Horde_Kolab_Format/distinfo
+++ b/textproc/pear-Horde_Kolab_Format/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Kolab_Format-1.1.2.tgz) = 359685d0c85aa486603efea7cbca6999fd3cc26e74394480f527a14ff587eca8
-SIZE (Horde/Horde_Kolab_Format-1.1.2.tgz) = 57978
+SHA256 (Horde/Horde_Kolab_Format-2.0.1.tgz) = 587dba60fc0b9742af0d92b6cbe70ca625ed5545908ec76ba27cc48aac80cbf9
+SIZE (Horde/Horde_Kolab_Format-2.0.1.tgz) = 57039
diff --git a/textproc/pear-Horde_Pdf/Makefile b/textproc/pear-Horde_Pdf/Makefile
index f6933d0bffd4..06e7e07820b4 100644
--- a/textproc/pear-Horde_Pdf/Makefile
+++ b/textproc/pear-Horde_Pdf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= Horde_Pdf
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_Pdf/distinfo b/textproc/pear-Horde_Pdf/distinfo
index bc5ae381ed29..c4b780fe9b11 100644
--- a/textproc/pear-Horde_Pdf/distinfo
+++ b/textproc/pear-Horde_Pdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Pdf-1.0.2.tgz) = 82c28bdd650513cc83b31644951185c40e3a076b29b63df31590aa7295d4c70d
-SIZE (Horde/Horde_Pdf-1.0.2.tgz) = 52234
+SHA256 (Horde/Horde_Pdf-2.0.1.tgz) = 94abe956e00351ca9b08f042222a9f2385a8e4c9c9cbb552885c0678f95191a1
+SIZE (Horde/Horde_Pdf-2.0.1.tgz) = 52426
diff --git a/textproc/pear-Horde_SpellChecker/Makefile b/textproc/pear-Horde_SpellChecker/Makefile
index 5512357ef75a..cd74ba4fcbb1 100644
--- a/textproc/pear-Horde_SpellChecker/Makefile
+++ b/textproc/pear-Horde_SpellChecker/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_SpellChecker
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Spellcheck 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/textproc/pear-Horde_SpellChecker/distinfo b/textproc/pear-Horde_SpellChecker/distinfo
index f351edc76e94..d51a7ad06894 100644
--- a/textproc/pear-Horde_SpellChecker/distinfo
+++ b/textproc/pear-Horde_SpellChecker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_SpellChecker-1.0.1.tgz) = 70dddd7608ea44c98440ce84b7e7e300eb2a5b75e81fbcaf1ff8c098a3a8e7bf
-SIZE (Horde/Horde_SpellChecker-1.0.1.tgz) = 12366
+SHA256 (Horde/Horde_SpellChecker-2.0.1.tgz) = 40c9bc9b54583307ab707a85c12c273660b237177edef2c60f8573f4d661166c
+SIZE (Horde/Horde_SpellChecker-2.0.1.tgz) = 12454
diff --git a/textproc/pear-Horde_Text_Diff/Makefile b/textproc/pear-Horde_Text_Diff/Makefile
index 35dde73883bb..4619b4fde97a 100644
--- a/textproc/pear-Horde_Text_Diff/Makefile
+++ b/textproc/pear-Horde_Text_Diff/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Text_Diff
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde engine for performing and rendering text diffs
-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/textproc/pear-Horde_Text_Diff/distinfo b/textproc/pear-Horde_Text_Diff/distinfo
index a516ce682eec..18cde151491c 100644
--- a/textproc/pear-Horde_Text_Diff/distinfo
+++ b/textproc/pear-Horde_Text_Diff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Text_Diff-1.0.2.tgz) = 62bea455fae291bb87d347e5caa39b2460c3042475cacb89a619e9e9c6bd0a25
-SIZE (Horde/Horde_Text_Diff-1.0.2.tgz) = 28691
+SHA256 (Horde/Horde_Text_Diff-2.0.1.tgz) = 1c1afd2a82a3a728463a849d7ff25476602d5c1571c6cf12e5195a4e238e2d22
+SIZE (Horde/Horde_Text_Diff-2.0.1.tgz) = 28657
diff --git a/textproc/pear-Horde_Text_Filter/Makefile b/textproc/pear-Horde_Text_Filter/Makefile
index 86e5a892ca4c..ef34004cf75e 100644
--- a/textproc/pear-Horde_Text_Filter/Makefile
+++ b/textproc/pear-Horde_Text_Filter/Makefile
@@ -5,13 +5,14 @@
# $FreeBSD$
PORTNAME= Horde_Text_Filter
-PORTVERSION= 1.1.6
+PORTVERSION= 2.0.3
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Text Filter 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/textproc/pear-Horde_Text_Filter/distinfo b/textproc/pear-Horde_Text_Filter/distinfo
index 6110bc907288..cb6bb9f9fcb4 100644
--- a/textproc/pear-Horde_Text_Filter/distinfo
+++ b/textproc/pear-Horde_Text_Filter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Text_Filter-1.1.6.tgz) = bef6aa023cf5b84ba75d6f5ca689264e4604f9a5bccee32112380594db5b356b
-SIZE (Horde/Horde_Text_Filter-1.1.6.tgz) = 51803
+SHA256 (Horde/Horde_Text_Filter-2.0.3.tgz) = 4bb6be0138b09da176adddac5aab8e3597b24fe7d2248ae31fcba6e0b50b038c
+SIZE (Horde/Horde_Text_Filter-2.0.3.tgz) = 51855
diff --git a/textproc/pear-Horde_Text_Filter_Csstidy/Makefile b/textproc/pear-Horde_Text_Filter_Csstidy/Makefile
index 9e7e3b460ff8..2ebc8606ee12 100644
--- a/textproc/pear-Horde_Text_Filter_Csstidy/Makefile
+++ b/textproc/pear-Horde_Text_Filter_Csstidy/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Text_Filter_Csstidy
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_Text_Filter_Csstidy/distinfo b/textproc/pear-Horde_Text_Filter_Csstidy/distinfo
index a7cc5a3c75d0..541fd84b25c9 100644
--- a/textproc/pear-Horde_Text_Filter_Csstidy/distinfo
+++ b/textproc/pear-Horde_Text_Filter_Csstidy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Text_Filter_Csstidy-1.0.1.tgz) = 4d4e7765b3753543cb36467a7ea484e867c127a481227a633f6da072221e6d89
-SIZE (Horde/Horde_Text_Filter_Csstidy-1.0.1.tgz) = 24566
+SHA256 (Horde/Horde_Text_Filter_Csstidy-2.0.1.tgz) = 437f375870a399228f43431aab2a668b10ca057904cd5fc76b7273e71e19b6cf
+SIZE (Horde/Horde_Text_Filter_Csstidy-2.0.1.tgz) = 24792
diff --git a/textproc/pear-Horde_Text_Flowed/Makefile b/textproc/pear-Horde_Text_Flowed/Makefile
index 0974906c3ac4..23b7c11fae42 100644
--- a/textproc/pear-Horde_Text_Flowed/Makefile
+++ b/textproc/pear-Horde_Text_Flowed/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Text_Flowed
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_Text_Flowed/distinfo b/textproc/pear-Horde_Text_Flowed/distinfo
index 942d32b5449b..0b422bd61c9f 100644
--- a/textproc/pear-Horde_Text_Flowed/distinfo
+++ b/textproc/pear-Horde_Text_Flowed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Text_Flowed-1.0.1.tgz) = 38cecb121106407991f1e2bddefcda2f0c421652afcec11a37afe0b67b7bd1db
-SIZE (Horde/Horde_Text_Flowed-1.0.1.tgz) = 14258
+SHA256 (Horde/Horde_Text_Flowed-2.0.1.tgz) = d45a8d30af880cde954592a870bb66171930ee8e167f37548d3ec6fb432278c9
+SIZE (Horde/Horde_Text_Flowed-2.0.1.tgz) = 14202
diff --git a/textproc/pear-Horde_Xml_Element/Makefile b/textproc/pear-Horde_Xml_Element/Makefile
index c9eb2204e481..a9213b49673c 100644
--- a/textproc/pear-Horde_Xml_Element/Makefile
+++ b/textproc/pear-Horde_Xml_Element/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Xml_Element
-PORTVERSION= 1.0.1
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_Xml_Element/distinfo b/textproc/pear-Horde_Xml_Element/distinfo
index 98f8e1d39924..32c49948f326 100644
--- a/textproc/pear-Horde_Xml_Element/distinfo
+++ b/textproc/pear-Horde_Xml_Element/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Xml_Element-1.0.1.tgz) = 3fd0cda5b1dd5a91b944195059c42a6e2fe88d006b8d7ef03a1f2caad3f11478
-SIZE (Horde/Horde_Xml_Element-1.0.1.tgz) = 10744
+SHA256 (Horde/Horde_Xml_Element-2.0.1.tgz) = c649c95a7deaf571e4621ad515ceec13ab4d502d623354fdb7aa17fb20869815
+SIZE (Horde/Horde_Xml_Element-2.0.1.tgz) = 10680
diff --git a/textproc/pear-Horde_Xml_Wbxml/Makefile b/textproc/pear-Horde_Xml_Wbxml/Makefile
index cc7f10daac91..287f500476b7 100644
--- a/textproc/pear-Horde_Xml_Wbxml/Makefile
+++ b/textproc/pear-Horde_Xml_Wbxml/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= Horde_Xml_Wbxml
-PORTVERSION= 1.0.3
+PORTVERSION= 2.0.1
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_Xml_Wbxml/distinfo b/textproc/pear-Horde_Xml_Wbxml/distinfo
index 80e976bd1d97..033983032f5c 100644
--- a/textproc/pear-Horde_Xml_Wbxml/distinfo
+++ b/textproc/pear-Horde_Xml_Wbxml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Horde/Horde_Xml_Wbxml-1.0.3.tgz) = 2f56233c0e17587a86b88f90e5e10c67b95160afd19aaf5454726437b5d5344a
-SIZE (Horde/Horde_Xml_Wbxml-1.0.3.tgz) = 26503
+SHA256 (Horde/Horde_Xml_Wbxml-2.0.1.tgz) = 42840829722582055fc84a5a7812aa1344aadc3b19a32b774e7aebd273adc34d
+SIZE (Horde/Horde_Xml_Wbxml-2.0.1.tgz) = 26541
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