Index: CHANGES
===================================================================
--- CHANGES
+++ CHANGES
@@ -10,6 +10,42 @@
 
 All ports committers are allowed to commit to this file.
 
+20180308:
+AUTHOR: mat@FreeBSD.org
+
+  Ports using USES=php:phpize, php:ext, php:zend, and php:pecl are now
+  flavored.  They will automatically get flavors (php56, php70, php71, php72)
+  depending of the versions they support (set with IGNORE_WITH_PHP).  As a
+  consequence, ports using USES=pear and USES=horde are also flavored.
+
+  As all packages must have different package names, the following variables
+  must be used in PKGNAMEPREFIX/SUFFIX:
+
+    Variable                     + Values                +
+    --------------------------------------------------------------------------------------
+    PHP_PKGNAMEPREFIX            | php56- php72-         | PHP Extensions
+                                 |                       | and modules
+    --------------------------------------------------------------------------------------
+    PHP_PKGNAMESUFFIX            | -php56 -php72         | PHP Applications
+    --------------------------------------------------------------------------------------
+    PECL_PKGNAMEPREFIX           | php56-pecl-           | PECL extensions
+                                 |                       | automatic
+    --------------------------------------------------------------------------------------
+    PEAR_PKGNAMEPREFIX           | php56-pear-           | PEAR modules
+                                 |                       | without PEAR_CHANNEL
+    PEAR_<channel>_PKGNAMEPREFIX | php56-pear-channel-   | with PEAR_CHANNEL
+                                 |                       | automatic
+
+  In all the ports with PHP dependencies, the *_DEPENDS entries MUST end with
+  the flavor so that the framework knows which to build/use.  This is done by
+  appending '@${PHP_FLAVOR}' after the origin.  For example:
+
+    RUN_DEPENDS=  ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR} \
+                  ${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR} \
+
+  PHP applications (for example, www/wordpress) can also get flavors, change
+  USES=php to USES=php:flavors, and add PHP_PKGNAMESUFFIX to its PKGNAMESUFFIX.
+
 20180125:
 AUTHOR: mat@FreeBSD.org
 
Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10157,3 +10157,15 @@
 audio/amp||2018-03-02|Has expired: No more upstream
 devel/alf||2018-03-02|Has expired: Abandonware, unused in the ports tree
 net/remmina-plugin-gnome|net/remmina-plugin-secret|2018-03-04|Renamed upstream
+databases/php70-memcache|databases/php-memcache@php70|2018-03-05|Merge into a flavorized version
+databases/php71-memcache|databases/php-memcache@php71|2018-03-05|Merge into a flavorized version
+databases/php72-memcache|databases/php-memcache@php72|2018-03-05|Merge into a flavorized version
+ftp/php56-fastdfs|ftp/php-fastdfs@php56|2018-03-05|Merge into flavorized version
+ftp/php70-fastdfs|ftp/php-fastdfs@php70|2018-03-05|Merge into flavorized version
+ftp/php71-fastdfs|ftp/php-fastdfs@php71|2018-03-05|Merge into flavorized version
+ftp/php72-fastdfs|ftp/php-fastdfs@php72|2018-03-05|Merge into flavorized version
+www/unit-php56|www/unit-php@php56|2018-03-05|Merge into flavorized version
+www/unit-php70|www/unit-php@php70|2018-03-05|Merge into flavorized version
+www/unit-php71|www/unit-php@php71|2018-03-05|Merge into flavorized version
+www/unit-php72|www/unit-php@php72|2018-03-05|Merge into flavorized version
+databases/php70-memcached|databases/php-memcached|2018-03-05|Move to flavorized version.
Index: Mk/Uses/horde.mk
===================================================================
--- Mk/Uses/horde.mk
+++ Mk/Uses/horde.mk
@@ -11,10 +11,6 @@
 
 MASTER_SITES?=	http://pear.horde.org/get/
 
