Convert to USES=horde

Fix pear-Horde_core options
Use options helpers where possible

14 files changed, 30 insertions, 42 deletions

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>