aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/pear-Horde_Compress/Makefile5
-rw-r--r--archivers/pear-Horde_Compress_Fast/Makefile6
-rw-r--r--archivers/pear-Horde_Pack/Makefile5
-rw-r--r--comms/pear-Horde_ActiveSync/Makefile5
-rw-r--r--comms/pear-Horde_SyncMl/Makefile5
-rw-r--r--databases/pear-Horde_Db/Makefile20
-rw-r--r--databases/pear-Horde_HashTable/Makefile10
-rw-r--r--databases/pear-Horde_Imsp/Makefile5
-rw-r--r--databases/pear-Horde_Memcache/Makefile5
-rw-r--r--databases/pear-Horde_Mongo/Makefile5
-rw-r--r--devel/pear-Horde_Alarm/Makefile5
-rw-r--r--devel/pear-Horde_Argv/Makefile5
-rw-r--r--devel/pear-Horde_Autoloader/Makefile6
-rw-r--r--devel/pear-Horde_Autoloader_Cache/Makefile5
-rw-r--r--devel/pear-Horde_Cache/Makefile12
-rw-r--r--devel/pear-Horde_Cli/Makefile5
-rw-r--r--devel/pear-Horde_Constraint/Makefile6
-rw-r--r--devel/pear-Horde_Controller/Makefile5
-rw-r--r--devel/pear-Horde_Core/Makefile24
-rw-r--r--devel/pear-Horde_Data/Makefile5
-rw-r--r--devel/pear-Horde_Date/Makefile5
-rw-r--r--devel/pear-Horde_Date_Parser/Makefile5
-rw-r--r--devel/pear-Horde_Exception/Makefile5
-rw-r--r--devel/pear-Horde_History/Makefile5
-rw-r--r--devel/pear-Horde_Icalendar/Makefile5
-rw-r--r--devel/pear-Horde_Injector/Makefile5
-rw-r--r--devel/pear-Horde_Itip/Makefile5
-rw-r--r--devel/pear-Horde_Lock/Makefile5
-rw-r--r--devel/pear-Horde_LoginTasks/Makefile5
-rw-r--r--devel/pear-Horde_Nls/Makefile16
-rw-r--r--devel/pear-Horde_Notification/Makefile5
-rw-r--r--devel/pear-Horde_Prefs/Makefile5
-rw-r--r--devel/pear-Horde_Queue/Makefile6
-rw-r--r--devel/pear-Horde_Rdo/Makefile5
-rw-r--r--devel/pear-Horde_Role/Makefile5
-rw-r--r--devel/pear-Horde_Scheduler/Makefile5
-rw-r--r--devel/pear-Horde_Serialize/Makefile5
-rw-r--r--devel/pear-Horde_Stream/Makefile5
-rw-r--r--devel/pear-Horde_Stream_Filter/Makefile6
-rw-r--r--devel/pear-Horde_Stream_Wrapper/Makefile6
-rw-r--r--devel/pear-Horde_Support/Makefile5
-rw-r--r--devel/pear-Horde_Thrift/Makefile6
-rw-r--r--devel/pear-Horde_Timezone/Makefile5
-rw-r--r--devel/pear-Horde_Token/Makefile5
-rw-r--r--devel/pear-Horde_Translation/Makefile6
-rw-r--r--devel/pear-Horde_Tree/Makefile5
-rw-r--r--devel/pear-Horde_Util/Makefile5
-rw-r--r--devel/pear-Horde_View/Makefile5
-rw-r--r--graphics/pear-Horde_Image/Makefile10
-rw-r--r--mail/pear-Horde_Imap_Client/Makefile20
-rw-r--r--mail/pear-Horde_Kolab_Storage/Makefile5
-rw-r--r--mail/pear-Horde_ListHeaders/Makefile5
-rw-r--r--mail/pear-Horde_Mail/Makefile5
-rw-r--r--mail/pear-Horde_Mapi/Makefile5
-rw-r--r--mail/pear-Horde_Mime/Makefile5
-rw-r--r--mail/pear-Horde_Mime_Viewer/Makefile5
-rw-r--r--mail/pear-Horde_Smtp/Makefile5
-rw-r--r--net/pear-Horde_Kolab_Server/Makefile10
-rw-r--r--net/pear-Horde_Kolab_Session/Makefile5
-rw-r--r--net/pear-Horde_Ldap/Makefile5
-rw-r--r--net/pear-Horde_Rpc/Makefile5
-rw-r--r--net/pear-Horde_Scribe/Makefile5
-rw-r--r--net/pear-Horde_Socket_Client/Makefile5
-rw-r--r--net/pear-Horde_Url/Makefile5
-rw-r--r--security/pear-Horde_Auth/Makefile5
-rw-r--r--security/pear-Horde_Crypt/Makefile10
-rw-r--r--security/pear-Horde_Crypt_Blowfish/Makefile15
-rw-r--r--security/pear-Horde_Group/Makefile5
-rw-r--r--security/pear-Horde_Oauth/Makefile5
-rw-r--r--security/pear-Horde_Perms/Makefile5
-rw-r--r--security/pear-Horde_Secret/Makefile5
-rw-r--r--security/pear-Horde_Share/Makefile5
-rw-r--r--sysutils/pear-Horde_Log/Makefile10
-rw-r--r--sysutils/pear-Horde_Vfs/Makefile9
-rw-r--r--textproc/pear-Horde_CssMinify/Makefile6
-rw-r--r--textproc/pear-Horde_JavascriptMinify/Makefile6
-rw-r--r--textproc/pear-Horde_Kolab_Format/Makefile5
-rw-r--r--textproc/pear-Horde_Pdf/Makefile5
-rw-r--r--textproc/pear-Horde_SpellChecker/Makefile5
-rw-r--r--textproc/pear-Horde_Text_Diff/Makefile5
-rw-r--r--textproc/pear-Horde_Text_Filter/Makefile5
-rw-r--r--textproc/pear-Horde_Text_Filter_Csstidy/Makefile5
-rw-r--r--textproc/pear-Horde_Text_Flowed/Makefile5
-rw-r--r--textproc/pear-Horde_Xml_Element/Makefile5
-rw-r--r--textproc/pear-Horde_Xml_Wbxml/Makefile5
-rw-r--r--www/pear-Horde_Browser/Makefile5
-rw-r--r--www/pear-Horde_Css_Parser/Makefile6
-rw-r--r--www/pear-Horde_Dav/Makefile5
-rw-r--r--www/pear-Horde_Editor/Makefile5
-rw-r--r--www/pear-Horde_Feed/Makefile5
-rw-r--r--www/pear-Horde_Form/Makefile5
-rw-r--r--www/pear-Horde_Http/Makefile5
-rw-r--r--www/pear-Horde_Routes/Makefile5
-rw-r--r--www/pear-Horde_Service_Facebook/Makefile5
-rw-r--r--www/pear-Horde_Service_Twitter/Makefile5
-rw-r--r--www/pear-Horde_Service_UrlShortener/Makefile5
-rw-r--r--www/pear-Horde_Service_Weather/Makefile5
-rw-r--r--www/pear-Horde_SessionHandler/Makefile5
-rw-r--r--www/pear-Horde_Template/Makefile6
99 files changed, 230 insertions, 383 deletions
diff --git a/archivers/pear-Horde_Compress/Makefile b/archivers/pear-Horde_Compress/Makefile
index 9215b908255b..2831d6d9ae33 100644
--- a/archivers/pear-Horde_Compress/Makefile
+++ b/archivers/pear-Horde_Compress/Makefile
@@ -12,6 +12,7 @@ OPTIONS_DEFAULT= ZLIB
OPTIONS_DEFINE= ZLIB
ZLIB_DESC= Depend on PHP zlib extension
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Translation \
Horde_Util \
@@ -19,6 +20,4 @@ USE_HORDE_RUN= Horde_Exception \
ZLIP_USE= PHP=zlib
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/pear-Horde_Compress_Fast/Makefile b/archivers/pear-Horde_Compress_Fast/Makefile
index a0e38afa01b1..faa5be6b75fb 100644
--- a/archivers/pear-Horde_Compress_Fast/Makefile
+++ b/archivers/pear-Horde_Compress_Fast/Makefile
@@ -8,8 +8,6 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Fast Compression Library
-USE_HORDE_RUN= Horde_Exception
+USES= horde
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/pear-Horde_Pack/Makefile b/archivers/pear-Horde_Pack/Makefile
index 1fc154853e89..2372ccd13b4b 100644
--- a/archivers/pear-Horde_Pack/Makefile
+++ b/archivers/pear-Horde_Pack/Makefile
@@ -9,9 +9,8 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Pack Utility
+USES= horde
USE_HORDE_RUN= Horde_Compress_Fast \
Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/pear-Horde_ActiveSync/Makefile b/comms/pear-Horde_ActiveSync/Makefile
index 80518ac80e08..424a08061be6 100644
--- a/comms/pear-Horde_ActiveSync/Makefile
+++ b/comms/pear-Horde_ActiveSync/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= comms www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde ActiveSync Server Library
+USES= horde
USE_HORDE_RUN= Horde_Compress \
Horde_Date \
Horde_Exception \
@@ -17,6 +18,4 @@ USE_HORDE_RUN= Horde_Compress \
Horde_Support \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/comms/pear-Horde_SyncMl/Makefile b/comms/pear-Horde_SyncMl/Makefile
index 29a69f955ba8..45cdf34acb56 100644
--- a/comms/pear-Horde_SyncMl/Makefile
+++ b/comms/pear-Horde_SyncMl/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= comms www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde API for processing SyncML requests
+USES= horde
USE_HORDE_RUN= Horde_Date \
Horde_Icalendar \
Horde_Log \
@@ -20,6 +21,4 @@ USE_HORDE_RUN= Horde_Date \
USE_HORDE_RUN+= Horde_Auth \
Horde_Core
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile
index 3c0c63a06666..3edc8a717388 100644
--- a/databases/pear-Horde_Db/Makefile
+++ b/databases/pear-Horde_Db/Makefile
@@ -14,23 +14,13 @@ MYSQL_DESC= Depend on mysql PHP extension
MYSQLI_DESC= Depend on mysqli PHP extension
PDO_DESC= Depend on PDO PHP extension
+USES= horde
USE_HORDE_RUN= Horde_Date \
Horde_Exception \
Horde_Support
-.include <bsd.port.pre.mk>
+MYSQL_USE= PHP=mysql
+MYSQLI_USE= PHP=mysqli
+PDO_USE= PHP=pdo
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+= mysql
-.endif
-
-.if ${PORT_OPTIONS:MMYSQLI}
-USE_PHP+= mysqli
-.endif
-
-.if ${PORT_OPTIONS:MPDO}
-USE_PHP+= pdo
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-Horde_HashTable/Makefile b/databases/pear-Horde_HashTable/Makefile
index a0efb34009e0..6604352b3f2f 100644
--- a/databases/pear-Horde_HashTable/Makefile
+++ b/databases/pear-Horde_HashTable/Makefile
@@ -9,13 +9,9 @@ MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Hash Table Interface
OPTIONS_DEFINE= MEMCACHE
+USES= horde
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
+MEMCACHE_USE= HORDE_RUN=Horde_Memcache
-.if ${PORT_OPTIONS:MMEMCACHE}
-USE_HORDE_RUN+= Horde_Memcache
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-Horde_Imsp/Makefile b/databases/pear-Horde_Imsp/Makefile
index 024de5616b8e..88871c297f54 100644
--- a/databases/pear-Horde_Imsp/Makefile
+++ b/databases/pear-Horde_Imsp/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= databases www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde IMSP API
+USES= horde
USE_HORDE_RUN= Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-Horde_Memcache/Makefile b/databases/pear-Horde_Memcache/Makefile
index 5895c12b22a3..10cbbd6cb941 100644
--- a/databases/pear-Horde_Memcache/Makefile
+++ b/databases/pear-Horde_Memcache/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= databases www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Memcache API
+USES= horde
USE_PHP= memcache hash
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-Horde_Mongo/Makefile b/databases/pear-Horde_Mongo/Makefile
index 08ce72ce03d5..45e4248a175e 100644
--- a/databases/pear-Horde_Mongo/Makefile
+++ b/databases/pear-Horde_Mongo/Makefile
@@ -8,8 +8,7 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Mongo Configuration
+USES= horde
#RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:${PORTSDIR}/databases/pecl-mongo
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Alarm/Makefile b/devel/pear-Horde_Alarm/Makefile
index ad585133e316..02f1b982980c 100644
--- a/devel/pear-Horde_Alarm/Makefile
+++ b/devel/pear-Horde_Alarm/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= PEAR Horde alarm libraries
+USES= horde
USE_HORDE_RUN= Horde_Date Horde_Exception Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Argv/Makefile b/devel/pear-Horde_Argv/Makefile
index efea5378a1c5..6eac0747c851 100644
--- a/devel/pear-Horde_Argv/Makefile
+++ b/devel/pear-Horde_Argv/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde command-line argument parsing package
+USES= horde
USE_HORDE_RUN= Horde_Exception Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Autoloader/Makefile b/devel/pear-Horde_Autoloader/Makefile
index 4c5d35b75df0..c6300de7d63d 100644
--- a/devel/pear-Horde_Autoloader/Makefile
+++ b/devel/pear-Horde_Autoloader/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Autoloader
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Autoloader_Cache/Makefile b/devel/pear-Horde_Autoloader_Cache/Makefile
index a3af915756bf..c9253608ea45 100644
--- a/devel/pear-Horde_Autoloader_Cache/Makefile
+++ b/devel/pear-Horde_Autoloader_Cache/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Autoloader Cache
+USES= horde
USE_HORDE_RUN= Horde_Autoloader
USE_PHP= json
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Cache/Makefile b/devel/pear-Horde_Cache/Makefile
index de2c8e242f3e..0df703ac4444 100644
--- a/devel/pear-Horde_Cache/Makefile
+++ b/devel/pear-Horde_Cache/Makefile
@@ -10,18 +10,14 @@ COMMENT= Horde Caching API
OPTIONS_DEFINE= APC
APC_DESC= Require APC PHP extension
-
+
+USES= horde
USE_HORDE_RUN= Horde_Compress_Fast \
Horde_Exception \
Horde_HashTable \
Horde_Util
USE_PHP= hash
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MAPC}
-USE_PHP+= apc
-.endif
+APC_USE= PHP=apc
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Cli/Makefile b/devel/pear-Horde_Cli/Makefile
index d94d2c65886e..abb492d7e9e7 100644
--- a/devel/pear-Horde_Cli/Makefile
+++ b/devel/pear-Horde_Cli/Makefile
@@ -7,8 +7,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Command Line Interface API
+USES= horde
USE_HORDE_RUN= Horde_Support Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Constraint/Makefile b/devel/pear-Horde_Constraint/Makefile
index aa9cd33744de..f0d446beb8d6 100644
--- a/devel/pear-Horde_Constraint/Makefile
+++ b/devel/pear-Horde_Constraint/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Constraint library
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Controller/Makefile b/devel/pear-Horde_Controller/Makefile
index df0b9b00603e..93db92cf7679 100644
--- a/devel/pear-Horde_Controller/Makefile
+++ b/devel/pear-Horde_Controller/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Controller libraries
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Injector \
Horde_Log \
Horde_Support \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Core/Makefile b/devel/pear-Horde_Core/Makefile
index 3156a2033520..d8d797c967dd 100644
--- a/devel/pear-Horde_Core/Makefile
+++ b/devel/pear-Horde_Core/Makefile
@@ -11,11 +11,12 @@ COMMENT= Horde Core Framework libraries
CONFLICTS= horde-3*
-OPTONS_DEFINE= KOLAB LZF SOCKETS
+OPTIONS_DEFINE= KOLAB LZF SOCKETS
KOLAB_DESC= Enable Kolab server support
LZF_DESC= Depend on lzf PHP extension
SOCKETS_DESC= Depend on sockets PHP extension
+USES= horde
USE_PHP= session
USE_HORDE_BUILD= Horde_Role
@@ -66,21 +67,8 @@ USE_HORDE_RUN= Horde_Role \
# Not required but wanted
USE_HORDE_RUN+= Horde_Routes
-.include <bsd.port.pre.mk>
+KOLAB_USE= HORDE_RUN=Horde_Kolab_Server,Horde_Kolab_Session,Horde_Kolab_Storage
+LZF_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf
+SOCKETS_USE= PHP=sockets
-.if defined(WITH_KOLAB)
-USE_HORDE_RUN+= Horde_Kolab_Server \
- Horde_Kolab_Session \
- Horde_Kolab_Storage
-.endif
-
-.if ${PORT_OPTIONS:MLZF}
-RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf
-.endif
-
-.if ${PORT_OPTIONS:MSOCKETS}
-USE_PHP+= sockets
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Data/Makefile b/devel/pear-Horde_Data/Makefile
index 915ee5799a95..67f2f38d0707 100644
--- a/devel/pear-Horde_Data/Makefile
+++ b/devel/pear-Horde_Data/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Data API
+USES= horde
USE_HORDE_RUN= Horde_Browser \
Horde_Exception \
Horde_Icalendar \
@@ -16,6 +17,4 @@ USE_HORDE_RUN= Horde_Browser \
Horde_Translation \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Date/Makefile b/devel/pear-Horde_Date/Makefile
index e13035ae4528..05435ec2637e 100644
--- a/devel/pear-Horde_Date/Makefile
+++ b/devel/pear-Horde_Date/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Date package
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Nls \
Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Date_Parser/Makefile b/devel/pear-Horde_Date_Parser/Makefile
index 311c1e773961..5a502dee5c90 100644
--- a/devel/pear-Horde_Date_Parser/Makefile
+++ b/devel/pear-Horde_Date_Parser/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Date Parser
+USES= horde
USE_HORDE_RUN= Horde_Date \
Horde_Support
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Exception/Makefile b/devel/pear-Horde_Exception/Makefile
index 8ba879bb0f83..b8dce994c1d2 100644
--- a/devel/pear-Horde_Exception/Makefile
+++ b/devel/pear-Horde_Exception/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Exception Handler
+USES= horde
USE_HORDE_RUN= Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_History/Makefile b/devel/pear-Horde_History/Makefile
index a775471ab800..4d577dd50924 100644
--- a/devel/pear-Horde_History/Makefile
+++ b/devel/pear-Horde_History/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde API for tracking the history of an object
+USES= horde
USE_HORDE_RUN= Horde_Db \
Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Icalendar/Makefile b/devel/pear-Horde_Icalendar/Makefile
index 934fdf5e5734..5aeb7333524c 100644
--- a/devel/pear-Horde_Icalendar/Makefile
+++ b/devel/pear-Horde_Icalendar/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde iCalendar API
+USES= horde
USE_HORDE_RUN= Horde_Date \
Horde_Exception \
Horde_Mail \
@@ -15,6 +16,4 @@ USE_HORDE_RUN= Horde_Date \
Horde_Translation \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Injector/Makefile b/devel/pear-Horde_Injector/Makefile
index 7fae1c9ae258..2cb044a9993a 100644
--- a/devel/pear-Horde_Injector/Makefile
+++ b/devel/pear-Horde_Injector/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde dependency injection container
+USES= horde
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Itip/Makefile b/devel/pear-Horde_Itip/Makefile
index bd4084bf549c..27c06347f66a 100644
--- a/devel/pear-Horde_Itip/Makefile
+++ b/devel/pear-Horde_Itip/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde iTip invitation response handling
+USES= horde
USE_HORDE_RUN= Horde_Icalendar \
Horde_Mime
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Lock/Makefile b/devel/pear-Horde_Lock/Makefile
index d2285d1ca716..6ac1ee6e602f 100644
--- a/devel/pear-Horde_Lock/Makefile
+++ b/devel/pear-Horde_Lock/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Resource Locking System
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Support
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_LoginTasks/Makefile b/devel/pear-Horde_LoginTasks/Makefile
index b014158dbb17..892752a77b0b 100644
--- a/devel/pear-Horde_LoginTasks/Makefile
+++ b/devel/pear-Horde_LoginTasks/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Login Tasks System
+USES= horde
USE_HORDE_RUN= Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Nls/Makefile b/devel/pear-Horde_Nls/Makefile
index 34a852ca5fe0..2e24be1ab9f7 100644
--- a/devel/pear-Horde_Nls/Makefile
+++ b/devel/pear-Horde_Nls/Makefile
@@ -16,17 +16,7 @@ USE_HORDE_RUN= Horde_Translation \
OPTIONS_DEFINE= GEOIP
GEOIP_DESC= Depend on geoip PHP extension
-.include <bsd.port.options.mk>
+GEOIP_USE= PHP=yes
+GEOIP_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip
-.if ${PORT_OPTIONS:MGEOIP}
-USE_PHP= yes
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MGEOIP}
-RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Notification/Makefile b/devel/pear-Horde_Notification/Makefile
index 1814a645ce8f..591445ab8e74 100644
--- a/devel/pear-Horde_Notification/Makefile
+++ b/devel/pear-Horde_Notification/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Notification System
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
USE_PHP= gettext
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Prefs/Makefile b/devel/pear-Horde_Prefs/Makefile
index 99236d0fd9b7..21b1134aff75 100644
--- a/devel/pear-Horde_Prefs/Makefile
+++ b/devel/pear-Horde_Prefs/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Preferences API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Mail \
Horde_Mime \
@@ -14,6 +15,4 @@ USE_HORDE_RUN= Horde_Exception \
Horde_Util
USE_PHP= json
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Queue/Makefile b/devel/pear-Horde_Queue/Makefile
index b777eb208b1e..77fa89e0348e 100644
--- a/devel/pear-Horde_Queue/Makefile
+++ b/devel/pear-Horde_Queue/Makefile
@@ -8,6 +8,6 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Queue
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Rdo/Makefile b/devel/pear-Horde_Rdo/Makefile
index 018030bf802e..6251920c541f 100644
--- a/devel/pear-Horde_Rdo/Makefile
+++ b/devel/pear-Horde_Rdo/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES= http://pear.horde.org/get/
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Rampage Data Objects
+USES= horde
USE_HORDE_RUN= Horde_Db \
Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Role/Makefile b/devel/pear-Horde_Role/Makefile
index c8ffed0825bb..a62955c93717 100644
--- a/devel/pear-Horde_Role/Makefile
+++ b/devel/pear-Horde_Role/Makefile
@@ -10,8 +10,7 @@ COMMENT= PEAR installer role for Horde components
PATCH_WRKSRC= ${WRKDIR}
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
+USES= horde
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${HORDE_DIR}
@@ -20,4 +19,4 @@ post-install:
@${ECHO_CMD} "@unexec rmdir %D/${HORDE_DIR} 2>/dev/null || true" >> \
${TMPPLIST}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Scheduler/Makefile b/devel/pear-Horde_Scheduler/Makefile
index 2f722cb7c8ca..558f97303ae4 100644
--- a/devel/pear-Horde_Scheduler/Makefile
+++ b/devel/pear-Horde_Scheduler/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Scheduler System
+USES= horde
USE_HORDE_RUN= Horde_Core \
Horde_Util \
Horde_Vfs
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Serialize/Makefile b/devel/pear-Horde_Serialize/Makefile
index ae70bbb57ba1..d47b2c68f650 100644
--- a/devel/pear-Horde_Serialize/Makefile
+++ b/devel/pear-Horde_Serialize/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Data Encapulation API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Stream/Makefile b/devel/pear-Horde_Stream/Makefile
index 6d2de3694398..eb36490f279f 100644
--- a/devel/pear-Horde_Stream/Makefile
+++ b/devel/pear-Horde_Stream/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde stream handler
+USES= horde
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Stream_Filter/Makefile b/devel/pear-Horde_Stream_Filter/Makefile
index 7fd805a6f796..5068ec453191 100644
--- a/devel/pear-Horde_Stream_Filter/Makefile
+++ b/devel/pear-Horde_Stream_Filter/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Stream filters
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Stream_Wrapper/Makefile b/devel/pear-Horde_Stream_Wrapper/Makefile
index c23dd0b38444..26ab0e033874 100644
--- a/devel/pear-Horde_Stream_Wrapper/Makefile
+++ b/devel/pear-Horde_Stream_Wrapper/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Stream wrappers
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Support/Makefile b/devel/pear-Horde_Support/Makefile
index d37f21710c3c..3bb5596ed03b 100644
--- a/devel/pear-Horde_Support/Makefile
+++ b/devel/pear-Horde_Support/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde support package
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Stream_Wrapper
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Thrift/Makefile b/devel/pear-Horde_Thrift/Makefile
index 487cf6f005e6..6e4857edbcd2 100644
--- a/devel/pear-Horde_Thrift/Makefile
+++ b/devel/pear-Horde_Thrift/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Thrift Client
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Timezone/Makefile b/devel/pear-Horde_Timezone/Makefile
index f9df1a8ecdb8..75a8b4c275df 100644
--- a/devel/pear-Horde_Timezone/Makefile
+++ b/devel/pear-Horde_Timezone/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde timezone library
+USES= horde
USE_HORDE_RUN= Horde_Date \
Horde_Icalendar \
Horde_Vfs
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Token/Makefile b/devel/pear-Horde_Token/Makefile
index 023bc03bbfd2..b33e902ccf75 100644
--- a/devel/pear-Horde_Token/Makefile
+++ b/devel/pear-Horde_Token/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Token API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Translation \
Horde_Url \
Horde_Util
USE_PHP= hash
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Translation/Makefile b/devel/pear-Horde_Translation/Makefile
index 355d6be6f495..0512cbb14925 100644
--- a/devel/pear-Horde_Translation/Makefile
+++ b/devel/pear-Horde_Translation/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde translation library
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Tree/Makefile b/devel/pear-Horde_Tree/Makefile
index 3bc9027566c6..36c7be691eda 100644
--- a/devel/pear-Horde_Tree/Makefile
+++ b/devel/pear-Horde_Tree/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Tree API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Url \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_Util/Makefile b/devel/pear-Horde_Util/Makefile
index 6594f0e921bf..b541a93707cc 100644
--- a/devel/pear-Horde_Util/Makefile
+++ b/devel/pear-Horde_Util/Makefile
@@ -6,8 +6,7 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Utility Libraries
+USES= horde
USE_PHP= dom
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Horde_View/Makefile b/devel/pear-Horde_View/Makefile
index 9ad9f90529cd..39dd52c88f85 100644
--- a/devel/pear-Horde_View/Makefile
+++ b/devel/pear-Horde_View/Makefile
@@ -7,10 +7,9 @@ CATEGORIES= devel www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde View API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Support \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/pear-Horde_Image/Makefile b/graphics/pear-Horde_Image/Makefile
index b19437cbafd7..8f7b7bc29145 100644
--- a/graphics/pear-Horde_Image/Makefile
+++ b/graphics/pear-Horde_Image/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Image API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Support \
Horde_Translation \
@@ -16,11 +17,6 @@ USE_HORDE_RUN= Horde_Exception \
OPTIONS_DEFINE= GD
GD_DESC= Depend on PHP gd extension
-.include <bsd.port.pre.mk>
+GD_USE= PHP=gd
-.if ${PORT_OPTIONS:MGD}
-USE_PHP+= gd
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile
index 9657a838d278..e898d1d5ce99 100644
--- a/mail/pear-Horde_Imap_Client/Makefile
+++ b/mail/pear-Horde_Imap_Client/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde IMAP abstraction interface
+USES= horde
USE_PHP= hash
USE_HORDE_RUN= Horde_Exception \
Horde_Mail \
@@ -21,19 +22,8 @@ IMAP_DESC= Require PHP imap extension
MBSTRING_DESC= Require PHP mbstring extension
SASL_DESC= Support SASL Authentication
-.include <bsd.port.pre.mk>
+IMAP_USE= PHP=imap
+MBSTRING_USE= PHP=mbstring
+SASL_RUN_DEPENDS= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
-.if ${PORT_OPTIONS:MIMAP}
-USE_PHP+= imap
-.endif
-
-.if ${PORT_OPTIONS:MMBSTRING}
-USE_PHP+= mbstring
-.endif
-
-.if ${PORT_OPTIONS:MSASL}
-RUN_DEPENDS+= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Kolab_Storage/Makefile b/mail/pear-Horde_Kolab_Storage/Makefile
index 9c9311c1a53a..d49799700928 100644
--- a/mail/pear-Horde_Kolab_Storage/Makefile
+++ b/mail/pear-Horde_Kolab_Storage/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= mail www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for handling Kolab data stored on an IMAP server
+USES= horde
USE_HORDE_RUN= Horde_Cache \
Horde_Exception \
Horde_Kolab_Format \
@@ -20,6 +21,4 @@ USE_HORDE_RUN= Horde_Cache \
USE_PHP+= imap
USE_HORDE_RUN+= Horde_Imap_Client
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_ListHeaders/Makefile b/mail/pear-Horde_ListHeaders/Makefile
index b44dd169941f..e740aae9a134 100644
--- a/mail/pear-Horde_ListHeaders/Makefile
+++ b/mail/pear-Horde_ListHeaders/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= mail www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde List Headers Parsing Library
+USES= horde
USE_HORDE_RUN= Horde_Mail
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mail/Makefile b/mail/pear-Horde_Mail/Makefile
index 2ea511b8d084..0b00d9be79fe 100644
--- a/mail/pear-Horde_Mail/Makefile
+++ b/mail/pear-Horde_Mail/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= mail www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Mail Library
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Stream_Filter
@@ -16,6 +17,4 @@ USE_HORDE_RUN= Horde_Exception \
# Optional but we want it
RUN_DEPENDS+= ${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mapi/Makefile b/mail/pear-Horde_Mapi/Makefile
index 6bb924eed4e4..6c7d051e06f1 100644
--- a/mail/pear-Horde_Mapi/Makefile
+++ b/mail/pear-Horde_Mapi/Makefile
@@ -8,11 +8,10 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde MAPI utility library
+USES= horde
USE_HORDE_RUN= Horde_Date \
Horde_Exception
USE_PHP+= bcmath
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mime/Makefile b/mail/pear-Horde_Mime/Makefile
index 5527dd5f6ee9..1bf11625cb45 100644
--- a/mail/pear-Horde_Mime/Makefile
+++ b/mail/pear-Horde_Mime/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= mail www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde MIME Library
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Mail \
Horde_Stream_Filter \
@@ -15,6 +16,4 @@ USE_HORDE_RUN= Horde_Exception \
Horde_Translation \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mime_Viewer/Makefile b/mail/pear-Horde_Mime_Viewer/Makefile
index ef56d433cc3f..316b56c934f5 100644
--- a/mail/pear-Horde_Mime_Viewer/Makefile
+++ b/mail/pear-Horde_Mime_Viewer/Makefile
@@ -12,6 +12,7 @@ CONFLICTS= horde-3*
USE_HORDE_BUILD= Horde_Role
+USES= horde
USE_HORDE_RUN= Horde_Role \
Horde_Browser \
Horde_Compress \
@@ -24,6 +25,4 @@ USE_HORDE_RUN= Horde_Role \
USE_PHP= xml
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Horde_Smtp/Makefile b/mail/pear-Horde_Smtp/Makefile
index 3f47bcb3eb26..60edf7d943cc 100644
--- a/mail/pear-Horde_Smtp/Makefile
+++ b/mail/pear-Horde_Smtp/Makefile
@@ -8,12 +8,11 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde SMTP Client
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Mail \
Horde_Socket_Client \
Horde_Support \
Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Kolab_Server/Makefile b/net/pear-Horde_Kolab_Server/Makefile
index 468358844110..b1bbaf80733a 100644
--- a/net/pear-Horde_Kolab_Server/Makefile
+++ b/net/pear-Horde_Kolab_Server/Makefile
@@ -9,6 +9,7 @@ PKGNAMEPREFIX= pear-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for manipulating the Kolab user database
+USES= horde
USE_PHP= hash
USE_HORDE_RUN= Horde_Auth \
Horde_Exception
@@ -20,11 +21,6 @@ LDAP_DESC= Enable LDAP support
# Not required but we want it
USE_HORDE_RUN+= Horde_Date
-.include <bsd.port.pre.mk>
+LDAP_USE= HORDE_RUN=Horde_Ldap
-.if ${PORT_OPTIONS:MLDAP}
-USE_HORDE_RUN+= Horde_Ldap
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Kolab_Session/Makefile b/net/pear-Horde_Kolab_Session/Makefile
index 77345695e2c4..2908c4d8bdca 100644
--- a/net/pear-Horde_Kolab_Session/Makefile
+++ b/net/pear-Horde_Kolab_Session/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for managing an active Kolab session
+USES= horde
USE_HORDE_RUN= Horde_Exception
# Optional but we want it
USE_HORDE_RUN+= Horde_Kolab_Server \
Horde_Log
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Ldap/Makefile b/net/pear-Horde_Ldap/Makefile
index bb3b70b512d5..58e849d14669 100644
--- a/net/pear-Horde_Ldap/Makefile
+++ b/net/pear-Horde_Ldap/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde LDAP libraries
+USES= horde
USE_PHP= ldap
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Rpc/Makefile b/net/pear-Horde_Rpc/Makefile
index da2bb6464cea..0e243ecea640 100644
--- a/net/pear-Horde_Rpc/Makefile
+++ b/net/pear-Horde_Rpc/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde RPC API
+USES= horde
USE_HORDE_RUN= Horde_Core \
Horde_Dav \
Horde_Exception \
@@ -23,6 +24,4 @@ USE_HORDE_RUN+= Horde_ActiveSync \
Horde_SyncMl \
Horde_Http
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Scribe/Makefile b/net/pear-Horde_Scribe/Makefile
index 72c86d2e2f2c..1fdea40c0c98 100644
--- a/net/pear-Horde_Scribe/Makefile
+++ b/net/pear-Horde_Scribe/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Scribe client
+USES= horde
USE_HORDE_RUN= Horde_Thrift
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Socket_Client/Makefile b/net/pear-Horde_Socket_Client/Makefile
index 606ceb270b80..44fe19855c26 100644
--- a/net/pear-Horde_Socket_Client/Makefile
+++ b/net/pear-Horde_Socket_Client/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Socket Client
+USES= horde
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-Horde_Url/Makefile b/net/pear-Horde_Url/Makefile
index ff11d60552c2..45b506b50de5 100644
--- a/net/pear-Horde_Url/Makefile
+++ b/net/pear-Horde_Url/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= net www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde URL class
+USES= horde
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Auth/Makefile b/security/pear-Horde_Auth/Makefile
index fdcd2b390360..6ee1f03a43dd 100644
--- a/security/pear-Horde_Auth/Makefile
+++ b/security/pear-Horde_Auth/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Authentication API
+USES= horde
USE_HORDE_RUN= Horde_Exception Horde_Util
USE_PHP= hash
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Crypt/Makefile b/security/pear-Horde_Crypt/Makefile
index b3f114c4d512..4816980c197e 100644
--- a/security/pear-Horde_Crypt/Makefile
+++ b/security/pear-Horde_Crypt/Makefile
@@ -12,6 +12,7 @@ COMMENT= Horde Cryptography API
OPTIONS_DEFINE= BCMATH
BCMATH_DESC= Depend on bcmath PHP extension
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Mime \
Horde_Stream_Filter \
@@ -19,11 +20,6 @@ USE_HORDE_RUN= Horde_Exception \
Horde_Util
USE_PHP= hash openssl
-.include <bsd.port.pre.mk>
+BCMATH_USE= PHP=bcmath
-.if ${PORT_OPTIONS:MBCMATH}
-USE_PHP+= bcmath
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Crypt_Blowfish/Makefile b/security/pear-Horde_Crypt_Blowfish/Makefile
index cc311c2bb6c3..3083ba700c74 100644
--- a/security/pear-Horde_Crypt_Blowfish/Makefile
+++ b/security/pear-Horde_Crypt_Blowfish/Makefile
@@ -16,15 +16,8 @@ OPTIONS_DEFINE= MHASH OPENSSL
MHASH_DESC= Depend on mhash PHP extension
OPENSSL_DESC= Depend on OpenSSL PHP extension
-.include <bsd.port.pre.mk>
+USES= horde
+MHASH_USE= PHP=mhash
+OPENSSL_USE= PHP=openssl
-.if ${PORT_OPTIONS:MMHASH}
-USE_PHP+= mhash
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_PHP+= openssl
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Group/Makefile b/security/pear-Horde_Group/Makefile
index 08f9db07a9e6..8512a32276e2 100644
--- a/security/pear-Horde_Group/Makefile
+++ b/security/pear-Horde_Group/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde User Groups System
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Oauth/Makefile b/security/pear-Horde_Oauth/Makefile
index 064fbadbb804..8b9b92e963dd 100644
--- a/security/pear-Horde_Oauth/Makefile
+++ b/security/pear-Horde_Oauth/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde OAuth client/server
+USES= horde
USE_HORDE_RUN= Horde_Exception Horde_Http
USE_PHP= hash openssl
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Perms/Makefile b/security/pear-Horde_Perms/Makefile
index 52fb139b8513..0e69d956b42f 100644
--- a/security/pear-Horde_Perms/Makefile
+++ b/security/pear-Horde_Perms/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Permissions System
+USES= horde
USE_HORDE_RUN= Horde_Db \
Horde_Exception \
Horde_Group \
Horde_Util \
Horde_Translation
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Secret/Makefile b/security/pear-Horde_Secret/Makefile
index 5a96d61e62de..a4b35ece549a 100644
--- a/security/pear-Horde_Secret/Makefile
+++ b/security/pear-Horde_Secret/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Secret Encryption API
+USES= horde
USE_HORDE_RUN= Horde_Crypt_Blowfish \
Horde_Exception \
Horde_Support
USE_PHP= hash
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Horde_Share/Makefile b/security/pear-Horde_Share/Makefile
index 8ff2079fc1f2..5a52470b2c5b 100644
--- a/security/pear-Horde_Share/Makefile
+++ b/security/pear-Horde_Share/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= security www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Shared Permissions System
+USES= horde
USE_HORDE_RUN= Horde_Db \
Horde_Exception \
Horde_Group \
@@ -16,6 +17,4 @@ USE_HORDE_RUN= Horde_Db \
Horde_Url \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/pear-Horde_Log/Makefile b/sysutils/pear-Horde_Log/Makefile
index 91305105fad9..0f1d8470780e 100644
--- a/sysutils/pear-Horde_Log/Makefile
+++ b/sysutils/pear-Horde_Log/Makefile
@@ -12,14 +12,10 @@ COMMENT= Horde Logging library
OPTIONS_DEFINE= SCRIBE
SCRIBE_DESC= Enable scribe support
+USES= horde
USE_HORDE_RUN= Horde_Constraint \
Horde_Exception
-.include <bsd.port.pre.mk>
+SCRIBE_USE= HORDE=Horde_Scribe
-.if ${PORT_OPTIONS:MSCRIBE}
-USE_HORDE+= Horde_Scribe
-.endif
-
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/pear-Horde_Vfs/Makefile b/sysutils/pear-Horde_Vfs/Makefile
index 3e2f383b4662..43ee04c3dcbd 100644
--- a/sysutils/pear-Horde_Vfs/Makefile
+++ b/sysutils/pear-Horde_Vfs/Makefile
@@ -15,11 +15,8 @@ USE_HORDE_RUN= Horde_Exception \
OPTIONS_DEFINE= FTP
FTP_DESC= Depend on FTP PHP extension
-.include <bsd.port.pre.mk>
+USES= horde
-.if ${PORT_OPTIONS:MFTP}
-USE_PHP+= ftp
-.endif
+FTP_USE= PHP=ftp
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_CssMinify/Makefile b/textproc/pear-Horde_CssMinify/Makefile
index af85cc8e0ffa..0e8fb4247145 100644
--- a/textproc/pear-Horde_CssMinify/Makefile
+++ b/textproc/pear-Horde_CssMinify/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde CSS Minification
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_JavascriptMinify/Makefile b/textproc/pear-Horde_JavascriptMinify/Makefile
index 5483b5b34d22..24c653420d06 100644
--- a/textproc/pear-Horde_JavascriptMinify/Makefile
+++ b/textproc/pear-Horde_JavascriptMinify/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Javascript Minification
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Kolab_Format/Makefile b/textproc/pear-Horde_Kolab_Format/Makefile
index 58e4ae2a4fcd..5bf642956f0d 100644
--- a/textproc/pear-Horde_Kolab_Format/Makefile
+++ b/textproc/pear-Horde_Kolab_Format/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde library for reading/writing Kolab data formats
+USES= horde
USE_PHP= dom
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Pdf/Makefile b/textproc/pear-Horde_Pdf/Makefile
index f083f4ed12a0..19dad8e4f964 100644
--- a/textproc/pear-Horde_Pdf/Makefile
+++ b/textproc/pear-Horde_Pdf/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde PDF library
+USES= horde
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_SpellChecker/Makefile b/textproc/pear-Horde_SpellChecker/Makefile
index bc6c34c3cdb8..7a38eca02c7f 100644
--- a/textproc/pear-Horde_SpellChecker/Makefile
+++ b/textproc/pear-Horde_SpellChecker/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Spellcheck API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Text_Diff/Makefile b/textproc/pear-Horde_Text_Diff/Makefile
index f46da24997eb..11c12544d458 100644
--- a/textproc/pear-Horde_Text_Diff/Makefile
+++ b/textproc/pear-Horde_Text_Diff/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde engine for performing and rendering text diffs
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Text_Filter/Makefile b/textproc/pear-Horde_Text_Filter/Makefile
index 36f4cc3e0696..7994f80cfa4d 100644
--- a/textproc/pear-Horde_Text_Filter/Makefile
+++ b/textproc/pear-Horde_Text_Filter/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Text Filter API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Text_Filter_Csstidy/Makefile b/textproc/pear-Horde_Text_Filter_Csstidy/Makefile
index 1d96ddaa4356..9992dae3fdc6 100644
--- a/textproc/pear-Horde_Text_Filter_Csstidy/Makefile
+++ b/textproc/pear-Horde_Text_Filter_Csstidy/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Text Filter CSS optimization class
+USES= horde
USE_HORDE_RUN= Horde_Text_Filter
USE_PHP= ctype
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Text_Flowed/Makefile b/textproc/pear-Horde_Text_Flowed/Makefile
index fc6270704916..9d5625683e91 100644
--- a/textproc/pear-Horde_Text_Flowed/Makefile
+++ b/textproc/pear-Horde_Text_Flowed/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde API for flowed text as per RFC 3676
+USES= horde
USE_HORDE_RUN= Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Xml_Element/Makefile b/textproc/pear-Horde_Xml_Element/Makefile
index 751e84e8413f..9f517e321085 100644
--- a/textproc/pear-Horde_Xml_Element/Makefile
+++ b/textproc/pear-Horde_Xml_Element/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Xml Element object
+USES= horde
USE_PHP= dom
USE_HORDE_RUN= Horde_Exception
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Xml_Wbxml/Makefile b/textproc/pear-Horde_Xml_Wbxml/Makefile
index c617e6d0e170..fafda2fd932e 100644
--- a/textproc/pear-Horde_Xml_Wbxml/Makefile
+++ b/textproc/pear-Horde_Xml_Wbxml/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde API for encoding and decoding WBXML documents
+USES= horde
USE_HORDE_RUN= Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Browser/Makefile b/www/pear-Horde_Browser/Makefile
index 34759ad5e8ff..389106db4467 100644
--- a/www/pear-Horde_Browser/Makefile
+++ b/www/pear-Horde_Browser/Makefile
@@ -8,8 +8,7 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Browser API
+USES= horde
USE_HORDE_RUN= Horde_Exception Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Css_Parser/Makefile b/www/pear-Horde_Css_Parser/Makefile
index ebed82bdfe61..418d9fcee88e 100644
--- a/www/pear-Horde_Css_Parser/Makefile
+++ b/www/pear-Horde_Css_Parser/Makefile
@@ -7,6 +7,6 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde CSS Parser
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Dav/Makefile b/www/pear-Horde_Dav/Makefile
index 83caeb39bf53..b56884338861 100644
--- a/www/pear-Horde_Dav/Makefile
+++ b/www/pear-Horde_Dav/Makefile
@@ -9,10 +9,9 @@ COMMENT= Horde library for WebDAV, CalDAV, CardDAV
LICENSE= BSD
+USES= horde
USE_HORDE_RUN= Horde_Auth \
Horde_Core \
Horde_Stream
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Editor/Makefile b/www/pear-Horde_Editor/Makefile
index 87e2ad1aeddf..cb62ab815ff5 100644
--- a/www/pear-Horde_Editor/Makefile
+++ b/www/pear-Horde_Editor/Makefile
@@ -10,12 +10,11 @@ COMMENT= Horde Editor API
CONFLICTS= horde-3*
+USES= horde
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
Horde_Browser \
Horde_Exception \
Horde_Serialize
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Feed/Makefile b/www/pear-Horde_Feed/Makefile
index 759689d06569..71a27c3a8797 100644
--- a/www/pear-Horde_Feed/Makefile
+++ b/www/pear-Horde_Feed/Makefile
@@ -8,11 +8,10 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Feed libraries
+USES= horde
USE_PHP= dom
USE_HORDE_RUN= Horde_Exception \
Horde_Http \
Horde_Xml_Element
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Form/Makefile b/www/pear-Horde_Form/Makefile
index c133ebd31e43..9b82697f344b 100644
--- a/www/pear-Horde_Form/Makefile
+++ b/www/pear-Horde_Form/Makefile
@@ -7,6 +7,7 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Form API
+USES= horde
USE_HORDE_RUN= Horde_Core \
Horde_Date \
Horde_Exception \
@@ -17,6 +18,4 @@ USE_HORDE_RUN= Horde_Core \
Horde_Translation \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Http/Makefile b/www/pear-Horde_Http/Makefile
index 51be6a5480a2..967357525bda 100644
--- a/www/pear-Horde_Http/Makefile
+++ b/www/pear-Horde_Http/Makefile
@@ -8,9 +8,8 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde HTTP libraries
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Support
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Routes/Makefile b/www/pear-Horde_Routes/Makefile
index fa1f48c94f23..e57d61be23ac 100644
--- a/www/pear-Horde_Routes/Makefile
+++ b/www/pear-Horde_Routes/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES= http://pear.horde.org/get/
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Routes URL mapping system
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Service_Facebook/Makefile b/www/pear-Horde_Service_Facebook/Makefile
index 68dcaa843fb5..cdd226e8b3cd 100644
--- a/www/pear-Horde_Service_Facebook/Makefile
+++ b/www/pear-Horde_Service_Facebook/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Facebook client
+USES= horde
USE_PHP= json simplexml
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"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Service_Twitter/Makefile b/www/pear-Horde_Service_Twitter/Makefile
index 531cadd68124..f39cfa92a0fd 100644
--- a/www/pear-Horde_Service_Twitter/Makefile
+++ b/www/pear-Horde_Service_Twitter/Makefile
@@ -8,12 +8,11 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Twitter client
+USES= horde
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"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Service_UrlShortener/Makefile b/www/pear-Horde_Service_UrlShortener/Makefile
index bebf0917f2c2..12c4646437ec 100644
--- a/www/pear-Horde_Service_UrlShortener/Makefile
+++ b/www/pear-Horde_Service_UrlShortener/Makefile
@@ -8,10 +8,9 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde URL shortening services interface
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Http \
Horde_Url
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Service_Weather/Makefile b/www/pear-Horde_Service_Weather/Makefile
index b638f9c91ce9..73a600d2d6da 100644
--- a/www/pear-Horde_Service_Weather/Makefile
+++ b/www/pear-Horde_Service_Weather/Makefile
@@ -8,6 +8,7 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Weather Provider
+USES= horde
USE_HORDE_BUILD= Horde_Role
USE_HORDE_RUN= Horde_Role \
Horde_Date \
@@ -15,6 +16,4 @@ USE_HORDE_RUN= Horde_Role \
Horde_Http \
Horde_Url
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_SessionHandler/Makefile b/www/pear-Horde_SessionHandler/Makefile
index 8b2f3d0d1a81..177926e04586 100644
--- a/www/pear-Horde_SessionHandler/Makefile
+++ b/www/pear-Horde_SessionHandler/Makefile
@@ -7,9 +7,8 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Session Handler API
+USES= horde
USE_HORDE_RUN= Horde_Exception \
Horde_Util
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-Horde_Template/Makefile b/www/pear-Horde_Template/Makefile
index 5efeac383e3d..daf4c7ca1870 100644
--- a/www/pear-Horde_Template/Makefile
+++ b/www/pear-Horde_Template/Makefile
@@ -8,6 +8,6 @@ CATEGORIES= www pear
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Template System
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+USES= horde
+
+.include <bsd.port.mk>