20 files changed, 33 insertions, 34 deletions

diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 2600c3294a3e..0047ac71cb32 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	imp
 PORTVERSION=	6.2.21
 CATEGORIES=	mail www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde web based webmail system
diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile
index 832653a4166d..de10a134a360 100644
--- a/mail/horde-ingo/Makefile
+++ b/mail/horde-ingo/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ingo
 PORTVERSION=	3.2.16
 CATEGORIES=	mail www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde email filter rules manager
@@ -29,7 +29,7 @@ USE_HORDE_RUN=	Horde_Role \
 		Horde_Util
 
 # Optional but we want it
-RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve \
-		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS+=	${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index 8916e31e1807..3def4d26bb73 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	turba
 PORTVERSION=	4.2.21
 PORTREVISION=	1
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 CATEGORIES=	mail www pear
 
 MAINTAINER=	horde@FreeBSD.org
diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile
index 0af44992cada..9bb3c5578a99 100644
--- a/mail/horde-webmail/Makefile
+++ b/mail/horde-webmail/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	webmail
 PORTVERSION=	5.2.22
 CATEGORIES=	mail www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Groupware Webmail Edition
diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile
index 8f8b4d1992a7..7ab035cc7fe4 100644
--- a/mail/pear-Horde_Imap_Client/Makefile
+++ b/mail/pear-Horde_Imap_Client/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	Horde_Imap_Client
 PORTVERSION=	2.29.15
 CATEGORIES=	mail www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde IMAP abstraction interface
@@ -24,6 +24,6 @@ SASL_DESC=	Support SASL Authentication
 
 IMAP_USE=	PHP=imap
 MBSTRING_USE=	PHP=mbstring
-SASL_RUN_DEPENDS=	${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL
+SASL_RUN_DEPENDS=	${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mail/Makefile b/mail/pear-Horde_Mail/Makefile
index 98f898a019ee..b8d777d263a8 100644
--- a/mail/pear-Horde_Mail/Makefile
+++ b/mail/pear-Horde_Mail/Makefile
@@ -17,6 +17,6 @@ USE_HORDE_RUN=	Horde_Exception \
 #USE_HORDE_RUN+=	Horde_Mime
 
 # Optional but we want it
-RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP
+RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mail_Autoconfig/Makefile b/mail/pear-Horde_Mail_Autoconfig/Makefile
index 7099333cc197..203da37b8607 100644
--- a/mail/pear-Horde_Mail_Autoconfig/Makefile
+++ b/mail/pear-Horde_Mail_Autoconfig/Makefile
@@ -14,6 +14,6 @@ USE_HORDE_RUN=	Horde_Exception \
 		Horde_Mail \
 		Horde_Smtp
 
-RUN_DEPENDS+=	${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2
+RUN_DEPENDS+=	${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Horde_Mapi/Makefile b/mail/pear-Horde_Mapi/Makefile
index 3de656ccde54..1a2eacf5d031 100644
--- a/mail/pear-Horde_Mapi/Makefile
+++ b/mail/pear-Horde_Mapi/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	Horde_Mapi
 PORTVERSION=	1.0.8
 PORTREVISION=	1
 CATEGORIES=	mail www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde MAPI utility library
@@ -15,6 +15,6 @@ USE_HORDE_RUN=	Horde_Date \
 
 USE_PHP+=	bcmath
 
-RUN_DEPENDS+=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger
+RUN_DEPENDS+=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Horde_Smtp/Makefile b/mail/pear-Horde_Smtp/Makefile
index 9450cc3e7d09..bf3dee8495b7 100644
--- a/mail/pear-Horde_Smtp/Makefile
+++ b/mail/pear-Horde_Smtp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	Horde_Smtp
 PORTVERSION=	1.9.5
 CATEGORIES=	mail www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde SMTP Client
diff --git a/mail/pear-MIME_Type/Makefile b/mail/pear-MIME_Type/Makefile
index b676db2e623a..bdff6f0e0ee6 100644
--- a/mail/pear-MIME_Type/Makefile
+++ b/mail/pear-MIME_Type/Makefile
@@ -16,6 +16,6 @@ PEAR_SYSTEM_COMMAND_DESC=	PEAR::System_Command support
 USES=		pear
 NO_ARCH=	yes
 
-PEAR_SYSTEM_COMMAND_RUN_DEPENDS=	${PEARDIR}/System/Command.php:devel/pear-System_Command
+PEAR_SYSTEM_COMMAND_RUN_DEPENDS=	${PEARDIR}/System/Command.php:devel/pear-System_Command@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 9f5a1e4beded..97cd4cdd5271 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -16,6 +16,6 @@ PEAR_NET_SMTP_DESC=	PEAR::Net_SMTP support
 
 USES=	pear
 
-PEAR_NET_SMTP_RUN_DEPENDS=	${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP
+PEAR_NET_SMTP_RUN_DEPENDS=	${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile
index 8a9bab00f45a..8dabc66fe17a 100644
--- a/mail/pear-Mail_Queue/Makefile
+++ b/mail/pear-Mail_Queue/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	mail www pear
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class for put mails in queue and send them later in background
 
-BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
-		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
-RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
-		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
+BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \
+		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \
+		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
 
 USES=		pear
 
@@ -21,8 +21,8 @@ PEAR_DB_DESC=	PEAR::DB support
 PEAR_MDB_DESC=	PEAR::MDB support
 PEAR_MDB2_DESC=	PEAR::MDB2 support
 
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR}
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/mail/pear-Mail_mimeDecode/Makefile b/mail/pear-Mail_mimeDecode/Makefile
index 6deba882a068..f7c1f418d74f 100644
--- a/mail/pear-Mail_mimeDecode/Makefile
+++ b/mail/pear-Mail_mimeDecode/Makefile
@@ -10,7 +10,7 @@ COMMENT=	Provides a class to decode mime messages
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
+RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
 
 USES=		pear
 NO_ARCH=	yes
diff --git a/mail/pear-Net_Cyrus/Makefile b/mail/pear-Net_Cyrus/Makefile
index 70628afcdaa7..db69a2eec518 100644
--- a/mail/pear-Net_Cyrus/Makefile
+++ b/mail/pear-Net_Cyrus/Makefile
@@ -8,10 +8,10 @@ CATEGORIES=	mail net pear
 MAINTAINER=	bra@fsn.hu
 COMMENT=	PEAR class to administer Cyrus IMAP servers
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR}
 
 USES=		pear
 
diff --git a/mail/pear-Net_IMAP/Makefile b/mail/pear-Net_IMAP/Makefile
index 840e5bb4a1b5..e9579b8b7bb0 100644
--- a/mail/pear-Net_IMAP/Makefile
+++ b/mail/pear-Net_IMAP/Makefile
@@ -10,8 +10,8 @@ COMMENT=	PEAR class that provides an implementation of the IMAP protocol
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pear
diff --git a/mail/pear-Net_LMTP/Makefile b/mail/pear-Net_LMTP/Makefile
index e45d8fa8dd07..e669958d1c8c 100644
--- a/mail/pear-Net_LMTP/Makefile
+++ b/mail/pear-Net_LMTP/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR implementation of the RFC2033 LMTP protocol
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		pear
diff --git a/mail/pecl-mailparse2/Makefile b/mail/pecl-mailparse2/Makefile
index bd2a67aa5583..a9faf5de778b 100644
--- a/mail/pecl-mailparse2/Makefile
+++ b/mail/pecl-mailparse2/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	mailparse
 PORTVERSION=	2.1.6
 PORTREVISION=	1
 CATEGORIES=	mail www
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	PECL extension to create and decode MIME messages
diff --git a/mail/phplist/Makefile b/mail/phplist/Makefile
index 7eaa03bacd7b..f3b6fe36103b 100644
--- a/mail/phplist/Makefile
+++ b/mail/phplist/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Full-featured open-source newsletter manager
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		cpe tar:tgz php:web
 USE_PHP=	hash iconv imap mysqli pcre session xml zlib
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index 36dd635ba7a8..7f62a9b7677a 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows users to change their passwords stored in a SQL database
 
 USE_SM_COMPAT=	yes
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index 9b5941330f76..eeb63afd2899 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	mail www
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit SpamAssassin settings stored in an SQL DB
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes