8 files changed, 19 insertions, 36 deletions

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>