16 files changed, 18 insertions, 16 deletions

diff --git a/deskutils/horde-groupware/Makefile b/deskutils/horde-groupware/Makefile
index 4378a63722de..206c0ddd69e9 100644
--- a/deskutils/horde-groupware/Makefile
+++ b/deskutils/horde-groupware/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Horde Groupware
 
 CONFLICTS=	horde-webmail-[456]*
 
-USES=	horde
+USES=	horde cpe
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		content \
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index 31164ee30f8f..ba31346c4b17 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -18,7 +18,7 @@ DATE_HOLIDAYS_DESC=	Depend on PEAR Date_Holidays
 TIMEOBJECTS_DESC=	Depenbd on Horde timeobjects
 XMLWRITER_DESC=		Depend on PHP xmlwriter extension
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext json simplexml
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index cbe9d84cee42..2b585cd9c925 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde web based notes manager
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 18edc4d6402e..4ef0fad67c2f 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde web based task list manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile
index 409bc253a212..c60c1826a586 100644
--- a/devel/horde-content/Makefile
+++ b/devel/horde-content/Makefile
@@ -8,7 +8,7 @@ PKGNAMEPREFIX=	horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde tagging application
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile
index 3f743a21ed3d..9aa6c4edc050 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde-whups/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde bug tracking/ticketing system
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index 3b4d97b84c5e..ac3dfe9d68f4 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Horde Web-based File Manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index ac624d7cdc94..3945dfe6a538 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde web based webmail system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde
+USES=	horde cpe
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		horde \
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 0b518053ea00..1427a253c02b 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde email filter rules manager
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 855e0f2eb9a8..1b1e5266046b 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -16,7 +16,7 @@ FACEBOOK_DESC=	Support connections with Facebook
 IMSP_DSC=	Support IMSP addressbooks
 LDAP_DESC=	Support LDAP Addressbooks
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext hash json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile
index df2b6c27f131..8f618351f7bf 100644
--- a/mail/horde-webmail/Makefile
+++ b/mail/horde-webmail/Makefile
@@ -10,7 +10,9 @@ COMMENT=	Horde Groupware Webmail Edition
 
 CONFLICTS=	horde-groupware-[456]*
 
-USES=	horde
+USES=	horde cpe
+CPE_PRODUCT=	groupware
+CPE_EDITION=	webmail
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
 		content \
diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile
index 7ecc954c8a57..ddce050d3164 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde Photo Management and Web Gallery
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext hash
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index f0652ed2a550..7d66c317f0d6 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -18,7 +18,7 @@ ICONV_DESC=	Depend on PHP iconv extension
 TWITTER_DESC=	Support connections to Twitter
 WEATHER_DESC=	Support weather forecast display
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	filter gettext hash
 
 USE_HORDE_BUILD=	Horde_Role
diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index 9ef2d40438c0..ea81e0367350 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde password changing application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/www/horde-trean/Makefile b/www/horde-trean/Makefile
index f4fa56e9c335..eef99599c402 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde-trean/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde Bookmark Manager
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
diff --git a/www/horde-wicked/Makefile b/www/horde-wicked/Makefile
index 2029673bf27a..98314f50588a 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde-wicked/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:${PORTSDIR}/www/pear-Text_Wiki
 
-USES=	horde
+USES=	horde cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \