Convert to USES=horde

17 files changed, 45 insertions, 127 deletions

diff --git a/deskutils/horde-groupware/Makefile b/deskutils/horde-groupware/Makefile
index 14ab22ca4126..636e29fbd549 100644
--- a/deskutils/horde-groupware/Makefile
+++ b/deskutils/horde-groupware/Makefile
@@ -10,8 +10,7 @@ COMMENT=	Horde Groupware
 
 CONFLICTS=	horde-webmail-[456]*
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		content \
@@ -24,6 +23,4 @@ USE_HORDE_RUN=	Horde_Role \
 		trean \
 		turba
 
-.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/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index f2279707cf7a..3d774126d007 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -12,14 +12,13 @@ COMMENT=	Horde web based calendar
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
 OPTIONS_DEFAULT=	DATE_HOLIDAYS TIMEOBJECTS
 OPTIONS_DEFINE=		DATE_HOLIDAYS TIMEOBJECTS XMLWRITER
 DATE_HOLIDAYS_DESC=	Depend on PEAR Date_Holidays
 TIMEOBJECTS_DESC=	Depenbd on Horde timeobjects
 XMLWRITER_DESC=		Depend on PHP xmlwriter extension
 
+USES=	horde
 USE_PHP=	gettext json simplexml
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -55,19 +54,9 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MDATE_HOLIDAYS}
-RUN_DEPENDS+=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-.endif
-
-.if ${PORT_OPTIONS:MTIMEOBJECTS}
-USE_HORDE_RUN+=	timeobjects
-.endif
+HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
 
-.if ${PORT_OPTIONS:MXMLWRITER}
-USE_PHP+=	xmlwriter
-.endif
+TIMEOBJECTS_USE=	HORDE_RUN=timeobjects
+XMLWRITER_USE=	PHP=xmlwriter
 
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index 19d4712452bc..591573a8babd 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde web based notes manager
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -37,11 +36,6 @@ OPTIONS_DEFAULT=	PDF
 OPTIONS_DEFINE=		PDF
 PDF_DESC=		Support PDF generation
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MPDF}
-USE_HORDE_RUN+=	Horde_Pdf
-.endif
+PDF_USE=	HORDE_RUN=Horde_Pdf
 
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index dda0dd6228ed..609f41683740 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde web based task list manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -39,6 +38,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-.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/horde-content/Makefile b/devel/horde-content/Makefile
index 9165d32262fb..409bc253a212 100644
--- a/devel/horde-content/Makefile
+++ b/devel/horde-content/Makefile
@@ -8,8 +8,7 @@ PKGNAMEPREFIX=	horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde tagging application
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -21,6 +20,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Rdo \
 		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/horde-timeobjects/Makefile b/devel/horde-timeobjects/Makefile
index d0fdccc28834..6f70abaa955a 100644
--- a/devel/horde-timeobjects/Makefile
+++ b/devel/horde-timeobjects/Makefile
@@ -8,8 +8,7 @@ PKGNAMEPREFIX=	horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde timeobjects application
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -19,6 +18,4 @@ USE_HORDE_RUN=	Horde_Role \
 		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/horde-whups/Makefile b/devel/horde-whups/Makefile
index 1714687e5269..24e8b9e49942 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde-whups/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde bug tracking/ticketing system
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -40,6 +39,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Vfs \
 		Horde_View
 
-.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/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index 815c769787b0..3b4d97b84c5e 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Horde Web-based File Manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -38,6 +37,4 @@ USE_HORDE_RUN=	Horde_Role \
 USE_HORDE_RUN+=	Horde_Db \
 		Horde_Share
 