-BUILD_DEPENDS+=	${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
-RUN_DEPENDS+=	${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
-
-PKGNAMEPREFIX?=	pear-
 HORDE_DIR?=	www/horde
 
 CONFLICTS+=	horde3-*.[0-9]*
@@ -142,7 +138,7 @@
 .  if !defined(horde-${DEP}-DEPEND)
 UNKNOWN_HORDE_PACKAGES+=	${DEP}
 .  else
-RUN_DEPENDS+=	${horde-${DEP}-DEPEND}
+RUN_DEPENDS+=	${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
 .  endif
 . endfor
 .endif
@@ -152,7 +148,7 @@
 .  if !defined(horde-${DEP}-DEPEND)
 UNKNOWN_HORDE_PACKAGES+=	${DEP}
 .  else
-BUILD_DEPENDS+=	${horde-${DEP}-DEPEND}
+BUILD_DEPENDS+=	${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
 .  endif
 . endfor
 .endif
Index: Mk/Uses/pear.mk
===================================================================
--- Mk/Uses/pear.mk
+++ Mk/Uses/pear.mk
@@ -4,7 +4,10 @@
 #
 # Feature:	pear
 # Usage:	USES=pear
-# Valid ARGS:	none
+# Valid ARGS:	env
+#
+#	- env : Only provide the environment variables, no fetch/build/install
+#		targets.
 #
 # MAINTAINER=	portmgr@FreeBSD.org
 
@@ -12,35 +15,51 @@
 _INCLUDE_USES_PEAR_MK=	yes
 _USES_POST+=	pear
 
-.if !empty(pear_ARGS)
-IGNORE+=	USES=pear takes not arguments
-.endif
+_valid_pear_ARGS=		env
+
+# Sanity check
+.  for arg in ${pear_ARGS}
+.    if empty(_valid_pear_ARGS:M${arg})
+IGNORE=	Incorrect 'USES+= pear:${cmake_ARGS}' usage: argument [${arg}] is not recognized
+.    endif
+.  endfor
 
+php_ARGS+=	flavors
+.include "${USESDIR}/php.mk"
+
+.  if empty(pear_ARGS:Menv)
 MASTER_SITES?=	http://pear.php.net/get/
 
 EXTRACT_SUFX?=	.tgz
 DIST_SUBDIR?=	PEAR
 
-BUILD_DEPENDS+=	pear:devel/pear
-RUN_DEPENDS+=	pear:devel/pear
-
-.if !defined(USE_PHPIZE)
+.    if !defined(USE_PHPIZE)
 NO_BUILD=	yes
-.endif
+.    endif
+.  endif
 
-.if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != ""
-PKGNAMEPREFIX?=	pear-${PEAR_CHANNEL}-
+BUILD_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
+
+PEAR_PKGNAMEPREFIX=	php${PHP_VER}-pear-
+
+.  if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != ""
+PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX=	php${PHP_VER}-pear-${PEAR_CHANNEL}-
+PKGNAMEPREFIX?=	${PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX}
 PEARPKGREF=	${PEAR_CHANNEL}/${PORTNAME}
-.else
-PKGNAMEPREFIX?=	pear-
+PEAR_CHANNEL_VER?=	>=0
+BUILD_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
+RUN_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
+.  else
+PKGNAMEPREFIX?=	${PEAR_PKGNAMEPREFIX}
 PEARPKGREF=	${PORTNAME}
-.endif
+.  endif
 
-.if exists(${LOCALBASE}/bin/php-config)
+.  if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
+.  else
 PHP_BASE=	${LOCALBASE}
-.endif
+.  endif
 PEAR=		${LOCALBASE}/bin/pear
 LPEARDIR=	share/pear
 LPKGREGDIR=	${LPEARDIR}/packages/${PKGNAME}
@@ -58,32 +77,36 @@
 SQLSDIR=	${PHP_BASE}/${LSQLSDIR}
 SCRIPTFILESDIR=	${LOCALBASE}/bin
 TESTSDIR=	${PHP_BASE}/${LTESTSDIR}
-.if defined(CATEGORY) && !empty(CATEGORY)
+.  if defined(CATEGORY) && !empty(CATEGORY)
 LINSTDIR=	${LPEARDIR}/${CATEGORY}
-.else
+.  else
 LINSTDIR=	${LPEARDIR}
-.endif
+.  endif
 INSTDIR=	${PHP_BASE}/${LINSTDIR}
 
 SUB_LIST+=	PKG_NAME=${PEARPKGREF}
 
-.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist)
+.  if empty(pear_ARGS:Menv)
+.    if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist)
 PLIST=		${WRKDIR}/PLIST
-.endif
+.    endif
+PKGINSTALL?=	${PORTSDIR}/devel/pear/pear-install
+PKGDEINSTALL?=	${WRKDIR}/pear-deinstall
+.  endif
+
 PLIST_SUB+=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
 		TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
 		SCRIPTFILESDIR=${LCRIPTSDIR}
 
-PKGINSTALL?=	${PORTSDIR}/devel/pear/pear-install
-PKGDEINSTALL?=	${WRKDIR}/pear-deinstall
-
 .endif
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK)
 _INCLUDE_USES_PEAR_POST_MK=	yes
 
+.  if empty(pear_ARGS:Menv)
+
 _USES_install+=	250:pear-pre-install
 pear-pre-install:
-.if exists(${LOCALBASE}/lib/php.DIST_PHP)	\
+.    if exists(${LOCALBASE}/lib/php.DIST_PHP)	\
 	|| exists(${PHP_BASE}/lib/php.DIST_PHP)	\
 	|| exists(${LOCALBASE}/.PEAR.pkg)	\
 	|| exists(${PHP_BASE}/.PEAR.pkg)
@@ -92,7 +115,7 @@
 	@${ECHO_MSG} "	Please deinstall your installed pear- ports."
 	@${ECHO_MSG} ""
 	@${FALSE}
-.endif
+.    endif
 
 DIRFILTER=	${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \
 		    | ( while read r; do \
@@ -108,16 +131,16 @@
 	            done \
 	      ) | ${SORT} -ur
 
-.if !defined(USE_PHPIZE)
+.    if !defined(USE_PHPIZE)
 _USES_install+=	260:do-autogenerate-plist
 do-autogenerate-plist:
 	@${ECHO_MSG} "===>   Generating packing list with pear"
 	@${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml
 	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null
-.for R in .channels .depdb .depdblock .filemap .lock .registry
+.      for R in .channels .depdb .depdblock .filemap .lock .registry
 	@${RM} -r ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R}
 	@${RM} -r ${WRKDIR}/inst/${R}
-.endfor
+.      endfor
 	@FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \
 	${GREP} -v -E "^${PREFIX}/"` || exit 0; \
 	${ECHO_CMD} $${FILES}; if ${TEST} -n "$${FILES}"; then \
@@ -131,11 +154,11 @@
 do-install:
 	@cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml
 # Clean up orphans re-generated by pear-install
-.for R in .channels .depdb .depdblock .filemap .lock .registry
+.      for R in .channels .depdb .depdblock .filemap .lock .registry
 	@${RM} -r ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R}
 	@${RM} -r ${STAGEDIR}/${R}
-.endfor
-.endif
+.      endfor
+.    endif
 
 _USES_install+=	270:do-generate-deinstall-script
 do-generate-deinstall-script:
@@ -149,4 +172,6 @@
 show-depends: patch
 	@${PEAR} package-dependencies ${WRKDIR}/package.xml
 
+.  endif
+
 .endif
Index: Mk/Uses/php.mk
===================================================================
--- Mk/Uses/php.mk
+++ Mk/Uses/php.mk
@@ -16,6 +16,9 @@
 #	- web      : Want the Apache Module or the CGI version of PHP.
 #	- embed    : Want the embedded library version of PHP.
 #	- pecl     : Fetches from PECL.
+#	- flavors  : Generates flavors for supported versions.
+#		     (implied by phpize,ext,zend,pecl)
+#	- noflavors: Prevents generation of flavor.
 #
 # If the port requires a predefined set of PHP extensions, they can be
 # listed in this way:
@@ -43,7 +46,6 @@
 #
 # The port can set these options in its Makefile before bsd.port.pre.mk:
 #
-# DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed.
 # IGNORE_WITH_PHP=N - The port doesn't work with PHP version N.
 #
 # You may combine multiple WANT_PHP_* knobs.
@@ -58,10 +60,6 @@
 
 _INCLUDE_USES_PHP_MK=	yes
 
-.  if defined(DEFAULT_PHP_VER)
-WARNING+=	"DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead"
-.  endif
-
 .  if defined(USE_PHPIZE) && empty(php_ARGS:Mphpize)
 php_ARGS+=	phpize
 .  endif
@@ -84,6 +82,9 @@
 .  if ${php_ARGS:Mbuild} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
 DEV_WARNING+=	"USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed"
 .  endif
+.  if ${php_ARGS:Mflavors} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} )
+DEV_WARNINGS+=	"USES=php:flavors is included in phpize, ext, zend and pecl, so it is not needed."
+.  endif
 .  if ${php_ARGS:Mphpize} && ( ${php_ARGS:Mext} || ${php_ARGS:Mzend} )
 DEV_WARNING+=	"USES=php:phpize is included in USES=php:ext and USES=php:zend, so it is not needed"
 .  endif
@@ -94,26 +95,91 @@
 DEV_WARNING+=	"USES=php:ext is included in USES=php:pecl, so it is not needed"
 .  endif
 
+.  if ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} ) && !${php_ARGS:Mnoflavors}
+php_ARGS+=	flavors
+.  endif
+
+.  if ${php_ARGS:Mnoflavors} && ${php_ARGS:Mflavors}
+php_ARGS:=	${php_ARGS:Nflavors}
+.  endif
+
+
 .  if ${php_ARGS:Mpecl}
 php_ARGS+=	ext
+.    if !defined(USE_GITHUB)
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	http://pecl.php.net/get/
-PKGNAMEPREFIX=	pecl-
+.    endif
+PKGNAMEPREFIX=	${PECL_PKGNAMEPREFIX}
 DIST_SUBDIR=	PECL
 .  endif
 
 PHPBASE?=	${LOCALBASE}
+
+_ALL_PHP_VERSIONS=	56 70 71 72
+
+# Make the already installed PHP the default one.
 .  if exists(${PHPBASE}/etc/php.conf)
 .include "${PHPBASE}/etc/php.conf"
 .    if !defined(PHP_EXT_DIR)
 PHP_EXT_DIR!=	${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p'
 .    endif
+_INSTALLED_PHP_VER:=	${PHP_VER}
+# If we have an installed version of PHP, and this does not support it, set
+# IGNORE to fail early as you cannot install two different versions of PHP at
+# the same time anyway.
+.    if defined(IGNORE_WITH_PHP) && ${IGNORE_WITH_PHP:M${_INSTALLED_PHP_VER}}
+IGNORE=	does not work with PHP versions "${IGNORE_WITH_PHP}" and "${_INSTALLED_PHP_VER}" is installed.
+.    endif
+
 .  else
-DEFAULT_PHP_VER?=	${PHP_DEFAULT:S/.//}
+PHP_VER?=	${PHP_DEFAULT:S/.//}
+.  endif # .if exists(${PHPBASE}/etc/php.conf)
+
+# Use the "default" php version as th first version for flavors, so that it
+# gets to be the default flavor.
+_ALL_FLAVOR_VERSIONS=	${PHP_VER} ${_ALL_PHP_VERSIONS:N${PHP_VER}}
+
+# If we want flavors, fill in FLAVORS with the allowed PHP versions, if some
+# cannot be used, or all of them if they all can.
+# Then if there is no flavor set, use the first one as the default.
+.  if ${php_ARGS:Mflavors}
+.    if empty(FLAVORS)
+.      if defined(IGNORE_WITH_PHP)
+.        for _v in ${_ALL_FLAVOR_VERSIONS}
+.          if empty(IGNORE_WITH_PHP:M${_v})
+# Avoid a leading space in FLAVORS.
+.            if empty(FLAVORS)
+FLAVORS:=	php${_v}
+.            else
+FLAVORS:=	${FLAVORS} php${_v}
+.            endif
+.          endif
+.        endfor
+.      else # defined(IGNORE_WITH_PHP)
+FLAVORS:=	${_ALL_FLAVOR_VERSIONS:S/^/php/}
+.      endif # defined(IGNORE_WITH_PHP)
+.    endif
+.    if empty(FLAVOR)
+FLAVOR=	${FLAVORS:[1]}
+.    endif
+.  endif
+
+# This variable is for dependencies lines, so you write:
+# ${PHP_PKGNAMEPREFIX}foo:devel/php-foo@${PHP_FLAVOR}
+PHP_FLAVOR=	php${PHP_VER}
 
+# So, we have PHP flavors, set PHP_VER accordingly.
+.  if ${FLAVOR:Mphp[0-9][0-9]}
+PHP_VER=	${FLAVOR:S/^php//}
+.  endif
+
+# If lang/php is not installed, or if we have a php flavor but want a non
+# default one, we need to overwrite those.
+.  if empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || \
+	(${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]})
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-PHP_VER?=	${DEFAULT_PHP_VER}
 .    if ${PHP_VER} == 72
 PHP_EXT_DIR=   20170718
 PHP_EXT_INC=    pcre spl
@@ -132,6 +198,8 @@
 PHP_EXT_INC=	pcre spl
 .    endif
 
+# Try to figure out what the PHP_EXT_DIR should be WRT the
+# installed Apache port.
 HTTPD?=		${LOCALBASE}/sbin/httpd
 .    if exists(${HTTPD})
 APACHE_THR!=	${HTTPD} -V | ${AWK} '/threaded/ {print $2}'
@@ -148,8 +216,12 @@
 PHP_EXT_DIR:=	${PHP_EXT_DIR}-debug
 .    endif
 PHP_SAPI?=	""
-.  endif	# .if exists(${PHPBASE}/etc/php.conf)
-PHP_EXT_INC?=	""
+.  endif # empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]})
+
+# Set a few PKGNAME(PRE|SUF)FIX to be used in ports.
+PHP_PKGNAMEPREFIX=	php${PHP_VER}-
+PHP_PKGNAMESUFFIX=	-php${PHP_VER}
+PECL_PKGNAMEPREFIX=	php${PHP_VER}-pecl-
 
 .  if defined(IGNORE_WITH_PHP)
 .    for VER in ${IGNORE_WITH_PHP}
@@ -220,7 +292,7 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config
 
-configure-message: phpize-message do-phpize
+_USES_configure+=	190:phpize-message 250:do-phpize
 
 phpize-message:
 	@${ECHO_MSG} "===>  PHPizing for ${PKGNAME}"
@@ -308,9 +380,9 @@
 
 bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
 .    if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72
-bitset_DEPENDS=	math/pecl-bitset
+bitset_DEPENDS=	math/pecl-bitset@${PHP_FLAVOR}
 .    else
-bitset_DEPENDS=	math/pecl-bitset2
+bitset_DEPENDS=	math/pecl-bitset2@${PHP_FLAVOR}
 .    endif
 bz2_DEPENDS=	archivers/php${PHP_VER}-bz2
 calendar_DEPENDS=	misc/php${PHP_VER}-calendar
@@ -329,31 +401,31 @@
 gmp_DEPENDS=	math/php${PHP_VER}-gmp
 hash_DEPENDS=	security/php${PHP_VER}-hash
 iconv_DEPENDS=	converters/php${PHP_VER}-iconv
-igbinary_DEPENDS=	converters/pecl-igbinary
+igbinary_DEPENDS=	converters/pecl-igbinary@${PHP_FLAVOR}
 imap_DEPENDS=	mail/php${PHP_VER}-imap
 interbase_DEPENDS=	databases/php${PHP_VER}-interbase
 .    if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72
 intl_DEPENDS=	devel/php${PHP_VER}-intl
 .    else
-intl_DEPENDS=	devel/pecl-intl
+intl_DEPENDS=	devel/pecl-intl@${PHP_FLAVOR}
 .    endif
 json_DEPENDS=	devel/php${PHP_VER}-json
 ldap_DEPENDS=	net/php${PHP_VER}-ldap
 mbstring_DEPENDS=	converters/php${PHP_VER}-mbstring
 .    if ${PHP_VER} >= 72
-mcrypt_DEPENDS=	security/pecl-mcrypt
+mcrypt_DEPENDS=	security/pecl-mcrypt@${PHP_FLAVOR}
 .    else
 mcrypt_DEPENDS=	security/php${PHP_VER}-mcrypt
 .    endif
 .    if ${PHP_VER} >= 70
-memcache_DEPENDS=	databases/php${PHP_VER}-memcache
+memcache_DEPENDS=	databases/php-memcache@${PHP_FLAVOR}
 .    else
-memcache_DEPENDS=	databases/pecl-memcache
+memcache_DEPENDS=	databases/pecl-memcache@${PHP_FLAVOR}
 .    endif
 .    if ${PHP_VER} >= 70
-memcached_DEPENDS=	databases/pecl-memcached
+memcached_DEPENDS=	databases/pecl-memcached@${PHP_FLAVOR}
 .    else
-memcached_DEPENDS=	databases/pecl-memcached2
+memcached_DEPENDS=	databases/pecl-memcached2@${PHP_FLAVOR}
 .    endif
 mssql_DEPENDS=	databases/php${PHP_VER}-mssql
 mysql_DEPENDS=	databases/php${PHP_VER}-mysql
@@ -364,7 +436,7 @@
 opcache_DEPENDS=	www/php${PHP_VER}-opcache
 openssl_DEPENDS=security/php${PHP_VER}-openssl
 pcntl_DEPENDS=	devel/php${PHP_VER}-pcntl
-pdf_DEPENDS=	print/pecl-pdflib
+pdf_DEPENDS=	print/pecl-pdflib@${PHP_FLAVOR}
 pdo_DEPENDS=	databases/php${PHP_VER}-pdo
 pdo_dblib_DEPENDS=	databases/php${PHP_VER}-pdo_dblib
 pdo_firebird_DEPENDS=	databases/php${PHP_VER}-pdo_firebird
@@ -376,10 +448,10 @@
 phar_DEPENDS=	archivers/php${PHP_VER}-phar
 posix_DEPENDS=	sysutils/php${PHP_VER}-posix
 pspell_DEPENDS=	textproc/php${PHP_VER}-pspell
-radius_DEPENDS=	net/pecl-radius
+radius_DEPENDS=	net/pecl-radius@${PHP_FLAVOR}
 readline_DEPENDS=	devel/php${PHP_VER}-readline
 recode_DEPENDS=	converters/php${PHP_VER}-recode
-redis_DEPENDS=	databases/pecl-redis
+redis_DEPENDS=	databases/pecl-redis@${PHP_FLAVOR}
 session_DEPENDS=www/php${PHP_VER}-session
 shmop_DEPENDS=	devel/php${PHP_VER}-shmop
 simplexml_DEPENDS=	textproc/php${PHP_VER}-simplexml
Index: UPDATING
===================================================================
--- UPDATING
+++ UPDATING
@@ -5,6 +5,22 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20180308:
+  AFFECTS: */php* */pecl* */pear*
+  AUTHOR: mat@FreeBSD.org
+
+  PHP extensions and modules have been flavored.
+
+  People using Poudriere 3.2+ and binary packages do not have to do anything.
+
+  PECL extensions and PEAR modules package names have changed from pecl- and
+  pear- to phpXX-pecl and phpXX-pear-.
+
+  For other people, to build the PHP 7.2 version of, for example,
+  databases/php-memcached, you need to run:
+
+    # make FLAVOR=php72 install
+
 20180220:
   AFFECTS: users of www/nextcloud
   AUTHOR: brnrd@FreeBSD.org
Index: archivers/pear-File_Archive/Makefile
===================================================================
--- archivers/pear-File_Archive/Makefile
+++ archivers/pear-File_Archive/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files
 
-BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type
-RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type
+BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR}
 
 USES=		pear php
 NO_ARCH=	yes
@@ -22,8 +22,8 @@
 PEAR_MAIL_MIME_DESC=	PEAR::Mail_Mime support
 PEAR_CACHE_LITE_DESC=	PEAR::Cache_Lite support
 
-PEAR_MAIL_RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail
-PEAR_MAIL_MIME_RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
-PEAR_CACHE_LITE_RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite
+PEAR_MAIL_RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
+PEAR_MAIL_MIME_RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
+PEAR_CACHE_LITE_RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: archivers/pear-Horde_Compress/Makefile
===================================================================
--- archivers/pear-Horde_Compress/Makefile
+++ archivers/pear-Horde_Compress/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_Compress
 PORTVERSION=	2.2.1
 CATEGORIES=	archivers www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Compression API
Index: archivers/pear-Horde_Compress_Fast/Makefile
===================================================================
--- archivers/pear-Horde_Compress_Fast/Makefile
+++ archivers/pear-Horde_Compress_Fast/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_Compress_Fast
 PORTVERSION=	1.1.1
 CATEGORIES=	archivers www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Fast Compression Library
Index: archivers/pear-Horde_Pack/Makefile
===================================================================
--- archivers/pear-Horde_Pack/Makefile
+++ archivers/pear-Horde_Pack/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_Pack
 PORTVERSION=	1.0.7
 CATEGORIES=	archivers www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Pack Utility
Index: archivers/php-horde_lz4/Makefile
===================================================================
--- archivers/php-horde_lz4/Makefile
+++ archivers/php-horde_lz4/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	1.0.10
 CATEGORIES=	archivers pear
 MASTER_SITES=	http://pear.horde.org/get/
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PECL_PKGNAMEPREFIX}
 DIST_SUBDIR=	PECL
 
 MAINTAINER=	mm@FreeBSD.org
Index: archivers/php-snappy/Makefile
===================================================================
--- archivers/php-snappy/Makefile
+++ archivers/php-snappy/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	snappy
 PORTVERSION=	0.1.9
 CATEGORIES=	archivers
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP extension for the snappy compression algorithm
Index: chinese/php-opencc/Makefile
===================================================================
--- chinese/php-opencc/Makefile
+++ chinese/php-opencc/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	opencc
 PORTVERSION=	0.0.0.20161110
 CATEGORIES=	chinese
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	OpenCC shared extension for php
Index: chinese/phpbb-tw/Makefile
===================================================================
--- chinese/phpbb-tw/Makefile
+++ chinese/phpbb-tw/Makefile
@@ -12,10 +12,10 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Traditional Chinese version of phpBB
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
 CONFLICTS=	phpbb-[0-9]*
-USES=		dos2unix
+USES=		dos2unix php
 
 # Get HOSTNAME
 .if exists(/sbin/sysctl)
Index: converters/php5-bsdconv/Makefile
===================================================================
--- converters/php5-bsdconv/Makefile
+++ converters/php5-bsdconv/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	11.3.0
 PORTREVISION=	1
 CATEGORIES=	converters
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	PHP wrapper for bsdconv
Index: databases/Makefile
===================================================================
--- databases/Makefile
+++ databases/Makefile
@@ -608,6 +608,8 @@
     SUBDIR += pguri
     SUBDIR += pgworksheet
     SUBDIR += php-mdcached
+    SUBDIR += php-memcache
+    SUBDIR += php-memcached
     SUBDIR += php-xapian
     SUBDIR += php5-pdo_cassandra
     SUBDIR += php5-tarantool
@@ -630,8 +632,6 @@
     SUBDIR += php7-tarantool
     SUBDIR += php70-dba
     SUBDIR += php70-interbase
-    SUBDIR += php70-memcache
-    SUBDIR += php70-memcached
     SUBDIR += php70-mysqli
     SUBDIR += php70-odbc
     SUBDIR += php70-pdo
@@ -645,7 +645,6 @@
     SUBDIR += php70-sqlite3
     SUBDIR += php71-dba
     SUBDIR += php71-interbase
-    SUBDIR += php71-memcache
     SUBDIR += php71-mysqli
     SUBDIR += php71-odbc
     SUBDIR += php71-pdo
@@ -659,7 +658,6 @@
     SUBDIR += php71-sqlite3
     SUBDIR += php72-dba
     SUBDIR += php72-interbase
-    SUBDIR += php72-memcache
     SUBDIR += php72-mysqli
     SUBDIR += php72-odbc
     SUBDIR += php72-pdo
Index: databases/pear-DB_DataObject/Makefile
===================================================================
--- databases/pear-DB_DataObject/Makefile
+++ databases/pear-DB_DataObject/Makefile
@@ -11,10 +11,10 @@
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/docs/LICENCE.txt
 
-BUILD_DEPENDS=	pear-DB>=1.7.0:databases/pear-DB \
-		pear-Date>=1.4.3:devel/pear-Date
-RUN_DEPENDS=	pear-DB>=1.7.0:databases/pear-DB \
-		pear-Date>=1.4.3:devel/pear-Date
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
 
 USES=		pear
 
@@ -23,7 +23,7 @@
 PEAR_MDB2_DESC=		PEAR::MDB2 support
 PEAR_VALIDATE_DESC=	PEAR::Validate support
 
-PEAR_MDB2_RUN_DEPENDS=	pear-MDB2>=2.3.0:databases/pear-MDB2
-PEAR_VALIDATE_RUN_DEPENDS=	pear-Validate>=0.1.1:devel/pear-Validate
+PEAR_MDB2_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}MDB2>=2.3.0:databases/pear-MDB2@${PHP_FLAVOR}
+PEAR_VALIDATE_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.1.1:devel/pear-Validate@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: databases/pear-DB_DataObject_FormBuilder/Makefile
===================================================================
--- databases/pear-DB_DataObject_FormBuilder/Makefile
+++ databases/pear-DB_DataObject_FormBuilder/Makefile
@@ -8,17 +8,17 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Automatically build HTML_QuickForm objects using DB_DataObject
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
-		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
-		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR}
 
 USES=		pear
 OPTIONS_DEFINE=	PEAR_DATE PEAR_HTML_TABLE
 PEAR_DATE_DESC=	PEAR::Date support
 PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table support
 
-PEAR_DATE_RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date
-PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table
+PEAR_DATE_RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
+PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: databases/pear-DB_Pager/Makefile
===================================================================
--- databases/pear-DB_Pager/Makefile
+++ databases/pear-DB_Pager/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 USES=	pear
 
Index: databases/pear-DB_QueryTool/Makefile
===================================================================
--- databases/pear-DB_QueryTool/Makefile
+++ databases/pear-DB_QueryTool/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR OO-interface for easily retrieving and modifying data in a DB
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
-		${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
-		${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-DB_Sqlite_Tools/Makefile
===================================================================
--- databases/pear-DB_Sqlite_Tools/Makefile
+++ databases/pear-DB_Sqlite_Tools/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	an object oriented interface to backup Sqlite databases
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
-		${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB \
-		${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-DB_Table/Makefile
===================================================================
--- databases/pear-DB_Table/Makefile
+++ databases/pear-DB_Table/Makefile
@@ -17,8 +17,8 @@
 PEAR_DB_DESC=	PEAR::DB support
 PEAR_MDB2_DESC=	PEAR::MDB2 support
 
-PEAR_HTML_QUICKFORM_RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_HTML_QUICKFORM_RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: databases/pear-DB_ldap/Makefile
===================================================================
--- databases/pear-DB_ldap/Makefile
+++ databases/pear-DB_ldap/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR DB compliant interface to LDAP servers
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-DB_ldap2/Makefile
===================================================================
--- databases/pear-DB_ldap2/Makefile
+++ databases/pear-DB_ldap2/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR DB compliant interface to LDAP v2 and v3 database
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 USE_PHP=	ldap
 USES=		pear php
Index: databases/pear-DoctrineCommon/Makefile
===================================================================
--- databases/pear-DoctrineCommon/Makefile
+++ databases/pear-DoctrineCommon/Makefile
@@ -11,9 +11,6 @@
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-
 USES=	pear
 PEAR_CHANNEL=	doctrine
 
Index: databases/pear-DoctrineDBAL/Makefile
===================================================================
--- databases/pear-DoctrineDBAL/Makefile
+++ databases/pear-DoctrineDBAL/Makefile
@@ -11,10 +11,8 @@
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \
-	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
-	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console
+RUN_DEPENDS=	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
+	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR}
 
 OPTIONS_DEFINE=	DBLIB MYSQL ODBC PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
Index: databases/pear-DoctrineORM/Makefile
===================================================================
--- databases/pear-DoctrineORM/Makefile
+++ databases/pear-DoctrineORM/Makefile
@@ -11,12 +11,10 @@
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \
-	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \
-	${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL \
-	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console \
-	${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml
+RUN_DEPENDS=	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
+	${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL@${PHP_FLAVOR} \
+	${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} \
+	${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml@${PHP_FLAVOR}
 
 USES=	pear
 PEAR_CHANNEL=	doctrine
Index: databases/pear-Horde_Db/Makefile
===================================================================
--- databases/pear-Horde_Db/Makefile
+++ databases/pear-Horde_Db/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_Db
 PORTVERSION=	2.4.0
 CATEGORIES=	databases www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Database Libraries
Index: databases/pear-Horde_HashTable/Makefile
===================================================================
--- databases/pear-Horde_HashTable/Makefile
+++ databases/pear-Horde_HashTable/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_HashTable
 PORTVERSION=	1.2.6
 CATEGORIES=	databases www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Hash Table Interface
Index: databases/pear-Horde_Mongo/Makefile
===================================================================
--- databases/pear-Horde_Mongo/Makefile
+++ databases/pear-Horde_Mongo/Makefile
@@ -3,12 +3,10 @@
 PORTNAME=	Horde_Mongo
 PORTVERSION=	1.1.0
 CATEGORIES=	databases www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Mongo Configuration
 
 USES=	horde
-#RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:databases/pecl-mongo
 
 .include <bsd.port.mk>
Index: databases/pear-MDB/Makefile
===================================================================
--- databases/pear-MDB/Makefile
+++ databases/pear-MDB/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR unified API for DB access, based on user meta data
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-MDB2_Driver_mysql/Makefile
===================================================================
--- databases/pear-MDB2_Driver_mysql/Makefile
+++ databases/pear-MDB2_Driver_mysql/Makefile
@@ -10,7 +10,7 @@
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-MDB2>=0:databases/pear-MDB2
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
Index: databases/pear-MDB2_Driver_mysqli/Makefile
===================================================================
--- databases/pear-MDB2_Driver_mysqli/Makefile
+++ databases/pear-MDB2_Driver_mysqli/Makefile
@@ -10,7 +10,7 @@
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-MDB2>=0:databases/pear-MDB2
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
Index: databases/pear-MDB2_Driver_pgsql/Makefile
===================================================================
--- databases/pear-MDB2_Driver_pgsql/Makefile
+++ databases/pear-MDB2_Driver_pgsql/Makefile
@@ -10,7 +10,7 @@
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-MDB2>=0:databases/pear-MDB2
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
Index: databases/pear-MDB2_Schema/Makefile
===================================================================
--- databases/pear-MDB2_Schema/Makefile
+++ databases/pear-MDB2_Schema/Makefile
@@ -8,14 +8,14 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR XML based database schema manager
 
-BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2 \
-		${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2 \
-		${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 USES=	pear
 
Index: databases/pear-MDB_QueryTool/Makefile
===================================================================
--- databases/pear-MDB_QueryTool/Makefile
+++ databases/pear-MDB_QueryTool/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR OO-interface for easily retrieving and modifying data in a DB
 
-BUILD_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB \
-		${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS:=	${PEARDIR}/MDB.php:databases/pear-MDB \
-		${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \
+		${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-Structures_DataGrid_DataSource_Array/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_Array/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_Array/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using arrays
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using CSV files
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-Structures_DataGrid_DataSource_DB/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_DB/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_DB/Makefile
@@ -8,9 +8,9 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DB datasource driver for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB.php:databases/pear-DB \
-		${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
+		${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::DB and an SQL query
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 USES=	pear
 USE_PHP=	mysql
Index: databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::DB_Table
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/Table.php:databases/pear-DB_Table
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/Table.php:databases/pear-DB_Table
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB/Table.php:databases/pear-DB_Table@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB/Table.php:databases/pear-DB_Table@${PHP_FLAVOR}
 
 USES=	pear
 USE_PHP=	mysql
Index: databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::DB_DataObject
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR}
 
 USES=	pear
 USE_PHP=	mysql
Index: databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using PEAR::MDB2 and an SQL query
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/MDB2.php:databases/pear-MDB2
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/MDB2.php:databases/pear-MDB2
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
 
 USES=	pear
 USE_PHP=	mysql
Index: databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
===================================================================
--- databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
+++ databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using PHP Data Objects (PDO) and an SQL query
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
 
 USES=		pear
 
Index: databases/pear-XML_Query2XML/Makefile
===================================================================
--- databases/pear-XML_Query2XML/Makefile
+++ databases/pear-XML_Query2XML/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class transform SQL queries into XML data
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
+BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 OPTIONS_DEFINE=	PEAR_MDB2 PEAR_NET_LDAP2
 PEAR_MDB2_DESC=	Add support for pear-MDB2
@@ -17,7 +17,7 @@
 
 USES=		pear
 
-PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
-PEAR_NET_LDAP2_BUILD_DEPENDS=	${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2
+PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
+PEAR_NET_LDAP2_BUILD_DEPENDS=	${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: databases/pecl-memcached2/Makefile
===================================================================
--- databases/pecl-memcached2/Makefile
+++ databases/pecl-memcached2/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	2.2.0
 PORTREVISION=	5
 CATEGORIES=	databases
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP extension for interfacing with memcached via libmemcached library
Index: databases/pecl-rrd1/Makefile
===================================================================
--- databases/pecl-rrd1/Makefile
+++ databases/pecl-rrd1/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	rrd
 DISTVERSION=	1.1.3
 CATEGORIES=	databases pear
-PKGNAMESUFFIX=	1
 
 MAINTAINER=	daniel@blodan.se
 COMMENT=	PHP bindings to rrd tool system
Index: databases/php-mdcached/Makefile
===================================================================
--- databases/php-mdcached/Makefile
+++ databases/php-mdcached/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	1
 CATEGORIES=	databases devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ivoras@FreeBSD.org
Index: databases/php-memcache/Makefile
===================================================================
--- databases/php-memcache/Makefile
+++ databases/php-memcache/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	memcache
 PORTVERSION=	3.0.9
 CATEGORIES=	databases
-PKGNAMEPREFIX=	php70-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Memcached extension for PHP 7.0
+COMMENT=	Memcached extension for PHP
 
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,8 +17,7 @@
 PORTSCOUT=	skipv:start
 
 CONFIGURE_ARGS=	--with-zlib-dir=/usr
-IGNORE_WITH_PHP=56 71 72
-PHP_VER=	70
+IGNORE_WITH_PHP=56
 USE_CSTD=	gnu89
 USE_PHP=	session:build zlib:build
 USES=		dos2unix php:ext
Index: databases/php-memcached/Makefile
===================================================================
--- databases/php-memcached/Makefile
+++ databases/php-memcached/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	memcached
 PORTVERSION=	3.0.0b1
 CATEGORIES=	databases
-PKGNAMEPREFIX=	php70-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	townwear@gmail.com
 COMMENT=	PHP extension for interfacing with memcached via libmemcached library
@@ -18,8 +18,7 @@
 CONFIGURE_ARGS=	--disable-memcached-sasl --enable-memcached-json --with-libmemcached-dir=${LOCALBASE}
 USES=		pkgconfig php:ext
 USE_PHP=	session:build json:build
-PHP_VER=	70
-IGNORE_WITH_PHP=56 71 72
+IGNORE_WITH_PHP=56
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	php-memcached-dev
Index: databases/php5-pdo_cassandra/Makefile
===================================================================
--- databases/php5-pdo_cassandra/Makefile
+++ databases/php5-pdo_cassandra/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.2.1
 PORTREVISION=	14
 CATEGORIES=	databases
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PDO driver for Apache Cassandra
Index: databases/php5-tarantool/Makefile
===================================================================
--- databases/php5-tarantool/Makefile
+++ databases/php5-tarantool/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.1.0
 PORTEPOCH=	1
 CATEGORIES=	databases
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PECL PHP driver for Tarantool
Index: databases/php7-tarantool/Makefile
===================================================================
--- databases/php7-tarantool/Makefile
+++ databases/php7-tarantool/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.3.0
 PORTREVISION=	1
 CATEGORIES=	databases
-PKGNAMEPREFIX=	php7-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PECL PHP driver for Tarantool
Index: databases/php70-memcache/distinfo
===================================================================
--- /dev/null
+++ databases/php70-memcache/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1512806606
-SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854
-SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689
Index: databases/php70-memcache/pkg-descr
===================================================================
--- /dev/null
+++ databases/php70-memcache/pkg-descr
@@ -1,8 +0,0 @@
-Memcached is a caching daemon designed especially for dynamic web applications
-to decrease database load by storing objects in memory. This extension allows
-you to work with memcached through handy OO and procedural interfaces.
-
-Note that this port uses unofficial development from
-https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch).
-
-WWW: https://github.com/websupport-sk/pecl-memcache
Index: databases/php70-memcache/pkg-plist
===================================================================
--- /dev/null
+++ databases/php70-memcache/pkg-plist
@@ -1 +0,0 @@
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php
Index: databases/php70-memcached/distinfo
===================================================================
--- /dev/null
+++ databases/php70-memcached/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1479968492
-SHA256 (php-memcached-dev-php-memcached-3.0.0b1-c032fba_GH0.tar.gz) = 214354faaa002d52c4ce80a5e56e27b1c35bba48ff3afc3ef6d9f0630b7cf5c4
-SIZE (php-memcached-dev-php-memcached-3.0.0b1-c032fba_GH0.tar.gz) = 82011
Index: databases/php70-memcached/pkg-descr
===================================================================
--- /dev/null
+++ databases/php70-memcached/pkg-descr
@@ -1,8 +0,0 @@
-memcached is a high-performance, distributed memory object caching
-system, generic in nature, but intended for use in speeding up dynamic
-web applications by alleviating database load.
-
-This extension uses the libmemcached library to provide the API for
-communicating with memcached servers.
-
-WWW: https://pecl.php.net/package/memcached
Index: databases/php71-memcache/Makefile
===================================================================
--- databases/php71-memcache/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Gerrit Beine <tux@pinguru.net>
-# $FreeBSD$
-
-PORTNAME=	memcache
-PORTVERSION=	3.0.9
-CATEGORIES=	databases
-PKGNAMEPREFIX=	php71-
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Memcached extension for PHP 7.1
-
-LICENSE=	PHP30
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-OPTIONS_DEFINE=	EXAMPLES
-
-PORTSCOUT=	skipv:start
-
-CONFIGURE_ARGS=	--with-zlib-dir=/usr
-IGNORE_WITH_PHP=56 70 72
-PHP_VER=	71
-USE_CSTD=	gnu89
-USE_PHP=	session:build zlib:build
-USES=		dos2unix php:ext
-
-GH_ACCOUNT=	websupport-sk
-GH_PROJECT=	pecl-${PORTNAME}
-GH_TAGNAME=	e702b5f
-USE_GITHUB=	yes
-
-post-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/example.php ${STAGEDIR}${EXAMPLESDIR}/
-
-.include <bsd.port.mk>
Index: databases/php71-memcache/distinfo
===================================================================
--- databases/php71-memcache/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1512806606
-SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854
-SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689
Index: databases/php71-memcache/pkg-descr
===================================================================
--- databases/php71-memcache/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Memcached is a caching daemon designed especially for dynamic web applications
-to decrease database load by storing objects in memory. This extension allows
-you to work with memcached through handy OO and procedural interfaces.
-
-Note that this port uses unofficial development from
-https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch).
-
-WWW: https://github.com/websupport-sk/pecl-memcache
Index: databases/php71-memcache/pkg-plist
===================================================================
--- databases/php71-memcache/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php
Index: databases/php72-memcache/Makefile
===================================================================
--- databases/php72-memcache/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Gerrit Beine <tux@pinguru.net>
-# $FreeBSD$
-
-PORTNAME=	memcache
-PORTVERSION=	3.0.9
-CATEGORIES=	databases
-PKGNAMEPREFIX=	php72-
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Memcached extension for PHP 7.2
-
-LICENSE=	PHP30
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-OPTIONS_DEFINE=	EXAMPLES
-
-PORTSCOUT=	skipv:start
-
-CONFIGURE_ARGS=	--with-zlib-dir=/usr
-IGNORE_WITH_PHP=56 70 71
-PHP_VER=	72
-USE_CSTD=	gnu89
-USE_PHP=	session:build zlib:build
-USES=		dos2unix php:ext
-
-GH_ACCOUNT=	websupport-sk
-GH_PROJECT=	pecl-${PORTNAME}
-GH_TAGNAME=	e702b5f
-USE_GITHUB=	yes
-
-post-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/example.php ${STAGEDIR}${EXAMPLESDIR}/
-
-.include <bsd.port.mk>
Index: databases/php72-memcache/distinfo
===================================================================
--- databases/php72-memcache/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1512806606
-SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854
-SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689
Index: databases/php72-memcache/pkg-descr
===================================================================
--- databases/php72-memcache/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Memcached is a caching daemon designed especially for dynamic web applications
-to decrease database load by storing objects in memory. This extension allows
-you to work with memcached through handy OO and procedural interfaces.
-
-Note that this port uses unofficial development from
-https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch).
-
-WWW: https://github.com/websupport-sk/pecl-memcache
Index: databases/php72-memcache/pkg-plist
===================================================================
--- databases/php72-memcache/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php
Index: deskutils/egroupware/Makefile
===================================================================
--- deskutils/egroupware/Makefile
+++ deskutils/egroupware/Makefile
@@ -13,15 +13,15 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${PORTNAME:tl}/doc/LICENSE
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/Net/Sieve.php:net/pear-Net_Sieve \
-		${LOCALBASE}/share/pear/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client \
-		${LOCALBASE}/share/pear/Horde/Nls.php:devel/pear-Horde_Nls \
-		${LOCALBASE}/share/pear/Horde/Mail/Transport.php:mail/pear-Horde_Mail \
-		${LOCALBASE}/share/pear/Horde/Smtp.php:mail/pear-Horde_Smtp \
-		${LOCALBASE}/share/pear/Horde/Compress.php:archivers/pear-Horde_Compress \
-		${LOCALBASE}/share/pear/Horde/Icalendar.php:devel/pear-Horde_Icalendar \
-		${LOCALBASE}/share/pear/Horde/Mapi.php:mail/pear-Horde_Mapi \
-		${LOCALBASE}/share/pear/Horde/Crypt.php:security/pear-Horde_Crypt
+RUN_DEPENDS=	${LOCALBASE}/share/pear/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Nls.php:devel/pear-Horde_Nls@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Mail/Transport.php:mail/pear-Horde_Mail@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Smtp.php:mail/pear-Horde_Smtp@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Compress.php:archivers/pear-Horde_Compress@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Icalendar.php:devel/pear-Horde_Icalendar@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Mapi.php:mail/pear-Horde_Mapi@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Horde/Crypt.php:security/pear-Horde_Crypt@${PHP_FLAVOR}
 
 USES=		cpe php tar:bzip2
 USE_PHP=	bcmath bz2 ctype json session simplexml tidy xmlreader zlib
Index: deskutils/horde-groupware/Makefile
===================================================================
--- deskutils/horde-groupware/Makefile
+++ deskutils/horde-groupware/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	groupware
 PORTVERSION=	5.2.22
 CATEGORIES=	deskutils www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Groupware
Index: deskutils/horde-kronolith/Makefile
===================================================================
--- deskutils/horde-kronolith/Makefile
+++ deskutils/horde-kronolith/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	kronolith
 PORTVERSION=	4.2.23
 CATEGORIES=	deskutils www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde web based calendar
@@ -54,9 +54,9 @@
 		Horde_Util \
 		Horde_View
 
-RUN_DEPENDS+=	${PEARDIR}/Date.php:devel/pear-Date
+RUN_DEPENDS+=	${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
 
-DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+DATE_HOLIDAYS_RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 TIMEOBJECTS_USE=	HORDE_RUN=timeobjects
 XMLWRITER_USE=	PHP=xmlwriter
Index: deskutils/horde-mnemo/Makefile
===================================================================
--- deskutils/horde-mnemo/Makefile
+++ deskutils/horde-mnemo/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	4.2.14
 PORTREVISION=	1
 CATEGORIES=	deskutils www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde web based notes manager
Index: deskutils/horde-nag/Makefile
===================================================================
--- deskutils/horde-nag/Makefile
+++ deskutils/horde-nag/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	nag
 PORTVERSION=	4.2.17
 CATEGORIES=	deskutils www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde web based task list manager
Index: devel/gitphp/Makefile
===================================================================
--- devel/gitphp/Makefile
+++ devel/gitphp/Makefile
@@ -19,7 +19,7 @@
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff@${PHP_FLAVOR}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
Index: devel/horde-content/Makefile
===================================================================
--- devel/horde-content/Makefile
+++ devel/horde-content/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	content
 PORTVERSION=	2.0.6
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde tagging application
Index: devel/horde-timeobjects/Makefile
===================================================================
--- devel/horde-timeobjects/Makefile
+++ devel/horde-timeobjects/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	timeobjects
 PORTVERSION=	2.1.4
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde timeobjects application
Index: devel/horde-whups/Makefile
===================================================================
--- devel/horde-whups/Makefile
+++ devel/horde-whups/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	whups
 DISTVERSION=	3.0.12
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde bug tracking/ticketing system
Index: devel/pear-Config/Makefile
===================================================================
--- devel/pear-Config/Makefile
+++ devel/pear-Config/Makefile
@@ -14,7 +14,7 @@
 
 USES=		pear
 
-PEAR_XML_PARSER_RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+PEAR_XML_PARSER_RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-Date_Holidays/Makefile
===================================================================
--- devel/pear-Date_Holidays/Makefile
+++ devel/pear-Date_Holidays/Makefile
@@ -8,16 +8,16 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR driver based class to calculate holidays
 
-BUILD_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 USES=		pear
 
 OPTIONS_DEFINE=	PEAR_CONSOLE_GETARGS
 PEAR_CONSOLE_GETARGS_DESC=	Console::Getargs support
 
-PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
+PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-Date_Holidays_Austria/Makefile
===================================================================
--- devel/pear-Date_Holidays_Austria/Makefile
+++ devel/pear-Date_Holidays_Austria/Makefile
@@ -9,8 +9,8 @@
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 NO_ARCH=	yes
Index: devel/pear-Date_Holidays_Brazil/Makefile
===================================================================
--- devel/pear-Date_Holidays_Brazil/Makefile
+++ devel/pear-Date_Holidays_Brazil/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Brazil
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Denmark/Makefile
===================================================================
--- devel/pear-Date_Holidays_Denmark/Makefile
+++ devel/pear-Date_Holidays_Denmark/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Denmark
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Discordian/Makefile
===================================================================
--- devel/pear-Date_Holidays_Discordian/Makefile
+++ devel/pear-Date_Holidays_Discordian/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate Discordian holidays
 
-BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=  ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_EnglandWales/Makefile
===================================================================
--- devel/pear-Date_Holidays_EnglandWales/Makefile
+++ devel/pear-Date_Holidays_EnglandWales/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in England and Wales
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Germany/Makefile
===================================================================
--- devel/pear-Date_Holidays_Germany/Makefile
+++ devel/pear-Date_Holidays_Germany/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Germany
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Iceland/Makefile
===================================================================
--- devel/pear-Date_Holidays_Iceland/Makefile
+++ devel/pear-Date_Holidays_Iceland/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Iceland
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Ireland/Makefile
===================================================================
--- devel/pear-Date_Holidays_Ireland/Makefile
+++ devel/pear-Date_Holidays_Ireland/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Ireland
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Italy/Makefile
===================================================================
--- devel/pear-Date_Holidays_Italy/Makefile
+++ devel/pear-Date_Holidays_Italy/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Italy
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Japan/Makefile
===================================================================
--- devel/pear-Date_Holidays_Japan/Makefile
+++ devel/pear-Date_Holidays_Japan/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Japan
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Netherlands/Makefile
===================================================================
--- devel/pear-Date_Holidays_Netherlands/Makefile
+++ devel/pear-Date_Holidays_Netherlands/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the Netherlands
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS:=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Norway/Makefile
===================================================================
--- devel/pear-Date_Holidays_Norway/Makefile
+++ devel/pear-Date_Holidays_Norway/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Norway
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_PHPdotNet/Makefile
===================================================================
--- devel/pear-Date_Holidays_PHPdotNet/Makefile
+++ devel/pear-Date_Holidays_PHPdotNet/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate birthdays of members of PHP.net
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Romania/Makefile
===================================================================
--- devel/pear-Date_Holidays_Romania/Makefile
+++ devel/pear-Date_Holidays_Romania/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Romania
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Slovenia/Makefile
===================================================================
--- devel/pear-Date_Holidays_Slovenia/Makefile
+++ devel/pear-Date_Holidays_Slovenia/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Slovenia
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Sweden/Makefile
===================================================================
--- devel/pear-Date_Holidays_Sweden/Makefile
+++ devel/pear-Date_Holidays_Sweden/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in Sweden
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_UNO/Makefile
===================================================================
--- devel/pear-Date_Holidays_UNO/Makefile
+++ devel/pear-Date_Holidays_UNO/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the UNO
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_USA/Makefile
===================================================================
--- devel/pear-Date_Holidays_USA/Makefile
+++ devel/pear-Date_Holidays_USA/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the USA
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Date_Holidays_Ukraine/Makefile
===================================================================
--- devel/pear-Date_Holidays_Ukraine/Makefile
+++ devel/pear-Date_Holidays_Ukraine/Makefile
@@ -7,8 +7,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Driver based class to calculate holidays in the Ukraine
 
-BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
-RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays
+BUILD_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-FSM/Makefile
===================================================================
--- devel/pear-FSM/Makefile
+++ devel/pear-FSM/Makefile
@@ -13,6 +13,6 @@
 
 USES=		pear
 
-PEAR_GRAPGHVIZ_RUN_DEPENDS=	${PEARDIR}/GraphViz.php:graphics/pear-Image_GraphViz
+PEAR_GRAPGHVIZ_RUN_DEPENDS=	${PEARDIR}/GraphViz.php:graphics/pear-Image_GraphViz@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-File_Iterator/Makefile
===================================================================
--- devel/pear-File_Iterator/Makefile
+++ devel/pear-File_Iterator/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	File_Iterator
 DISTVERSION=	1.4.5
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR FileIterator implementation
@@ -12,9 +12,8 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-
+USES=	pear:env
+PEAR_CHANNEL=	phpunit
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	php-file-iterator
Index: devel/pear-HTML_BBCodeParser/Makefile
===================================================================
--- devel/pear-HTML_BBCodeParser/Makefile
+++ devel/pear-HTML_BBCodeParser/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Parser to replace UBB style tags with their HTML equivalents
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=	pear
 
Index: devel/pear-HTML_CSS/Makefile
===================================================================
--- devel/pear-HTML_CSS/Makefile
+++ devel/pear-HTML_CSS/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class for generating CSS declarations
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_Page2/Makefile
===================================================================
--- devel/pear-HTML_Page2/Makefile
+++ devel/pear-HTML_Page2/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR base class for XHTML page generation
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm/Makefile
===================================================================
--- devel/pear-HTML_QuickForm/Makefile
+++ devel/pear-HTML_QuickForm/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS:=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm2/Makefile
===================================================================
--- devel/pear-HTML_QuickForm2/Makefile
+++ devel/pear-HTML_QuickForm2/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP5 rewrite of the HTML_QuickForm package
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2
-RUN_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm_Controller/Makefile
===================================================================
--- devel/pear-HTML_QuickForm_Controller/Makefile
+++ devel/pear-HTML_QuickForm_Controller/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm_Livesearch/Makefile
===================================================================
--- devel/pear-HTML_QuickForm_Livesearch/Makefile
+++ devel/pear-HTML_QuickForm_Livesearch/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Element for PEAR::HTML_QuickForm to enable a suggest search
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX
-RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
===================================================================
--- devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
+++ devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	chris@smartt.com
 COMMENT=	Implementation of Tableless Renderer for HTML_QuickForm
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm_SelectFilter/Makefile
===================================================================
--- devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ devel/pear-HTML_QuickForm_SelectFilter/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Element for PEAR::HTML_QuickForm that defines dynamic filters
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_QuickForm_advmultiselect/Makefile
===================================================================
--- devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	Element for PEAR::HTML_QuickForm that defines a 2 box multi-select
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \
-		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_Select/Makefile
===================================================================
--- devel/pear-HTML_Select/Makefile
+++ devel/pear-HTML_Select/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR::HTML_Select is a class for generating HTML form select elements
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_Select_Common/Makefile
===================================================================
--- devel/pear-HTML_Select_Common/Makefile
+++ devel/pear-HTML_Select_Common/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Some small PEAR classes to handle common <select> lists
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common	\
-		${PEARDIR}/I18N/Common.php:devel/pear-I18N
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common	\
-		${PEARDIR}/I18N/Common.php:devel/pear-I18N
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}	\
+		${PEARDIR}/I18N/Common.php:devel/pear-I18N@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}	\
+		${PEARDIR}/I18N/Common.php:devel/pear-I18N@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-HTML_Table/Makefile
===================================================================
--- devel/pear-HTML_Table/Makefile
+++ devel/pear-HTML_Table/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR}
 
 USES=	pear
 NO_ARCH=	yes
Index: devel/pear-HTML_Template_Flexy/Makefile
===================================================================
--- devel/pear-HTML_Template_Flexy/Makefile
+++ devel/pear-HTML_Template_Flexy/Makefile
@@ -17,8 +17,8 @@
 
 USES=		pear
 
-PEAR_HTML_JAVASCRIPT_RUN_DEPENDS=	${PEARDIR}/HTML/Javascript.php:devel/pear-HTML_Javascript
-PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext
-PEAR_TRANSLATION2_RUN_DEPENDS=	${PEARDIR}/Translation2.php:sysutils/pear-Translation2
+PEAR_HTML_JAVASCRIPT_RUN_DEPENDS=	${PEARDIR}/HTML/Javascript.php:devel/pear-HTML_Javascript@${PHP_FLAVOR}
+PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext@${PHP_FLAVOR}
+PEAR_TRANSLATION2_RUN_DEPENDS=	${PEARDIR}/Translation2.php:sysutils/pear-Translation2@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-Horde_Cache/Makefile
===================================================================
--- devel/pear-Horde_Cache/Makefile
+++ devel/pear-Horde_Cache/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_Cache
 PORTVERSION=	2.5.5
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Caching API
Index: devel/pear-Horde_Core/Makefile
===================================================================
--- devel/pear-Horde_Core/Makefile
+++ devel/pear-Horde_Core/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	Horde_Core
 DISTVERSION=	2.31.2
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Core Framework libraries
@@ -68,7 +67,7 @@
 USE_HORDE_RUN+=	Horde_Routes
 
 KOLAB_USE=	HORDE_RUN=Horde_Kolab_Server,Horde_Kolab_Session,Horde_Kolab_Storage
-LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:archivers/pecl-lzf
+LZF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:archivers/pecl-lzf@${PHP_FLAVOR}
 SOCKETS_USE=	PHP=sockets
 
 .include <bsd.port.mk>
Index: devel/pear-Horde_Nls/Makefile
===================================================================
--- devel/pear-Horde_Nls/Makefile
+++ devel/pear-Horde_Nls/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	2.2.1
 CATEGORIES=	devel www pear
 MASTER_SITES=	http://pear.horde.org/get/
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Native Language Support
@@ -18,6 +17,6 @@
 GEOIP_DESC=	Depend on geoip PHP extension
 
 GEOIP_USES=	php
-GEOIP_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:net/pecl-geoip
+GEOIP_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:net/pecl-geoip@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-Horde_Queue/Makefile
===================================================================
--- devel/pear-Horde_Queue/Makefile
+++ devel/pear-Horde_Queue/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	Horde_Queue
 PORTVERSION=	1.1.5
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Queue
Index: devel/pear-I18N/Makefile
===================================================================
--- devel/pear-I18N/Makefile
+++ devel/pear-I18N/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR internationalization package
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Net_Gearman/Makefile
===================================================================
--- devel/pear-Net_Gearman/Makefile
+++ devel/pear-Net_Gearman/Makefile
@@ -11,8 +11,8 @@
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear
-RUN_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear
+BUILD_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS=	${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR}
 
 USE_PHP=	json mbstring sockets
 USES=		pear php
Index: devel/pear-PEAR_Info/Makefile
===================================================================
--- devel/pear-PEAR_Info/Makefile
+++ devel/pear-PEAR_Info/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Show Information about your PEAR install and its packages
 
-BUILD_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
-RUN_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs
+BUILD_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs@${PHP_FLAVOR}
 
 OPTIONS_DEFINE=	PHPUNIT
 OPTIONS_DEFAULT=PHPUNIT
@@ -18,6 +18,6 @@
 
 USES=		pear
 
-PHPUNIT_RUN_DEPENDS=	phpunit:devel/phpunit
+PHPUNIT_RUN_DEPENDS=	phpunit:devel/phpunit@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-PEAR_PackageFileManager/Makefile
===================================================================
--- devel/pear-PEAR_PackageFileManager/Makefile
+++ devel/pear-PEAR_PackageFileManager/Makefile
@@ -14,7 +14,7 @@
 
 USES=	pear
 
-PEAR_PHP_COMPATINFO_RUN_DEPENDS=	${PEARDIR}/PHP/CompatInfo.php:devel/pear-PHP_CompatInfo
-PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree
+PEAR_PHP_COMPATINFO_RUN_DEPENDS=	${PEARDIR}/PHP/CompatInfo.php:devel/pear-PHP_CompatInfo@${PHP_FLAVOR}
+PEAR_XML_TREE_RUN_DEPENDS=	${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-PEAR_PackageFileManager2/Makefile
===================================================================
--- devel/pear-PEAR_PackageFileManager2/Makefile
+++ devel/pear-PEAR_PackageFileManager2/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins
-RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins
+BUILD_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/PEAR/PackageFileManager/Plugins.php:devel/pear-PEAR_PackageFileManager_Plugins@${PHP_FLAVOR}
 
 USES=	pear
 
Index: devel/pear-PEAR_PackageFileManager_Plugins/Makefile
===================================================================
--- devel/pear-PEAR_PackageFileManager_Plugins/Makefile
+++ devel/pear-PEAR_PackageFileManager_Plugins/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	The plugins for PEAR_PackageFileManager
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 LICENSE=	BSD2CLAUSE
 
Index: devel/pear-PHPUnit_MockObject/Makefile
===================================================================
--- devel/pear-PHPUnit_MockObject/Makefile
+++ devel/pear-PHPUnit_MockObject/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	PHPUnit_MockObject
 PORTVERSION=	4.0.1
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Mock Object library for PHPUnit
Index: devel/pear-PHP_Beautifier/Makefile
===================================================================
--- devel/pear-PHP_Beautifier/Makefile
+++ devel/pear-PHP_Beautifier/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR}
 
 USES=		pear php
 USE_PHP=	tokenizer bz2
Index: devel/pear-PHP_CodeBrowser/Makefile
===================================================================
--- devel/pear-PHP_CodeBrowser/Makefile
+++ devel/pear-PHP_CodeBrowser/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	1.0.2
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.phpunit.de/get/
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Code browser that augments the code with information
@@ -13,12 +12,12 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine \
-		pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
-		pear-Log>=1.13.1:sysutils/pear-Log
-RUN_DEPENDS=	pear-Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine \
-		pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
-		pear-Log>=1.13.1:sysutils/pear-Log
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Log>=1.13.1:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.2.2:devel/pear-Console_CommandLine@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Log>=1.13.1:sysutils/pear-Log@${PHP_FLAVOR}
 
 USES=	pear php
 PEAR_CHANNEL=	phpunit
Index: devel/pear-PHP_CodeCoverage/Makefile
===================================================================
--- devel/pear-PHP_CodeCoverage/Makefile
+++ devel/pear-PHP_CodeCoverage/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	PHP_CodeCoverage
 DISTVERSION=	5.2.2
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Library that provides PHP code coverage information
@@ -12,15 +11,15 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
-		pear-PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream \
-		pear-Text_Template>=1.2.0:textproc/pear-Text_Template \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-File_Iterator>=1.4.2:devel/pear-File_Iterator \
-		pear-PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream \
-		pear-Text_Template>=1.2.0:textproc/pear-Text_Template \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Text_Template>=1.2.0:textproc/pear-Text_Template@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}File_Iterator>=1.4.2:devel/pear-File_Iterator@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}PHP_TokenStream>=1.4.11:devel/pear-PHP_TokenStream@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Text_Template>=1.2.0:textproc/pear-Text_Template@${PHP_FLAVOR}
 
+USES=	pear:env
+PEAR_CHANNEL=	phpunit
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	php-code-coverage
@@ -32,7 +31,7 @@
 XDEBUG_DESC=	Enable Xdebug support
 
 DOM_USE=	PHP=dom
-XDEBUG_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:devel/pecl-xdebug
+XDEBUG_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:devel/pecl-xdebug@${PHP_FLAVOR}
 
 PHP_DIR=	share/PHP
 
Index: devel/pear-PHP_CompatInfo/Makefile
===================================================================
--- devel/pear-PHP_CompatInfo/Makefile
+++ devel/pear-PHP_CompatInfo/Makefile
@@ -9,10 +9,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class to find out the minimum version and extensions required
 
-RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table \
-		${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs \
-		${PEARDIR}/File/Find.php:sysutils/pear-File_Find \
-		${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher
+RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table@${PHP_FLAVOR} \
+		${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs@${PHP_FLAVOR} \
+		${PEARDIR}/File/Find.php:sysutils/pear-File_Find@${PHP_FLAVOR} \
+		${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher@${PHP_FLAVOR}
 
 PORTSCOUT=	skipv:1.9.0a1,1.9.0b1,1.9.0b2
 USE_PHP=	tokenizer
@@ -26,10 +26,10 @@
 PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
 PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table
 
-PEAR_XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier
-PEAR_VAR_DUMP_RUN_DEPENDS=	${PEARDIR}/Var/Dump.php:devel/pear-Var_Dump
-PHPUNIT_RUN_DEPENDS=	phpunit:devel/phpunit
-PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table
+PEAR_XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier@${PHP_FLAVOR}
+PEAR_VAR_DUMP_RUN_DEPENDS=	${PEARDIR}/Var/Dump.php:devel/pear-Var_Dump@${PHP_FLAVOR}
+PHPUNIT_RUN_DEPENDS=	phpunit:devel/phpunit@${PHP_FLAVOR}
+PEAR_XML_UTIL_RUN_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+PEAR_HTML_TABLE_RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/pear-PHP_Depend/Makefile
===================================================================
--- devel/pear-PHP_Depend/Makefile
+++ devel/pear-PHP_Depend/Makefile
@@ -5,16 +5,12 @@
 PORTVERSION=	1.1.2
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.pdepend.org/get/
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP_Depend design quality metrics for PHP packages
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-
 USES=	pear
 PEAR_CHANNEL=	pdepend
 USE_PHP=	dom tokenizer simplexml
Index: devel/pear-PHP_PMD/Makefile
===================================================================
--- devel/pear-PHP_PMD/Makefile
+++ devel/pear-PHP_PMD/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	1.5.0
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.phpmd.org/get/
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP Mess Detector
@@ -13,9 +12,6 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpmd.org.reg:devel/pear-channel-phpmd
-
 PORTSCOUT=	skipv=2.*
 
 USES=	pear
Index: devel/pear-PHP_Timer/Makefile
===================================================================
--- devel/pear-PHP_Timer/Makefile
+++ devel/pear-PHP_Timer/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	PHP_Timer
 PORTVERSION=	2.0.0
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Utility class for timing
@@ -12,6 +11,7 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=	pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	php-timer
Index: devel/pear-PHP_TokenStream/Makefile
===================================================================
--- devel/pear-PHP_TokenStream/Makefile
+++ devel/pear-PHP_TokenStream/Makefile
@@ -4,13 +4,13 @@
 PORTNAME=	PHP_TokenStream
 PORTVERSION=	1.4.11
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Wrapper around PHP tokenizer extension
 
 LICENSE=	BSD3CLAUSE
 
+USES=		pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	php-token-stream
Index: devel/pear-PHP_UML/Makefile
===================================================================
--- devel/pear-PHP_UML/Makefile
+++ devel/pear-PHP_UML/Makefile
@@ -10,9 +10,9 @@
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear \
-		${PEARDIR}/Console/CommandLine.php:devel/pear-Console_CommandLine
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR} \
+		${PEARDIR}/Console/CommandLine.php:devel/pear-Console_CommandLine@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
 
 BROKEN_powerpc64=	fails to package: Signal 11
 
Index: devel/pear-PhpDocumentor/Makefile
===================================================================
--- devel/pear-PhpDocumentor/Makefile
+++ devel/pear-PhpDocumentor/Makefile
@@ -8,7 +8,7 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Provides automatic documenting of php-api from the source
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:devel/pear@${PHP_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CONFLICTS=	pear-PHPDoc-[0-9]*
@@ -17,7 +17,7 @@
 OPTIONS_DEFINE=	XML_BEAUTIFIER
 XML_BEAUTIFIER_DESC=	XML_Beautifier support
 
-XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier
+XML_BEAUTIFIER_RUN_DEPENDS=	${PEARDIR}/XML/Beautifier.php:textproc/pear-XML_Beautifier@${PHP_FLAVOR}
 
 post-extract:
 .for dir in ${DUMMYDIRS}
Index: devel/pear-Pirum/Makefile
===================================================================
--- devel/pear-Pirum/Makefile
+++ devel/pear-Pirum/Makefile
@@ -5,16 +5,12 @@
 PORTVERSION=	1.1.5
 CATEGORIES=	devel www pear
 MASTER_SITES=	http://pear.pirum-project.org/get/
-PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Simple PEAR channel server manager
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pirum-project.org.reg:devel/pear-channel-pirum
-
 PEAR_CHANNEL=	pirum
 USES=	pear
 
Index: devel/pear-SebastianBergmann_FinderFacade/Makefile
===================================================================
--- devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ devel/pear-SebastianBergmann_FinderFacade/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	FinderFacade
 PORTVERSION=	1.2.2
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-SebastianBergmann_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}SebastianBergmann_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Convenience wrapper for Symfony Finder component
@@ -12,16 +12,16 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument \
-		pear-Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder@${PHP_FLAVOR} \
 
-RUN_DEPENDS=	pear-TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument \
-		pear-Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.6.6:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}Symfony_Component_Finder>=2.3.4:devel/pear-Symfony_Component_Finder@${PHP_FLAVOR} \
 
 NO_ARCH=	yes
 
+USES=		pear:env
+PEAR_CHANNEL=	phpunit
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	finder-facade
Index: devel/pear-SebastianBergmann_Git/Makefile
===================================================================
--- devel/pear-SebastianBergmann_Git/Makefile
+++ devel/pear-SebastianBergmann_Git/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	1.2.0
 PORTREVISION=	1
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-SebastianBergmann_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}SebastianBergmann_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Simple wrapper for Git
@@ -13,9 +13,7 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear>=1.9.4:devel/pear
-RUN_DEPENDS=	pear>=1.9.4:devel/pear
-
+USES=	pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	git
Index: devel/pear-SebastianBergmann_PHPCPD/Makefile
===================================================================
--- devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ devel/pear-SebastianBergmann_PHPCPD/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	PHPCPD
 DISTVERSION=	2.0.0
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-SebastianBergmann_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}SebastianBergmann_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Copy/Paste Detector (CPD) for PHP code
@@ -12,16 +12,15 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools \
-		pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \
-		pear-PHP_Timer>=1.0.9:devel/pear-PHP_Timer \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools \
-		pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \
-		pear-PHP_Timer>=1.0.9:devel/pear-PHP_Timer \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}PHP_Timer>=1.0.9:devel/pear-PHP_Timer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6.1:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}PHP_Timer>=1.0.9:devel/pear-PHP_Timer@${PHP_FLAVOR}
 
-USES=	php
+USES=	php pear:env
+PEAR_CHANNEL=	phpunit
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	${PORTNAME:tl}
Index: devel/pear-SebastianBergmann_PHPLOC/Makefile
===================================================================
--- devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ devel/pear-SebastianBergmann_PHPLOC/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	PHPLOC
 DISTVERSION=	4.0.1
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-SebastianBergmann_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}SebastianBergmann_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Tool for quickly measuring the size of a PHP project
@@ -12,13 +12,13 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	pear-Symfony_Component_Console>=2.4.4:devel/pear-Symfony_Component_Console \
-		pear-SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade \
-		pear-SebastianBergmann_Git>=1.2.0:devel/pear-SebastianBergmann_Git \
-		pear-SebastianBergmann_Version>=2.0.1:devel/pear-SebastianBergmann_Version \
-		pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Symfony_Component_Console>=2.4.4:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}SebastianBergmann_FinderFacade>=1.2.2:devel/pear-SebastianBergmann_FinderFacade@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}SebastianBergmann_Git>=1.2.0:devel/pear-SebastianBergmann_Git@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}SebastianBergmann_Version>=2.0.1:devel/pear-SebastianBergmann_Version@${PHP_FLAVOR} \
 
-USES=	php
+USES=	php pear:env
+PEAR_CHANNEL=	phpunit
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	${PORTNAME:tl}
Index: devel/pear-SebastianBergmann_Version/Makefile
===================================================================
--- devel/pear-SebastianBergmann_Version/Makefile
+++ devel/pear-SebastianBergmann_Version/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Version
 DISTVERSION=	2.0.1
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-SebastianBergmann_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}SebastianBergmann_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Managing the version number of Git-hosted PHP projects
@@ -12,10 +12,8 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-RUN_DEPENDS=	pear-channel-phpunit>=20110327:devel/pear-channel-phpunit
-
-USES=	php
+USES=	pear:env
+PEAR_CHANNEL=	phpunit
 USE_GITHUB=	yes
 GH_ACCOUNT=	sebastianbergmann
 GH_PROJECT=	${PORTNAME:tl}
Index: devel/pear-Structures_DataGrid/Makefile
===================================================================
--- devel/pear-Structures_DataGrid/Makefile
+++ devel/pear-Structures_DataGrid/Makefile
@@ -8,7 +8,7 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Full-featured tabular structured data management package
 
-RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table
+RUN_DEPENDS=	${PEARDIR}/Console/Table.php:devel/pear-Console_Table@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Structures_DataGrid_Renderer_Console/Makefile
===================================================================
--- devel/pear-Structures_DataGrid_Renderer_Console/Makefile
+++ devel/pear-Structures_DataGrid_Renderer_Console/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Console_Table Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/Console/Table.php:devel/pear-Console_Table
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/Console/Table.php:devel/pear-Console_Table@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
===================================================================
--- devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
+++ devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	HTMLSortForm Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
===================================================================
--- devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
+++ devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
@@ -8,9 +8,9 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	HTML_Table Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table \
-		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table@${PHP_FLAVOR} \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
===================================================================
--- devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
+++ devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	XUL Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Symfony_Component_Console/Makefile
===================================================================
--- devel/pear-Symfony_Component_Console/Makefile
+++ devel/pear-Symfony_Component_Console/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	2.4.4
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.symfony.com/get/
-PKGNAMEPREFIX=	pear-Symfony_Component_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}Symfony_Component_
 DIST_SUBDIR=	Symfony2
 
 MAINTAINER=	wg@FreeBSD.org
@@ -13,9 +13,6 @@
 
 LICENSE=	MIT
 
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-RUN_DEPENDS+=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-
 USES=		pear
 PEAR_CHANNEL=	symfony2
 
Index: devel/pear-Symfony_Component_Finder/Makefile
===================================================================
--- devel/pear-Symfony_Component_Finder/Makefile
+++ devel/pear-Symfony_Component_Finder/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	2.4.4
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.symfony.com/get/
-PKGNAMEPREFIX=	pear-Symfony_Component_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}Symfony_Component_
 DIST_SUBDIR=	Symfony2
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -13,9 +13,6 @@
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-
 USES=		pear
 PEAR_CHANNEL=	symfony2
 
Index: devel/pear-TheSeer_DirectoryScanner/Makefile
===================================================================
--- devel/pear-TheSeer_DirectoryScanner/Makefile
+++ devel/pear-TheSeer_DirectoryScanner/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	DirectoryScanner
 PORTVERSION=	1.3.2
 CATEGORIES=	devel pear
-PKGNAMEPREFIX=	pear-TheSeer_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}TheSeer_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Recursive directory scanner and filter
@@ -12,15 +12,14 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-channel-theseer>=20120501:devel/pear-channel-theseer
-RUN_DEPENDS=	pear-channel-theseer>=20120501:devel/pear-channel-theseer
-
+USES=	php:flavors pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	theseer
 GH_PROJECT=	DirectoryScanner
 
 USE_PHP=	fileinfo
 PEAR_CHANNEL=	theseer
+PEAR_CHANNEL_VER=	>=20120501
 
 NO_BUILD=	yes
 
Index: devel/pear-TheSeer_fDOMDocument/Makefile
===================================================================
--- devel/pear-TheSeer_fDOMDocument/Makefile
+++ devel/pear-TheSeer_fDOMDocument/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	fDOMDocument
 PORTVERSION=	1.6.6
 CATEGORIES=	devel www pear
-PKGNAMEPREFIX=	pear-TheSeer_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}TheSeer_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Extension to PHP standard DOM
@@ -12,15 +12,14 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	pear-channel-theseer>=20120501:devel/pear-channel-theseer
-RUN_DEPENDS=	pear-channel-theseer>=20120501:devel/pear-channel-theseer
-
+USES=	php:flavors pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	theseer
 GH_PROJECT=	fDOMDocument
 
 USE_PHP=	dom xml
 PEAR_CHANNEL=	theseer
+PEAR_CHANNEL_VER=	>=20120501
 
 NO_BUILD=	yes
 
Index: devel/pear-TheSeer_fXSL/Makefile
===================================================================
--- devel/pear-TheSeer_fXSL/Makefile
+++ devel/pear-TheSeer_fXSL/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	1.1.0
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.netpirates.net/get/
-PKGNAMEPREFIX=	pear-TheSeer_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}TheSeer_
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -13,9 +13,6 @@
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.netpirates.net.reg:devel/pear-channel-theseer
-
 BROKEN_powerpc64=	fails to package: Signal 11
 
 USE_PHP=	dom xml xsl
Index: devel/pear-TheSeer_phpDox/Makefile
===================================================================
--- devel/pear-TheSeer_phpDox/Makefile
+++ devel/pear-TheSeer_phpDox/Makefile
@@ -5,23 +5,23 @@
 PORTVERSION=	0.5.0
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.netpirates.net/get/
-PKGNAMEPREFIX=	pear-TheSeer_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}TheSeer_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP Documentation generation framework and tool
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
-		pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
-		pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
-		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
-		pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
-RUN_DEPENDS=	pear-TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner \
-		pear-TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument \
-		pear-TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL \
-		pear-ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools \
-		pear-pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}TheSeer_DirectoryScanner>=1.1.0:devel/pear-TheSeer_DirectoryScanner@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}TheSeer_fDOMDocument>=1.2.3:devel/pear-TheSeer_fDOMDocument@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}TheSeer_fXSL>=1.0.4:devel/pear-TheSeer_fXSL@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}ezc_ConsoleTools>=1.6:devel/pear-ezc_ConsoleTools@${PHP_FLAVOR} \
+		${PEAR_PKGNAMEPREFIX}pdepend_staticReflection>=0.2.1:devel/pear-pdepend-staticReflection@${PHP_FLAVOR}
 
 USE_PHP=	dom tokenizer xsl iconv
 PEAR_CHANNEL=	theseer
Index: devel/pear-VFS/Makefile
===================================================================
--- devel/pear-VFS/Makefile
+++ devel/pear-VFS/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR Virtual File System API
 
-BUILD_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR}
 
 USE_PHP=	gettext
 USES=		pear php
Index: devel/pear-Validate/Makefile
===================================================================
--- devel/pear-Validate/Makefile
+++ devel/pear-Validate/Makefile
@@ -15,10 +15,10 @@
 OPTIONS_DEFINE=	DATE IDNA
 
 DATE_DESC=	Date and Time Zone Classes
-DATE_RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date
+DATE_RUN_DEPENDS=	${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR}
 
 IDNA_DESC=	Net_IDNA - Punycode encoding and decoding package
-IDNA_RUN_DEPENDS=	${PEARDIR}/Net/IDNA.php:net/pear-Net_IDNA
+IDNA_RUN_DEPENDS=	${PEARDIR}/Net/IDNA.php:net/pear-Net_IDNA@${PHP_FLAVOR}
 
 USES=		pear
 NO_ARCH=	yes
Index: devel/pear-Validate_Finance/Makefile
===================================================================
--- devel/pear-Validate_Finance/Makefile
+++ devel/pear-Validate_Finance/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR Finance Validation class
 
-BUILD_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
-RUN_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-Validate_US/Makefile
===================================================================
--- devel/pear-Validate_US/Makefile
+++ devel/pear-Validate_US/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR data validation class for US
 
-BUILD_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
-RUN_DEPENDS=	pear-Validate>=0.5.0:devel/pear-Validate
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-VersionControl_SVN/Makefile
===================================================================
--- devel/pear-VersionControl_SVN/Makefile
+++ devel/pear-VersionControl_SVN/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
-RUN_DEPENDS=	pear-XML_Parser>=1.3.4:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}XML_Parser>=1.3.4:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}XML_Parser>=1.3.4:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-XML_NITF/Makefile
===================================================================
--- devel/pear-XML_NITF/Makefile
+++ devel/pear-XML_NITF/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR NITF XML parser
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 NO_ARCH=	yes
 USES=		pear
Index: devel/pear-XML_RSS/Makefile
===================================================================
--- devel/pear-XML_RSS/Makefile
+++ devel/pear-XML_RSS/Makefile
@@ -11,7 +11,7 @@
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 NO_ARCH=	yes
 USES=		pear
Index: devel/pear-XML_Serializer/Makefile
===================================================================
--- devel/pear-XML_Serializer/Makefile
+++ devel/pear-XML_Serializer/Makefile
@@ -10,10 +10,10 @@
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-XML_Transformer/Makefile
===================================================================
--- devel/pear-XML_Transformer/Makefile
+++ devel/pear-XML_Transformer/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR XML Transformations in PHP
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-RUN_DEPENDS:=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-XML_Tree/Makefile
===================================================================
--- devel/pear-XML_Tree/Makefile
+++ devel/pear-XML_Tree/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class for representing XML data in a tree structure
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 USES=		pear
 
Index: devel/pear-channel-doctrine/Makefile
===================================================================
--- devel/pear-channel-doctrine/Makefile
+++ devel/pear-channel-doctrine/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.doctrine-project.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-ezc/Makefile
===================================================================
--- devel/pear-channel-ezc/Makefile
+++ devel/pear-channel-ezc/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	components.ez.no
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-horde/Makefile
===================================================================
--- devel/pear-channel-horde/Makefile
+++ devel/pear-channel-horde/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.horde.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-htmlpurifier.org/Makefile
===================================================================
--- devel/pear-channel-htmlpurifier.org/Makefile
+++ devel/pear-channel-htmlpurifier.org/Makefile
@@ -13,6 +13,5 @@
 PEAR_CHANNEL_HOST=	htmlpurifier.org
 PEAR_CHANNEL_ALIAS=	hp
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-openpear/Makefile
===================================================================
--- devel/pear-channel-openpear/Makefile
+++ devel/pear-channel-openpear/Makefile
@@ -11,6 +11,5 @@
 
 PEAR_CHANNEL_HOST=	openpear.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-pdepend/Makefile
===================================================================
--- devel/pear-channel-pdepend/Makefile
+++ devel/pear-channel-pdepend/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.pdepend.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phing/Makefile
===================================================================
--- devel/pear-channel-phing/Makefile
+++ devel/pear-channel-phing/Makefile
@@ -9,6 +9,5 @@
 
 PEAR_CHANNEL_HOST=	pear.phing.info
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phpdoc/Makefile
===================================================================
--- devel/pear-channel-phpdoc/Makefile
+++ devel/pear-channel-phpdoc/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.phpdoc.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phpmd/Makefile
===================================================================
--- devel/pear-channel-phpmd/Makefile
+++ devel/pear-channel-phpmd/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.phpmd.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-phpunit/Makefile
===================================================================
--- devel/pear-channel-phpunit/Makefile
+++ devel/pear-channel-phpunit/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.phpunit.de
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-pirum/Makefile
===================================================================
--- devel/pear-channel-pirum/Makefile
+++ devel/pear-channel-pirum/Makefile
@@ -11,6 +11,5 @@
 
 PEAR_CHANNEL_HOST=	pear.pirum-project.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-symfony/Makefile
===================================================================
--- devel/pear-channel-symfony/Makefile
+++ devel/pear-channel-symfony/Makefile
@@ -10,6 +10,5 @@
 
 PEAR_CHANNEL_HOST=	pear.symfony-project.com
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-symfony2/Makefile
===================================================================
--- devel/pear-channel-symfony2/Makefile
+++ devel/pear-channel-symfony2/Makefile
@@ -11,6 +11,5 @@
 
 PEAR_CHANNEL_HOST=	pear.symfony.com
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-theseer/Makefile
===================================================================
--- devel/pear-channel-theseer/Makefile
+++ devel/pear-channel-theseer/Makefile
@@ -11,6 +11,5 @@
 
 PEAR_CHANNEL_HOST=	pear.netpirates.net
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-channel-twig/Makefile
===================================================================
--- devel/pear-channel-twig/Makefile
+++ devel/pear-channel-twig/Makefile
@@ -11,6 +11,5 @@
 
 PEAR_CHANNEL_HOST=	pear.twig-project.org
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.channel.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/pear-ezc_Base/Makefile
===================================================================
--- devel/pear-ezc_Base/Makefile
+++ devel/pear-ezc_Base/Makefile
@@ -5,16 +5,13 @@
 PORTVERSION=	1.8
 CATEGORIES=	devel pear
 MASTER_SITES=	http://components.ez.no/get/
-PKGNAMEPREFIX=	pear-${PEAR_CHANNEL}_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}${PEAR_CHANNEL}_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Base package that all ezc components packages rely on
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
-RUN_DEPENDS=	${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
-
 PEAR_CHANNEL=	ezc
 USES=	pear
 
Index: devel/pear-ezc_ConsoleTools/Makefile
===================================================================
--- devel/pear-ezc_ConsoleTools/Makefile
+++ devel/pear-ezc_ConsoleTools/Makefile
@@ -5,17 +5,15 @@
 PORTVERSION=	1.6.1
 CATEGORIES=	devel pear
 MASTER_SITES=	http://components.ez.no/get/
-PKGNAMEPREFIX=	pear-${PEAR_CHANNEL}_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}${PEAR_CHANNEL}_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Set of classes to do different actions with the console
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	pear-ezc_Base>=1.8:devel/pear-ezc_Base \
-		${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
-RUN_DEPENDS=	pear-ezc_Base>=1.8:devel/pear-ezc_Base \
-		${PEARDIR}/.channels/components.ez.no.reg:devel/pear-channel-ezc
+BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}ezc_Base>=1.8:devel/pear-ezc_Base@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}ezc_Base>=1.8:devel/pear-ezc_Base@${PHP_FLAVOR}
 
 PEAR_CHANNEL=	ezc
 USES=	pear
Index: devel/pear-htmlpurifier/Makefile
===================================================================
--- devel/pear-htmlpurifier/Makefile
+++ devel/pear-htmlpurifier/Makefile
@@ -8,16 +8,13 @@
 MASTER_SITES=	http://htmlpurifier.org/get/ \
 		LOCAL
 DISTNAME=	HTMLPurifier-${PORTVERSION}
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	PHP HTML filter library
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier.org
-RUN_DEPENDS=	${PEARDIR}/.channels/htmlpurifier.org.reg:devel/pear-channel-htmlpurifier.org
-
 PEAR_CHANNEL=	htmlpurifier.org
 USES=	pear
 
Index: devel/pear-pdepend-staticReflection/Makefile
===================================================================
--- devel/pear-pdepend-staticReflection/Makefile
+++ devel/pear-pdepend-staticReflection/Makefile
@@ -5,16 +5,13 @@
 PORTVERSION=	1.0.0
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.pdepend.org/get/
-PKGNAMEPREFIX=	pear-${PEAR_CHANNEL}_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}${PEAR_CHANNEL}_
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	staticReflection package for PHP
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.pdepend.org.reg:devel/pear-channel-pdepend
-
 USE_PHP=	tokenizer
 PEAR_CHANNEL=	pdepend
 USES=	pear
Index: devel/pear-phing/Makefile
===================================================================
--- devel/pear-phing/Makefile
+++ devel/pear-phing/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	2.6.1
 CATEGORIES=	devel pear
 MASTER_SITES=	http://pear.phing.info/get/
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	PHP project build system based on Apache Ant
@@ -14,7 +14,4 @@
 PEAR_CHANNEL=	phing
 USES=	pear
 
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:devel/pear-channel-phing
-
 .include <bsd.port.mk>
Index: devel/pear/Makefile
===================================================================
--- devel/pear/Makefile
+++ devel/pear/Makefile
@@ -6,13 +6,14 @@
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://mirror.bsdproject.de/
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR framework for PHP
 
 LICENSE=	PHP301
 
-USES=		cpe php:cli tar:bzip2
+USES=		cpe php:cli,flavors tar:bzip2
 CPE_VENDOR=	php
 NO_BUILD=	yes
 NO_ARCH=	yes
Index: devel/pear/bsd.pear.channel.mk
===================================================================
--- devel/pear/bsd.pear.channel.mk
+++ devel/pear/bsd.pear.channel.mk
@@ -2,20 +2,22 @@
 #
 # Common code for PEAR channels
 
-PKGNAMEPREFIX?=	pear-channel-
+PKGNAMEPREFIX?=	${PEAR_PKGNAMEPREFIX}channel-
 
 MASTER_SITES?=	#no master sites
 DISTFILES?=	#no distfiles
 
-BUILD_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear
-RUN_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear
+USES+=	pear:env
+
+BUILD_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear@${PHP_FLAVOR}
+RUN_DEPENDS?=	${LOCALBASE}/bin/pear:devel/pear@${PHP_FLAVOR}
 
 NO_BUILD?=	yes
 
 LPEARDIR?=	share/pear
 
 PEAR_CHANNEL_ALIAS?=	${PORTNAME}
-PEAR_CHANNEL_REG?=	${FILESDIR}/${PEAR_CHANNEL_HOST}.reg
+PEAR_CHANNEL_REG?=	${.CURDIR}/files/${PEAR_CHANNEL_HOST}.reg
 
 PLIST_FILES=	${LPEARDIR}/.channels/.alias/${PEAR_CHANNEL_ALIAS}.txt \
 		${LPEARDIR}/.channels/${PEAR_CHANNEL_HOST}.reg
Index: devel/pecl-APCu4/Makefile
===================================================================
--- devel/pecl-APCu4/Makefile
+++ devel/pecl-APCu4/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	4.0.11
 PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMESUFFIX=	4
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	johnpupu@gmail.com
Index: devel/pecl-grpc/Makefile
===================================================================
--- devel/pecl-grpc/Makefile
+++ devel/pecl-grpc/Makefile
@@ -18,4 +18,10 @@
 
 USES=		php:pecl
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${FLAVOR} == php72 && ${ARCH} == i386
+BROKEN=		error: fastcall calling convention ignored on variadic function [-Werror,-Wignored-attributes]
+.endif
+
+.include <bsd.port.post.mk>
Index: devel/pecl-jsmin2/Makefile
===================================================================
--- devel/pecl-jsmin2/Makefile
+++ devel/pecl-jsmin2/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	jsmin
 PORTVERSION=	2.0.1
 CATEGORIES=	devel
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	pascal.christen@hostpoint.ch
 COMMENT=	PHP extension for minifying JavaScript
Index: devel/pecl-msgpack0/Makefile
===================================================================
--- devel/pecl-msgpack0/Makefile
+++ devel/pecl-msgpack0/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	msgpack
 PORTVERSION=	0.5.7
 CATEGORIES=	devel
-PKGNAMESUFFIX=	0
 
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	Provides API for communicating with MessagePack serialization
Index: devel/pecl-propro2/Makefile
===================================================================
--- devel/pecl-propro2/Makefile
+++ devel/pecl-propro2/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	2.0.1
 PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Facility to manage extension object properties
Index: devel/pecl-raphf2/Makefile
===================================================================
--- devel/pecl-raphf2/Makefile
+++ devel/pecl-raphf2/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	2.0.0
 PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Resource and persistent handles factory
Index: devel/pecl-weakref2/Makefile
===================================================================
--- devel/pecl-weakref2/Makefile
+++ devel/pecl-weakref2/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	weakref
 PORTVERSION=	0.3.3
 CATEGORIES=	devel pear
-PKGNAMESUFFIX=	2
 DISTNAME=	Weakref-${PORTVERSION}
 
 MAINTAINER=	joneum@FreeBSD.org
Index: devel/pecl-yac/Makefile
===================================================================
--- devel/pecl-yac/Makefile
+++ devel/pecl-yac/Makefile
@@ -16,7 +16,7 @@
 
 OPTIONS_DEFINE=	MSGPACK
 MSGPACK_DESC=	Enable MSGPACK module
-MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
-MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
+MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack@${PHP_FLAVOR}
+MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: devel/phabricator/Makefile
===================================================================
--- devel/phabricator/Makefile
+++ devel/phabricator/Makefile
@@ -56,9 +56,9 @@
 .if ${PORT_OPTIONS:MOPCACHE}
 USE_PHP+=	opcache
 .	if ${PHP_VER} >= 70
-RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu
+RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
 .	else
-RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4
+RUN_DEPENDS+=	 ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4@${PHP_FLAVOR}
 .	endif
 .endif
 
Index: devel/php-jq/Makefile
===================================================================
--- devel/php-jq/Makefile
+++ devel/php-jq/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.0.1
 PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Jq shared extension for php
Index: devel/php-maxminddb/Makefile
===================================================================
--- devel/php-maxminddb/Makefile
+++ devel/php-maxminddb/Makefile
@@ -6,7 +6,7 @@
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	devel net
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	danger@FreeBSD.org
 COMMENT=	MaxMind DB Reader extension for PHP
Index: devel/php-memoize/Makefile
===================================================================
--- devel/php-memoize/Makefile
+++ devel/php-memoize/Makefile
@@ -1,20 +1,21 @@
 # Created by: Gasol Wu <gasol.wu@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	php-memoize
+PORTNAME=	memoize
 PORTVERSION=	0.2.0b1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	devel
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP extension which transparently caches PHP functions
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arraypad
+GH_PROJECT=	php-${PORTNAME}
 
 USES=		php:ext
-PHP_MODNAME=	memoize
 IGNORE_WITH_PHP=	70 71 72
 CONFIGURE_ARGS=	--enable-memoize
 
Index: devel/php-scalar_objects/Makefile
===================================================================
--- devel/php-scalar_objects/Makefile
+++ devel/php-scalar_objects/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.0.20140124
 PORTREVISION=	2
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Support method calls on primitive types in PHP
Index: devel/php-uprofiler/Makefile
===================================================================
--- devel/php-uprofiler/Makefile
+++ devel/php-uprofiler/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	0.11.0.20150219
 PORTREVISION=	1
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Lightweight profiler for PHP
Index: devel/php5-blitz-devel/Makefile
===================================================================
--- devel/php5-blitz-devel/Makefile
+++ devel/php5-blitz-devel/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://alexeyrybak.com/blitz/
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	blitz-${PORTVERSION}-devel
 
 MAINTAINER=	komarov@valerka.net
Index: devel/php5-blitz/Makefile
===================================================================
--- devel/php5-blitz/Makefile
+++ devel/php5-blitz/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://alexeyrybak.com/blitz/
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	komarov@valerka.net
 COMMENT=	PHP templating engine
Index: devel/php5-dav/Makefile
===================================================================
--- devel/php5-dav/Makefile
+++ devel/php5-dav/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://download.pureftpd.org/php-webdav/
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	php-webdav-${PORTVERSION}
 
 MAINTAINER=	komarov@valerka.net
Index: devel/php5-pinba/Makefile
===================================================================
--- devel/php5-pinba/Makefile
+++ devel/php5-pinba/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	2012.03.20
 PORTREVISION=	8
 CATEGORIES=	devel
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	komarov@valerka.net
 COMMENT=	PHP-extension part of statistics server for PHP
Index: devel/php5-thrift/Makefile
===================================================================
--- devel/php5-thrift/Makefile
+++ devel/php5-thrift/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
-PKGNAMEPREFIX=	php5-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	webmaster@kibab.com
 COMMENT=	PHP interface to Thrift
Index: devel/phpbt/Makefile
===================================================================
--- devel/phpbt/Makefile
+++ devel/phpbt/Makefile
@@ -13,7 +13,7 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	ctype pcre posix session tokenizer xml zlib
Index: devel/phpunit/Makefile
===================================================================
--- devel/phpunit/Makefile
+++ devel/phpunit/Makefile
@@ -5,6 +5,7 @@
 CATEGORIES=	devel www
 MASTER_SITES=	https://phar.phpunit.de/
 EXTRACT_SUFX=	.phar
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Testing framework for unit tests
@@ -18,7 +19,7 @@
 
 PORTSCOUT=	limit:^5\.7\.[0-9]*
 
-USES=		cpe php
+USES=		cpe php:flavors
 CPE_VENDOR=	phpunit_project
 USE_PHP=	dom json spl pcre phar
 
Index: dns/pear-File_DNS/Makefile
===================================================================
--- dns/pear-File_DNS/Makefile
+++ dns/pear-File_DNS/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	chris@ctgameinfo.com
 COMMENT=	PEAR class to read and write RFC1033-style DNS Zonefiles
 
-BUILD_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File
-RUN_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File
+BUILD_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/File.php:sysutils/pear-File@${PHP_FLAVOR}
 
 USES=		pear
 
Index: finance/php-tclink/Makefile
===================================================================
--- finance/php-tclink/Makefile
+++ finance/php-tclink/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	https://vault.trustcommerce.com/downloads/
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-php
 
 MAINTAINER=	mbowie@buzmo.com
Index: ftp/Makefile
===================================================================
--- ftp/Makefile
+++ ftp/Makefile
@@ -62,17 +62,14 @@
     SUBDIR += pavuk
     SUBDIR += pear-Net_FTP
     SUBDIR += pftpd
+    SUBDIR += php-fastdfs
     SUBDIR += php56-curl
-    SUBDIR += php56-fastdfs
     SUBDIR += php56-ftp
     SUBDIR += php70-curl
-    SUBDIR += php70-fastdfs
     SUBDIR += php70-ftp
     SUBDIR += php71-curl
-    SUBDIR += php71-fastdfs
     SUBDIR += php71-ftp
     SUBDIR += php72-curl
-    SUBDIR += php72-fastdfs
     SUBDIR += php72-ftp
     SUBDIR += phpwebftp
     SUBDIR += plasma-applet-ftpmonitor
Index: ftp/horde-gollem/Makefile
===================================================================
--- ftp/horde-gollem/Makefile
+++ ftp/horde-gollem/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gollem
 PORTVERSION=	3.0.12
 CATEGORIES=	ftp www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Web-based File Manager
Index: ftp/php-fastdfs/Makefile
===================================================================
--- ftp/php-fastdfs/Makefile
+++ ftp/php-fastdfs/Makefile
@@ -3,11 +3,10 @@
 PORTNAME=	fastdfs
 DISTVERSION=	5.0.11
 CATEGORIES=	ftp
-PKGNAMEPREFIX?=	php56-
-IGNORE_WITH_PHP?=	70 71 72
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	daniel@blodan.se
-COMMENT?=	PHP 5.6 module for accessing a FastDFS cluster
+COMMENT?=	PHP module for accessing a FastDFS cluster
 
 LICENSE=	GPLv3+
 
@@ -20,7 +19,6 @@
 GH_TAGNAME=	1e50b4f
 
 USES=			php:ext
-PHP_VER?=		56
 
 WRKSRC_SUBDIR=	php_client
 CONFIGURE_ENV=	ROOT=${LOCALBASE}
Index: ftp/php56-fastdfs/distinfo
===================================================================
--- /dev/null
+++ ftp/php56-fastdfs/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1502819567
-SHA256 (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 42ef67951c55fb416282cd20389dde5709016913debbb87465b9b744fa3dacf9
-SIZE (happyfish100-fastdfs-5.0.11-1e50b4f_GH0.tar.gz) = 336996
Index: ftp/php56-fastdfs/pkg-descr
===================================================================
--- /dev/null
+++ ftp/php56-fastdfs/pkg-descr
@@ -1,3 +0,0 @@
-PHP module for accessing a FastDFS cluster
-
-WWW: https://github.com/happyfish100/fastdfs
Index: ftp/php56-fastdfs/pkg-message
===================================================================
--- /dev/null
+++ ftp/php56-fastdfs/pkg-message
@@ -1,15 +0,0 @@
-Before you can start using this module;
-- Make sure you have configured client.conf to point to your FastDFS cluster
-  and that you see the cluster with fdfs_monitor
-- Add this to your php.ini file
-==================================================================
-fastdfs_client.base_path = /var/tmp
-fastdfs_client.connect_timeout = 2
-fastdfs_client.network_timeout = 60
-fastdfs_client.log_level = info
-fastdfs_client.log_filename =
-fastdfs_client.http.anti_steal_secret_key =
-fastdfs_client.tracker_group_count = 1
-fastdfs_client.tracker_group0 = /usr/local/etc/fdfs/client.conf
-fastdfs_client.use_connection_pool = false
-fastdfs_client.connection_pool_max_idle_time = 3600
Index: ftp/php70-fastdfs/Makefile
===================================================================
--- ftp/php70-fastdfs/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../php56-fastdfs
-
-PKGNAMEPREFIX=	php70-
-
-COMMENT=	PHP 7 module for accessing a FastDFS cluster
-
-IGNORE_WITH_PHP=	56 71 72
-PHP_VER=		70
-
-.include "${MASTERDIR}/Makefile"
Index: ftp/php71-fastdfs/Makefile
===================================================================
--- ftp/php71-fastdfs/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../php56-fastdfs
-
-PKGNAMEPREFIX=	php71-
-
-COMMENT=	PHP 7.1 module for accessing a FastDFS cluster
-
-IGNORE_WITH_PHP=	56 70 72
-PHP_VER=		71
-
-.include "${MASTERDIR}/Makefile"
Index: ftp/php72-fastdfs/Makefile
===================================================================
--- ftp/php72-fastdfs/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../php56-fastdfs
-
-PKGNAMEPREFIX=	php72-
-
-COMMENT=	PHP 7.2 module for accessing a FastDFS cluster
-
-IGNORE_WITH_PHP=	56 70 71
-PHP_VER=		72
-
-.include "${MASTERDIR}/Makefile"
Index: graphics/pear-Horde_Image/Makefile
===================================================================
--- graphics/pear-Horde_Image/Makefile
+++ graphics/pear-Horde_Image/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	Horde_Image
 PORTVERSION=	2.5.2
 CATEGORIES=	graphics www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Image API
Index: graphics/pear-Image_Barcode/Makefile
===================================================================
--- graphics/pear-Image_Barcode/Makefile
+++ graphics/pear-Image_Barcode/Makefile
@@ -14,6 +14,6 @@
 OPTIONS_DEFINE=		PEAR_PHP_COMPAT
 PEAR_PHP_COMPAT_DESC=	PEAR::PHP_Compat support
 
-PEAR_PHP_COMPAT_RUN_DEPENDS=	${PEARDIR}/PHP/Compat.php:devel/pear-PHP_Compat
+PEAR_PHP_COMPAT_RUN_DEPENDS=	${PEARDIR}/PHP/Compat.php:devel/pear-PHP_Compat@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: graphics/pear-Image_Canvas/Makefile
===================================================================
--- graphics/pear-Image_Canvas/Makefile
+++ graphics/pear-Image_Canvas/Makefile
@@ -9,7 +9,7 @@
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	OO PEAR common interface to image drawing
 
-RUN_DEPENDS=	${PEARDIR}/Image/Color.php:graphics/pear-Image_Color
+RUN_DEPENDS=	${PEARDIR}/Image/Color.php:graphics/pear-Image_Color@${PHP_FLAVOR}
 
 USE_PHP=	gd
 USES=		dos2unix pear php
Index: graphics/pear-Image_Graph/Makefile
===================================================================
--- graphics/pear-Image_Graph/Makefile
+++ graphics/pear-Image_Graph/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	OO PEAR graph rendering package
 
-RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log \
-		${PEARDIR}/Image/Canvas.php:graphics/pear-Image_Canvas
+RUN_DEPENDS=	${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
+		${PEARDIR}/Image/Canvas.php:graphics/pear-Image_Canvas@${PHP_FLAVOR}
 
 USES=		dos2unix pear
 DOS2UNIX_REGEX=	.*php$$
Index: graphics/pecl-qrencode/Makefile
===================================================================
--- graphics/pecl-qrencode/Makefile
+++ graphics/pecl-qrencode/Makefile
@@ -6,8 +6,6 @@
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	graphics pear
-PKGNAMEPREFIX=	pecl-
-DIST_SUBDIR=	PECL
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	PECL extension for generate qrcode
@@ -17,7 +15,7 @@
 LIB_DEPENDS=	libqrencode.so:graphics/libqrencode \
 		libpng.so:graphics/png
 
-USES=		php:ext
+USES=		php:pecl
 USE_GITHUB=	yes
 GH_ACCOUNT=	vanillahsu
 GH_PROJECT=	pecl-qrencode
Index: graphics/pecl-qrencode/pkg-descr
===================================================================
--- graphics/pecl-qrencode/pkg-descr
+++ graphics/pecl-qrencode/pkg-descr
@@ -1,3 +1,3 @@
 A PECL extension for generate qrcode.
 
-WWW: https://github.com/vanillahsu/pecl-qrencode
+WWW: https://github.com/vanillahsu/pecl-qrencode@${PHP_FLAVOR}
Index: graphics/php-facedetect/Makefile
===================================================================
--- graphics/php-facedetect/Makefile
+++ graphics/php-facedetect/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	1.1
 PORTREVISION=	6
 CATEGORIES=	graphics
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Face detection extension for PHP using OpenCV library
Index: graphics/php-geos/Makefile
===================================================================
--- graphics/php-geos/Makefile
+++ graphics/php-geos/Makefile
@@ -6,9 +6,9 @@
 CATEGORIES=	graphics
 MASTER_SITES=	https://git.osgeo.org/gogs/geos/php-geos/archive/ \
 		LOCAL/sunpoet/${PKGNAMEPREFIX}${PORTNAME}
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	${DISTVERSION}
-DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+DIST_SUBDIR=	php-${PORTNAME}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP bindings for GEOS
@@ -24,6 +24,6 @@
 LDFLAGS+=	-L${PREFIX}/lib
 USES=		php:ext
 
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=		${WRKDIR}/php-${PORTNAME}
 
 .include <bsd.port.mk>
Index: graphics/php-libpuzzle/Makefile
===================================================================
--- graphics/php-libpuzzle/Makefile
+++ graphics/php-libpuzzle/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/release/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	PHP extension for Puzzle library to find similar pictures
Index: graphics/php-magickwand/Makefile
===================================================================
--- graphics/php-magickwand/Makefile
+++ graphics/php-magickwand/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	MagickWandForPHP-${PORTVERSION}-2
 
 MAINTAINER=	ports@FreeBSD.org
Index: japanese/php5-mecab/Makefile
===================================================================
--- japanese/php5-mecab/Makefile
+++ japanese/php5-mecab/Makefile
@@ -19,6 +19,6 @@
 
 .include <bsd.port.pre.mk>
 
-PKGNAMEPREFIX:=	${PKGNAMEPREFIX}php5-
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${PHP_PKGNAMEPREFIX}
 
 .include <bsd.port.post.mk>
Index: lang/php56/Makefile.ext
===================================================================
--- lang/php56/Makefile.ext
+++ lang/php56/Makefile.ext
@@ -1,6 +1,6 @@
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
-USES+=	php:ext
+USES+=	php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	56
 IGNORE_WITH_PHP=	70
Index: lang/php70/Makefile.ext
===================================================================
--- lang/php70/Makefile.ext
+++ lang/php70/Makefile.ext
@@ -2,7 +2,7 @@
 
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
-USES+=	php:ext
+USES+=	php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	70
 IGNORE_WITH_PHP=	56
Index: lang/php71/Makefile.ext
===================================================================
--- lang/php71/Makefile.ext
+++ lang/php71/Makefile.ext
@@ -2,7 +2,7 @@
 
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
-USES+=	php:ext
+USES+=	php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	71
 IGNORE_WITH_PHP=	55 56 70
Index: lang/php72/Makefile.ext
===================================================================
--- lang/php72/Makefile.ext
+++ lang/php72/Makefile.ext
@@ -2,7 +2,7 @@
 
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
-USES+=	php:ext
+USES+=	php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	72
 IGNORE_WITH_PHP= 56 70 71
Index: mail/horde-imp/Makefile
===================================================================
--- mail/horde-imp/Makefile
+++ 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
Index: mail/horde-ingo/Makefile
===================================================================
--- mail/horde-ingo/Makefile
+++ 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 @@
 		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>
Index: mail/horde-turba/Makefile
===================================================================
--- mail/horde-turba/Makefile
+++ 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
Index: mail/horde-webmail/Makefile
===================================================================
--- mail/horde-webmail/Makefile
+++ 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
Index: mail/pear-Horde_Imap_Client/Makefile
===================================================================
--- mail/pear-Horde_Imap_Client/Makefile
+++ 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 @@
 
 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>
Index: mail/pear-Horde_Mail/Makefile
===================================================================
--- mail/pear-Horde_Mail/Makefile
+++ mail/pear-Horde_Mail/Makefile
@@ -17,6 +17,6 @@
 #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>
Index: mail/pear-Horde_Mail_Autoconfig/Makefile
===================================================================
--- mail/pear-Horde_Mail_Autoconfig/Makefile
+++ mail/pear-Horde_Mail_Autoconfig/Makefile
@@ -14,6 +14,6 @@
 		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>
Index: mail/pear-Horde_Mapi/Makefile
===================================================================
--- mail/pear-Horde_Mapi/Makefile
+++ mail/pear-Horde_Mapi/Makefile
@@ -4,7 +4,7 @@
 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_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>
Index: mail/pear-Horde_Smtp/Makefile
===================================================================
--- mail/pear-Horde_Smtp/Makefile
+++ 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
Index: mail/pear-MIME_Type/Makefile
===================================================================
--- mail/pear-MIME_Type/Makefile
+++ mail/pear-MIME_Type/Makefile
@@ -16,6 +16,6 @@
 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>
Index: mail/pear-Mail/Makefile
===================================================================
--- mail/pear-Mail/Makefile
+++ mail/pear-Mail/Makefile
@@ -16,6 +16,6 @@
 
 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>
Index: mail/pear-Mail_Queue/Makefile
===================================================================
--- mail/pear-Mail_Queue/Makefile
+++ mail/pear-Mail_Queue/Makefile
@@ -9,10 +9,10 @@
 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_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>
Index: mail/pear-Mail_mimeDecode/Makefile
===================================================================
--- mail/pear-Mail_mimeDecode/Makefile
+++ mail/pear-Mail_mimeDecode/Makefile
@@ -10,7 +10,7 @@
 
 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
Index: mail/pear-Net_Cyrus/Makefile
===================================================================
--- mail/pear-Net_Cyrus/Makefile
+++ mail/pear-Net_Cyrus/Makefile
@@ -8,10 +8,10 @@
 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
 
Index: mail/pear-Net_IMAP/Makefile
===================================================================
--- mail/pear-Net_IMAP/Makefile
+++ mail/pear-Net_IMAP/Makefile
@@ -10,8 +10,8 @@
 
 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
Index: mail/pear-Net_LMTP/Makefile
===================================================================
--- mail/pear-Net_LMTP/Makefile
+++ mail/pear-Net_LMTP/Makefile
@@ -10,7 +10,7 @@
 
 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
Index: mail/pecl-mailparse2/Makefile
===================================================================
--- mail/pecl-mailparse2/Makefile
+++ mail/pecl-mailparse2/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	2.1.6
 PORTREVISION=	1
 CATEGORIES=	mail www
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	PECL extension to create and decode MIME messages
Index: mail/phplist/Makefile
===================================================================
--- mail/phplist/Makefile
+++ mail/phplist/Makefile
@@ -12,7 +12,7 @@
 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
Index: mail/squirrelmail-change_sqlpass-plugin/Makefile
===================================================================
--- mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -12,7 +12,7 @@
 
 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/-/_/}
 
Index: mail/squirrelmail-sasql-plugin/Makefile
===================================================================
--- mail/squirrelmail-sasql-plugin/Makefile
+++ mail/squirrelmail-sasql-plugin/Makefile
@@ -9,7 +9,7 @@
 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
Index: math/pecl-bitset2/Makefile
===================================================================
--- math/pecl-bitset2/Makefile
+++ math/pecl-bitset2/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	bitset
 PORTVERSION=	2.0.4
 CATEGORIES=	math
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PECL extension for manipulating bitsets
Index: math/pecl-stats2/Makefile
===================================================================
--- math/pecl-stats2/Makefile
+++ math/pecl-stats2/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	stats
 PORTVERSION=	2.0.3
 CATEGORIES=	math textproc pear
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	PECL extension with routines for statistical computation
Index: misc/pear-Services_Weather/Makefile
===================================================================
--- misc/pear-Services_Weather/Makefile
+++ misc/pear-Services_Weather/Makefile
@@ -11,7 +11,7 @@
 
 LICENSE=	BSD2CLAUSE
 
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 PORTSCOUT=	skipv:1.4.7
 
@@ -26,10 +26,10 @@
 PEAR_SOAP_DESC=	PEAR::SOAP support
 PEAR_XML_SERIALIZER_DESC=	PEAR::XML::Serializer support
 
-PEAR_NET_FTP_BUILD_DEPENDS=	${PEARDIR}/Net/FTP.php:ftp/pear-Net_FTP
-PEAR_CACHE_BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache
-PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:net/pear-SOAP
-PEAR_XML_SERIALIZER_BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+PEAR_NET_FTP_BUILD_DEPENDS=	${PEARDIR}/Net/FTP.php:ftp/pear-Net_FTP@${PHP_FLAVOR}
+PEAR_CACHE_BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR}
+PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:net/pear-SOAP@${PHP_FLAVOR}
+PEAR_XML_SERIALIZER_BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: multimedia/php-pHash/Makefile
===================================================================
--- multimedia/php-pHash/Makefile
+++ multimedia/php-pHash/Makefile
@@ -7,7 +7,7 @@
 CATEGORIES=	multimedia devel
 MASTER_SITES=	http://phash.org/releases/ \
 		http://www.cyberbotx.com/pHash/
-PKGNAMEPREFIX=	php-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	PHP extension for the pHash perceptual hash library
Index: multimedia/zoneminder/Makefile
===================================================================
--- multimedia/zoneminder/Makefile
+++ multimedia/zoneminder/Makefile
@@ -82,9 +82,9 @@
 .include <bsd.port.pre.mk>
 
 .if ${PHP_VER} >= 70
-RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu
+RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
 .else
-RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4
+RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4@${PHP_FLAVOR}
 .endif
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
Index: net-im/pecl-stomp2/Makefile
===================================================================
--- net-im/pecl-stomp2/Makefile
+++ net-im/pecl-stomp2/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	stomp
 PORTVERSION=	2.0.1
 CATEGORIES=	net-im pear
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	PECL extension of stomp client
Index: net-mgmt/icingaweb2/Makefile
===================================================================
--- net-mgmt/icingaweb2/Makefile
+++ net-mgmt/icingaweb2/Makefile
@@ -40,7 +40,7 @@
 PGSQL_USE=	PHP=pdo_pgsql,pgsql
 MYSQL_USE=	PHP=pdo_mysql
 LDAP_USE=	PHP=ldap
-PDF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+PDF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 
 post-patch:
 	${REINPLACE_CMD} 's%\(/etc/icingaweb2\)%${PREFIX}\1%g' \
Index: net-mgmt/klg/Makefile
===================================================================
--- net-mgmt/klg/Makefile
+++ net-mgmt/klg/Makefile
@@ -11,7 +11,7 @@
 
 LICENSE=	BSD3CLAUSE
 
-USES=		tar:txz
+USES=		tar:txz php
 USE_MYSQL=	yes
 USE_PHP=	mysql pcre sockets xml
 WANT_PHP_WEB=	yes
@@ -33,10 +33,14 @@
 
 SSH2_DESC=		SSH2 support for router access
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSSH2}
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2
+.  if ${PHP_VER} < 70
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2-0@${PHP_FLAVOR}
+.  else
+RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2@${PHP_FLAVOR}
+.  endif
 .endif
 
 do-install:
@@ -47,4 +51,4 @@
 	${CP} ${WRKSRC}/klg_config.php ${STAGEDIR}/${WWWDIR}/klg_config.php.sample
 	${CP} ${WRKSRC}/klg_template.html ${STAGEDIR}/${WWWDIR}/klg_template.html.sample
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: net-mgmt/librenms/Makefile
===================================================================
--- net-mgmt/librenms/Makefile
+++ net-mgmt/librenms/Makefile
@@ -49,8 +49,8 @@
 
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \
 		dot:graphics/graphviz \
-		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \
-		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \
+		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
 		snmpget:net-mgmt/net-snmp \
 		bash:shells/bash \
 		sudo:security/sudo
Index: net-mgmt/nagiosql/Makefile
===================================================================
--- net-mgmt/nagiosql/Makefile
+++ net-mgmt/nagiosql/Makefile
@@ -15,7 +15,7 @@
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	nagios:net-mgmt/nagios \
-		${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT
+		${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR}
 
 USE_MYSQL=	yes
 USES=		cpe gettext tar:bzip2
Index: net-mgmt/observium/Makefile
===================================================================
--- net-mgmt/observium/Makefile
+++ net-mgmt/observium/Makefile
@@ -35,8 +35,8 @@
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \
 		dot:graphics/graphviz \
 		mtr:net/mtr-nox11 \
-		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \
-		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \
+		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
 		snmpget:net-mgmt/net-snmp \
 		sudo:security/sudo
 LIB_DEPENDS+=	libpng.so:graphics/png
Index: net-mgmt/phpipam/Makefile
===================================================================
--- net-mgmt/phpipam/Makefile
+++ net-mgmt/phpipam/Makefile
@@ -11,7 +11,7 @@
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
Index: net-mgmt/phpweathermap/Makefile
===================================================================
--- net-mgmt/phpweathermap/Makefile
+++ net-mgmt/phpweathermap/Makefile
@@ -14,7 +14,7 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear \
+RUN_DEPENDS=	${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear@${PHP_FLAVOR} \
 		rrdtool:databases/rrdtool
 
 NO_BUILD=	yes
Index: net/pear-Auth_RADIUS/Makefile
===================================================================
--- net/pear-Auth_RADIUS/Makefile
+++ net/pear-Auth_RADIUS/Makefile
@@ -11,6 +11,6 @@
 LICNSE=		BSD3CLAUSE
 
 USE_PHP=	radius
-USES=		pear php
+USES=		pear php:flavors
 
 .include <bsd.port.mk>
Index: net/pear-Horde_Kolab_Server/Makefile
===================================================================
--- net/pear-Horde_Kolab_Server/Makefile
+++ net/pear-Horde_Kolab_Server/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Horde_Kolab_Server
 DISTVERSION=	2.0.5
 CATEGORIES=	net www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde library for manipulating the Kolab user database
Index: net/pear-Net_CDDB/Makefile
===================================================================
--- net/pear-Net_CDDB/Makefile
+++ net/pear-Net_CDDB/Makefile
@@ -8,12 +8,12 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class that access and query CDDB audio-CD servers
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
-		${PEARDIR}/MDB2.php:databases/pear-MDB2
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
-		${PEARDIR}/MDB2.php:databases/pear-MDB2
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+		${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
 
 USES=		dos2unix pear
 
Index: net/pear-Net_DNSBL/Makefile
===================================================================
--- net/pear-Net_DNSBL/Makefile
+++ net/pear-Net_DNSBL/Makefile
@@ -11,14 +11,14 @@
 
 LICENSE=	PHP30
 
-BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
-		${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP \
-		${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2 \
-		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS:=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
-		${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP \
-		${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2 \
-		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \
+		${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP@${PHP_FLAVOR} \
+		${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \
+		${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP@${PHP_FLAVOR} \
+		${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_Dict/Makefile
===================================================================
--- net/pear-Net_Dict/Makefile
+++ net/pear-Net_Dict/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR interface to the DICT protocol
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Cache.php:sysutils/pear-Cache
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Cache.php:sysutils/pear-Cache
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_Finger/Makefile
===================================================================
--- net/pear-Net_Finger/Makefile
+++ net/pear-Net_Finger/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class that provides a tool for querying finger servers
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_Geo/Makefile
===================================================================
--- net/pear-Net_Geo/Makefile
+++ net/pear-Net_Geo/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Geographical locations based on Internet address
 
-BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_GeoIP/Makefile
===================================================================
--- net/pear-Net_GeoIP/Makefile
+++ net/pear-Net_GeoIP/Makefile
@@ -10,10 +10,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Library to perform geo-location lookups of IP addresses
 
-BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_NNTP/Makefile
===================================================================
--- net/pear-Net_NNTP/Makefile
+++ net/pear-Net_NNTP/Makefile
@@ -14,8 +14,8 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 NO_ARCH=	yes
 
Index: net/pear-Net_Nmap/Makefile
===================================================================
--- net/pear-Net_Nmap/Makefile
+++ net/pear-Net_Nmap/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS:=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_POP3/Makefile
===================================================================
--- net/pear-Net_POP3/Makefile
+++ net/pear-Net_POP3/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Provides a POP3 class to access POP3 server
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_SMS/Makefile
===================================================================
--- net/pear-Net_SMS/Makefile
+++ net/pear-Net_SMS/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR SMS functionality
 
-BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USE_PHP=	gettext
 USES=		pear php
Index: net/pear-Net_SMTP/Makefile
===================================================================
--- net/pear-Net_SMTP/Makefile
+++ net/pear-Net_SMTP/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 NO_ARCH=	yes
 USES=		pear
@@ -19,6 +19,6 @@
 OPTIONS_DEFINE=	PEAR_AUTH_SASL
 PEAR_AUTH_SASL_DESC=	PEAR::Auth_SASL support
 
-PEAR_AUTH_SASL_BUILD_DEPENDS=	${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL
+PEAR_AUTH_SASL_BUILD_DEPENDS=	${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: net/pear-Net_Sieve/Makefile
===================================================================
--- net/pear-Net_Sieve/Makefile
+++ net/pear-Net_Sieve/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 USES=	pear
 
Index: net/pear-Net_Vpopmaild/Makefile
===================================================================
--- net/pear-Net_Vpopmaild/Makefile
+++ net/pear-Net_Vpopmaild/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR Class for accessing Vpopmail's vpopmaild daemon
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Log.php:sysutils/pear-Log
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \
-		${PEARDIR}/Log.php:sysutils/pear-Log
+BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \
+		${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR}
 
 USES=		pear
 
Index: net/pear-Net_Whois/Makefile
===================================================================
--- net/pear-Net_Whois/Makefile
+++ net/pear-Net_Whois/Makefile
@@ -10,6 +10,6 @@
 
 USES=		pear
 
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: net/pear-SOAP/Makefile
===================================================================
--- net/pear-SOAP/Makefile
+++ net/pear-SOAP/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR SOAP Client/Server for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		pear
 
@@ -18,8 +18,8 @@
 PEAR_MAIL_MIME_DESC=	PEAR::Mail::Mime support
 PEAR_NET_DIME_DESC=	PEAR::Net::DIME support
 
-PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail
-PEAR_MAIL_MIME_BUILD_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime
-PEAR_NET_DIME_BUILD_DEPENDS=	${PEARDIR}/Net/DIME.php:net/pear-Net_DIME
+PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
+PEAR_MAIL_MIME_BUILD_DEPENDS=	${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR}
+PEAR_NET_DIME_BUILD_DEPENDS=	${PEARDIR}/Net/DIME.php:net/pear-Net_DIME@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: net/pear-Services_Twitter/Makefile
===================================================================
--- net/pear-Services_Twitter/Makefile
+++ net/pear-Services_Twitter/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP interface to Twitter's API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USE_PHP=	json simplexml mbstring
 
Index: net/pear-XML_RPC2/Makefile
===================================================================
--- net/pear-XML_RPC2/Makefile
+++ net/pear-XML_RPC2/Makefile
@@ -10,10 +10,10 @@
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
-		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \
-		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USE_PHP=	curl
 USES=	pear
Index: net/pecl-oauth2/Makefile
===================================================================
--- net/pecl-oauth2/Makefile
+++ net/pecl-oauth2/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	oauth
 PORTVERSION=	2.0.2
 CATEGORIES=	net pear
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Php interface to the OAuth Protocol
Index: security/base/Makefile
===================================================================
--- security/base/Makefile
+++ security/base/Makefile
@@ -13,9 +13,9 @@
 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
 
Index: security/maia/Makefile
===================================================================
--- security/maia/Makefile
+++ security/maia/Makefile
@@ -108,26 +108,26 @@
 		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 "
Index: security/mailzu/Makefile
===================================================================
--- security/mailzu/Makefile
+++ security/mailzu/Makefile
@@ -15,10 +15,10 @@
 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}"
Index: security/nextcloud-passman/Makefile
===================================================================
--- security/nextcloud-passman/Makefile
+++ security/nextcloud-passman/Makefile
@@ -18,7 +18,7 @@
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: security/nextcloud-twofactor_totp/Makefile
===================================================================
--- security/nextcloud-twofactor_totp/Makefile
+++ security/nextcloud-twofactor_totp/Makefile
@@ -17,6 +17,7 @@
 
 RUN_DEPENDS=	nextcloud>=12:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: security/nextcloud-twofactor_u2f/Makefile
===================================================================
--- security/nextcloud-twofactor_u2f/Makefile
+++ security/nextcloud-twofactor_u2f/Makefile
@@ -17,6 +17,7 @@
 
 RUN_DEPENDS=	nextcloud>=12:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: security/pear-Auth/Makefile
===================================================================
--- security/pear-Auth/Makefile
+++ security/pear-Auth/Makefile
@@ -25,17 +25,17 @@
 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
Index: security/pear-Auth_SASL/Makefile
===================================================================
--- security/pear-Auth_SASL/Makefile
+++ security/pear-Auth_SASL/Makefile
@@ -10,7 +10,7 @@
 
 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
Index: security/pear-Crypt_GPG/Makefile
===================================================================
--- security/pear-Crypt_GPG/Makefile
+++ security/pear-Crypt_GPG/Makefile
@@ -11,7 +11,7 @@
 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
Index: security/pear-File_Passwd/Makefile
===================================================================
--- security/pear-File_Passwd/Makefile
+++ security/pear-File_Passwd/Makefile
@@ -13,6 +13,6 @@
 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>
Index: security/pear-File_SMBPasswd/Makefile
===================================================================
--- security/pear-File_SMBPasswd/Makefile
+++ security/pear-File_SMBPasswd/Makefile
@@ -8,8 +8,8 @@
 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
Index: security/pear-Horde_Crypt/Makefile
===================================================================
--- security/pear-Horde_Crypt/Makefile
+++ 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
Index: security/pear-Horde_Crypt_Blowfish/Makefile
===================================================================
--- security/pear-Horde_Crypt_Blowfish/Makefile
+++ 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
Index: security/pear-LiveUser/Makefile
===================================================================
--- security/pear-LiveUser/Makefile
+++ security/pear-LiveUser/Makefile
@@ -8,8 +8,8 @@
 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_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>
Index: security/pear-LiveUser_Admin/Makefile
===================================================================
--- security/pear-LiveUser_Admin/Makefile
+++ security/pear-LiveUser_Admin/Makefile
@@ -9,8 +9,8 @@
 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 @@
 
 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>
Index: security/pecl-ssh2-0/Makefile
===================================================================
--- security/pecl-ssh2-0/Makefile
+++ 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
Index: security/php-suhosin/Makefile
===================================================================
--- security/php-suhosin/Makefile
+++ security/php-suhosin/Makefile
@@ -6,7 +6,7 @@
 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
Index: security/snuffleupagus/Makefile
===================================================================
--- security/snuffleupagus/Makefile
+++ security/snuffleupagus/Makefile
@@ -4,6 +4,7 @@
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.2.1
 CATEGORIES=	security
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	franco@opnsense.org
 COMMENT=	Security module for PHP 7+
Index: sysutils/pear-Cache/Makefile
===================================================================
--- sysutils/pear-Cache/Makefile
+++ sysutils/pear-Cache/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR framework for caching of arbitrary data
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		pear
 
Index: sysutils/pear-Horde_Log/Makefile
===================================================================
--- sysutils/pear-Horde_Log/Makefile
+++ sysutils/pear-Horde_Log/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	Horde_Log
 PORTVERSION=	2.3.0
 CATEGORIES=	sysutils www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Logging library
Index: sysutils/pear-Horde_Vfs/Makefile
===================================================================
--- sysutils/pear-Horde_Vfs/Makefile
+++ sysutils/pear-Horde_Vfs/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	Horde_Vfs
 PORTVERSION=	2.4.0
 CATEGORIES=	sysutils www pear
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Virtual File System API
Index: sysutils/pear-Log/Makefile
===================================================================
--- sysutils/pear-Log/Makefile
+++ sysutils/pear-Log/Makefile
@@ -18,9 +18,9 @@
 PEAR_MAIL_DESC=	PEAR::Mail support
 PHP_SQLITE_DESC=	PHP sqlite support (php5 only)
 
-PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
-PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail
+PEAR_DB_BUILD_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_MDB2_BUILD_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
+PEAR_MAIL_BUILD_DEPENDS=	${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
 PHP_SQLITE_USE=	PHP=sqlite3
 
 .include <bsd.port.mk>
Index: sysutils/pear-Translation2/Makefile
===================================================================
--- sysutils/pear-Translation2/Makefile
+++ sysutils/pear-Translation2/Makefile
@@ -24,13 +24,13 @@
 PEAR_I18NV2_DESC=	PEAR::I18Nv2 support
 PEAR_XML_SERIALIZER_DESC=	PEAR::XML_Serializer support
 
-PEAR_CACHE_LITE_RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite
-PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB
-PEAR_DB_DATAOBJECT_RUN_DEPENDS=	${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject
-PEAR_MDB_RUN_DEPENDS=	${PEARDIR}/MDB.php:databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS=	${PEARDIR}/MDB2.php:databases/pear-MDB2
-PEAR_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext
-PEAR_I18NV2_RUN_DEPENDS=	${PEARDIR}/File/I18Nv2.php:sysutils/pear-I18Nv2
-PEAR_XML_SERIALIZER_RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+PEAR_CACHE_LITE_RUN_DEPENDS=	${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR}
+PEAR_DB_RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_DB_DATAOBJECT_RUN_DEPENDS=	${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${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_FILE_GETTEXT_RUN_DEPENDS=	${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext@${PHP_FLAVOR}
+PEAR_I18NV2_RUN_DEPENDS=	${PEARDIR}/File/I18Nv2.php:sysutils/pear-I18Nv2@${PHP_FLAVOR}
+PEAR_XML_SERIALIZER_RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: textproc/libmrss-php/Makefile
===================================================================
--- textproc/libmrss-php/Makefile
+++ textproc/libmrss-php/Makefile
@@ -6,7 +6,7 @@
 PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.autistici.org/bakunin/libmrss/
-PKGNAMESUFFIX=	-php
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP library for parsing, writing, and creating RSS
Index: textproc/pear-File_MARC/Makefile
===================================================================
--- textproc/pear-File_MARC/Makefile
+++ textproc/pear-File_MARC/Makefile
@@ -14,7 +14,7 @@
 OPTIONS_DEFINE=	ISPN
 
 ISPN_DESC=	Validation class for ISPN (International Standard Product Numbers)
-ISPN_RUN_DEPENDS=	${PEARDIR}/Validate/ISPN.php:textproc/pear-Validate_ISPN
+ISPN_RUN_DEPENDS=	${PEARDIR}/Validate/ISPN.php:textproc/pear-Validate_ISPN@${PHP_FLAVOR}
 
 USES=	pear
 NO_ARCH=	yes
Index: textproc/pear-Numbers_Words/Makefile
===================================================================
--- textproc/pear-Numbers_Words/Makefile
+++ textproc/pear-Numbers_Words/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	meritus@innervision.pl
 COMMENT=	PEAR package provides methods for spelling numerals in words
 
-BUILD_DEPENDS=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger
-RUN_DEPENDS=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger
+BUILD_DEPENDS=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger@${PHP_FLAVOR}
 
 USES=		pear
 
Index: textproc/pear-Spreadsheet_Excel_Writer/Makefile
===================================================================
--- textproc/pear-Spreadsheet_Excel_Writer/Makefile
+++ textproc/pear-Spreadsheet_Excel_Writer/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PEARDIR}/OLE.php:devel/pear-OLE
-RUN_DEPENDS=	${PEARDIR}/OLE.php:devel/pear-OLE
+BUILD_DEPENDS=	${PEARDIR}/OLE.php:devel/pear-OLE@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/OLE.php:devel/pear-OLE@${PHP_FLAVOR}
 
 USES=	pear
 NO_ARCH=	yes
Index: textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
===================================================================
--- textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
+++ textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using RSS files
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
 
 USES=	pear
 USE_PHP=	mysql
Index: textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
===================================================================
--- textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
+++ textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	DataSource driver using XML files
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
 
 USES=	pear
 USE_PHP=	mysql
Index: textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
===================================================================
--- textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
+++ textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Renderer driver that generates a CSV string
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR}
 
 USES=		pear
 
Index: textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
===================================================================
--- textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
+++ textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Renderer driver that generates a XLS string
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \
+		${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \
+		${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer@${PHP_FLAVOR}
 
 USES=		pear
 
Index: textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
===================================================================
--- textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
+++ textproc/pear-Structures_DataGrid_Renderer_XML/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Renderer driver that generates a XML string
 
-BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 USES=		pear
 
Index: textproc/pear-Symfony_Component_Yaml/Makefile
===================================================================
--- textproc/pear-Symfony_Component_Yaml/Makefile
+++ textproc/pear-Symfony_Component_Yaml/Makefile
@@ -5,7 +5,7 @@
 PORTVERSION=	2.4.4
 CATEGORIES=	textproc pear
 MASTER_SITES=	http://pear.symfony.com/get/
-PKGNAMEPREFIX=	pear-Symfony_Component_
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}Symfony_Component_
 DIST_SUBDIR=	Symfony2
 
 MAINTAINER=	joneum@FreeBSD.org
@@ -13,9 +13,6 @@
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony.com.reg:devel/pear-channel-symfony2
-
 USES=		pear
 PEAR_CHANNEL=	symfony2
 
Index: textproc/pear-Text_Highlighter/Makefile
===================================================================
--- textproc/pear-Text_Highlighter/Makefile
+++ textproc/pear-Text_Highlighter/Makefile
@@ -10,8 +10,8 @@
 
 LICENSE=	PHP301
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 USES=		pear
 NO_ARCH=	yes
Index: textproc/pear-Text_Template/Makefile
===================================================================
--- textproc/pear-Text_Template/Makefile
+++ textproc/pear-Text_Template/Makefile
@@ -5,14 +5,11 @@
 PORTVERSION=	1.2.0
 CATEGORIES=	textproc www pear
 MASTER_SITES=	http://pear.phpunit.de/get/
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Simple template engine
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-
 USES=	pear
 PEAR_CHANNEL=	phpunit
 
Index: textproc/pear-Validate_ISPN/Makefile
===================================================================
--- textproc/pear-Validate_ISPN/Makefile
+++ textproc/pear-Validate_ISPN/Makefile
@@ -11,7 +11,7 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate
+RUN_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
 
 USES=		pear
 NO_ARCH=	yes
Index: textproc/pear-XML_Beautifier/Makefile
===================================================================
--- textproc/pear-XML_Beautifier/Makefile
+++ textproc/pear-XML_Beautifier/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class to format XML documents
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 USES=		pear
 
Index: textproc/pear-XML_DTD/Makefile
===================================================================
--- textproc/pear-XML_DTD/Makefile
+++ textproc/pear-XML_DTD/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Parsing of DTD files and DTD validation of XML files
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 USES=		dos2unix pear
 
Index: textproc/pear-XML_Wddx/Makefile
===================================================================
--- textproc/pear-XML_Wddx/Makefile
+++ textproc/pear-XML_Wddx/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR Wddx pretty serializer and deserializer
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR}
 
 NO_ARCH=	yes
 USES=		pear
Index: textproc/pear-YAML/Makefile
===================================================================
--- textproc/pear-YAML/Makefile
+++ textproc/pear-YAML/Makefile
@@ -5,14 +5,11 @@
 PORTVERSION=	1.0.6
 CATEGORIES=	textproc www pear
 MASTER_SITES=	http://pear.symfony-project.com/get/
-PKGNAMEPREFIX=	pear-
+PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	The Symfony YAML Component
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony
-
 USES=	pear
 PEAR_CHANNEL=	symfony
 
Index: textproc/pecl-xdiff2/Makefile
===================================================================
--- textproc/pecl-xdiff2/Makefile
+++ textproc/pecl-xdiff2/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	xdiff
 PORTVERSION=	2.0.1
 CATEGORIES=	textproc pear
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	PECL extension to create/apply binary and text patches
Index: textproc/pecl-yaml1/Makefile
===================================================================
--- textproc/pecl-yaml1/Makefile
+++ textproc/pecl-yaml1/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	yaml
 PORTVERSION=	1.3.1
 CATEGORIES=	textproc pear
-PKGNAMESUFFIX=	1
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	YAML-1.1 parser and emitter
Index: textproc/php-mecab/Makefile
===================================================================
--- textproc/php-mecab/Makefile
+++ textproc/php-mecab/Makefile
@@ -1,11 +1,12 @@
 # Created by: Gasol Wu <gasol.wu@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	php-mecab
+PORTNAME=	mecab
 PORTVERSION=	0.6.0
 PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	PHP bindings of the MeCab
@@ -16,10 +17,10 @@
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsky
+GH_PROJECT=	php-${PORTNAME}
 
 WRKSRC_SUBDIR=	mecab
 CONFIGURE_ARGS=	--with-mecab=${LOCALBASE}/bin/mecab-config
 USES=		php:ext
-PHP_MODNAME=	mecab
 
 .include <bsd.port.mk>
Index: www/Makefile
===================================================================
--- www/Makefile
+++ www/Makefile
@@ -2411,10 +2411,7 @@
     SUBDIR += ufdbguard
     SUBDIR += unit
     SUBDIR += unit-go
-    SUBDIR += unit-php56
-    SUBDIR += unit-php70
-    SUBDIR += unit-php71
-    SUBDIR += unit-php72
+    SUBDIR += unit-php
     SUBDIR += usermanager
     SUBDIR += uwsgi
     SUBDIR += uwsgitop
Index: www/hastymail2-devel/Makefile
===================================================================
--- www/hastymail2-devel/Makefile
+++ www/hastymail2-devel/Makefile
@@ -38,19 +38,19 @@
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=	pgsql
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql@${PHP_FLAVOR}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 .endif
 
 post-patch:
Index: www/hastymail2/Makefile
===================================================================
--- www/hastymail2/Makefile
+++ www/hastymail2/Makefile
@@ -42,19 +42,19 @@
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=	pgsql
 .if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql@${PHP_FLAVOR}
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL})
-RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS+=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
Index: www/horde-ansel/Makefile
===================================================================
--- www/horde-ansel/Makefile
+++ www/horde-ansel/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ansel
 PORTVERSION=	3.0.8
 CATEGORIES=	www pear graphics
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Photo Management and Web Gallery
Index: www/horde-base/Makefile
===================================================================
--- www/horde-base/Makefile
+++ www/horde-base/Makefile
@@ -3,12 +3,12 @@
 PORTNAME=	horde
 PORTVERSION=	5.2.17
 CATEGORIES=	www pear
-PKGNAMEPREFIX=
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Application Framework
 
-RUN_DEPENDS=	${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2
+RUN_DEPENDS=	${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR}
 
 OPTIONS_DEFAULT=	ICONV
 OPTIONS_DEFINE=	FACEBOOK ICONV TWITTER WEATHER
Index: www/horde-passwd/Makefile
===================================================================
--- www/horde-passwd/Makefile
+++ www/horde-passwd/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	passwd
 PORTVERSION=	5.0.7
 CATEGORIES=	www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde password changing application
Index: www/horde-trean/Makefile
===================================================================
--- www/horde-trean/Makefile
+++ www/horde-trean/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	trean
 PORTVERSION=	1.1.9
 CATEGORIES=	www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Bookmark Manager
Index: www/horde-wicked/Makefile
===================================================================
--- www/horde-wicked/Makefile
+++ www/horde-wicked/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	wicked
 PORTVERSION=	2.0.8
 CATEGORIES=	www pear
-PKGNAMEPREFIX=	horde-
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}horde-
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Wiki Application
@@ -11,7 +11,7 @@
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki
+RUN_DEPENDS+=	${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki@${PHP_FLAVOR}
 
 USES=	horde cpe php
 USE_PHP=	gettext
Index: www/ilias/Makefile
===================================================================
--- www/ilias/Makefile
+++ www/ilias/Makefile
@@ -14,10 +14,10 @@
 RUN_DEPENDS=	convert:graphics/ImageMagick \
 		zip:archivers/zip \
 		${UNZIP_CMD}:archivers/unzip \
-		${LOCALBASE}/share/pear/PEAR.php:devel/pear \
-		${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth \
-		${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2 \
-		${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT
+		${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+		${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR}
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GITHUB=	yes
@@ -37,8 +37,8 @@
 
 OPTIONS_DEFINE=		SCORM2004 Checker Mail
 SCORM2004_USE=		php=json
-Checker_RUN_DEPENDS=	${LOCALBASE}/share/pear/HTTP/Request.php:www/pear-HTTP_Request
-Mail_RUN_DEPENDS=	${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail
+Checker_RUN_DEPENDS=	${LOCALBASE}/share/pear/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+Mail_RUN_DEPENDS=	${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
 
 EXTRA_FILES=	%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/_mocha \
 		%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/express \
Index: www/magento/Makefile
===================================================================
--- www/magento/Makefile
+++ www/magento/Makefile
@@ -28,7 +28,7 @@
 NO_ARCH=	yes
 MAGENTODIR?=	www/magento
 
-OAUTH_RUN_DEPENDS=	pecl-oauth>=1.2.3:net/pecl-oauth
+OAUTH_RUN_DEPENDS=	pecl-oauth>=1.2.3:net/pecl-oauth@${PHP_FLAVOR}
 REDIS_USE=	php=redis
 
 # First need to submit the port
Index: www/mediawiki123/Makefile
===================================================================
--- www/mediawiki123/Makefile
+++ www/mediawiki123/Makefile
@@ -51,7 +51,7 @@
 LDAP_USE=	php=ldap
 
 MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 SOCKETS_USE=	php=sockets
 
Index: www/mediawiki127/Makefile
===================================================================
--- www/mediawiki127/Makefile
+++ www/mediawiki127/Makefile
@@ -50,7 +50,7 @@
 SOCKETS_USE=	php=sockets
 
 MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 
 pre-install:
Index: www/mediawiki128/Makefile
===================================================================
--- www/mediawiki128/Makefile
+++ www/mediawiki128/Makefile
@@ -52,7 +52,7 @@
 SOCKETS_USE=	php=sockets
 
 MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 
 pre-install:
Index: www/mediawiki129/Makefile
===================================================================
--- www/mediawiki129/Makefile
+++ www/mediawiki129/Makefile
@@ -49,7 +49,7 @@
 SOCKETS_USE=	php=sockets
 
 MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 
 pre-install:
Index: www/mediawiki130/Makefile
===================================================================
--- www/mediawiki130/Makefile
+++ www/mediawiki130/Makefile
@@ -49,7 +49,7 @@
 SOCKETS_USE=	php=sockets
 
 MEMCACHED_RUN_DEPENDS=	memcached:databases/memcached
-IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
 XCACHE_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
 
 pre-install:
Index: www/nextcloud-calendar/Makefile
===================================================================
--- www/nextcloud-calendar/Makefile
+++ www/nextcloud-calendar/Makefile
@@ -17,6 +17,7 @@
 
 RUN_DEPENDS=	nextcloud>=12:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: www/nextcloud-contacts/Makefile
===================================================================
--- www/nextcloud-contacts/Makefile
+++ www/nextcloud-contacts/Makefile
@@ -17,6 +17,7 @@
 
 RUN_DEPENDS=	nextcloud>=11:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: www/nextcloud-notes/Makefile
===================================================================
--- www/nextcloud-notes/Makefile
+++ www/nextcloud-notes/Makefile
@@ -18,6 +18,7 @@
 
 RUN_DEPENDS=	nextcloud>=9:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: www/nextcloud-tasks/Makefile
===================================================================
--- www/nextcloud-tasks/Makefile
+++ www/nextcloud-tasks/Makefile
@@ -18,6 +18,7 @@
 
 RUN_DEPENDS=	nextcloud>=10:www/nextcloud
 
+USES=		php
 NO_BUILD=	yes
 NO_ARCH=	yes
 
Index: www/nextcloud/Makefile
===================================================================
--- www/nextcloud/Makefile
+++ www/nextcloud/Makefile
@@ -40,7 +40,7 @@
 PGSQL_USES=	pgsql
 PGSQL_USE=	PHP=pdo_pgsql,pgsql
 SQLITE_USE=	PHP=pdo_sqlite,sqlite3
-SMB_RUN_DEPENDS=	pecl-smbclient>=0.8.0:net/pecl-smbclient
+SMB_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR}
 SSL_USE=	PHP=openssl
 
 post-patch:
Index: www/nibbleblog/Makefile
===================================================================
--- www/nibbleblog/Makefile
+++ www/nibbleblog/Makefile
@@ -11,7 +11,7 @@
 MAINTAINER=	marekholienka@gmail.com
 COMMENT=	Lightweight blog system for general use
 
-RUN_DEPENDS=	pear:devel/pear
+RUN_DEPENDS=	pear:devel/pear@${PHP_FLAVOR}
 
 USES=		cpe php zip
 NO_BUILD=	yes
Index: www/owncloud/Makefile
===================================================================
--- www/owncloud/Makefile
+++ www/owncloud/Makefile
@@ -41,7 +41,7 @@
 PGSQL_USES=	pgsql
 PGSQL_USE=	PHP=pdo_pgsql,pgsql
 SQLITE_USE=	PHP=pdo_sqlite,sqlite3
-SMB_RUN_DEPENDS=	pecl-smbclient>=0.8.0:net/pecl-smbclient
+SMB_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR}
 SSL_USE=	PHP=openssl
 
 do-install:
Index: www/pear-HTTP_Client/Makefile
===================================================================
--- www/pear-HTTP_Client/Makefile
+++ www/pear-HTTP_Client/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	PEAR classes for high level HTTP requests
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-HTTP_Download/Makefile
===================================================================
--- www/pear-HTTP_Download/Makefile
+++ www/pear-HTTP_Download/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR class to send HTTP downloads
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header
-RUN_DEPENDS=	${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-HTTP_FloodControl/Makefile
===================================================================
--- www/pear-HTTP_FloodControl/Makefile
+++ www/pear-HTTP_FloodControl/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR classes to detect and protect from attempts to flood a site
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
 
 DOCS=		README LICENSE
 OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2
@@ -19,9 +19,9 @@
 
 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_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}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/docs
Index: www/pear-HTTP_Header/Makefile
===================================================================
--- www/pear-HTTP_Header/Makefile
+++ www/pear-HTTP_Header/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR OO interface to modify and handle HTTP headers and status codes
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-HTTP_Request/Makefile
===================================================================
--- www/pear-HTTP_Request/Makefile
+++ www/pear-HTTP_Request/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR classes providing an easy way to perform HTTP requests
 
-BUILD_DEPENDS=	${PEARDIR}/Net/URL.php:net/pear-Net_URL		\
-		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/URL.php:net/pear-Net_URL		\
-		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR}		\
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR}		\
+		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-HTTP_Request2/Makefile
===================================================================
--- www/pear-HTTP_Request2/Makefile
+++ www/pear-HTTP_Request2/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR classes providing an easy way to perform HTTP requests
 
-BUILD_DEPENDS=	${PEARDIR}/Net/URL2.php:net/pear-Net_URL2
-RUN_DEPENDS=	${PEARDIR}/Net/URL2.php:net/pear-Net_URL2
+BUILD_DEPENDS=	${PEARDIR}/Net/URL2.php:net/pear-Net_URL2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Net/URL2.php:net/pear-Net_URL2@${PHP_FLAVOR}
 
 OPTIONS_DEFINE=	CURL FILEINFO ZLIB
 CURL_DESC=	PHP CURL extension support
Index: www/pear-HTTP_Server/Makefile
===================================================================
--- www/pear-HTTP_Server/Makefile
+++ www/pear-HTTP_Server/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	HTTP server class
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
-		${PEARDIR}/Net/Server.php:net/pear-Net_Server
-RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP \
-		${PEARDIR}/Net/Server.php:net/pear-Net_Server
+BUILD_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+		${PEARDIR}/Net/Server.php:net/pear-Net_Server@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+		${PEARDIR}/Net/Server.php:net/pear-Net_Server@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-HTTP_WebDAV_Client/Makefile
===================================================================
--- www/pear-HTTP_WebDAV_Client/Makefile
+++ www/pear-HTTP_WebDAV_Client/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	WebDAV Stream Wrapper Class
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS:=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS:=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_Amazon/Makefile
===================================================================
--- www/pear-Services_Amazon/Makefile
+++ www/pear-Services_Amazon/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP interface to Amazon Product Advertising API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
-		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_Amazon_S3/Makefile
===================================================================
--- www/pear-Services_Amazon_S3/Makefile
+++ www/pear-Services_Amazon_S3/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP API for Amazon S3 (Simple Storage Service)
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 \
-		${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 \
-		${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} \
+		${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} \
+		${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2@${PHP_FLAVOR}
 
 USE_PHP=	spl
 USES=		pear php
Index: www/pear-Services_Blogging/Makefile
===================================================================
--- www/pear-Services_Blogging/Makefile
+++ www/pear-Services_Blogging/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP interface to Blog
 
-BUILD_DEPENDS=	${PEARDIR}/XML/RPC.php:net/pear-XML_RPC
-RUN_DEPENDS=	${PEARDIR}/XML/RPC.php:net/pear-XML_RPC
+BUILD_DEPENDS=	${PEARDIR}/XML/RPC.php:net/pear-XML_RPC@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/RPC.php:net/pear-XML_RPC@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_Compete/Makefile
===================================================================
--- www/pear-Services_Compete/Makefile
+++ www/pear-Services_Compete/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP interface to Compete SnapShop API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_Delicious/Makefile
===================================================================
--- www/pear-Services_Delicious/Makefile
+++ www/pear-Services_Delicious/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR Client for the del.icio.us web service
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
-		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} \
+		${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		dos2unix pear php
 USE_PHP=	openssl
Index: www/pear-Services_Facebook/Makefile
===================================================================
--- www/pear-Services_Facebook/Makefile
+++ www/pear-Services_Facebook/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP interface to Facebook's API
 
-BUILD_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate
-RUN_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate
+BUILD_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
 
 USES=		pear php
 USE_PHP=	curl
Index: www/pear-Services_GeoNames/Makefile
===================================================================
--- www/pear-Services_GeoNames/Makefile
+++ www/pear-Services_GeoNames/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP5 Interface to the GeoNames Public API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_OpenSearch/Makefile
===================================================================
--- www/pear-Services_OpenSearch/Makefile
+++ www/pear-Services_OpenSearch/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Search A9 OpenSearch compatible engines
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
-		${PEARDIR}/XML/RSS.php:devel/pear-XML_RSS
+BUILD_DEPENDS=	${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} \
+		${PEARDIR}/XML/RSS.php:devel/pear-XML_RSS@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_ShortURL/Makefile
===================================================================
--- www/pear-Services_ShortURL/Makefile
+++ www/pear-Services_ShortURL/Makefile
@@ -8,7 +8,7 @@
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Abstract PHP5 interface for shortening and expanding short URLs
 
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USES=		pear php
 USE_PHP=	simplexml pcre spl
Index: www/pear-Services_W3C_CSSValidator/Makefile
===================================================================
--- www/pear-Services_W3C_CSSValidator/Makefile
+++ www/pear-Services_W3C_CSSValidator/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP interface to W3C CSS Validator API
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Services_W3C_HTMLValidator/Makefile
===================================================================
--- www/pear-Services_W3C_HTMLValidator/Makefile
+++ www/pear-Services_W3C_HTMLValidator/Makefile
@@ -9,8 +9,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Object Oriented Interface to the W3C HTML Validator service
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
===================================================================
--- www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
+++ www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
@@ -8,9 +8,9 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Renderer for pear-Structures_DataGrid using HTML_Template_Flexy
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/HTML/Template/Flexy.php:devel/pear-HTML_Template_Flexy \
-		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/HTML/Template/Flexy.php:devel/pear-HTML_Template_Flexy@${PHP_FLAVOR} \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Structures_DataGrid_Renderer_Pager/Makefile
===================================================================
--- www/pear-Structures_DataGrid_Renderer_Pager/Makefile
+++ www/pear-Structures_DataGrid_Renderer_Pager/Makefile
@@ -8,8 +8,8 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Pager Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${PEARDIR}/Pager/Pager.php:devel/pear-Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${PEARDIR}/Pager/Pager.php:devel/pear-Pager@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
===================================================================
--- www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
+++ www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
@@ -8,9 +8,9 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Smarty Renderer for pear-Structures_DataGrid
 
-RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
-		${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 \
-		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS=	${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+		${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2@${PHP_FLAVOR} \
+		${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-UDDI/Makefile
===================================================================
--- www/pear-UDDI/Makefile
+++ www/pear-UDDI/Makefile
@@ -8,10 +8,10 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PEAR UDDI for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
-		${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+		${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
 
 USES=		pear
 
Index: www/pear-XML_GRDDL/Makefile
===================================================================
--- www/pear-XML_GRDDL/Makefile
+++ www/pear-XML_GRDDL/Makefile
@@ -8,14 +8,14 @@
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	PHP library for dealing with GRDDL
 
-BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
-		${PEARDIR}/Net/URL.php:net/pear-Net_URL \
-		${PEARDIR}/Log.php:sysutils/pear-Log \
-		${PEARDIR}/Validate.php:devel/pear-Validate
-RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
-		${PEARDIR}/Net/URL.php:net/pear-Net_URL \
-		${PEARDIR}/Log.php:sysutils/pear-Log \
-		${PEARDIR}/Validate.php:devel/pear-Validate
+BUILD_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+		${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR} \
+		${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
+		${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+		${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR} \
+		${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
+		${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
 
 BROKEN_powerpc64=	fails to package: Generating packing list with pear: Signal 11
 
Index: www/pear-twig/Makefile
===================================================================
--- www/pear-twig/Makefile
+++ www/pear-twig/Makefile
@@ -13,9 +13,6 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
-
 USES=		pear php:cli
 PEAR_CHANNEL=	twig
 NO_ARCH=	yes
Index: www/pecl-http/Makefile
===================================================================
--- www/pecl-http/Makefile
+++ www/pecl-http/Makefile
@@ -12,11 +12,11 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2 \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2 \
+BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2@${PHP_FLAVOR} \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2@${PHP_FLAVOR} \
 		re2c:devel/re2c
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2 \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2
+RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2@${PHP_FLAVOR} \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2@${PHP_FLAVOR}
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent
 
Index: www/pecl-http2/Makefile
===================================================================
--- www/pecl-http2/Makefile
+++ www/pecl-http2/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	http
 PORTVERSION=	2.6.0
 CATEGORIES=	www
-PKGNAMESUFFIX=	2
 DISTNAME=	pecl_${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -13,11 +12,11 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro \
+BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf@${PHP_FLAVOR} \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro@${PHP_FLAVOR} \
 		re2c:devel/re2c
-RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf \
-		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro
+RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf@${PHP_FLAVOR} \
+		${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro@${PHP_FLAVOR}
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent
 
Index: www/pecl-yaf2/Makefile
===================================================================
--- www/pecl-yaf2/Makefile
+++ www/pecl-yaf2/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	yaf
 PORTVERSION=	2.3.5
 CATEGORIES=	www
-PKGNAMESUFFIX=	2
 
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	MVC framework written as a C PHP extension
Index: www/pecl-yar/Makefile
===================================================================
--- www/pecl-yar/Makefile
+++ www/pecl-yar/Makefile
@@ -18,7 +18,7 @@
 
 OPTIONS_DEFINE=	MSGPACK
 MSGPACK_DESC=	Enable MSGPACK module
-MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
-MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack
+MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack@${PHP_FLAVOR}
+MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: www/pecl-yar1/Makefile
===================================================================
--- www/pecl-yar1/Makefile
+++ www/pecl-yar1/Makefile
@@ -5,7 +5,6 @@
 PORTVERSION=	1.2.5
 PORTREVISION=	1
 CATEGORIES=	www
-PKGNAMESUFFIX=	1
 
 MAINTAINER=	johnpupu@gmail.com
 COMMENT=	Yar (Yet another RPC framework) is a light, concurrent RPC framework
@@ -18,7 +17,7 @@
 
 OPTIONS_DEFINE=	MSGPACK
 MSGPACK_DESC=	Enable MSGPACK module
-MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0
-MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0
+MSGPACK_BUILD_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0@${PHP_FLAVOR}
+MSGPACK_RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
Index: www/phalcon/Makefile
===================================================================
--- www/phalcon/Makefile
+++ www/phalcon/Makefile
@@ -5,6 +5,7 @@
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.3.1
 CATEGORIES=	www
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	linpct@gmail.com
 COMMENT=	Phalcon PHP Framework written in C-language
Index: www/php-screw/Makefile
===================================================================
--- www/php-screw/Makefile
+++ www/php-screw/Makefile
@@ -1,11 +1,12 @@
 # Created by: Alex Dupre <sysadmin@alexdupre.com>
 # $FreeBSD$
 
-PORTNAME=	php-screw
+PORTNAME=	screw
 PORTVERSION=	1.5
 PORTREVISION=	1
 CATEGORIES=	www security
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	php_screw-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
Index: www/php-templates/Makefile
===================================================================
--- www/php-templates/Makefile
+++ www/php-templates/Makefile
@@ -1,12 +1,13 @@
 # Created by: vanilla
 # $FreeBSD$
 
-PORTNAME=	php-templates
+PORTNAME=	templates
 PORTVERSION=	1.7.2
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.7:ext \
 		SF/${PORTNAME}/${PORTNAME}-doc/html:doc
+PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 DISTNAME=	php_templates-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:ext
 DISTFILES+=	php_templates-doc-eng-1.1${EXTRACT_SUFX}:doc
Index: www/php56-opcache/Makefile
===================================================================
--- www/php56-opcache/Makefile
+++ www/php56-opcache/Makefile
@@ -7,6 +7,6 @@
 
 PKGNAMESUFFIX=	-opcache
 
-USES=	php:zend
+USES=	php:zend,noflavors
 
 .include "${MASTERDIR}/Makefile"
Index: www/php70-opcache/Makefile
===================================================================
--- www/php70-opcache/Makefile
+++ www/php70-opcache/Makefile
@@ -7,6 +7,6 @@
 
 PKGNAMESUFFIX=	-opcache
 
-USES=	php:zend
+USES=	php:zend,noflavors
 
 .include "${MASTERDIR}/Makefile"
Index: www/php71-opcache/Makefile
===================================================================
--- www/php71-opcache/Makefile
+++ www/php71-opcache/Makefile
@@ -6,6 +6,6 @@
 
 PKGNAMESUFFIX=	-opcache
 
-USES=	php:zend
+USES=	php:zend,noflavors
 
 .include "${MASTERDIR}/Makefile"
Index: www/php72-opcache/Makefile
===================================================================
--- www/php72-opcache/Makefile
+++ www/php72-opcache/Makefile
@@ -6,6 +6,6 @@
 
 PKGNAMESUFFIX=	-opcache
 
-USES=	php:zend
+USES=	php:zend,noflavors
 
 .include "${MASTERDIR}/Makefile"
Index: www/phpbb/Makefile
===================================================================
--- www/phpbb/Makefile
+++ www/phpbb/Makefile
@@ -12,11 +12,11 @@
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
 CONFLICTS=	phpbb-tw-[0-9]*
 
-USES=		tar:bzip2
+USES=		tar:bzip2 php
 
 # The phpBB2 port supports a number of variables that may be tweaked at build
 # time.  Perform a "make options" to see more information on these variables.
Index: www/smarty2/Makefile
===================================================================
--- www/smarty2/Makefile
+++ www/smarty2/Makefile
@@ -7,6 +7,7 @@
 CATEGORIES=	www
 MASTER_SITES=	http://www.smarty.net/files/docs/:manual
 DISTFILES=	manual-en-${PORTVERSION:R}.zip:manual
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	PHP compiling template engine
@@ -17,7 +18,7 @@
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		php:web
+USES=		php:web,flavors
 USE_PHP=	pcre
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
Index: www/smarty3/Makefile
===================================================================
--- www/smarty3/Makefile
+++ www/smarty3/Makefile
@@ -5,14 +5,14 @@
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.30
 CATEGORIES=	www
-PKGNAMESUFFIX=	3
+PKGNAMESUFFIX=	3${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@michael-fausten.de
 COMMENT=	PHP compiling template engine
 
 LICENSE=	LGPL3
 
-USES=		php:web
+USES=		php:web,flavors
 USE_PHP=	pcre
 USE_GITHUB=	yes
 GH_ACCOUNT=	smarty-php
Index: www/unit-php/Makefile
===================================================================
--- www/unit-php/Makefile
+++ www/unit-php/Makefile
@@ -1,17 +1,15 @@
 # Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
 # $FreeBSD$
 
-PHP_VER?=	56
-
-PKGNAMESUFFIX=	-php${PHP_VER}
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 COMMENT=	PHP module for NGINX Unit
 
 PLIST_FILES=	libexec/unit/modules/php${PHP_VER}.unit.so
 
-USES=		php:build,embed
+USES=		php:build,embed,flavors
 
-USE_RC_SUBR?=	# reset to empty
+USE_RC_SUBR=	# reset to empty
 
 MASTERDIR=	${.CURDIR}/../unit
 
Index: www/unit-php70/Makefile
===================================================================
--- www/unit-php70/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-# $FreeBSD$
-
-PHP_VER=	70
-
-MASTERDIR=	${.CURDIR}/../unit-php56
-
-.include "${MASTERDIR}/Makefile"
Index: www/unit-php71/Makefile
===================================================================
--- www/unit-php71/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-# $FreeBSD$
-
-PHP_VER=	71
-
-MASTERDIR=	${.CURDIR}/../unit-php56
-
-.include "${MASTERDIR}/Makefile"
Index: www/unit-php72/Makefile
===================================================================
--- www/unit-php72/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-# $FreeBSD$
-
-PHP_VER=	72
-
-MASTERDIR=	${.CURDIR}/../unit-php56
-
-.include "${MASTERDIR}/Makefile"
Index: www/xcache/Makefile
===================================================================
--- www/xcache/Makefile
+++ www/xcache/Makefile
@@ -5,6 +5,7 @@
 DISTVERSION=	3.2.0
 CATEGORIES=	www
 MASTER_SITES=	http://xcache.lighttpd.net/pub/Releases/${DISTVERSION}/
+PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Fast and stable php opcode cacher