Convert to USES=horde

Fix pear-Horde_core options
Use options helpers where possible

38 files changed, 90 insertions, 144 deletions

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>