-.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/horde-imp/Makefile b/mail/horde-imp/Makefile
index 5463064f6711..dd3f7f77136a 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde web based webmail system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		horde \
@@ -50,6 +49,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-.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/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index c1534e6a9ff1..36a225a3f405 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde email filter rules manager
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -33,6 +32,4 @@ USE_HORDE_RUN=	Horde_Role \
 RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve \
 		${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index faca6df35f1e..fec7009bded5 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -11,13 +11,12 @@ COMMENT=	Horde web based address book
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LATEST_LINK=	horde-${PORTNAME}
-
 OPTIONS_DEFINE=	FACEBOOK IMSP LDAP
 FACEBOOK_DESC=	Support connections with Facebook
 IMSP_DSC=	Support IMSP addressbooks
 LDAP_DESC=	Support LDAP Addressbooks
 
+USES=	horde
 USE_PHP=	gettext hash json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -43,19 +42,8 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MFACEBOOK}
-USE_HORDE_RUN+=	Horde_Service_Facebook
-.endif
-
-.if ${PORT_OPTIONS:MIMSP}
-USE_HORDE_RUN+=	Horde_Imsp
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_HORDE_RUN+=	Horde_Ldap
-.endif
+FACEBOOK_USE=	HORDE_RUN=Horde_Service_Facebook
+IMSP_USE=	HORDE_RUN=Horde_Imsp
+LDAP_USE=	HORDE_RUN=Horde_Ldap
 
-.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile
index 0284735f2a56..3d08d782c273 100644
--- a/mail/horde-webmail/Makefile
+++ b/mail/horde-webmail/Makefile
@@ -10,8 +10,7 @@ COMMENT=	Horde Groupware Webmail Edition
 
 CONFLICTS=	horde-groupware-[456]*
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		content \
@@ -26,6 +25,4 @@ USE_HORDE_RUN=	Horde_Role \
 		trean \
 		turba
 
-.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/horde-ansel/Makefile b/www/horde-ansel/Makefile
index e65d1533d720..7965bdeb51f1 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde Photo Management and Web Gallery
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext hash
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -40,6 +39,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_View \
 		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/www/horde-base/Makefile b/www/horde-base/Makefile
index 1142b283158c..084eb60d659f 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -18,6 +18,7 @@ ICONV_DESC=	Depend on PHP iconv extension
 TWITTER_DESC=	Support connections to Twitter
 WEATHER_DESC=	Support weather forecast display
 
+USES=	horde
 USE_PHP=	filter gettext hash
 
 USE_HORDE_BUILD=	Horde_Role
@@ -56,24 +57,9 @@ USE_HORDE_RUN=	Horde_Role \
 # Optional in package but we want them in
 USE_HORDE_RUN+=	Horde_Feed
 
-.include <bsd.port.options.mk>
+FACEBOOK_USE=	HORDE_RUN=Horde_Service_Facebook
+ICONV_USE=	PHP=iconv
+TWITTER_USE=	HORDE_RUN=Horde_Service_Twitter
+WEATHER_USE=	HORDE_RUN=Horde_Service_Weather
 
-.if defined(WITH_FACEBOOK)
-USE_HORDE_RUN+=	Horde_Service_Facebook
-.endif
-
-.if !defined(WITHOUT_ICONV)
-USE_PHP+=	iconv
-.endif
-
-.if defined(WITH_TWITTER)
-USE_HORDE_RUN+=	Horde_Service_Twitter
-.endif
-
-.if defined(WITH_WEATHER)
-USE_HORDE_RUN+=	Horde_Service_Weather
-.endif
-
-.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/horde-passwd/Makefile b/www/horde-passwd/Makefile
index 338b796327cd..9ef2d40438c0 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde password changing application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -24,6 +23,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-.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/horde-trean/Makefile b/www/horde-trean/Makefile
index eb045b70c30e..327f71de4b1f 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde-trean/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Horde Bookmark Manager
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LATEST_LINK=	horde-${PORTNAME}
-
+USES=	horde
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -33,6 +32,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Vfs \
 		Horde_View
 
-.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/horde-wicked/Makefile b/www/horde-wicked/Makefile
index 5b58da300f0d..386b4e0a2ae9 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde-wicked/Makefile
@@ -11,10 +11,9 @@ COMMENT=	Horde Wiki Application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	horde-${PORTNAME}
-
 RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:${PORTSDIR}/www/pear-Text_Wiki
 
+USES=	horde
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -38,6 +37,4 @@ USE_HORDE_RUN=	Horde_Role \
 		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>