11 files changed, 11 insertions, 30 deletions

diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile
index 8a0dc221334e..1acecbc99629 100644
--- a/devel/horde-content/Makefile
+++ b/devel/horde-content/Makefile
@@ -6,7 +6,7 @@ PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde tagging application
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -18,6 +18,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Rdo \
 		Horde_Util
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile
index af20cd3619e8..5de0c1a0ffe6 100644
--- a/devel/horde-whups/Makefile
+++ b/devel/horde-whups/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Horde bug tracking/ticketing system
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -37,6 +37,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Vfs \
 		Horde_View
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Alarm/Makefile b/devel/pear-Horde_Alarm/Makefile
index 21b979c772be..70c31498ce18 100644
--- a/devel/pear-Horde_Alarm/Makefile
+++ b/devel/pear-Horde_Alarm/Makefile
@@ -7,9 +7,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	PEAR Horde alarm libraries
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Date Horde_Exception Horde_Translation
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Argv/Makefile b/devel/pear-Horde_Argv/Makefile
index 6672c3138b5a..ed933cb2149b 100644
--- a/devel/pear-Horde_Argv/Makefile
+++ b/devel/pear-Horde_Argv/Makefile
@@ -7,9 +7,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde command-line argument parsing package
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception Horde_Translation
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Autoloader/Makefile b/devel/pear-Horde_Autoloader/Makefile
index 9b04f451b118..d2825e81be8e 100644
--- a/devel/pear-Horde_Autoloader/Makefile
+++ b/devel/pear-Horde_Autoloader/Makefile
@@ -7,8 +7,6 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Autoloader
 
-USES=		cpe horde
-
-CPE_VENDOR=	horde
+USES=		horde cpe
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Autoloader_Cache/Makefile b/devel/pear-Horde_Autoloader_Cache/Makefile
index 6fa5bfc96457..34d5192a3c42 100644
--- a/devel/pear-Horde_Autoloader_Cache/Makefile
+++ b/devel/pear-Horde_Autoloader_Cache/Makefile
@@ -7,10 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Autoloader Cache
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_HORDE_RUN=	Horde_Autoloader
 USE_PHP=	json
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Cache/Makefile b/devel/pear-Horde_Cache/Makefile
index 50bc6ed4b8af..ea77225c9937 100644
--- a/devel/pear-Horde_Cache/Makefile
+++ b/devel/pear-Horde_Cache/Makefile
@@ -5,13 +5,11 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Caching API
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_HORDE_RUN=	Horde_Compress_Fast \
 		Horde_Exception \
 		Horde_HashTable \
 		Horde_Util
 USE_PHP=	hash
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Date_Parser/Makefile b/devel/pear-Horde_Date_Parser/Makefile
index fdd26e58c49e..03dddb32e3da 100644
--- a/devel/pear-Horde_Date_Parser/Makefile
+++ b/devel/pear-Horde_Date_Parser/Makefile
@@ -7,10 +7,8 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Date Parser
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Date \
 		Horde_Support
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Prefs/Makefile b/devel/pear-Horde_Prefs/Makefile
index 762e5a0b8385..4f5d5060ac9e 100644
--- a/devel/pear-Horde_Prefs/Makefile
+++ b/devel/pear-Horde_Prefs/Makefile
@@ -5,13 +5,12 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Preferences API
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Mail \
 		Horde_Mime \
 		Horde_Translation \
 		Horde_Util
 USE_PHP=	json
-CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Timezone/Makefile b/devel/pear-Horde_Timezone/Makefile
index b1081b303f80..9295b0f0efd7 100644
--- a/devel/pear-Horde_Timezone/Makefile
+++ b/devel/pear-Horde_Timezone/Makefile
@@ -7,10 +7,9 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde timezone library
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Date \
 		Horde_Icalendar \
 		Horde_Vfs
-CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/devel/pear-Horde_Tree/Makefile b/devel/pear-Horde_Tree/Makefile
index 48a2a6e3a92b..c772b3b4e1a9 100644
--- a/devel/pear-Horde_Tree/Makefile
+++ b/devel/pear-Horde_Tree/Makefile
@@ -7,10 +7,9 @@ CATEGORIES=	devel www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Tree API
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Url \
 		Horde_Util
-CPE_VENDOR=	horde
 
 .include <bsd.port.mk>