summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/gitphp/Makefile2
-rw-r--r--devel/horde-content/Makefile2
-rw-r--r--devel/horde-timeobjects/Makefile2
-rw-r--r--devel/horde-whups/Makefile2
-rw-r--r--devel/pear-Config/Makefile4
-rw-r--r--devel/pear-Date_Holidays/Makefile10
-rw-r--r--devel/pear-Date_Holidays_Austria/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Brazil/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Denmark/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Discordian/Makefile4
-rw-r--r--devel/pear-Date_Holidays_EnglandWales/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Germany/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Iceland/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Ireland/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Italy/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Japan/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Netherlands/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Norway/Makefile4
-rw-r--r--devel/pear-Date_Holidays_PHPdotNet/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Romania/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Slovenia/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Sweden/Makefile4
-rw-r--r--devel/pear-Date_Holidays_UNO/Makefile4
-rw-r--r--devel/pear-Date_Holidays_USA/Makefile4
-rw-r--r--devel/pear-Date_Holidays_Ukraine/Makefile4
-rw-r--r--devel/pear-FSM/Makefile2
-rw-r--r--devel/pear-File_Iterator/Makefile7
-rw-r--r--devel/pear-HTML_BBCodeParser/Makefile4
-rw-r--r--devel/pear-HTML_CSS/Makefile4
-rw-r--r--devel/pear-HTML_Page2/Makefile4
-rw-r--r--devel/pear-HTML_QuickForm/Makefile4
-rw-r--r--devel/pear-HTML_QuickForm2/Makefile4
-rw-r--r--devel/pear-HTML_QuickForm_Controller/Makefile4
-rw-r--r--devel/pear-HTML_QuickForm_Livesearch/Makefile8
-rw-r--r--devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile4
-rw-r--r--devel/pear-HTML_QuickForm_SelectFilter/Makefile4
-rw-r--r--devel/pear-HTML_QuickForm_advmultiselect/Makefile8
-rw-r--r--devel/pear-HTML_Select/Makefile4
-rw-r--r--devel/pear-HTML_Select_Common/Makefile8
-rw-r--r--devel/pear-HTML_Table/Makefile4
-rw-r--r--devel/pear-HTML_Template_Flexy/Makefile6
-rw-r--r--devel/pear-Horde_Cache/Makefile1
-rw-r--r--devel/pear-Horde_Core/Makefile3
-rw-r--r--devel/pear-Horde_Nls/Makefile3
-rw-r--r--devel/pear-Horde_Queue/Makefile1
-rw-r--r--devel/pear-I18N/Makefile4
-rw-r--r--devel/pear-Net_Gearman/Makefile4
-rw-r--r--devel/pear-PEAR_Info/Makefile6
-rw-r--r--devel/pear-PEAR_PackageFileManager/Makefile4
-rw-r--r--devel/pear-PEAR_PackageFileManager2/Makefile4
-rw-r--r--devel/pear-PEAR_PackageFileManager_Plugins/Makefile4
-rw-r--r--devel/pear-PHPUnit_MockObject/Makefile1
-rw-r--r--devel/pear-PHP_Beautifier/Makefile4
-rw-r--r--devel/pear-PHP_CodeBrowser/Makefile13
-rw-r--r--devel/pear-PHP_CodeCoverage/Makefile19
-rw-r--r--devel/pear-PHP_CompatInfo/Makefile18
-rw-r--r--devel/pear-PHP_Depend/Makefile4
-rw-r--r--devel/pear-PHP_PMD/Makefile4
-rw-r--r--devel/pear-PHP_Timer/Makefile2
-rw-r--r--devel/pear-PHP_TokenStream/Makefile2
-rw-r--r--devel/pear-PHP_UML/Makefile6
-rw-r--r--devel/pear-PhpDocumentor/Makefile4
-rw-r--r--devel/pear-Pirum/Makefile4
-rw-r--r--devel/pear-SebastianBergmann_FinderFacade/Makefile14
-rw-r--r--devel/pear-SebastianBergmann_Git/Makefile6
-rw-r--r--devel/pear-SebastianBergmann_PHPCPD/Makefile19
-rw-r--r--devel/pear-SebastianBergmann_PHPLOC/Makefile14
-rw-r--r--devel/pear-SebastianBergmann_Version/Makefile8
-rw-r--r--devel/pear-Structures_DataGrid/Makefile2
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_Console/Makefile4
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile4
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile6
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_XUL/Makefile4
-rw-r--r--devel/pear-Symfony_Component_Console/Makefile5
-rw-r--r--devel/pear-Symfony_Component_Finder/Makefile5
-rw-r--r--devel/pear-TheSeer_DirectoryScanner/Makefile7
-rw-r--r--devel/pear-TheSeer_fDOMDocument/Makefile7
-rw-r--r--devel/pear-TheSeer_fXSL/Makefile5
-rw-r--r--devel/pear-TheSeer_phpDox/Makefile22
-rw-r--r--devel/pear-VFS/Makefile4
-rw-r--r--devel/pear-Validate/Makefile4
-rw-r--r--devel/pear-Validate_Finance/Makefile4
-rw-r--r--devel/pear-Validate_US/Makefile4
-rw-r--r--devel/pear-VersionControl_SVN/Makefile4
-rw-r--r--devel/pear-XML_NITF/Makefile4
-rw-r--r--devel/pear-XML_RSS/Makefile2
-rw-r--r--devel/pear-XML_Serializer/Makefile8
-rw-r--r--devel/pear-XML_Transformer/Makefile4
-rw-r--r--devel/pear-XML_Tree/Makefile4
-rw-r--r--devel/pear-channel-doctrine/Makefile3
-rw-r--r--devel/pear-channel-ezc/Makefile3
-rw-r--r--devel/pear-channel-horde/Makefile3
-rw-r--r--devel/pear-channel-htmlpurifier.org/Makefile3
-rw-r--r--devel/pear-channel-openpear/Makefile3
-rw-r--r--devel/pear-channel-pdepend/Makefile3
-rw-r--r--devel/pear-channel-phing/Makefile3
-rw-r--r--devel/pear-channel-phpdoc/Makefile3
-rw-r--r--devel/pear-channel-phpmd/Makefile3
-rw-r--r--devel/pear-channel-phpunit/Makefile3
-rw-r--r--devel/pear-channel-pirum/Makefile3
-rw-r--r--devel/pear-channel-symfony/Makefile3
-rw-r--r--devel/pear-channel-symfony2/Makefile3
-rw-r--r--devel/pear-channel-theseer/Makefile3
-rw-r--r--devel/pear-channel-twig/Makefile3
-rw-r--r--devel/pear-ezc_Base/Makefile5
-rw-r--r--devel/pear-ezc_ConsoleTools/Makefile8
-rw-r--r--devel/pear-htmlpurifier/Makefile5
-rw-r--r--devel/pear-pdepend-staticReflection/Makefile5
-rw-r--r--devel/pear-phing/Makefile5
-rw-r--r--devel/pear/Makefile3
-rw-r--r--devel/pear/bsd.pear.channel.mk10
-rw-r--r--devel/pecl-APCu4/Makefile1
-rw-r--r--devel/pecl-grpc/Makefile8
-rw-r--r--devel/pecl-jsmin2/Makefile1
-rw-r--r--devel/pecl-msgpack0/Makefile1
-rw-r--r--devel/pecl-propro2/Makefile1
-rw-r--r--devel/pecl-raphf2/Makefile1
-rw-r--r--devel/pecl-weakref2/Makefile1
-rw-r--r--devel/pecl-yac/Makefile4
-rw-r--r--devel/phabricator/Makefile4
-rw-r--r--devel/php-jq/Makefile2
-rw-r--r--devel/php-maxminddb/Makefile2
-rw-r--r--devel/php-memoize/Makefile5
-rw-r--r--devel/php-scalar_objects/Makefile2
-rw-r--r--devel/php-uprofiler/Makefile2
-rw-r--r--devel/php5-blitz-devel/Makefile2
-rw-r--r--devel/php5-blitz/Makefile2
-rw-r--r--devel/php5-dav/Makefile2
-rw-r--r--devel/php5-ice/Makefile6
-rw-r--r--devel/php5-pinba/Makefile2
-rw-r--r--devel/php5-thrift/Makefile2
-rw-r--r--devel/phpbt/Makefile2
-rw-r--r--devel/phpunit/Makefile3
133 files changed, 274 insertions, 334 deletions
diff --git a/devel/gitphp/Makefile b/devel/gitphp/Makefile
index f43f0302217e..62d45b8c3b34 100644
--- a/devel/gitphp/Makefile
+++ b/devel/gitphp/Makefile
@@ -19,7 +19,7 @@ NO_BUILD= yes
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}
diff --git a/devel/horde-content/Makefile b/devel/horde-content/Makefile
index 518ae88a05d2..b97f7f429f1e 100644
--- a/devel/horde-content/Makefile
+++ b/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
diff --git a/devel/horde-timeobjects/Makefile b/devel/horde-timeobjects/Makefile
index 5ac552846da9..78aad699ae95 100644
--- a/devel/horde-timeobjects/Makefile
+++ b/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
diff --git a/devel/horde-whups/Makefile b/devel/horde-whups/Makefile
index b230ff0a2a59..fe3007282088 100644
--- a/devel/horde-whups/Makefile
+++ b/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
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index a48e7cab70f8..3fbd6b9c84a1 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -14,7 +14,7 @@ PEAR_XML_UTIL_DESC= PEAR::XML_Util support
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>
diff --git a/devel/pear-Date_Holidays/Makefile b/devel/pear-Date_Holidays/Makefile
index 88f9fdcc816f..5ed2f45abd05 100644
--- a/devel/pear-Date_Holidays/Makefile
+++ b/devel/pear-Date_Holidays/Makefile
@@ -8,16 +8,16 @@ CATEGORIES= devel www pear
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>
diff --git a/devel/pear-Date_Holidays_Austria/Makefile b/devel/pear-Date_Holidays_Austria/Makefile
index 43bf3a68515a..3d4b9b164aa5 100644
--- a/devel/pear-Date_Holidays_Austria/Makefile
+++ b/devel/pear-Date_Holidays_Austria/Makefile
@@ -9,8 +9,8 @@ COMMENT= Driver based class to calculate holidays in Austria
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
diff --git a/devel/pear-Date_Holidays_Brazil/Makefile b/devel/pear-Date_Holidays_Brazil/Makefile
index 141639325b99..02ba210cd5b8 100644
--- a/devel/pear-Date_Holidays_Brazil/Makefile
+++ b/devel/pear-Date_Holidays_Brazil/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Denmark/Makefile b/devel/pear-Date_Holidays_Denmark/Makefile
index aba93a8995d8..b199fb371544 100644
--- a/devel/pear-Date_Holidays_Denmark/Makefile
+++ b/devel/pear-Date_Holidays_Denmark/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Discordian/Makefile b/devel/pear-Date_Holidays_Discordian/Makefile
index 82b6218e1913..82cd451f63b3 100644
--- a/devel/pear-Date_Holidays_Discordian/Makefile
+++ b/devel/pear-Date_Holidays_Discordian/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_EnglandWales/Makefile b/devel/pear-Date_Holidays_EnglandWales/Makefile
index 49a173a5b1e4..cf890dea6c9f 100644
--- a/devel/pear-Date_Holidays_EnglandWales/Makefile
+++ b/devel/pear-Date_Holidays_EnglandWales/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Germany/Makefile b/devel/pear-Date_Holidays_Germany/Makefile
index 9a4278e2bb27..2b49cf0fa79a 100644
--- a/devel/pear-Date_Holidays_Germany/Makefile
+++ b/devel/pear-Date_Holidays_Germany/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Iceland/Makefile b/devel/pear-Date_Holidays_Iceland/Makefile
index 8ddbb1abfb9c..89614443a419 100644
--- a/devel/pear-Date_Holidays_Iceland/Makefile
+++ b/devel/pear-Date_Holidays_Iceland/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Ireland/Makefile b/devel/pear-Date_Holidays_Ireland/Makefile
index b81e5c0a511d..da6dd0c0556d 100644
--- a/devel/pear-Date_Holidays_Ireland/Makefile
+++ b/devel/pear-Date_Holidays_Ireland/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Italy/Makefile b/devel/pear-Date_Holidays_Italy/Makefile
index f03619669b88..be60533226bf 100644
--- a/devel/pear-Date_Holidays_Italy/Makefile
+++ b/devel/pear-Date_Holidays_Italy/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Japan/Makefile b/devel/pear-Date_Holidays_Japan/Makefile
index 69c229168755..0f760dfe145d 100644
--- a/devel/pear-Date_Holidays_Japan/Makefile
+++ b/devel/pear-Date_Holidays_Japan/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Netherlands/Makefile b/devel/pear-Date_Holidays_Netherlands/Makefile
index e0ce8ccb969c..f5e95dd31cdf 100644
--- a/devel/pear-Date_Holidays_Netherlands/Makefile
+++ b/devel/pear-Date_Holidays_Netherlands/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Norway/Makefile b/devel/pear-Date_Holidays_Norway/Makefile
index 76c7066c3630..323e563f21e8 100644
--- a/devel/pear-Date_Holidays_Norway/Makefile
+++ b/devel/pear-Date_Holidays_Norway/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_PHPdotNet/Makefile b/devel/pear-Date_Holidays_PHPdotNet/Makefile
index d4bbdf1dfa59..51ab3fb8a424 100644
--- a/devel/pear-Date_Holidays_PHPdotNet/Makefile
+++ b/devel/pear-Date_Holidays_PHPdotNet/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Romania/Makefile b/devel/pear-Date_Holidays_Romania/Makefile
index 16c8fdc19101..240780a013da 100644
--- a/devel/pear-Date_Holidays_Romania/Makefile
+++ b/devel/pear-Date_Holidays_Romania/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Slovenia/Makefile b/devel/pear-Date_Holidays_Slovenia/Makefile
index e780a11d4111..92b10d9bd77d 100644
--- a/devel/pear-Date_Holidays_Slovenia/Makefile
+++ b/devel/pear-Date_Holidays_Slovenia/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Sweden/Makefile b/devel/pear-Date_Holidays_Sweden/Makefile
index 3e38fb709409..e528b329299e 100644
--- a/devel/pear-Date_Holidays_Sweden/Makefile
+++ b/devel/pear-Date_Holidays_Sweden/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_UNO/Makefile b/devel/pear-Date_Holidays_UNO/Makefile
index ff27a3fd0688..56ef71326e1f 100644
--- a/devel/pear-Date_Holidays_UNO/Makefile
+++ b/devel/pear-Date_Holidays_UNO/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_USA/Makefile b/devel/pear-Date_Holidays_USA/Makefile
index eca70d57abb3..71c57e1053f9 100644
--- a/devel/pear-Date_Holidays_USA/Makefile
+++ b/devel/pear-Date_Holidays_USA/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Date_Holidays_Ukraine/Makefile b/devel/pear-Date_Holidays_Ukraine/Makefile
index cd2289ec8498..170f686ad99f 100644
--- a/devel/pear-Date_Holidays_Ukraine/Makefile
+++ b/devel/pear-Date_Holidays_Ukraine/Makefile
@@ -7,8 +7,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index 249c257a2357..d4edc464fc27 100644
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@@ -13,6 +13,6 @@ PEAR_GRAPGHVIZ_DESC= PEAR::GraphViz support
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>
diff --git a/devel/pear-File_Iterator/Makefile b/devel/pear-File_Iterator/Makefile
index da07051f9a99..4cdf8c5853cd 100644
--- a/devel/pear-File_Iterator/Makefile
+++ b/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 @@ COMMENT= PEAR FileIterator implementation
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
diff --git a/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile
index 96ffd76c7cf3..065818674b31 100644
--- a/devel/pear-HTML_BBCodeParser/Makefile
+++ b/devel/pear-HTML_BBCodeParser/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile
index 9f3de5f022be..c5fcc250a9a2 100644
--- a/devel/pear-HTML_CSS/Makefile
+++ b/devel/pear-HTML_CSS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile
index ab69dac3a950..36de81193498 100644
--- a/devel/pear-HTML_Page2/Makefile
+++ b/devel/pear-HTML_Page2/Makefile
@@ -9,8 +9,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}beta
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
diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index 70c2bd49ab4c..87884461acb3 100644
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@@ -10,8 +10,8 @@ COMMENT= Provide methods for creating, validating, and processing HTML forms
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
diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index ecd89ea1ae52..d397d218a92a 100644
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile
index 0c965eb18b9c..a21544fe4ff1 100644
--- a/devel/pear-HTML_QuickForm_Controller/Makefile
+++ b/devel/pear-HTML_QuickForm_Controller/Makefile
@@ -10,8 +10,8 @@ COMMENT= The add-on to HTML_QuickForm that allows building of multipage forms
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
diff --git a/devel/pear-HTML_QuickForm_Livesearch/Makefile b/devel/pear-HTML_QuickForm_Livesearch/Makefile
index 2abfde17b975..b1d506aca063 100644
--- a/devel/pear-HTML_QuickForm_Livesearch/Makefile
+++ b/devel/pear-HTML_QuickForm_Livesearch/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
index 90541a21b371..444b991242cf 100644
--- a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
+++ b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
index 6dd967dbcc7f..e0f4052e3fa4 100644
--- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
@@ -9,8 +9,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}RC1
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
diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index 68b55d9ad66f..b9e49b9b9410 100644
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile
index 22fe79ea9355..320a97c7d45a 100644
--- a/devel/pear-HTML_Select/Makefile
+++ b/devel/pear-HTML_Select/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 4882e248e4d5..8498b2f8f1a9 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index 4df57be07842..608186737f66 100644
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@@ -10,8 +10,8 @@ COMMENT= Makes design of HTML tables easy, flexible, reusable, and efficient
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
diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index 3905c24d4bc0..7c0d8fd7136a 100644
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@@ -17,8 +17,8 @@ PEAR_TRANSLATION2_DESC= PEAR::Translation2 support
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>
diff --git a/devel/pear-Horde_Cache/Makefile b/devel/pear-Horde_Cache/Makefile
index 8ee29a05b36e..10f48886b478 100644
--- a/devel/pear-Horde_Cache/Makefile
+++ b/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
diff --git a/devel/pear-Horde_Core/Makefile b/devel/pear-Horde_Core/Makefile
index e9e77251c888..7aaedf06b26b 100644
--- a/devel/pear-Horde_Core/Makefile
+++ b/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_Role \
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>
diff --git a/devel/pear-Horde_Nls/Makefile b/devel/pear-Horde_Nls/Makefile
index 7d9f698d5e96..a6aaf117c0f0 100644
--- a/devel/pear-Horde_Nls/Makefile
+++ b/devel/pear-Horde_Nls/Makefile
@@ -5,7 +5,6 @@ PORTNAME= Horde_Nls
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 @@ OPTIONS_DEFINE= GEOIP
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>
diff --git a/devel/pear-Horde_Queue/Makefile b/devel/pear-Horde_Queue/Makefile
index de29f373ca92..fffbc1b6bd30 100644
--- a/devel/pear-Horde_Queue/Makefile
+++ b/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
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index e414482f4119..51cf8f1bfd66 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Net_Gearman/Makefile b/devel/pear-Net_Gearman/Makefile
index c453878b2fbd..0ca0489e327f 100644
--- a/devel/pear-Net_Gearman/Makefile
+++ b/devel/pear-Net_Gearman/Makefile
@@ -11,8 +11,8 @@ COMMENT= Gearman client libraray for PHP
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
diff --git a/devel/pear-PEAR_Info/Makefile b/devel/pear-PEAR_Info/Makefile
index eb4ed614b596..976118c097a4 100644
--- a/devel/pear-PEAR_Info/Makefile
+++ b/devel/pear-PEAR_Info/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= devel www pear
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 @@ PHPUNIT_DESC= PEAR::PHPUnit support
USES= pear
-PHPUNIT_RUN_DEPENDS= phpunit:devel/phpunit
+PHPUNIT_RUN_DEPENDS= phpunit:devel/phpunit@${PHP_FLAVOR}
.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index 93aa0b6193f7..81c6c983ec85 100644
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@@ -14,7 +14,7 @@ PEAR_XML_TREE_DESC= PEAR::XML_Tree support
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>
diff --git a/devel/pear-PEAR_PackageFileManager2/Makefile b/devel/pear-PEAR_PackageFileManager2/Makefile
index 4874d1721233..855015a24a5c 100644
--- a/devel/pear-PEAR_PackageFileManager2/Makefile
+++ b/devel/pear-PEAR_PackageFileManager2/Makefile
@@ -10,8 +10,8 @@ COMMENT= PEAR class to maintain PEAR packages
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
diff --git a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
index b9438bda3cd2..23fa50389faa 100644
--- a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
+++ b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-PHPUnit_MockObject/Makefile b/devel/pear-PHPUnit_MockObject/Makefile
index 9f308d6d448c..1801d3c5234a 100644
--- a/devel/pear-PHPUnit_MockObject/Makefile
+++ b/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
diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile
index b96fea586e0a..f4a1fa910d72 100644
--- a/devel/pear-PHP_Beautifier/Makefile
+++ b/devel/pear-PHP_Beautifier/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-PHP_CodeBrowser/Makefile b/devel/pear-PHP_CodeBrowser/Makefile
index 1c0779a871df..31c059ea35c6 100644
--- a/devel/pear-PHP_CodeBrowser/Makefile
+++ b/devel/pear-PHP_CodeBrowser/Makefile
@@ -5,7 +5,6 @@ PORTNAME= PHP_CodeBrowser
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 @@ COMMENT= Code browser that augments the code with information
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
diff --git a/devel/pear-PHP_CodeCoverage/Makefile b/devel/pear-PHP_CodeCoverage/Makefile
index f6b40bb3da1e..8d72260338e8 100644
--- a/devel/pear-PHP_CodeCoverage/Makefile
+++ b/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 @@ COMMENT= Library that provides PHP code coverage information
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 @@ DOM_DESC= Enable DOM support
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
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index b7aeabdfb173..4b7ce62d5505 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -9,10 +9,10 @@ CATEGORIES= devel pear
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 @@ PHPUNIT_DESC= PHPUnit support
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>
diff --git a/devel/pear-PHP_Depend/Makefile b/devel/pear-PHP_Depend/Makefile
index aced15f30f96..d2f8b41034c2 100644
--- a/devel/pear-PHP_Depend/Makefile
+++ b/devel/pear-PHP_Depend/Makefile
@@ -5,16 +5,12 @@ PORTNAME= PHP_Depend
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
diff --git a/devel/pear-PHP_PMD/Makefile b/devel/pear-PHP_PMD/Makefile
index bf5138e3e6eb..897385cf02c2 100644
--- a/devel/pear-PHP_PMD/Makefile
+++ b/devel/pear-PHP_PMD/Makefile
@@ -5,7 +5,6 @@ PORTNAME= PHP_PMD
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 @@ COMMENT= PHP Mess Detector
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
diff --git a/devel/pear-PHP_Timer/Makefile b/devel/pear-PHP_Timer/Makefile
index 3ee5f53eb6e8..adbd592eb010 100644
--- a/devel/pear-PHP_Timer/Makefile
+++ b/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 @@ COMMENT= Utility class for timing
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= pear:env
USE_GITHUB= yes
GH_ACCOUNT= sebastianbergmann
GH_PROJECT= php-timer
diff --git a/devel/pear-PHP_TokenStream/Makefile b/devel/pear-PHP_TokenStream/Makefile
index 57e8907d1c45..f548c6387940 100644
--- a/devel/pear-PHP_TokenStream/Makefile
+++ b/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
diff --git a/devel/pear-PHP_UML/Makefile b/devel/pear-PHP_UML/Makefile
index dd41708a71a2..e87c853d1032 100644
--- a/devel/pear-PHP_UML/Makefile
+++ b/devel/pear-PHP_UML/Makefile
@@ -10,9 +10,9 @@ COMMENT= PEAR Class to Create UML Representation of PHP Code
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
diff --git a/devel/pear-PhpDocumentor/Makefile b/devel/pear-PhpDocumentor/Makefile
index 8850c4a65530..808b6d8277cf 100644
--- a/devel/pear-PhpDocumentor/Makefile
+++ b/devel/pear-PhpDocumentor/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel www pear
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 @@ USES= pear
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}
diff --git a/devel/pear-Pirum/Makefile b/devel/pear-Pirum/Makefile
index 4fa6cb903432..8c1b5b3869ec 100644
--- a/devel/pear-Pirum/Makefile
+++ b/devel/pear-Pirum/Makefile
@@ -5,16 +5,12 @@ PORTNAME= Pirum
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
diff --git a/devel/pear-SebastianBergmann_FinderFacade/Makefile b/devel/pear-SebastianBergmann_FinderFacade/Makefile
index fb2d1c3f8f65..2d4e2db1345d 100644
--- a/devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ b/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 @@ COMMENT= Convenience wrapper for Symfony Finder component
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
diff --git a/devel/pear-SebastianBergmann_Git/Makefile b/devel/pear-SebastianBergmann_Git/Makefile
index a767c333508d..82142bbe0ee7 100644
--- a/devel/pear-SebastianBergmann_Git/Makefile
+++ b/devel/pear-SebastianBergmann_Git/Makefile
@@ -5,7 +5,7 @@ PORTNAME= Git
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 @@ COMMENT= Simple wrapper for Git
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
diff --git a/devel/pear-SebastianBergmann_PHPCPD/Makefile b/devel/pear-SebastianBergmann_PHPCPD/Makefile
index b2885257776f..4900c3498536 100644
--- a/devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ b/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 @@ COMMENT= Copy/Paste Detector (CPD) for PHP code
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}
diff --git a/devel/pear-SebastianBergmann_PHPLOC/Makefile b/devel/pear-SebastianBergmann_PHPLOC/Makefile
index eca15974ca58..2a2efde13570 100644
--- a/devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ b/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 @@ COMMENT= Tool for quickly measuring the size of a PHP project
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}
diff --git a/devel/pear-SebastianBergmann_Version/Makefile b/devel/pear-SebastianBergmann_Version/Makefile
index 65bcd9b84135..7c85b5268ea6 100644
--- a/devel/pear-SebastianBergmann_Version/Makefile
+++ b/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 @@ COMMENT= Managing the version number of Git-hosted PHP projects
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}
diff --git a/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile
index d98d8854b056..0140138bc909 100644
--- a/devel/pear-Structures_DataGrid/Makefile
+++ b/devel/pear-Structures_DataGrid/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
index 6d218e454bce..f1370fbf48a9 100644
--- a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
index 63319d9f7b0d..24f03134baae 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
index ce011875ed25..4f90f95c4a0a 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
index 35c2b30418e2..0a0163f00d81 100644
--- a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Symfony_Component_Console/Makefile b/devel/pear-Symfony_Component_Console/Makefile
index cbc6f0154543..59315cba2f5e 100644
--- a/devel/pear-Symfony_Component_Console/Makefile
+++ b/devel/pear-Symfony_Component_Console/Makefile
@@ -5,7 +5,7 @@ PORTNAME= Console
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 @@ COMMENT= Symfony2 Console Component
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
diff --git a/devel/pear-Symfony_Component_Finder/Makefile b/devel/pear-Symfony_Component_Finder/Makefile
index e1921358f577..aff0124afd77 100644
--- a/devel/pear-Symfony_Component_Finder/Makefile
+++ b/devel/pear-Symfony_Component_Finder/Makefile
@@ -5,7 +5,7 @@ PORTNAME= Finder
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 @@ COMMENT= Symfony2 Finder Component
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
diff --git a/devel/pear-TheSeer_DirectoryScanner/Makefile b/devel/pear-TheSeer_DirectoryScanner/Makefile
index d65fa144807c..524689ba13c4 100644
--- a/devel/pear-TheSeer_DirectoryScanner/Makefile
+++ b/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 @@ COMMENT= Recursive directory scanner and filter
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
diff --git a/devel/pear-TheSeer_fDOMDocument/Makefile b/devel/pear-TheSeer_fDOMDocument/Makefile
index 0a4514ffd95b..accdcb5c21db 100644
--- a/devel/pear-TheSeer_fDOMDocument/Makefile
+++ b/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 @@ COMMENT= Extension to PHP standard DOM
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
diff --git a/devel/pear-TheSeer_fXSL/Makefile b/devel/pear-TheSeer_fXSL/Makefile
index 19470b947208..0cb6c502a858 100644
--- a/devel/pear-TheSeer_fXSL/Makefile
+++ b/devel/pear-TheSeer_fXSL/Makefile
@@ -5,7 +5,7 @@ PORTNAME= fXSL
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 @@ COMMENT= XSL wrapper / extension to the PHP 5.x XSLTProcessor
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
diff --git a/devel/pear-TheSeer_phpDox/Makefile b/devel/pear-TheSeer_phpDox/Makefile
index 718ad28c76a7..f8ffab3da178 100644
--- a/devel/pear-TheSeer_phpDox/Makefile
+++ b/devel/pear-TheSeer_phpDox/Makefile
@@ -5,23 +5,23 @@ PORTNAME= phpDox
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
diff --git a/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile
index 30d396f9e284..9c991ee9a30c 100644
--- a/devel/pear-VFS/Makefile
+++ b/devel/pear-VFS/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel pear
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
diff --git a/devel/pear-Validate/Makefile b/devel/pear-Validate/Makefile
index 8c76dd0ffcfa..04e11afe8039 100644
--- a/devel/pear-Validate/Makefile
+++ b/devel/pear-Validate/Makefile
@@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
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
diff --git a/devel/pear-Validate_Finance/Makefile b/devel/pear-Validate_Finance/Makefile
index 07d38c137bd5..b7ff327e1864 100644
--- a/devel/pear-Validate_Finance/Makefile
+++ b/devel/pear-Validate_Finance/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-Validate_US/Makefile b/devel/pear-Validate_US/Makefile
index 2b384df2172d..bf33c522fe01 100644
--- a/devel/pear-Validate_US/Makefile
+++ b/devel/pear-Validate_US/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-VersionControl_SVN/Makefile b/devel/pear-VersionControl_SVN/Makefile
index 1aa0f579ea91..f9f5227b7278 100644
--- a/devel/pear-VersionControl_SVN/Makefile
+++ b/devel/pear-VersionControl_SVN/Makefile
@@ -10,8 +10,8 @@ COMMENT= Wrapper interface for the Subversion command-line client
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
diff --git a/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile
index 369d8dc41086..0e8ce9fbfed6 100644
--- a/devel/pear-XML_NITF/Makefile
+++ b/devel/pear-XML_NITF/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel pear
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
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index ee0b3e31fe24..345c30620363 100644
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@@ -11,7 +11,7 @@ COMMENT= PEAR RSS parser
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
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 1613d1123d20..7770585788c9 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -10,10 +10,10 @@ COMMENT= PEAR Swiss-army knive for reading and writing XML files
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
diff --git a/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile
index 2d7bb43d1243..7fb947487ac1 100644
--- a/devel/pear-XML_Transformer/Makefile
+++ b/devel/pear-XML_Transformer/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index ae9c906d2fae..e926b5504b02 100644
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= devel www pear
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
diff --git a/devel/pear-channel-doctrine/Makefile b/devel/pear-channel-doctrine/Makefile
index 2b9a60651979..0064d1b35a07 100644
--- a/devel/pear-channel-doctrine/Makefile
+++ b/devel/pear-channel-doctrine/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-ezc/Makefile b/devel/pear-channel-ezc/Makefile
index f1933ed2b166..6bc6dacf7abb 100644
--- a/devel/pear-channel-ezc/Makefile
+++ b/devel/pear-channel-ezc/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-horde/Makefile b/devel/pear-channel-horde/Makefile
index 354b5d3876e8..735a763a4a93 100644
--- a/devel/pear-channel-horde/Makefile
+++ b/devel/pear-channel-horde/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-htmlpurifier.org/Makefile b/devel/pear-channel-htmlpurifier.org/Makefile
index bddacd197584..1d223067d8b7 100644
--- a/devel/pear-channel-htmlpurifier.org/Makefile
+++ b/devel/pear-channel-htmlpurifier.org/Makefile
@@ -13,6 +13,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-openpear/Makefile b/devel/pear-channel-openpear/Makefile
index 114edf11fb90..8736ab0e4ac4 100644
--- a/devel/pear-channel-openpear/Makefile
+++ b/devel/pear-channel-openpear/Makefile
@@ -11,6 +11,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-pdepend/Makefile b/devel/pear-channel-pdepend/Makefile
index 40dca4b91459..5f5f7798a704 100644
--- a/devel/pear-channel-pdepend/Makefile
+++ b/devel/pear-channel-pdepend/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-phing/Makefile b/devel/pear-channel-phing/Makefile
index 07bbcb190aa3..9e7af3420ded 100644
--- a/devel/pear-channel-phing/Makefile
+++ b/devel/pear-channel-phing/Makefile
@@ -9,6 +9,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-phpdoc/Makefile b/devel/pear-channel-phpdoc/Makefile
index b5758d23eb7e..a0dd87f9294e 100644
--- a/devel/pear-channel-phpdoc/Makefile
+++ b/devel/pear-channel-phpdoc/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-phpmd/Makefile b/devel/pear-channel-phpmd/Makefile
index b752a0dde6f2..fcca46436890 100644
--- a/devel/pear-channel-phpmd/Makefile
+++ b/devel/pear-channel-phpmd/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-phpunit/Makefile b/devel/pear-channel-phpunit/Makefile
index 6031da262dff..8cf21ad33aac 100644
--- a/devel/pear-channel-phpunit/Makefile
+++ b/devel/pear-channel-phpunit/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-pirum/Makefile b/devel/pear-channel-pirum/Makefile
index 0d7171211b0a..b67693564d1c 100644
--- a/devel/pear-channel-pirum/Makefile
+++ b/devel/pear-channel-pirum/Makefile
@@ -11,6 +11,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-symfony/Makefile b/devel/pear-channel-symfony/Makefile
index 8024b01c66d4..0ccd14cdd25b 100644
--- a/devel/pear-channel-symfony/Makefile
+++ b/devel/pear-channel-symfony/Makefile
@@ -10,6 +10,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-symfony2/Makefile b/devel/pear-channel-symfony2/Makefile
index ce0b9b1adfd0..d95ee7591a04 100644
--- a/devel/pear-channel-symfony2/Makefile
+++ b/devel/pear-channel-symfony2/Makefile
@@ -11,6 +11,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-theseer/Makefile b/devel/pear-channel-theseer/Makefile
index 611a8d82c6e4..eddc03574713 100644
--- a/devel/pear-channel-theseer/Makefile
+++ b/devel/pear-channel-theseer/Makefile
@@ -11,6 +11,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-channel-twig/Makefile b/devel/pear-channel-twig/Makefile
index 0985f11f0c72..235cc323cf01 100644
--- a/devel/pear-channel-twig/Makefile
+++ b/devel/pear-channel-twig/Makefile
@@ -11,6 +11,5 @@ COMMENT= PEAR channel ${PEAR_CHANNEL_HOST}
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>
diff --git a/devel/pear-ezc_Base/Makefile b/devel/pear-ezc_Base/Makefile
index 0bf163b6ec1e..91103168368c 100644
--- a/devel/pear-ezc_Base/Makefile
+++ b/devel/pear-ezc_Base/Makefile
@@ -5,16 +5,13 @@ PORTNAME= Base
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
diff --git a/devel/pear-ezc_ConsoleTools/Makefile b/devel/pear-ezc_ConsoleTools/Makefile
index e22869475cde..12b85e9de6e0 100644
--- a/devel/pear-ezc_ConsoleTools/Makefile
+++ b/devel/pear-ezc_ConsoleTools/Makefile
@@ -5,17 +5,15 @@ PORTNAME= ConsoleTools
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
diff --git a/devel/pear-htmlpurifier/Makefile b/devel/pear-htmlpurifier/Makefile
index e13a7a3219f2..790f810674e0 100644
--- a/devel/pear-htmlpurifier/Makefile
+++ b/devel/pear-htmlpurifier/Makefile
@@ -8,16 +8,13 @@ CATEGORIES= devel pear www
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
diff --git a/devel/pear-pdepend-staticReflection/Makefile b/devel/pear-pdepend-staticReflection/Makefile
index eeb4f2a4dffd..dd2012c1e6bb 100644
--- a/devel/pear-pdepend-staticReflection/Makefile
+++ b/devel/pear-pdepend-staticReflection/Makefile
@@ -5,16 +5,13 @@ PORTNAME= staticReflection
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
diff --git a/devel/pear-phing/Makefile b/devel/pear-phing/Makefile
index deebcf7e9217..f48d2c9ef617 100644
--- a/devel/pear-phing/Makefile
+++ b/devel/pear-phing/Makefile
@@ -4,7 +4,7 @@ PORTNAME= phing
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 @@ LICENSE= LGPL3
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>
diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index 1364a6272517..33c4b07e55db 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -6,13 +6,14 @@ PORTVERSION= 1.10.5
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
diff --git a/devel/pear/bsd.pear.channel.mk b/devel/pear/bsd.pear.channel.mk
index 1fa97ada6620..01acf9b3c832 100644
--- a/devel/pear/bsd.pear.channel.mk
+++ b/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
diff --git a/devel/pecl-APCu4/Makefile b/devel/pecl-APCu4/Makefile
index 8d31f65fec1a..1e4043f6d124 100644
--- a/devel/pecl-APCu4/Makefile
+++ b/devel/pecl-APCu4/Makefile
@@ -5,7 +5,6 @@ PORTNAME= APCu
PORTVERSION= 4.0.11
PORTREVISION= 1
CATEGORIES= devel
-PKGNAMESUFFIX= 4
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
MAINTAINER= johnpupu@gmail.com
diff --git a/devel/pecl-grpc/Makefile b/devel/pecl-grpc/Makefile
index d1585022c20a..2314d4461554 100644
--- a/devel/pecl-grpc/Makefile
+++ b/devel/pecl-grpc/Makefile
@@ -18,4 +18,10 @@ BROKEN_powerpc64= fails to compile: cc1: error: unrecognized command line option
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>
diff --git a/devel/pecl-jsmin2/Makefile b/devel/pecl-jsmin2/Makefile
index df24c22577a6..b09370a0a9d0 100644
--- a/devel/pecl-jsmin2/Makefile
+++ b/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
diff --git a/devel/pecl-msgpack0/Makefile b/devel/pecl-msgpack0/Makefile
index d2d77084a653..6607d815e85e 100644
--- a/devel/pecl-msgpack0/Makefile
+++ b/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
diff --git a/devel/pecl-propro2/Makefile b/devel/pecl-propro2/Makefile
index bbcc549d193a..ab58b3718b8a 100644
--- a/devel/pecl-propro2/Makefile
+++ b/devel/pecl-propro2/Makefile
@@ -5,7 +5,6 @@ PORTNAME= propro
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= devel
-PKGNAMESUFFIX= 2
MAINTAINER= bofh@FreeBSD.org
COMMENT= Facility to manage extension object properties
diff --git a/devel/pecl-raphf2/Makefile b/devel/pecl-raphf2/Makefile
index 0ef7142e478d..478d7950551d 100644
--- a/devel/pecl-raphf2/Makefile
+++ b/devel/pecl-raphf2/Makefile
@@ -5,7 +5,6 @@ PORTNAME= raphf
PORTVERSION= 2.0.0
PORTREVISION= 1
CATEGORIES= devel
-PKGNAMESUFFIX= 2
MAINTAINER= bofh@FreeBSD.org
COMMENT= Resource and persistent handles factory
diff --git a/devel/pecl-weakref2/Makefile b/devel/pecl-weakref2/Makefile
index beccb8edd678..bf56bfb824e2 100644
--- a/devel/pecl-weakref2/Makefile
+++ b/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
diff --git a/devel/pecl-yac/Makefile b/devel/pecl-yac/Makefile
index 88e3cf1ca3c3..1cb376bb57ae 100644
--- a/devel/pecl-yac/Makefile
+++ b/devel/pecl-yac/Makefile
@@ -16,7 +16,7 @@ IGNORE_WITH_PHP= 56
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>
diff --git a/devel/phabricator/Makefile b/devel/phabricator/Makefile
index f1ab1adb8d58..91cd6eadd210 100644
--- a/devel/phabricator/Makefile
+++ b/devel/phabricator/Makefile
@@ -56,9 +56,9 @@ GD_USE= PHP=gd
.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
diff --git a/devel/php-jq/Makefile b/devel/php-jq/Makefile
index 809a5799c4b6..24853a3896cc 100644
--- a/devel/php-jq/Makefile
+++ b/devel/php-jq/Makefile
@@ -5,7 +5,7 @@ PORTNAME= jq
PORTVERSION= 0.0.1
PORTREVISION= 1
CATEGORIES= devel
-PKGNAMEPREFIX= php-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= gasol.wu@gmail.com
COMMENT= Jq shared extension for php
diff --git a/devel/php-maxminddb/Makefile b/devel/php-maxminddb/Makefile
index 0e3dcd1d6dae..d4a0ed461b48 100644
--- a/devel/php-maxminddb/Makefile
+++ b/devel/php-maxminddb/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.1.0
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= devel net
-PKGNAMEPREFIX= php-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= danger@FreeBSD.org
COMMENT= MaxMind DB Reader extension for PHP
diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile
index f958566c7f52..ca2248aab73c 100644
--- a/devel/php-memoize/Makefile
+++ b/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
diff --git a/devel/php-scalar_objects/Makefile b/devel/php-scalar_objects/Makefile
index 0dd0d00d72c8..37381931b370 100644
--- a/devel/php-scalar_objects/Makefile
+++ b/devel/php-scalar_objects/Makefile
@@ -5,7 +5,7 @@ PORTNAME= scalar_objects
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
diff --git a/devel/php-uprofiler/Makefile b/devel/php-uprofiler/Makefile
index 32f80ce22131..0d97d306feb1 100644
--- a/devel/php-uprofiler/Makefile
+++ b/devel/php-uprofiler/Makefile
@@ -5,7 +5,7 @@ PORTNAME= uprofiler
PORTVERSION= 0.11.0.20150219
PORTREVISION= 1
CATEGORIES= devel
-PKGNAMEPREFIX= php-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= gasol.wu@gmail.com
COMMENT= Lightweight profiler for PHP
diff --git a/devel/php5-blitz-devel/Makefile b/devel/php5-blitz-devel/Makefile
index c93600a22f43..1c3a54f8a117 100644
--- a/devel/php5-blitz-devel/Makefile
+++ b/devel/php5-blitz-devel/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.7.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://alexeyrybak.com/blitz/
-PKGNAMEPREFIX= php5-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= blitz-${PORTVERSION}-devel
MAINTAINER= komarov@valerka.net
diff --git a/devel/php5-blitz/Makefile b/devel/php5-blitz/Makefile
index 8dde0984d435..bdb39f99bddb 100644
--- a/devel/php5-blitz/Makefile
+++ b/devel/php5-blitz/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8.2
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://alexeyrybak.com/blitz/
-PKGNAMEPREFIX= php5-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= komarov@valerka.net
COMMENT= PHP templating engine
diff --git a/devel/php5-dav/Makefile b/devel/php5-dav/Makefile
index 2a90a95b1182..99e56a128fad 100644
--- a/devel/php5-dav/Makefile
+++ b/devel/php5-dav/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2
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
diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile
index e9c5f6b85528..b026e76d9bd4 100644
--- a/devel/php5-ice/Makefile
+++ b/devel/php5-ice/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
CATEGORIES= devel
-PKGNAMEPREFIX= php5-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= freebsd@grem.de
COMMENT= Ice (Internet Communications Engine) language mapping for PHP
@@ -23,8 +23,8 @@ PLIST= ${.CURDIR}/pkg-plist
MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \
PHP_HOME=${LOCALBASE} OPTIMIZE=yes
-USES+= php:build
-IGNORE_WITH_PHP=70 71
+USES+= php:build,flavors
+IGNORE_WITH_PHP=70 71 72
BUILD_WRKSRC= ${WRKSRC}/php
INSTALL_WRKSRC= ${WRKSRC}/php
diff --git a/devel/php5-pinba/Makefile b/devel/php5-pinba/Makefile
index 7edad95b6396..e59ccf906768 100644
--- a/devel/php5-pinba/Makefile
+++ b/devel/php5-pinba/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pinba
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
diff --git a/devel/php5-thrift/Makefile b/devel/php5-thrift/Makefile
index 14014e706829..c79f07554083 100644
--- a/devel/php5-thrift/Makefile
+++ b/devel/php5-thrift/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= ${THRIFT_PORTVERSION}
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= APACHE/thrift/${PORTVERSION}
-PKGNAMEPREFIX= php5-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= webmaster@kibab.com
COMMENT= PHP interface to Thrift
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index 97c715dacc27..6435527728d2 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -13,7 +13,7 @@ COMMENT= Bug-tracking system developed in PHP
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
diff --git a/devel/phpunit/Makefile b/devel/phpunit/Makefile
index a778df76af35..28f17ad10a31 100644
--- a/devel/phpunit/Makefile
+++ b/devel/phpunit/Makefile
@@ -5,6 +5,7 @@ DISTVERSION= 5.7.27
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 @@ CONFLICTS_INSTALL= phpunit6
PORTSCOUT= limit:^5\.7\.[0-9]*
-USES= cpe php
+USES= cpe php:flavors
CPE_VENDOR= phpunit_project
USE_PHP= dom json spl pcre phar