summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/Makefile5
-rw-r--r--www/hastymail2-devel/Makefile6
-rw-r--r--www/hastymail2/Makefile6
-rw-r--r--www/horde-ansel/Makefile2
-rw-r--r--www/horde-base/Makefile4
-rw-r--r--www/horde-passwd/Makefile2
-rw-r--r--www/horde-trean/Makefile2
-rw-r--r--www/horde-wicked/Makefile4
-rw-r--r--www/ilias/Makefile12
-rw-r--r--www/magento/Makefile2
-rw-r--r--www/mediawiki123/Makefile2
-rw-r--r--www/mediawiki127/Makefile2
-rw-r--r--www/mediawiki128/Makefile2
-rw-r--r--www/mediawiki129/Makefile2
-rw-r--r--www/mediawiki130/Makefile2
-rw-r--r--www/nextcloud-calendar/Makefile1
-rw-r--r--www/nextcloud-contacts/Makefile1
-rw-r--r--www/nextcloud-notes/Makefile1
-rw-r--r--www/nextcloud-tasks/Makefile1
-rw-r--r--www/nextcloud/Makefile2
-rw-r--r--www/nibbleblog/Makefile2
-rw-r--r--www/owncloud/Makefile2
-rw-r--r--www/pear-HTTP_Client/Makefile8
-rw-r--r--www/pear-HTTP_Download/Makefile4
-rw-r--r--www/pear-HTTP_FloodControl/Makefile10
-rw-r--r--www/pear-HTTP_Header/Makefile4
-rw-r--r--www/pear-HTTP_Request/Makefile8
-rw-r--r--www/pear-HTTP_Request2/Makefile4
-rw-r--r--www/pear-HTTP_Server/Makefile8
-rw-r--r--www/pear-HTTP_WebDAV_Client/Makefile4
-rw-r--r--www/pear-Services_Amazon/Makefile8
-rw-r--r--www/pear-Services_Amazon_S3/Makefile8
-rw-r--r--www/pear-Services_Blogging/Makefile4
-rw-r--r--www/pear-Services_Compete/Makefile4
-rw-r--r--www/pear-Services_Delicious/Makefile8
-rw-r--r--www/pear-Services_Facebook/Makefile4
-rw-r--r--www/pear-Services_GeoNames/Makefile4
-rw-r--r--www/pear-Services_OpenSearch/Makefile4
-rw-r--r--www/pear-Services_ShortURL/Makefile2
-rw-r--r--www/pear-Services_W3C_CSSValidator/Makefile4
-rw-r--r--www/pear-Services_W3C_HTMLValidator/Makefile4
-rw-r--r--www/pear-Structures_DataGrid_Renderer_Flexy/Makefile6
-rw-r--r--www/pear-Structures_DataGrid_Renderer_Pager/Makefile4
-rw-r--r--www/pear-Structures_DataGrid_Renderer_Smarty/Makefile6
-rw-r--r--www/pear-UDDI/Makefile8
-rw-r--r--www/pear-XML_GRDDL/Makefile16
-rw-r--r--www/pear-twig/Makefile3
-rw-r--r--www/pecl-http/Makefile8
-rw-r--r--www/pecl-http2/Makefile9
-rw-r--r--www/pecl-yaf2/Makefile1
-rw-r--r--www/pecl-yar/Makefile4
-rw-r--r--www/pecl-yar1/Makefile5
-rw-r--r--www/phalcon/Makefile1
-rw-r--r--www/php-screw/Makefile3
-rw-r--r--www/php-templates/Makefile3
-rw-r--r--www/php56-opcache/Makefile2
-rw-r--r--www/php70-opcache/Makefile2
-rw-r--r--www/php71-opcache/Makefile2
-rw-r--r--www/php72-opcache/Makefile2
-rw-r--r--www/phpbb/Makefile4
-rw-r--r--www/smarty2/Makefile3
-rw-r--r--www/smarty3/Makefile4
-rw-r--r--www/unit-php/Makefile (renamed from www/unit-php56/Makefile)8
-rw-r--r--www/unit-php70/Makefile8
-rw-r--r--www/unit-php71/Makefile8
-rw-r--r--www/unit-php72/Makefile8
-rw-r--r--www/xcache/Makefile1
67 files changed, 136 insertions, 162 deletions
diff --git a/www/Makefile b/www/Makefile
index 80964c45e10f..2ce1db1ba256 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2418,10 +2418,7 @@
SUBDIR += ufdbguard
SUBDIR += unit
SUBDIR += unit-go
- SUBDIR += unit-php56
- SUBDIR += unit-php70
- SUBDIR += unit-php71
- SUBDIR += unit-php72
+ SUBDIR += unit-php
SUBDIR += usermanager
SUBDIR += uwsgi
SUBDIR += uwsgitop
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index c35d9a1b8564..fbf208f9ac7e 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -38,19 +38,19 @@ DB_DESC= Use older pear DB (instead of MDB2)
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
.if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql
+RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR}
.endif
.endif
.if ${PORT_OPTIONS:MPGSQL}
USES+= pgsql
.if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql
+RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql@${PHP_FLAVOR}
.endif
.endif
.if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL}}
-RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
.endif
post-patch:
diff --git a/www/hastymail2/Makefile b/www/hastymail2/Makefile
index c97c5d694f87..edd071a29aeb 100644
--- a/www/hastymail2/Makefile
+++ b/www/hastymail2/Makefile
@@ -42,19 +42,19 @@ MBSTRING_DESC= Support multi-byte character sets
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
.if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql
+RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR}
.endif
.endif
.if ${PORT_OPTIONS:MPGSQL}
USES+= pgsql
.if ! ${PORT_OPTIONS:MDB}
-RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql
+RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:databases/pear-MDB2_Driver_pgsql@${PHP_FLAVOR}
.endif
.endif
.if ${PORT_OPTIONS:MDB} && (${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL})
-RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB
+RUN_DEPENDS+= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
.endif
.if ${PORT_OPTIONS:MICONV}
diff --git a/www/horde-ansel/Makefile b/www/horde-ansel/Makefile
index 9712017b4105..7f150df938ca 100644
--- a/www/horde-ansel/Makefile
+++ b/www/horde-ansel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ansel
PORTVERSION= 3.0.8
CATEGORIES= www pear graphics
-PKGNAMEPREFIX= horde-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Photo Management and Web Gallery
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 8bdd2d528677..d5982ff0e6bf 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -3,12 +3,12 @@
PORTNAME= horde
PORTVERSION= 5.2.17
CATEGORIES= www pear
-PKGNAMEPREFIX=
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Application Framework
-RUN_DEPENDS= ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2
+RUN_DEPENDS= ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR}
OPTIONS_DEFAULT= ICONV
OPTIONS_DEFINE= FACEBOOK ICONV TWITTER WEATHER
diff --git a/www/horde-passwd/Makefile b/www/horde-passwd/Makefile
index 36e11d2b8510..3317aee2fad2 100644
--- a/www/horde-passwd/Makefile
+++ b/www/horde-passwd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= passwd
PORTVERSION= 5.0.7
CATEGORIES= www pear
-PKGNAMEPREFIX= horde-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde password changing application
diff --git a/www/horde-trean/Makefile b/www/horde-trean/Makefile
index bc289b10eb95..fae0a2c6c46e 100644
--- a/www/horde-trean/Makefile
+++ b/www/horde-trean/Makefile
@@ -3,7 +3,7 @@
PORTNAME= trean
PORTVERSION= 1.1.9
CATEGORIES= www pear
-PKGNAMEPREFIX= horde-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Bookmark Manager
diff --git a/www/horde-wicked/Makefile b/www/horde-wicked/Makefile
index e4d7a5dc7976..da90f641f85c 100644
--- a/www/horde-wicked/Makefile
+++ b/www/horde-wicked/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wicked
PORTVERSION= 2.0.8
CATEGORIES= www pear
-PKGNAMEPREFIX= horde-
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde-
MAINTAINER= horde@FreeBSD.org
COMMENT= Horde Wiki Application
@@ -11,7 +11,7 @@ COMMENT= Horde Wiki Application
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS+= ${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki
+RUN_DEPENDS+= ${PEARDIR}/Text/Wiki.php:www/pear-Text_Wiki@${PHP_FLAVOR}
USES= horde cpe php
USE_PHP= gettext
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 66473b56dae2..63ce571bb88e 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -14,10 +14,10 @@ LICENSE= GPLv2
RUN_DEPENDS= convert:graphics/ImageMagick \
zip:archivers/zip \
${UNZIP_CMD}:archivers/unzip \
- ${LOCALBASE}/share/pear/PEAR.php:devel/pear \
- ${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth \
- ${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2 \
- ${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT
+ ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \
+ ${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAVOR} \
+ ${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
+ ${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR}
LIB_DEPENDS= libpng.so:graphics/png
USE_GITHUB= yes
@@ -37,8 +37,8 @@ SUB_LIST= ILIASDATADIR=${ILIASDATADIR}
OPTIONS_DEFINE= SCORM2004 Checker Mail
SCORM2004_USE= php=json
-Checker_RUN_DEPENDS= ${LOCALBASE}/share/pear/HTTP/Request.php:www/pear-HTTP_Request
-Mail_RUN_DEPENDS= ${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail
+Checker_RUN_DEPENDS= ${LOCALBASE}/share/pear/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+Mail_RUN_DEPENDS= ${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
EXTRA_FILES= %%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/_mocha \
%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/express \
diff --git a/www/magento/Makefile b/www/magento/Makefile
index 222c1cc6b1ea..b82d8dc198c2 100644
--- a/www/magento/Makefile
+++ b/www/magento/Makefile
@@ -28,7 +28,7 @@ NO_BUILD= yes
NO_ARCH= yes
MAGENTODIR?= www/magento
-OAUTH_RUN_DEPENDS= pecl-oauth>=1.2.3:net/pecl-oauth
+OAUTH_RUN_DEPENDS= pecl-oauth>=1.2.3:net/pecl-oauth@${PHP_FLAVOR}
REDIS_USE= php=redis
# First need to submit the port
diff --git a/www/mediawiki123/Makefile b/www/mediawiki123/Makefile
index ebc2e3a023de..8c7923695bcb 100644
--- a/www/mediawiki123/Makefile
+++ b/www/mediawiki123/Makefile
@@ -51,7 +51,7 @@ SQLITE_USE= php=sqlite3
LDAP_USE= php=ldap
MEMCACHED_RUN_DEPENDS= memcached:databases/memcached
-IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
SOCKETS_USE= php=sockets
diff --git a/www/mediawiki127/Makefile b/www/mediawiki127/Makefile
index c8685d4958aa..c8d562cf1910 100644
--- a/www/mediawiki127/Makefile
+++ b/www/mediawiki127/Makefile
@@ -50,7 +50,7 @@ LDAP_USE= php=ldap
SOCKETS_USE= php=sockets
MEMCACHED_RUN_DEPENDS= memcached:databases/memcached
-IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
pre-install:
diff --git a/www/mediawiki128/Makefile b/www/mediawiki128/Makefile
index 1ae82db288b5..a152f9e93373 100644
--- a/www/mediawiki128/Makefile
+++ b/www/mediawiki128/Makefile
@@ -52,7 +52,7 @@ LDAP_USE= php=ldap
SOCKETS_USE= php=sockets
MEMCACHED_RUN_DEPENDS= memcached:databases/memcached
-IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
pre-install:
diff --git a/www/mediawiki129/Makefile b/www/mediawiki129/Makefile
index d13fb83e574a..1e477d34ef51 100644
--- a/www/mediawiki129/Makefile
+++ b/www/mediawiki129/Makefile
@@ -49,7 +49,7 @@ LDAP_USE= php=ldap
SOCKETS_USE= php=sockets
MEMCACHED_RUN_DEPENDS= memcached:databases/memcached
-IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
pre-install:
diff --git a/www/mediawiki130/Makefile b/www/mediawiki130/Makefile
index 4dbe418fc91a..b9522248efcd 100644
--- a/www/mediawiki130/Makefile
+++ b/www/mediawiki130/Makefile
@@ -49,7 +49,7 @@ LDAP_USE= php=ldap
SOCKETS_USE= php=sockets
MEMCACHED_RUN_DEPENDS= memcached:databases/memcached
-IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
+IMAGICK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR}
XCACHE_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:www/xcache
pre-install:
diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile
index 8f033621efdd..fb1d4d65fa49 100644
--- a/www/nextcloud-calendar/Makefile
+++ b/www/nextcloud-calendar/Makefile
@@ -17,6 +17,7 @@ LICENSE= AGPLv3
RUN_DEPENDS= nextcloud>=12:www/nextcloud
+USES= php
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile
index c34266f94645..a3ceb5f0e03a 100644
--- a/www/nextcloud-contacts/Makefile
+++ b/www/nextcloud-contacts/Makefile
@@ -17,6 +17,7 @@ LICENSE= AGPLv3
RUN_DEPENDS= nextcloud>=11:www/nextcloud
+USES= php
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud-notes/Makefile b/www/nextcloud-notes/Makefile
index 03796333d0a1..a83ec53d5ffd 100644
--- a/www/nextcloud-notes/Makefile
+++ b/www/nextcloud-notes/Makefile
@@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= nextcloud>=9:www/nextcloud
+USES= php
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud-tasks/Makefile b/www/nextcloud-tasks/Makefile
index b73dd3e6db3e..cea180948bd9 100644
--- a/www/nextcloud-tasks/Makefile
+++ b/www/nextcloud-tasks/Makefile
@@ -18,6 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= nextcloud>=10:www/nextcloud
+USES= php
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index 176cca0e4680..9d5f95814fab 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -40,7 +40,7 @@ MYSQL_USE= PHP=pdo_mysql
PGSQL_USES= pgsql
PGSQL_USE= PHP=pdo_pgsql,pgsql
SQLITE_USE= PHP=pdo_sqlite,sqlite3
-SMB_RUN_DEPENDS= pecl-smbclient>=0.8.0:net/pecl-smbclient
+SMB_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR}
SSL_USE= PHP=openssl
post-patch:
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index 09df6ad19286..ea8fb3262b73 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -11,7 +11,7 @@ DISTNAME= nibbleblogv302
MAINTAINER= marekholienka@gmail.com
COMMENT= Lightweight blog system for general use
-RUN_DEPENDS= pear:devel/pear
+RUN_DEPENDS= pear:devel/pear@${PHP_FLAVOR}
USES= cpe php zip
NO_BUILD= yes
diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index 9058e975a2d5..6bf692817099 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -41,7 +41,7 @@ MYSQL_USES= mysql
PGSQL_USES= pgsql
PGSQL_USE= PHP=pdo_pgsql,pgsql
SQLITE_USE= PHP=pdo_sqlite,sqlite3
-SMB_RUN_DEPENDS= pecl-smbclient>=0.8.0:net/pecl-smbclient
+SMB_RUN_DEPENDS= ${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR}
SSL_USE= PHP=openssl
do-install:
diff --git a/www/pear-HTTP_Client/Makefile b/www/pear-HTTP_Client/Makefile
index 9332af812b1e..b87b18a3522a 100644
--- a/www/pear-HTTP_Client/Makefile
+++ b/www/pear-HTTP_Client/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www pear
MAINTAINER= joseph@randomnetworks.com
COMMENT= PEAR classes for high level HTTP requests
-BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP \
- ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP \
- ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+ ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+ ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-HTTP_Download/Makefile b/www/pear-HTTP_Download/Makefile
index 620adaf48a41..897cfbc917c2 100644
--- a/www/pear-HTTP_Download/Makefile
+++ b/www/pear-HTTP_Download/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www devel pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR class to send HTTP downloads
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header
-RUN_DEPENDS= ${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Header.php:www/pear-HTTP_Header@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-HTTP_FloodControl/Makefile b/www/pear-HTTP_FloodControl/Makefile
index 086ccb556873..d4c0836d2579 100644
--- a/www/pear-HTTP_FloodControl/Makefile
+++ b/www/pear-HTTP_FloodControl/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR classes to detect and protect from attempts to flood a site
-BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP
-RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP
+BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
DOCS= README LICENSE
OPTIONS_DEFINE= PEAR_DB PEAR_MDB PEAR_MDB2
@@ -19,9 +19,9 @@ PEAR_MDB2_DESC= PEAR::MDB2 support
USES= pear
-PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
-PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB
-PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2
+PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR}
+PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR}
+PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR}
post-extract:
${MKDIR} ${WRKSRC}/docs
diff --git a/www/pear-HTTP_Header/Makefile b/www/pear-HTTP_Header/Makefile
index efc2d2a08517..49a4d5861618 100644
--- a/www/pear-HTTP_Header/Makefile
+++ b/www/pear-HTTP_Header/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www devel pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR OO interface to modify and handle HTTP headers and status codes
-BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP
-RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP
+BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile
index 1ba3c504f4db..b8b9989ad5c5 100644
--- a/www/pear-HTTP_Request/Makefile
+++ b/www/pear-HTTP_Request/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR classes providing an easy way to perform HTTP requests
-BUILD_DEPENDS= ${PEARDIR}/Net/URL.php:net/pear-Net_URL \
- ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
-RUN_DEPENDS= ${PEARDIR}/Net/URL.php:net/pear-Net_URL \
- ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket
+BUILD_DEPENDS= ${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-HTTP_Request2/Makefile b/www/pear-HTTP_Request2/Makefile
index 287420160710..600dfc61ffd8 100644
--- a/www/pear-HTTP_Request2/Makefile
+++ b/www/pear-HTTP_Request2/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR classes providing an easy way to perform HTTP requests
-BUILD_DEPENDS= ${PEARDIR}/Net/URL2.php:net/pear-Net_URL2
-RUN_DEPENDS= ${PEARDIR}/Net/URL2.php:net/pear-Net_URL2
+BUILD_DEPENDS= ${PEARDIR}/Net/URL2.php:net/pear-Net_URL2@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/Net/URL2.php:net/pear-Net_URL2@${PHP_FLAVOR}
OPTIONS_DEFINE= CURL FILEINFO ZLIB
CURL_DESC= PHP CURL extension support
diff --git a/www/pear-HTTP_Server/Makefile b/www/pear-HTTP_Server/Makefile
index 44190c5935c1..53c34955f454 100644
--- a/www/pear-HTTP_Server/Makefile
+++ b/www/pear-HTTP_Server/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www devel pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= HTTP server class
-BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP \
- ${PEARDIR}/Net/Server.php:net/pear-Net_Server
-RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP \
- ${PEARDIR}/Net/Server.php:net/pear-Net_Server
+BUILD_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/Server.php:net/pear-Net_Server@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP.php:www/pear-HTTP@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/Server.php:net/pear-Net_Server@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-HTTP_WebDAV_Client/Makefile b/www/pear-HTTP_WebDAV_Client/Makefile
index 82069f281bad..3936e3fc84ff 100644
--- a/www/pear-HTTP_WebDAV_Client/Makefile
+++ b/www/pear-HTTP_WebDAV_Client/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www devel pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= WebDAV Stream Wrapper Class
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS:= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS:= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_Amazon/Makefile b/www/pear-Services_Amazon/Makefile
index 09586587711a..fb8978962ec0 100644
--- a/www/pear-Services_Amazon/Makefile
+++ b/www/pear-Services_Amazon/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP interface to Amazon Product Advertising API
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
- ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
- ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_Amazon_S3/Makefile b/www/pear-Services_Amazon_S3/Makefile
index a47fa9594e19..e48b21595861 100644
--- a/www/pear-Services_Amazon_S3/Makefile
+++ b/www/pear-Services_Amazon_S3/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP API for Amazon S3 (Simple Storage Service)
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 \
- ${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 \
- ${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} \
+ ${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} \
+ ${PEARDIR}/Crypt/HMAC2.php:security/pear-Crypt_HMAC2@${PHP_FLAVOR}
USE_PHP= spl
USES= pear php
diff --git a/www/pear-Services_Blogging/Makefile b/www/pear-Services_Blogging/Makefile
index c25980c55059..f47c791043ab 100644
--- a/www/pear-Services_Blogging/Makefile
+++ b/www/pear-Services_Blogging/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP interface to Blog
-BUILD_DEPENDS= ${PEARDIR}/XML/RPC.php:net/pear-XML_RPC
-RUN_DEPENDS= ${PEARDIR}/XML/RPC.php:net/pear-XML_RPC
+BUILD_DEPENDS= ${PEARDIR}/XML/RPC.php:net/pear-XML_RPC@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/XML/RPC.php:net/pear-XML_RPC@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_Compete/Makefile b/www/pear-Services_Compete/Makefile
index 771e90410c78..def02ea6ccf5 100644
--- a/www/pear-Services_Compete/Makefile
+++ b/www/pear-Services_Compete/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP interface to Compete SnapShop API
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_Delicious/Makefile b/www/pear-Services_Delicious/Makefile
index 9323b20cb515..6c3b0950ea52 100644
--- a/www/pear-Services_Delicious/Makefile
+++ b/www/pear-Services_Delicious/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR Client for the del.icio.us web service
-BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
- ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
-RUN_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
- ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
+BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} \
+ ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} \
+ ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
USES= dos2unix pear php
USE_PHP= openssl
diff --git a/www/pear-Services_Facebook/Makefile b/www/pear-Services_Facebook/Makefile
index 5b2c52e2007c..d28fa39b37b9 100644
--- a/www/pear-Services_Facebook/Makefile
+++ b/www/pear-Services_Facebook/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP interface to Facebook's API
-BUILD_DEPENDS= ${PEARDIR}/Validate.php:devel/pear-Validate
-RUN_DEPENDS= ${PEARDIR}/Validate.php:devel/pear-Validate
+BUILD_DEPENDS= ${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
USES= pear php
USE_PHP= curl
diff --git a/www/pear-Services_GeoNames/Makefile b/www/pear-Services_GeoNames/Makefile
index 654757d396d7..81e8dbb658eb 100644
--- a/www/pear-Services_GeoNames/Makefile
+++ b/www/pear-Services_GeoNames/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP5 Interface to the GeoNames Public API
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_OpenSearch/Makefile b/www/pear-Services_OpenSearch/Makefile
index 9415ed578ebf..02d173dd681b 100644
--- a/www/pear-Services_OpenSearch/Makefile
+++ b/www/pear-Services_OpenSearch/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= Search A9 OpenSearch compatible engines
-BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer \
- ${PEARDIR}/XML/RSS.php:devel/pear-XML_RSS
+BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/RSS.php:devel/pear-XML_RSS@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_ShortURL/Makefile b/www/pear-Services_ShortURL/Makefile
index ba45aa8d98a6..70d225d3d6d8 100644
--- a/www/pear-Services_ShortURL/Makefile
+++ b/www/pear-Services_ShortURL/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= www pear
MAINTAINER= wen@FreeBSD.org
COMMENT= Abstract PHP5 interface for shortening and expanding short URLs
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
USES= pear php
USE_PHP= simplexml pcre spl
diff --git a/www/pear-Services_W3C_CSSValidator/Makefile b/www/pear-Services_W3C_CSSValidator/Makefile
index 48a447b6fa43..ed7b31aa1f7c 100644
--- a/www/pear-Services_W3C_CSSValidator/Makefile
+++ b/www/pear-Services_W3C_CSSValidator/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP interface to W3C CSS Validator API
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Services_W3C_HTMLValidator/Makefile b/www/pear-Services_W3C_HTMLValidator/Makefile
index 39b5f3db8244..1635b51775ec 100644
--- a/www/pear-Services_W3C_HTMLValidator/Makefile
+++ b/www/pear-Services_W3C_HTMLValidator/Makefile
@@ -9,8 +9,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= Object Oriented Interface to the W3C HTML Validator service
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile b/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
index 8602391a94c2..000f227c2dfd 100644
--- a/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
+++ b/www/pear-Structures_DataGrid_Renderer_Flexy/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= Renderer for pear-Structures_DataGrid using HTML_Template_Flexy
-RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
- ${PEARDIR}/HTML/Template/Flexy.php:devel/pear-HTML_Template_Flexy \
- ${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+ ${PEARDIR}/HTML/Template/Flexy.php:devel/pear-HTML_Template_Flexy@${PHP_FLAVOR} \
+ ${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Structures_DataGrid_Renderer_Pager/Makefile b/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
index 763445d1587f..88685f7d9b0d 100644
--- a/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
+++ b/www/pear-Structures_DataGrid_Renderer_Pager/Makefile
@@ -8,8 +8,8 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= Pager Renderer for pear-Structures_DataGrid
-RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
- ${PEARDIR}/Pager/Pager.php:devel/pear-Pager
+RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+ ${PEARDIR}/Pager/Pager.php:devel/pear-Pager@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile b/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
index 6920759e59fe..b54c854e02e2 100644
--- a/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
+++ b/www/pear-Structures_DataGrid_Renderer_Smarty/Makefile
@@ -8,9 +8,9 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= Smarty Renderer for pear-Structures_DataGrid
-RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \
- ${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 \
- ${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager
+RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \
+ ${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2@${PHP_FLAVOR} \
+ ${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:www/pear-Structures_DataGrid_Renderer_Pager@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-UDDI/Makefile b/www/pear-UDDI/Makefile
index 92dc1182a15c..9e00fa135ff6 100644
--- a/www/pear-UDDI/Makefile
+++ b/www/pear-UDDI/Makefile
@@ -8,10 +8,10 @@ CATEGORIES= www pear finance
MAINTAINER= joneum@FreeBSD.org
COMMENT= PEAR UDDI for PHP
-BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
- ${PEARDIR}/XML/Util.php:devel/pear-XML_Util
-RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \
- ${PEARDIR}/XML/Util.php:devel/pear-XML_Util
+BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \
+ ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR}
USES= pear
diff --git a/www/pear-XML_GRDDL/Makefile b/www/pear-XML_GRDDL/Makefile
index 0b388c4d34a3..afa2362863d0 100644
--- a/www/pear-XML_GRDDL/Makefile
+++ b/www/pear-XML_GRDDL/Makefile
@@ -8,14 +8,14 @@ CATEGORIES= www pear
MAINTAINER= joneum@FreeBSD.org
COMMENT= PHP library for dealing with GRDDL
-BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
- ${PEARDIR}/Net/URL.php:net/pear-Net_URL \
- ${PEARDIR}/Log.php:sysutils/pear-Log \
- ${PEARDIR}/Validate.php:devel/pear-Validate
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \
- ${PEARDIR}/Net/URL.php:net/pear-Net_URL \
- ${PEARDIR}/Log.php:sysutils/pear-Log \
- ${PEARDIR}/Validate.php:devel/pear-Validate
+BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR} \
+ ${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
+ ${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \
+ ${PEARDIR}/Net/URL.php:net/pear-Net_URL@${PHP_FLAVOR} \
+ ${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \
+ ${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR}
BROKEN_powerpc64= fails to package: Generating packing list with pear: Signal 11
diff --git a/www/pear-twig/Makefile b/www/pear-twig/Makefile
index f005e137e393..f46d1b0e1ef9 100644
--- a/www/pear-twig/Makefile
+++ b/www/pear-twig/Makefile
@@ -13,9 +13,6 @@ COMMENT= Flexible, fast, and secure template engine for PHP
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
-RUN_DEPENDS= ${PEARDIR}/.channels/pear.twig-project.org.reg:devel/pear-channel-twig
-
USES= pear php:cli
PEAR_CHANNEL= twig
NO_ARCH= yes
diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile
index 43bd13a6b681..728c0d0123ba 100644
--- a/www/pecl-http/Makefile
+++ b/www/pecl-http/Makefile
@@ -12,11 +12,11 @@ COMMENT= Extended HTTP Support
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2 \
- ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2 \
+BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2@${PHP_FLAVOR} \
+ ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2@${PHP_FLAVOR} \
re2c:devel/re2c
-RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2 \
- ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2
+RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf2@${PHP_FLAVOR} \
+ ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro2@${PHP_FLAVOR}
LIB_DEPENDS= libcurl.so:ftp/curl \
libevent.so:devel/libevent
diff --git a/www/pecl-http2/Makefile b/www/pecl-http2/Makefile
index 46c7423f4f3f..be3c73a8ac82 100644
--- a/www/pecl-http2/Makefile
+++ b/www/pecl-http2/Makefile
@@ -4,7 +4,6 @@
PORTNAME= http
PORTVERSION= 2.6.0
CATEGORIES= www
-PKGNAMESUFFIX= 2
DISTNAME= pecl_${PORTNAME}-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
@@ -13,11 +12,11 @@ COMMENT= Extended HTTP Support
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf \
- ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro \
+BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf@${PHP_FLAVOR} \
+ ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro@${PHP_FLAVOR} \
re2c:devel/re2c
-RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf \
- ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro
+RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf@${PHP_FLAVOR} \
+ ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/propro.so:devel/pecl-propro@${PHP_FLAVOR}
LIB_DEPENDS= libcurl.so:ftp/curl \
libevent.so:devel/libevent
diff --git a/www/pecl-yaf2/Makefile b/www/pecl-yaf2/Makefile
index 3bbb03510dd4..a48f49456dd4 100644
--- a/www/pecl-yaf2/Makefile
+++ b/www/pecl-yaf2/Makefile
@@ -4,7 +4,6 @@
PORTNAME= yaf
PORTVERSION= 2.3.5
CATEGORIES= www
-PKGNAMESUFFIX= 2
MAINTAINER= johnpupu@gmail.com
COMMENT= MVC framework written as a C PHP extension
diff --git a/www/pecl-yar/Makefile b/www/pecl-yar/Makefile
index 7087e8e48afb..1d38c8530705 100644
--- a/www/pecl-yar/Makefile
+++ b/www/pecl-yar/Makefile
@@ -18,7 +18,7 @@ USE_PHP= json:build curl:build
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/www/pecl-yar1/Makefile b/www/pecl-yar1/Makefile
index 46c4c99bed2b..0c527e48ad59 100644
--- a/www/pecl-yar1/Makefile
+++ b/www/pecl-yar1/Makefile
@@ -5,7 +5,6 @@ PORTNAME= yar
PORTVERSION= 1.2.5
PORTREVISION= 1
CATEGORIES= www
-PKGNAMESUFFIX= 1
MAINTAINER= johnpupu@gmail.com
COMMENT= Yar (Yet another RPC framework) is a light, concurrent RPC framework
@@ -18,7 +17,7 @@ IGNORE_WITH_PHP=70 71 72
OPTIONS_DEFINE= MSGPACK
MSGPACK_DESC= Enable MSGPACK module
-MSGPACK_BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0
-MSGPACK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0
+MSGPACK_BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0@${PHP_FLAVOR}
+MSGPACK_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/msgpack.so:devel/pecl-msgpack0@${PHP_FLAVOR}
.include <bsd.port.mk>
diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
index 203a5d59a9ab..d68feb2df87e 100644
--- a/www/phalcon/Makefile
+++ b/www/phalcon/Makefile
@@ -5,6 +5,7 @@ PORTNAME= phalcon
DISTVERSIONPREFIX= v
DISTVERSION= 3.3.1
CATEGORIES= www
+PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= linpct@gmail.com
COMMENT= Phalcon PHP Framework written in C-language
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 2a5d47787637..2fa185a00cd4 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -1,11 +1,12 @@
# Created by: Alex Dupre <sysadmin@alexdupre.com>
# $FreeBSD$
-PORTNAME= php-screw
+PORTNAME= screw
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= www security
MASTER_SITES= SF/${PORTNAME}/OldFiles
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= php_screw-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile
index ae326515b426..4017cc379de9 100644
--- a/www/php-templates/Makefile
+++ b/www/php-templates/Makefile
@@ -1,12 +1,13 @@
# Created by: vanilla
# $FreeBSD$
-PORTNAME= php-templates
+PORTNAME= templates
PORTVERSION= 1.7.2
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.7:ext \
SF/${PORTNAME}/${PORTNAME}-doc/html:doc
+PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= php_templates-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:ext
DISTFILES+= php_templates-doc-eng-1.1${EXTRACT_SUFX}:doc
diff --git a/www/php56-opcache/Makefile b/www/php56-opcache/Makefile
index 2c4265adab60..3946132f64cc 100644
--- a/www/php56-opcache/Makefile
+++ b/www/php56-opcache/Makefile
@@ -7,6 +7,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php56
PKGNAMESUFFIX= -opcache
-USES= php:zend
+USES= php:zend,noflavors
.include "${MASTERDIR}/Makefile"
diff --git a/www/php70-opcache/Makefile b/www/php70-opcache/Makefile
index db9930ba6e63..d05b64176a72 100644
--- a/www/php70-opcache/Makefile
+++ b/www/php70-opcache/Makefile
@@ -7,6 +7,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php70
PKGNAMESUFFIX= -opcache
-USES= php:zend
+USES= php:zend,noflavors
.include "${MASTERDIR}/Makefile"
diff --git a/www/php71-opcache/Makefile b/www/php71-opcache/Makefile
index 6a991ff1b4f9..732536ae9d02 100644
--- a/www/php71-opcache/Makefile
+++ b/www/php71-opcache/Makefile
@@ -6,6 +6,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php71
PKGNAMESUFFIX= -opcache
-USES= php:zend
+USES= php:zend,noflavors
.include "${MASTERDIR}/Makefile"
diff --git a/www/php72-opcache/Makefile b/www/php72-opcache/Makefile
index be3994fc4342..5e1f01b8b5d0 100644
--- a/www/php72-opcache/Makefile
+++ b/www/php72-opcache/Makefile
@@ -6,6 +6,6 @@ MASTERDIR= ${.CURDIR}/../../lang/php72
PKGNAMESUFFIX= -opcache
-USES= php:zend
+USES= php:zend,noflavors
.include "${MASTERDIR}/Makefile"
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index 2c803b871ed2..2599c594f9f1 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -12,11 +12,11 @@ COMMENT= PHP-based bulletin board / discussion forum system
LICENSE= GPLv2
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
CONFLICTS= phpbb-tw-[0-9]*
-USES= tar:bzip2
+USES= tar:bzip2 php
# The phpBB2 port supports a number of variables that may be tweaked at build
# time. Perform a "make options" to see more information on these variables.
diff --git a/www/smarty2/Makefile b/www/smarty2/Makefile
index 1767dec4e344..919d9a41d2ec 100644
--- a/www/smarty2/Makefile
+++ b/www/smarty2/Makefile
@@ -7,6 +7,7 @@ DISTVERSIONPREFIX= v
CATEGORIES= www
MASTER_SITES= http://www.smarty.net/files/docs/:manual
DISTFILES= manual-en-${PORTVERSION:R}.zip:manual
+PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= danilo@FreeBSD.org
COMMENT= PHP compiling template engine
@@ -17,7 +18,7 @@ OPTIONS_DEFINE= DOCS
NO_ARCH= yes
NO_BUILD= yes
-USES= php:web
+USES= php:web,flavors
USE_PHP= pcre
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/www/smarty3/Makefile b/www/smarty3/Makefile
index fa2066cef28c..935c91fb998f 100644
--- a/www/smarty3/Makefile
+++ b/www/smarty3/Makefile
@@ -5,14 +5,14 @@ PORTNAME= smarty
DISTVERSIONPREFIX= v
DISTVERSION= 3.1.30
CATEGORIES= www
-PKGNAMESUFFIX= 3
+PKGNAMESUFFIX= 3${PHP_PKGNAMESUFFIX}
MAINTAINER= ports@michael-fausten.de
COMMENT= PHP compiling template engine
LICENSE= LGPL3
-USES= php:web
+USES= php:web,flavors
USE_PHP= pcre
USE_GITHUB= yes
GH_ACCOUNT= smarty-php
diff --git a/www/unit-php56/Makefile b/www/unit-php/Makefile
index b372af0ba1be..c1371334e0ad 100644
--- a/www/unit-php56/Makefile
+++ b/www/unit-php/Makefile
@@ -1,17 +1,15 @@
# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
# $FreeBSD$
-PHP_VER?= 56
-
-PKGNAMESUFFIX= -php${PHP_VER}
+PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
COMMENT= PHP module for NGINX Unit
PLIST_FILES= libexec/unit/modules/php${PHP_VER}.unit.so
-USES= php:build,embed
+USES= php:build,embed,flavors
-USE_RC_SUBR?= # reset to empty
+USE_RC_SUBR= # reset to empty
MASTERDIR= ${.CURDIR}/../unit
diff --git a/www/unit-php70/Makefile b/www/unit-php70/Makefile
deleted file mode 100644
index 72258eb13e85..000000000000
--- a/www/unit-php70/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-# $FreeBSD$
-
-PHP_VER= 70
-
-MASTERDIR= ${.CURDIR}/../unit-php56
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/unit-php71/Makefile b/www/unit-php71/Makefile
deleted file mode 100644
index 7ae400f2ffcb..000000000000
--- a/www/unit-php71/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-# $FreeBSD$
-
-PHP_VER= 71
-
-MASTERDIR= ${.CURDIR}/../unit-php56
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/unit-php72/Makefile b/www/unit-php72/Makefile
deleted file mode 100644
index ec8d323297a6..000000000000
--- a/www/unit-php72/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-# $FreeBSD$
-
-PHP_VER= 72
-
-MASTERDIR= ${.CURDIR}/../unit-php56
-
-.include "${MASTERDIR}/Makefile"
diff --git a/www/xcache/Makefile b/www/xcache/Makefile
index ea29c5b71513..f8f818b72e68 100644
--- a/www/xcache/Makefile
+++ b/www/xcache/Makefile
@@ -5,6 +5,7 @@ PORTNAME= xcache
DISTVERSION= 3.2.0
CATEGORIES= www
MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${DISTVERSION}/
+PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
MAINTAINER= ale@FreeBSD.org
COMMENT= Fast and stable php opcode cacher