git: 230540fefb21 - main - */*: Remove extra CPE_VENDOR=horde which is already present in USES=horde

From: Bernhard Froehlich <decke_at_FreeBSD.org>
Date: Thu, 07 Oct 2021 15:05:06 UTC
The branch main has been updated by decke:

URL: https://cgit.FreeBSD.org/ports/commit/?id=230540fefb212bc8199ce5daa83b6d695bdeda37

commit 230540fefb212bc8199ce5daa83b6d695bdeda37
Author:     Bernhard Froehlich <decke@FreeBSD.org>
AuthorDate: 2021-10-07 15:04:14 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2021-10-07 15:04:45 +0000

    */*: Remove extra CPE_VENDOR=horde which is already present in USES=horde
    
    Approved by:    portmgr (blanket)
---
 archivers/pear-Horde_Compress/Makefile       | 4 +---
 archivers/pear-Horde_Compress_Fast/Makefile  | 3 +--
 archivers/pear-Horde_Pack/Makefile           | 3 +--
 comms/pear-Horde_ActiveSync/Makefile         | 3 +--
 comms/pear-Horde_SyncMl/Makefile             | 4 +---
 databases/pear-Horde_Db/Makefile             | 4 +---
 databases/pear-Horde_HashTable/Makefile      | 4 +---
 databases/pear-Horde_Imsp/Makefile           | 4 +---
 databases/pear-Horde_Mongo/Makefile          | 4 +---
 deskutils/horde-kronolith/Makefile           | 4 +---
 deskutils/horde-mnemo/Makefile               | 4 +---
 deskutils/horde-nag/Makefile                 | 4 +---
 devel/horde-content/Makefile                 | 4 +---
 devel/horde-whups/Makefile                   | 4 +---
 devel/pear-Horde_Alarm/Makefile              | 4 +---
 devel/pear-Horde_Argv/Makefile               | 4 +---
 devel/pear-Horde_Autoloader/Makefile         | 4 +---
 devel/pear-Horde_Autoloader_Cache/Makefile   | 4 +---
 devel/pear-Horde_Cache/Makefile              | 4 +---
 devel/pear-Horde_Date_Parser/Makefile        | 4 +---
 devel/pear-Horde_Prefs/Makefile              | 3 +--
 devel/pear-Horde_Timezone/Makefile           | 3 +--
 devel/pear-Horde_Tree/Makefile               | 3 +--
 ftp/horde-gollem/Makefile                    | 4 +---
 mail/horde-ingo/Makefile                     | 4 +---
 mail/horde-turba/Makefile                    | 3 +--
 mail/pear-Horde_ListHeaders/Makefile         | 4 +---
 net/pear-Horde_Kolab_Session/Makefile        | 4 +---
 net/pear-Horde_Rpc/Makefile                  | 4 +---
 net/pear-Horde_Scribe/Makefile               | 4 +---
 textproc/pear-Horde_SpellChecker/Makefile    | 4 +---
 textproc/pear-Horde_Xml_Element/Makefile     | 4 +---
 www/pear-Horde_Service_UrlShortener/Makefile | 4 +---
 www/pear-Horde_SessionHandler/Makefile       | 4 +---
 34 files changed, 34 insertions(+), 95 deletions(-)

diff --git a/archivers/pear-Horde_Compress/Makefile b/archivers/pear-Horde_Compress/Makefile
index 343d5fce72b0..29291144605e 100644
--- a/archivers/pear-Horde_Compress/Makefile
+++ b/archivers/pear-Horde_Compress/Makefile
@@ -9,14 +9,12 @@ OPTIONS_DEFAULT=	ZLIB
 OPTIONS_DEFINE=		ZLIB
 ZLIB_DESC=	Depend on PHP zlib extension
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Translation \
 		Horde_Util \
 		Horde_Stream_Filter
 
-CPE_VENDOR=	horde
-
 ZLIB_USES=	php
 ZLIB_USE=	PHP=zlib
 
diff --git a/archivers/pear-Horde_Compress_Fast/Makefile b/archivers/pear-Horde_Compress_Fast/Makefile
index 7d421e2e9ba7..6b8d36dcf9ce 100644
--- a/archivers/pear-Horde_Compress_Fast/Makefile
+++ b/archivers/pear-Horde_Compress_Fast/Makefile
@@ -5,8 +5,7 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Fast Compression Library
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception
-CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/archivers/pear-Horde_Pack/Makefile b/archivers/pear-Horde_Pack/Makefile
index 5ae7eacef802..346949e1bae7 100644
--- a/archivers/pear-Horde_Pack/Makefile
+++ b/archivers/pear-Horde_Pack/Makefile
@@ -5,9 +5,8 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Pack Utility
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Compress_Fast \
 		Horde_Exception
-CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/comms/pear-Horde_ActiveSync/Makefile b/comms/pear-Horde_ActiveSync/Makefile
index e8dea4846471..8fc4a8dd9e5f 100644
--- a/comms/pear-Horde_ActiveSync/Makefile
+++ b/comms/pear-Horde_ActiveSync/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	comms www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde ActiveSync Server Library
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	ctype
 USE_HORDE_RUN=	Horde_Compress \
 		Horde_Date \
@@ -16,6 +16,5 @@ USE_HORDE_RUN=	Horde_Compress \
 		Horde_Stream \
 		Horde_Support \
 		Horde_Util
-CPE_VENDOR=	horde
 
 .include <bsd.port.mk>
diff --git a/comms/pear-Horde_SyncMl/Makefile b/comms/pear-Horde_SyncMl/Makefile
index f95d8663751b..aaae78da4c29 100644
--- a/comms/pear-Horde_SyncMl/Makefile
+++ b/comms/pear-Horde_SyncMl/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	comms www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde API for processing SyncML requests
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Date \
 		Horde_Icalendar \
 		Horde_Log \
@@ -20,6 +20,4 @@ USE_HORDE_RUN=	Horde_Date \
 USE_HORDE_RUN+= Horde_Auth \
 		Horde_Core
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile
index 0221192faea8..6b7ccd6d8402 100644
--- a/databases/pear-Horde_Db/Makefile
+++ b/databases/pear-Horde_Db/Makefile
@@ -11,13 +11,11 @@ OPTIONS_DEFINE=		MYSQLI PDO
 MYSQLI_DESC=		Depend on mysqli PHP extension
 PDO_DESC=		Depend on PDO PHP extension
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Date \
 		Horde_Exception \
 		Horde_Support
 
-CPE_VENDOR=	horde
-
 MYSQLI_USES=	php
 MYSQLI_USE=	PHP=mysqli
 PDO_USES=	php
diff --git a/databases/pear-Horde_HashTable/Makefile b/databases/pear-Horde_HashTable/Makefile
index 10ba1a715580..b630b4e24c5d 100644
--- a/databases/pear-Horde_HashTable/Makefile
+++ b/databases/pear-Horde_HashTable/Makefile
@@ -6,11 +6,9 @@ MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Hash Table Interface
 
 OPTIONS_DEFINE=	MEMCACHE
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception
 
-CPE_VENDOR=	horde
-
 MEMCACHE_USE=	HORDE_RUN=Horde_Memcache
 
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Imsp/Makefile b/databases/pear-Horde_Imsp/Makefile
index 4dfa00f9c10e..d3796a8905cd 100644
--- a/databases/pear-Horde_Imsp/Makefile
+++ b/databases/pear-Horde_Imsp/Makefile
@@ -7,9 +7,7 @@ CATEGORIES=	databases www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde IMSP API
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Translation
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Mongo/Makefile b/databases/pear-Horde_Mongo/Makefile
index 7704feefbbc6..5b31f7cd2516 100644
--- a/databases/pear-Horde_Mongo/Makefile
+++ b/databases/pear-Horde_Mongo/Makefile
@@ -5,8 +5,6 @@ CATEGORIES=	databases www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Mongo Configuration
 
-USES=		cpe horde
-
-CPE_VENDOR=	horde
+USES=		horde cpe
 
 .include <bsd.port.mk>
diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile
index cd072be5d914..efcccca3d8e9 100644
--- a/deskutils/horde-kronolith/Makefile
+++ b/deskutils/horde-kronolith/Makefile
@@ -17,7 +17,7 @@ DATE_HOLIDAYS_DESC=	Depend on PEAR Date_Holidays
 TIMEOBJECTS_DESC=	Depenbd on Horde timeobjects
 XMLWRITER_DESC=		Depend on PHP xmlwriter extension
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext json simplexml
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -53,8 +53,6 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-CPE_VENDOR=	horde
-
 RUN_DEPENDS+=	${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
 
 DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile
index d9257ede7c3b..3357d479486b 100644
--- a/deskutils/horde-mnemo/Makefile
+++ b/deskutils/horde-mnemo/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Horde web based notes manager
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -32,8 +32,6 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Text_Filter \
 		Horde_Util
 
-CPE_VENDOR=	horde
-
 OPTIONS_DEFAULT=	PDF
 OPTIONS_DEFINE=		PDF
 PDF_DESC=		Support PDF generation
diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile
index 8cef06f4d6e7..485a97d12094 100644
--- a/deskutils/horde-nag/Makefile
+++ b/deskutils/horde-nag/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Horde web based task list manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -37,6 +37,4 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
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>
diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile
index 9f352f3c6762..97b8a128702d 100644
--- a/ftp/horde-gollem/Makefile
+++ b/ftp/horde-gollem/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Horde Web-based File Manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -36,6 +36,4 @@ USE_HORDE_RUN=	Horde_Role \
 USE_HORDE_RUN+=	Horde_Db \
 		Horde_Share
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 2a141336ba85..a31eaf68c3a6 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Horde email filter rules manager
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -30,6 +30,4 @@ USE_HORDE_RUN=	Horde_Role \
 RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \
 		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index e85ad9a35722..6b600db6d472 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -14,7 +14,7 @@ FACEBOOK_DESC=	Support connections with Facebook
 IMSP_DSC=	Support IMSP addressbooks
 LDAP_DESC=	Support LDAP Addressbooks
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	gettext hash json
 USE_HORDE_BUILD=	Horde_Role
 USE_HORDE_RUN=	Horde_Role \
@@ -41,7 +41,6 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util \
 		Horde_View
 
-CPE_VENDOR=	horde
 NO_ARCH=	yes
 
 FACEBOOK_USE=	HORDE_RUN=Horde_Service_Facebook
diff --git a/mail/pear-Horde_ListHeaders/Makefile b/mail/pear-Horde_ListHeaders/Makefile
index 02fdb5490e06..96b1a7d39d66 100644
--- a/mail/pear-Horde_ListHeaders/Makefile
+++ b/mail/pear-Horde_ListHeaders/Makefile
@@ -7,9 +7,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde List Headers Parsing Library
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Mail
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/net/pear-Horde_Kolab_Session/Makefile b/net/pear-Horde_Kolab_Session/Makefile
index 5e398dcd7640..d677a771748e 100644
--- a/net/pear-Horde_Kolab_Session/Makefile
+++ b/net/pear-Horde_Kolab_Session/Makefile
@@ -7,11 +7,9 @@ CATEGORIES=	net www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde library for managing an active Kolab session
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception
 
-CPE_VENDOR=	horde
-
 # Optional but we want it
 USE_HORDE_RUN+=	Horde_Kolab_Server \
 		Horde_Log
diff --git a/net/pear-Horde_Rpc/Makefile b/net/pear-Horde_Rpc/Makefile
index 199081130848..492dc660ff52 100644
--- a/net/pear-Horde_Rpc/Makefile
+++ b/net/pear-Horde_Rpc/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde RPC API
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Core \
 		Horde_Dav \
 		Horde_Exception \
@@ -22,6 +22,4 @@ USE_HORDE_RUN+=	Horde_ActiveSync \
 		Horde_SyncMl \
 		Horde_Http
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/net/pear-Horde_Scribe/Makefile b/net/pear-Horde_Scribe/Makefile
index 3fc781e6ce04..2ff0bb929179 100644
--- a/net/pear-Horde_Scribe/Makefile
+++ b/net/pear-Horde_Scribe/Makefile
@@ -7,9 +7,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Scribe client
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Thrift
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/textproc/pear-Horde_SpellChecker/Makefile b/textproc/pear-Horde_SpellChecker/Makefile
index 133c3016c777..c7449e87db07 100644
--- a/textproc/pear-Horde_SpellChecker/Makefile
+++ b/textproc/pear-Horde_SpellChecker/Makefile
@@ -7,10 +7,8 @@ CATEGORIES=	textproc www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Spellcheck API
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Util
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/textproc/pear-Horde_Xml_Element/Makefile b/textproc/pear-Horde_Xml_Element/Makefile
index cf6150001317..c19c939e1cae 100644
--- a/textproc/pear-Horde_Xml_Element/Makefile
+++ b/textproc/pear-Horde_Xml_Element/Makefile
@@ -7,10 +7,8 @@ CATEGORIES=	textproc www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Xml Element object
 
-USES=		cpe horde php
+USES=		horde php cpe
 USE_PHP=	dom
 USE_HORDE_RUN=	Horde_Exception
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/www/pear-Horde_Service_UrlShortener/Makefile b/www/pear-Horde_Service_UrlShortener/Makefile
index bc6b490cb24a..ae8c4311f685 100644
--- a/www/pear-Horde_Service_UrlShortener/Makefile
+++ b/www/pear-Horde_Service_UrlShortener/Makefile
@@ -7,11 +7,9 @@ CATEGORIES=	www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde URL shortening services interface
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Http \
 		Horde_Url
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>
diff --git a/www/pear-Horde_SessionHandler/Makefile b/www/pear-Horde_SessionHandler/Makefile
index 86e9e066e3a3..26b93cb3eb1d 100644
--- a/www/pear-Horde_SessionHandler/Makefile
+++ b/www/pear-Horde_SessionHandler/Makefile
@@ -5,10 +5,8 @@ CATEGORIES=	www pear
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Session Handler API
 
-USES=		cpe horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception \
 		Horde_Util
 
-CPE_VENDOR=	horde
-
 .include <bsd.port.mk>