18 files changed, 66 insertions, 64 deletions

diff --git a/security/base/Makefile b/security/base/Makefile
index 201e071b9cdf..accd7233ad5d 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -13,9 +13,9 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/GPL
 
 RUN_DEPENDS=	${ADODB_DIR}/adodb.inc.php:databases/adodb5 \
-		${LOCALBASE}/share/pear/Image/Graph.php:graphics/pear-Image_Graph \
-		${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail \
-		${LOCALBASE}/share/pear/Mail/mime.php:mail/pear-Mail_Mime
+		${LOCALBASE}/share/pear/Image/Graph.php:graphics/pear-Image_Graph@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
 
 USE_PHP=	gd gettext pcre session zlib ctype
 
diff --git a/security/maia/Makefile b/security/maia/Makefile
index 9fb28cdef7a1..17482474abf4 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -108,26 +108,26 @@ USE_PHP=	bcmath ctype dom gettext hash iconv imap json mbstring \
 		mcrypt pdo pdo_sqlite posix session simplexml sockets \
 		sqlite3 tokenizer xml wddx xmlreader xmlwriter xmlrpc
 
-RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime \
-		${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode \
-		${PEAR_DIR}/DB.php:databases/pear-DB \
-		${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager \
-		${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP \
-		${PEAR_DIR}/Log.php:sysutils/pear-Log \
-		${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier \
-		${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP \
-		${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3 \
-		${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL \
-		${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color \
-		${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas \
-		${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph \
-		${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman \
-		${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words \
-		${PEAR_DIR}/MDB2.php:databases/pear-MDB2 \
-		${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql \
-		${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt
+RUN_DEPENDS+=	${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
+		${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \
+		${PEAR_DIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager@${PHP_FLAVOR} \
+		${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR} \
+		${PEAR_DIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
+		${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier@${PHP_FLAVOR} \
+		${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR} \
+		${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3@${PHP_FLAVOR} \
+		${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} \
+		${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color@${PHP_FLAVOR} \
+		${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas@${PHP_FLAVOR} \
+		${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph@${PHP_FLAVOR} \
+		${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \
+		${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \
+		${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+		${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR} \
+		${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2@${PHP_FLAVOR} \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR}
 PLIST_SUB+=     WEBHOST=""
 .else
 PLIST_SUB+=     WEBHOST="@comment "
diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index 0212f84769be..890cba7d74df 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -15,10 +15,10 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:security/amavisd-new \
-		${PEARDIR}/DB.php:databases/pear-DB \
-		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime \
-		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode
+		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR}
 
 PEARDIR?=	${LOCALBASE}/share/pear
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
diff --git a/security/nextcloud-passman/Makefile b/security/nextcloud-passman/Makefile
index b981f5c3429d..051d11f6bad2 100644
--- a/security/nextcloud-passman/Makefile
+++ b/security/nextcloud-passman/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	nextcloud>=9:www/nextcloud
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/security/nextcloud-twofactor_totp/Makefile b/security/nextcloud-twofactor_totp/Makefile
index 707d5a0ab970..5276b21e99af 100644
--- a/security/nextcloud-twofactor_totp/Makefile
+++ b/security/nextcloud-twofactor_totp/Makefile
@@ -17,6 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nextcloud>=12:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/security/nextcloud-twofactor_u2f/Makefile b/security/nextcloud-twofactor_u2f/Makefile
index 24dcf8508e23..099ae06d7d39 100644
--- a/security/nextcloud-twofactor_u2f/Makefile
+++ b/security/nextcloud-twofactor_u2f/Makefile
@@ -17,6 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	nextcloud>=12:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index c46c42f9241a..e5834d33de79 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -25,17 +25,17 @@ PEAR_FILE_SMBPASSWD_DESC=	PEAR::File_SMBPasswd support
 PEAR_SOAP_DESC=	PEAR::SOAP support
 PEAR_NET_VPOPMAILD_DESC=	PEAR::Net_Vpopmaild support
 
-PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log/syslog.php:sysutils/pear-Log
-PEAR_FILE_PASSWD_RUN_DEPENDS=	${PEARDIR}/File/Passwd.php:security/pear-File_Passwd
-PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
-PEAR_NET_POP3_RUN_DEPENDS=	${PEARDIR}/Net/POP3.php:net/pear-Net_POP3
-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_AUTH_RADIUS_RUN_DEPENDS=	${PEARDIR}/Auth/RADIUS.php:net/pear-Auth_RADIUS
-PEAR_FILE_SMBPASSWD_RUN_DEPENDS=	${PEARDIR}/File/SMBPasswd.php:security/pear-File_SMBPasswd
-PEAR_SOAP_RUN_DEPENDS=	${PEARDIR}/SOAP/Base.php:net/pear-SOAP
-PEAR_NET_VPOPMAILD_RUN_DEPENDS=	${PEARDIR}/Net/Vpopmaild.php:net/pear-Net_Vpopmaild
+PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log/syslog.php:sysutils/pear-Log@${PHP_FLAVOR}
+PEAR_FILE_PASSWD_RUN_DEPENDS=	${PEARDIR}/File/Passwd.php:security/pear-File_Passwd@${PHP_FLAVOR}
+PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR}
+PEAR_NET_POP3_RUN_DEPENDS=	${PEARDIR}/Net/POP3.php:net/pear-Net_POP3@${PHP_FLAVOR}
+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}
+PEAR_AUTH_RADIUS_RUN_DEPENDS=	${PEARDIR}/Auth/RADIUS.php:net/pear-Auth_RADIUS@${PHP_FLAVOR}
+PEAR_FILE_SMBPASSWD_RUN_DEPENDS=	${PEARDIR}/File/SMBPasswd.php:security/pear-File_SMBPasswd@${PHP_FLAVOR}
+PEAR_SOAP_RUN_DEPENDS=	${PEARDIR}/SOAP/Base.php:net/pear-SOAP@${PHP_FLAVOR}
+PEAR_NET_VPOPMAILD_RUN_DEPENDS=	${PEARDIR}/Net/Vpopmaild.php:net/pear-Net_Vpopmaild@${PHP_FLAVOR}
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Auth.php
diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index d47ee7ea95d0..de449e04b31f 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -10,7 +10,7 @@ COMMENT=	PEAR abstraction of various SASL mechanism responses
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-Auth>=0:security/pear-Auth
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}Auth>=0:security/pear-Auth@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/pear-Crypt_GPG/Makefile b/security/pear-Crypt_GPG/Makefile
index cb6ac30b7ad8..5dab682da296 100644
--- a/security/pear-Crypt_GPG/Makefile
+++ b/security/pear-Crypt_GPG/Makefile
@@ -11,7 +11,7 @@ COMMENT=	GNU Privacy Guard (GPG)
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile
index 701ee1ab5090..6b420fd8dff2 100644
--- a/security/pear-File_Passwd/Makefile
+++ b/security/pear-File_Passwd/Makefile
@@ -13,6 +13,6 @@ USES=		pear
 OPTIONS_DEFINE=	PEAR_CRYPT_CHAP
 PEAR_CRYPT_CHAP_DESC=	PEAR::Crypt_CHAP support
 
-PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
+PEAR_CRYPT_CHAP_RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/pear-File_SMBPasswd/Makefile b/security/pear-File_SMBPasswd/Makefile
index d906750c77b9..f44882e99edb 100644
--- a/security/pear-File_SMBPasswd/Makefile
+++ b/security/pear-File_SMBPasswd/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class for managing SAMBA style password files
 
-BUILD_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
-RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP
+BUILD_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR}
 
 USES=		pear php
 USE_PHP=	hash
diff --git a/security/pear-Horde_Crypt/Makefile b/security/pear-Horde_Crypt/Makefile
index fd722d5e4cc6..5c17f8a72960 100644
--- a/security/pear-Horde_Crypt/Makefile
+++ b/security/pear-Horde_Crypt/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Horde_Crypt
 DISTVERSION=	2.7.11
 CATEGORIES=	security www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Cryptography API
diff --git a/security/pear-Horde_Crypt_Blowfish/Makefile b/security/pear-Horde_Crypt_Blowfish/Makefile
index ca89fcef4186..b5a459362056 100644
--- a/security/pear-Horde_Crypt_Blowfish/Makefile
+++ b/security/pear-Horde_Crypt_Blowfish/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Horde_Crypt_Blowfish
 PORTVERSION=	1.1.2
 CATEGORIES=	security www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde blowfish encryption for PHP string data
diff --git a/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile
index 0dfdef96ff78..40fd732bf1dc 100644
--- a/security/pear-LiveUser/Makefile
+++ b/security/pear-LiveUser/Makefile
@@ -8,8 +8,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR user authentication and permission management framework
 
-BUILD_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
-RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
+BUILD_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher@${PHP_FLAVOR}
 
 PORTSCOUT=	skipv:0.61
 
@@ -23,11 +23,11 @@ PEAR_LOG_DESC=	PEAR::Log support
 PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
 PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 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_LOG_RUN_DEPENDS=	 ${PEARDIR}/Log/null.php:sysutils/pear-Log
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
-PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4
+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}
+PEAR_LOG_RUN_DEPENDS=	 ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree@${PHP_FLAVOR}
+PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile
index 4e20b8237e95..c7fb81a7aed7 100644
--- a/security/pear-LiveUser_Admin/Makefile
+++ b/security/pear-LiveUser_Admin/Makefile
@@ -9,8 +9,8 @@ CATEGORIES=	security www pear
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR user authentication and permission management framework
 
-BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser
-RUN_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser
+BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/LiveUser.php:security/pear-LiveUser@${PHP_FLAVOR}
 
 OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_LOG PEAR_XML_TREE PEAR_CRYPT_RC4
 
@@ -23,11 +23,11 @@ PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
 USES=		pear
 
-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_LOG_RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
-PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4
+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}
+PEAR_LOG_RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR}
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree@${PHP_FLAVOR}
+PEAR_CRYPT_RC4_RUN_DEPENDS=	${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/security/pecl-ssh2-0/Makefile b/security/pecl-ssh2-0/Makefile
index 122ba47d1240..458bd85d06e0 100644
--- a/security/pecl-ssh2-0/Makefile
+++ b/security/pecl-ssh2-0/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	ssh2
 PORTVERSION=	0.13
 CATEGORIES=	security pear
-PKGNAMESUFFIX=	-0
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	PECL extension to the libssh2 library
diff --git a/security/php-suhosin/Makefile b/security/php-suhosin/Makefile
index ae80b1b3c64e..1b01c949c49e 100644
--- a/security/php-suhosin/Makefile
+++ b/security/php-suhosin/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.9.38
 PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://download.suhosin.org/
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PHP extension that implements high-level protections
diff --git a/security/snuffleupagus/Makefile b/security/snuffleupagus/Makefile
index 31516fa7b70e..c3a59e8088f4 100644
--- a/security/snuffleupagus/Makefile
+++ b/security/snuffleupagus/Makefile
@@ -4,6 +4,7 @@ PORTNAME=	snuffleupagus
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.2.1
 CATEGORIES=	security
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	franco@opnsense.org
 COMMENT=	Security module for PHP 7+