diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2018-03-08 19:48:41 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2018-03-08 19:48:41 +0000 |
| commit | a1993564e04f29ecbaa05be740547c8677d423cd (patch) | |
| tree | a942b9de6ec3ced252f123bf8a905b18d685aa72 | |
| parent | 868fb29f23bfae4d55ab923ea34259adf63b4886 (diff) | |
| download | ports-a1993564e04f29ecbaa05be740547c8677d423cd.tar.gz ports-a1993564e04f29ecbaa05be740547c8677d423cd.zip | |
Introduce PHP flavors.
Ports using USES=php:phpize, php:ext, php:zend, and php:pecl are now
flavored. They will automatically get flavors (php56, php70, php71, php72)
depending of the versions they support (set with IGNORE_WITH_PHP). As a
consequence, ports using USES=pear and USES=horde are also flavored.
PR: 226242
Submitted by: mat
Exp-run by: antoine
Approved by: portmgr
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D14208
Notes
Notes:
svn path=/head/; revision=463917
394 files changed, 1013 insertions, 1105 deletions
@@ -10,6 +10,43 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20180308: +AUTHOR: mat@FreeBSD.org + + Ports using USES=php:phpize, php:ext, php:zend, and php:pecl are now + flavored. They will automatically get flavors (php56, php70, php71, php72) + depending of the versions they support (set with IGNORE_WITH_PHP). As a + consequence, ports using USES=pear and USES=horde are also flavored. + + As all packages must have different package names, the following variables + must be used in PKGNAMEPREFIX/SUFFIX: + + Variable + Values + + -------------------------------------------------------------------------------------- + PHP_PKGNAMEPREFIX | php56- php72- | PHP Extensions + | | and modules + -------------------------------------------------------------------------------------- + PHP_PKGNAMESUFFIX | -php56 -php72 | PHP Applications + -------------------------------------------------------------------------------------- + PECL_PKGNAMEPREFIX | php56-pecl- | PECL extensions + | | automatic + -------------------------------------------------------------------------------------- + PEAR_PKGNAMEPREFIX | php56-pear- | PEAR modules + | | without PEAR_CHANNEL + PEAR_<channel>_PKGNAMEPREFIX | php56-pear-channel- | with PEAR_CHANNEL + | | automatic + + In all the ports with PHP dependencies, the *_DEPENDS entries MUST end with + the flavor so that the framework knows which to build/use. This is done by + appending '@${PHP_FLAVOR}' after the origin. For example: + + RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.5.0:devel/pear-Validate@${PHP_FLAVOR} \ + ${PECL_PKGNAMEPREFIX}smbclient>=0.8.0:net/pecl-smbclient@${PHP_FLAVOR} \ + + PHP applications (for example, www/wordpress) can also get flavors, add the + flavors keyword to USES=php, for example: USES=php:flavors, and add + ${PHP_PKGNAMESUFFIX} to its PKGNAMESUFFIX. + 20180125: AUTHOR: mat@FreeBSD.org @@ -10157,3 +10157,15 @@ devel/boaconstructor||2018-03-02|Has expired: Abandonware, does not work with re audio/amp||2018-03-02|Has expired: No more upstream devel/alf||2018-03-02|Has expired: Abandonware, unused in the ports tree net/remmina-plugin-gnome|net/remmina-plugin-secret|2018-03-04|Renamed upstream +databases/php70-memcache|databases/php-memcache@php70|2018-03-08|Merge into a flavorized version +databases/php71-memcache|databases/php-memcache@php71|2018-03-08|Merge into a flavorized version +databases/php72-memcache|databases/php-memcache@php72|2018-03-08|Merge into a flavorized version +ftp/php56-fastdfs|ftp/php-fastdfs@php56|2018-03-08|Merge into flavorized version +ftp/php70-fastdfs|ftp/php-fastdfs@php70|2018-03-08|Merge into flavorized version +ftp/php71-fastdfs|ftp/php-fastdfs@php71|2018-03-08|Merge into flavorized version +ftp/php72-fastdfs|ftp/php-fastdfs@php72|2018-03-08|Merge into flavorized version +www/unit-php56|www/unit-php@php56|2018-03-08|Merge into flavorized version +www/unit-php70|www/unit-php@php70|2018-03-08|Merge into flavorized version +www/unit-php71|www/unit-php@php71|2018-03-08|Merge into flavorized version +www/unit-php72|www/unit-php@php72|2018-03-08|Merge into flavorized version +databases/php70-memcached|databases/php-memcached|2018-03-08|Move to flavorized version. diff --git a/Mk/Uses/horde.mk b/Mk/Uses/horde.mk index 86321cf9495a..ca1320fafb9b 100644 --- a/Mk/Uses/horde.mk +++ b/Mk/Uses/horde.mk @@ -11,10 +11,6 @@ _INCLUDE_USES_HORDE_MK= yes MASTER_SITES?= http://pear.horde.org/get/ -BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde -RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde - -PKGNAMEPREFIX?= pear- HORDE_DIR?= www/horde CONFLICTS+= horde3-*.[0-9]* @@ -142,7 +138,7 @@ horde-turba-DEPEND= ${LOCALBASE}/${HORDE_DIR}/turba/index.php:mail/horde-turba . if !defined(horde-${DEP}-DEPEND) UNKNOWN_HORDE_PACKAGES+= ${DEP} . else -RUN_DEPENDS+= ${horde-${DEP}-DEPEND} +RUN_DEPENDS+= ${horde-${DEP}-DEPEND}@${PHP_FLAVOR} . endif . endfor .endif @@ -152,7 +148,7 @@ RUN_DEPENDS+= ${horde-${DEP}-DEPEND} . if !defined(horde-${DEP}-DEPEND) UNKNOWN_HORDE_PACKAGES+= ${DEP} . else -BUILD_DEPENDS+= ${horde-${DEP}-DEPEND} +BUILD_DEPENDS+= ${horde-${DEP}-DEPEND}@${PHP_FLAVOR} . endif . endfor .endif diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk index 2ba377e40b4c..860cc7a05b2d 100644 --- a/Mk/Uses/pear.mk +++ b/Mk/Uses/pear.mk @@ -4,7 +4,10 @@ # # Feature: pear # Usage: USES=pear -# Valid ARGS: none +# Valid ARGS: env +# +# - env : Only provide the environment variables, no fetch/build/install +# targets. # # MAINTAINER= portmgr@FreeBSD.org @@ -12,35 +15,51 @@ _INCLUDE_USES_PEAR_MK= yes _USES_POST+= pear -.if !empty(pear_ARGS) -IGNORE+= USES=pear takes not arguments -.endif +_valid_pear_ARGS= env + +# Sanity check +. for arg in ${pear_ARGS} +. if empty(_valid_pear_ARGS:M${arg}) +IGNORE= Incorrect 'USES+= pear:${cmake_ARGS}' usage: argument [${arg}] is not recognized +. endif +. endfor +php_ARGS+= flavors +.include "${USESDIR}/php.mk" + +. if empty(pear_ARGS:Menv) MASTER_SITES?= http://pear.php.net/get/ EXTRACT_SUFX?= .tgz DIST_SUBDIR?= PEAR -BUILD_DEPENDS+= pear:devel/pear -RUN_DEPENDS+= pear:devel/pear - -.if !defined(USE_PHPIZE) +. if !defined(USE_PHPIZE) NO_BUILD= yes -.endif +. endif +. endif -.if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != "" -PKGNAMEPREFIX?= pear-${PEAR_CHANNEL}- +BUILD_DEPENDS+= pear:devel/pear@${PHP_FLAVOR} +RUN_DEPENDS+= pear:devel/pear@${PHP_FLAVOR} + +PEAR_PKGNAMEPREFIX= php${PHP_VER}-pear- + +. if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != "" +PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX= php${PHP_VER}-pear-${PEAR_CHANNEL}- +PKGNAMEPREFIX?= ${PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX} PEARPKGREF= ${PEAR_CHANNEL}/${PORTNAME} -.else -PKGNAMEPREFIX?= pear- +PEAR_CHANNEL_VER?= >=0 +BUILD_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR} +RUN_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR} +. else +PKGNAMEPREFIX?= ${PEAR_PKGNAMEPREFIX} PEARPKGREF= ${PORTNAME} -.endif +. endif -.if exists(${LOCALBASE}/bin/php-config) +. if exists(${LOCALBASE}/bin/php-config) PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix -.else +. else PHP_BASE= ${LOCALBASE} -.endif +. endif PEAR= ${LOCALBASE}/bin/pear LPEARDIR= share/pear LPKGREGDIR= ${LPEARDIR}/packages/${PKGNAME} @@ -58,32 +77,36 @@ EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR} SQLSDIR= ${PHP_BASE}/${LSQLSDIR} SCRIPTFILESDIR= ${LOCALBASE}/bin TESTSDIR= ${PHP_BASE}/${LTESTSDIR} -.if defined(CATEGORY) && !empty(CATEGORY) +. if defined(CATEGORY) && !empty(CATEGORY) LINSTDIR= ${LPEARDIR}/${CATEGORY} -.else +. else LINSTDIR= ${LPEARDIR} -.endif +. endif INSTDIR= ${PHP_BASE}/${LINSTDIR} SUB_LIST+= PKG_NAME=${PEARPKGREF} -.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist) +. if empty(pear_ARGS:Menv) +. if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist) PLIST= ${WRKDIR}/PLIST -.endif +. endif +PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install +PKGDEINSTALL?= ${WRKDIR}/pear-deinstall +. endif + PLIST_SUB+= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \ TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \ SCRIPTFILESDIR=${LCRIPTSDIR} -PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install -PKGDEINSTALL?= ${WRKDIR}/pear-deinstall - .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK) _INCLUDE_USES_PEAR_POST_MK= yes +. if empty(pear_ARGS:Menv) + _USES_install+= 250:pear-pre-install pear-pre-install: -.if exists(${LOCALBASE}/lib/php.DIST_PHP) \ +. if exists(${LOCALBASE}/lib/php.DIST_PHP) \ || exists(${PHP_BASE}/lib/php.DIST_PHP) \ || exists(${LOCALBASE}/.PEAR.pkg) \ || exists(${PHP_BASE}/.PEAR.pkg) @@ -92,7 +115,7 @@ pear-pre-install: @${ECHO_MSG} " Please deinstall your installed pear- ports." @${ECHO_MSG} "" @${FALSE} -.endif +. endif DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \ | ( while read r; do \ @@ -108,16 +131,16 @@ DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \ done \ ) | ${SORT} -ur -.if !defined(USE_PHPIZE) +. if !defined(USE_PHPIZE) _USES_install+= 260:do-autogenerate-plist do-autogenerate-plist: @${ECHO_MSG} "===> Generating packing list with pear" @${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml @cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null -.for R in .channels .depdb .depdblock .filemap .lock .registry +. for R in .channels .depdb .depdblock .filemap .lock .registry @${RM} -r ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R} @${RM} -r ${WRKDIR}/inst/${R} -.endfor +. endfor @FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \ ${GREP} -v -E "^${PREFIX}/"` || exit 0; \ ${ECHO_CMD} $${FILES}; if ${TEST} -n "$${FILES}"; then \ @@ -131,11 +154,11 @@ do-autogenerate-plist: do-install: @cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml # Clean up orphans re-generated by pear-install -.for R in .channels .depdb .depdblock .filemap .lock .registry +. for R in .channels .depdb .depdblock .filemap .lock .registry @${RM} -r ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R} @${RM} -r ${STAGEDIR}/${R} -.endfor -.endif +. endfor +. endif _USES_install+= 270:do-generate-deinstall-script do-generate-deinstall-script: @@ -149,4 +172,6 @@ pear-post-install: show-depends: patch @${PEAR} package-dependencies ${WRKDIR}/package.xml +. endif + .endif diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk index fe70b09a782d..698e18e70c34 100644 --- a/Mk/Uses/php.mk +++ b/Mk/Uses/php.mk @@ -16,6 +16,9 @@ # - web : Want the Apache Module or the CGI version of PHP. # - embed : Want the embedded library version of PHP. # - pecl : Fetches from PECL. +# - flavors : Generates flavors for supported versions. +# (implied by phpize,ext,zend,pecl) +# - noflavors: Prevents generation of flavor. # # If the port requires a predefined set of PHP extensions, they can be # listed in this way: @@ -43,7 +46,6 @@ # # The port can set these options in its Makefile before bsd.port.pre.mk: # -# DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed. # IGNORE_WITH_PHP=N - The port doesn't work with PHP version N. # # You may combine multiple WANT_PHP_* knobs. @@ -58,10 +60,6 @@ PHP_Include_MAINTAINER= ale@FreeBSD.org _INCLUDE_USES_PHP_MK= yes -. if defined(DEFAULT_PHP_VER) -WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead" -. endif - . if defined(USE_PHPIZE) && empty(php_ARGS:Mphpize) php_ARGS+= phpize . endif @@ -84,6 +82,9 @@ php_ARGS+= embed . if ${php_ARGS:Mbuild} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} ) DEV_WARNING+= "USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed" . endif +. if ${php_ARGS:Mflavors} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} ) +DEV_WARNINGS+= "USES=php:flavors is included in phpize, ext, zend and pecl, so it is not needed." +. endif . if ${php_ARGS:Mphpize} && ( ${php_ARGS:Mext} || ${php_ARGS:Mzend} ) DEV_WARNING+= "USES=php:phpize is included in USES=php:ext and USES=php:zend, so it is not needed" . endif @@ -94,26 +95,91 @@ DEV_WARNING+= "USES=php:ext is included in USES=php:zend, so it is not needed" DEV_WARNING+= "USES=php:ext is included in USES=php:pecl, so it is not needed" . endif +. if ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} ) && !${php_ARGS:Mnoflavors} +php_ARGS+= flavors +. endif + +. if ${php_ARGS:Mnoflavors} && ${php_ARGS:Mflavors} +php_ARGS:= ${php_ARGS:Nflavors} +. endif + + . if ${php_ARGS:Mpecl} php_ARGS+= ext +. if !defined(USE_GITHUB) EXTRACT_SUFX= .tgz MASTER_SITES= http://pecl.php.net/get/ -PKGNAMEPREFIX= pecl- +. endif +PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX} DIST_SUBDIR= PECL . endif PHPBASE?= ${LOCALBASE} + +_ALL_PHP_VERSIONS= 56 70 71 72 + +# Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) .include "${PHPBASE}/etc/php.conf" . if !defined(PHP_EXT_DIR) PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p' . endif +_INSTALLED_PHP_VER:= ${PHP_VER} +# If we have an installed version of PHP, and this does not support it, set +# IGNORE to fail early as you cannot install two different versions of PHP at +# the same time anyway. +. if defined(IGNORE_WITH_PHP) && ${IGNORE_WITH_PHP:M${_INSTALLED_PHP_VER}} +IGNORE= does not work with PHP versions "${IGNORE_WITH_PHP}" and "${_INSTALLED_PHP_VER}" is installed. +. endif + . else -DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//} +PHP_VER?= ${PHP_DEFAULT:S/.//} +. endif # .if exists(${PHPBASE}/etc/php.conf) + +# Use the "default" php version as th first version for flavors, so that it +# gets to be the default flavor. +_ALL_FLAVOR_VERSIONS= ${PHP_VER} ${_ALL_PHP_VERSIONS:N${PHP_VER}} + +# If we want flavors, fill in FLAVORS with the allowed PHP versions, if some +# cannot be used, or all of them if they all can. +# Then if there is no flavor set, use the first one as the default. +. if ${php_ARGS:Mflavors} +. if empty(FLAVORS) +. if defined(IGNORE_WITH_PHP) +. for _v in ${_ALL_FLAVOR_VERSIONS} +. if empty(IGNORE_WITH_PHP:M${_v}) +# Avoid a leading space in FLAVORS. +. if empty(FLAVORS) +FLAVORS:= php${_v} +. else +FLAVORS:= ${FLAVORS} php${_v} +. endif +. endif +. endfor +. else # defined(IGNORE_WITH_PHP) +FLAVORS:= ${_ALL_FLAVOR_VERSIONS:S/^/php/} +. endif # defined(IGNORE_WITH_PHP) +. endif +. if empty(FLAVOR) +FLAVOR= ${FLAVORS:[1]} +. endif +. endif + +# This variable is for dependencies lines, so you write: +# ${PHP_PKGNAMEPREFIX}foo:devel/php-foo@${PHP_FLAVOR} +PHP_FLAVOR= php${PHP_VER} +# So, we have PHP flavors, set PHP_VER accordingly. +. if ${FLAVOR:Mphp[0-9][0-9]} +PHP_VER= ${FLAVOR:S/^php//} +. endif + +# If lang/php is not installed, or if we have a php flavor but want a non +# default one, we need to overwrite those. +. if empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || \ + (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]}) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -PHP_VER?= ${DEFAULT_PHP_VER} . if ${PHP_VER} == 72 PHP_EXT_DIR= 20170718 PHP_EXT_INC= pcre spl @@ -132,6 +198,8 @@ PHP_EXT_DIR= 20131226 PHP_EXT_INC= pcre spl . endif +# Try to figure out what the PHP_EXT_DIR should be WRT the +# installed Apache port. HTTPD?= ${LOCALBASE}/sbin/httpd . if exists(${HTTPD}) APACHE_THR!= ${HTTPD} -V | ${AWK} '/threaded/ {print $2}' @@ -148,8 +216,12 @@ PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug . endif PHP_SAPI?= "" -. endif # .if exists(${PHPBASE}/etc/php.conf) -PHP_EXT_INC?= "" +. endif # empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]}) + +# Set a few PKGNAME(PRE|SUF)FIX to be used in ports. +PHP_PKGNAMEPREFIX= php${PHP_VER}- +PHP_PKGNAMESUFFIX= -php${PHP_VER} +PECL_PKGNAMEPREFIX= php${PHP_VER}-pecl- . if defined(IGNORE_WITH_PHP) . for VER in ${IGNORE_WITH_PHP} @@ -220,7 +292,7 @@ BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PHP_PORT} \ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config -configure-message: phpize-message do-phpize +_USES_configure+= 190:phpize-message 250:do-phpize phpize-message: @${ECHO_MSG} "===> PHPizing for ${PKGNAME}" @@ -308,9 +380,9 @@ _USE_PHP_VER72= ${_USE_PHP_ALL} sodium bcmath_DEPENDS= math/php${PHP_VER}-bcmath . if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72 -bitset_DEPENDS= math/pecl-bitset +bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR} . else -bitset_DEPENDS= math/pecl-bitset2 +bitset_DEPENDS= math/pecl-bitset2@${PHP_FLAVOR} . endif bz2_DEPENDS= archivers/php${PHP_VER}-bz2 calendar_DEPENDS= misc/php${PHP_VER}-calendar @@ -329,31 +401,31 @@ gettext_DEPENDS=devel/php${PHP_VER}-gettext gmp_DEPENDS= math/php${PHP_VER}-gmp hash_DEPENDS= security/php${PHP_VER}-hash iconv_DEPENDS= converters/php${PHP_VER}-iconv -igbinary_DEPENDS= converters/pecl-igbinary +igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR} imap_DEPENDS= mail/php${PHP_VER}-imap interbase_DEPENDS= databases/php${PHP_VER}-interbase . if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72 intl_DEPENDS= devel/php${PHP_VER}-intl . else -intl_DEPENDS= devel/pecl-intl +intl_DEPENDS= devel/pecl-intl@${PHP_FLAVOR} . endif json_DEPENDS= devel/php${PHP_VER}-json ldap_DEPENDS= net/php${PHP_VER}-ldap mbstring_DEPENDS= converters/php${PHP_VER}-mbstring . if ${PHP_VER} >= 72 -mcrypt_DEPENDS= security/pecl-mcrypt +mcrypt_DEPENDS= security/pecl-mcrypt@${PHP_FLAVOR} . else mcrypt_DEPENDS= security/php${PHP_VER}-mcrypt . endif . if ${PHP_VER} >= 70 -memcache_DEPENDS= databases/php${PHP_VER}-memcache +memcache_DEPENDS= databases/php-memcache@${PHP_FLAVOR} . else -memcache_DEPENDS= databases/pecl-memcache +memcache_DEPENDS= databases/pecl-memcache@${PHP_FLAVOR} . endif . if ${PHP_VER} >= 70 -memcached_DEPENDS= databases/pecl-memcached +memcached_DEPENDS= databases/pecl-memcached@${PHP_FLAVOR} . else -memcached_DEPENDS= databases/pecl-memcached2 +memcached_DEPENDS= databases/pecl-memcached2@${PHP_FLAVOR} . endif mssql_DEPENDS= databases/php${PHP_VER}-mssql mysql_DEPENDS= databases/php${PHP_VER}-mysql @@ -364,7 +436,7 @@ oci8_DEPENDS= databases/php${PHP_VER}-oci8 opcache_DEPENDS= www/php${PHP_VER}-opcache openssl_DEPENDS=security/php${PHP_VER}-openssl pcntl_DEPENDS= devel/php${PHP_VER}-pcntl -pdf_DEPENDS= print/pecl-pdflib +pdf_DEPENDS= print/pecl-pdflib@${PHP_FLAVOR} pdo_DEPENDS= databases/php${PHP_VER}-pdo pdo_dblib_DEPENDS= databases/php${PHP_VER}-pdo_dblib pdo_firebird_DEPENDS= databases/php${PHP_VER}-pdo_firebird @@ -376,10 +448,10 @@ pgsql_DEPENDS= databases/php${PHP_VER}-pgsql phar_DEPENDS= archivers/php${PHP_VER}-phar posix_DEPENDS= sysutils/php${PHP_VER}-posix pspell_DEPENDS= textproc/php${PHP_VER}-pspell -radius_DEPENDS= net/pecl-radius +radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR} readline_DEPENDS= devel/php${PHP_VER}-readline recode_DEPENDS= converters/php${PHP_VER}-recode -redis_DEPENDS= databases/pecl-redis +redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR} session_DEPENDS=www/php${PHP_VER}-session shmop_DEPENDS= devel/php${PHP_VER}-shmop simplexml_DEPENDS= textproc/php${PHP_VER}-simplexml @@ -5,6 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20180308: + AFFECTS: */php* */pecl* */pear* + AUTHOR: mat@FreeBSD.org + + PHP extensions and modules have been flavored. + + People using Poudriere 3.2+ and binary packages do not have to do anything. + + PHP modules and extensions may have change their names from php5- or php7- to + fully versionned phpXY-. + PECL extensions and PEAR modules package names have changed from pecl- and + pear- to phpXX-pecl and phpXX-pear-. + + For other people, to build the PHP 7.2 version of, for example, + databases/php-memcached, you need to run: + + # make FLAVOR=php72 install + 20180220: AFFECTS: users of www/nextcloud AUTHOR: brnrd@FreeBSD.org diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile index 7cd4280d8bbd..50e8916b9679 100644 --- a/archivers/pear-File_Archive/Makefile +++ b/archivers/pear-File_Archive/Makefile @@ -8,8 +8,8 @@ CATEGORIES= archivers www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files -BUILD_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type -RUN_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type +BUILD_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR} USES= pear php NO_ARCH= yes @@ -22,8 +22,8 @@ PEAR_MAIL_DESC= PEAR::Mail support PEAR_MAIL_MIME_DESC= PEAR::Mail_Mime support PEAR_CACHE_LITE_DESC= PEAR::Cache_Lite support -PEAR_MAIL_RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail -PEAR_MAIL_MIME_RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime -PEAR_CACHE_LITE_RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite +PEAR_MAIL_RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} +PEAR_MAIL_MIME_RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} +PEAR_CACHE_LITE_RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/archivers/pear-Horde_Compress/Makefile b/archivers/pear-Horde_Compress/Makefile index c987a92f1dc3..bb5210eb1879 100644 --- a/archivers/pear-Horde_Compress/Makefile +++ b/archivers/pear-Horde_Compress/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Compress PORTVERSION= 2.2.1 CATEGORIES= archivers www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Compression API diff --git a/archivers/pear-Horde_Compress_Fast/Makefile b/archivers/pear-Horde_Compress_Fast/Makefile index 026a2401462d..50c5fb6d50b3 100644 --- a/archivers/pear-Horde_Compress_Fast/Makefile +++ b/archivers/pear-Horde_Compress_Fast/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Compress_Fast PORTVERSION= 1.1.1 CATEGORIES= archivers www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Fast Compression Library diff --git a/archivers/pear-Horde_Pack/Makefile b/archivers/pear-Horde_Pack/Makefile index c60836f1d7d8..e8a2157769f1 100644 --- a/archivers/pear-Horde_Pack/Makefile +++ b/archivers/pear-Horde_Pack/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Pack PORTVERSION= 1.0.7 CATEGORIES= archivers www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Pack Utility diff --git a/archivers/php-horde_lz4/Makefile b/archivers/php-horde_lz4/Makefile index b18e55f8320c..b73e289565ce 100644 --- a/archivers/php-horde_lz4/Makefile +++ b/archivers/php-horde_lz4/Makefile @@ -5,7 +5,7 @@ PORTNAME= horde_lz4 PORTVERSION= 1.0.10 CATEGORIES= archivers pear MASTER_SITES= http://pear.horde.org/get/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX} DIST_SUBDIR= PECL MAINTAINER= mm@FreeBSD.org diff --git a/archivers/php-snappy/Makefile b/archivers/php-snappy/Makefile index 36d73c43b52c..63c8df5ced5b 100644 --- a/archivers/php-snappy/Makefile +++ b/archivers/php-snappy/Makefile @@ -4,7 +4,7 @@ PORTNAME= snappy PORTVERSION= 0.1.9 CATEGORIES= archivers -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= joneum@FreeBSD.org COMMENT= PHP extension for the snappy compression algorithm diff --git a/chinese/php-opencc/Makefile b/chinese/php-opencc/Makefile index b854eae820c9..170c71320dc5 100644 --- a/chinese/php-opencc/Makefile +++ b/chinese/php-opencc/Makefile @@ -4,7 +4,7 @@ PORTNAME= opencc PORTVERSION= 0.0.0.20161110 CATEGORIES= chinese -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= gasol.wu@gmail.com COMMENT= OpenCC shared extension for php diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile index b9dfdf99a35e..e5052f8d7b7f 100644 --- a/chinese/phpbb-tw/Makefile +++ b/chinese/phpbb-tw/Makefile @@ -12,10 +12,10 @@ DISTNAME= phpBB-tw-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= The Traditional Chinese version of phpBB -RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear +RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR} CONFLICTS= phpbb-[0-9]* -USES= dos2unix +USES= dos2unix php # Get HOSTNAME .if exists(/sbin/sysctl) diff --git a/converters/php5-bsdconv/Makefile b/converters/php5-bsdconv/Makefile index b414d7ecb737..fb5107389aa2 100644 --- a/converters/php5-bsdconv/Makefile +++ b/converters/php5-bsdconv/Makefile @@ -5,7 +5,7 @@ PORTNAME= bsdconv PORTVERSION= 11.3.0 PORTREVISION= 1 CATEGORIES= converters -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= buganini@gmail.com COMMENT= PHP wrapper for bsdconv diff --git a/databases/Makefile b/databases/Makefile index ae6dfcabcf8c..aa91b826c827 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -608,6 +608,8 @@ SUBDIR += pguri SUBDIR += pgworksheet SUBDIR += php-mdcached + SUBDIR += php-memcache + SUBDIR += php-memcached SUBDIR += php-xapian SUBDIR += php5-pdo_cassandra SUBDIR += php5-tarantool @@ -630,8 +632,6 @@ SUBDIR += php7-tarantool SUBDIR += php70-dba SUBDIR += php70-interbase - SUBDIR += php70-memcache - SUBDIR += php70-memcached SUBDIR += php70-mysqli SUBDIR += php70-odbc SUBDIR += php70-pdo @@ -645,7 +645,6 @@ SUBDIR += php70-sqlite3 SUBDIR += php71-dba SUBDIR += php71-interbase - SUBDIR += php71-memcache SUBDIR += php71-mysqli SUBDIR += php71-odbc SUBDIR += php71-pdo @@ -659,7 +658,6 @@ SUBDIR += php71-sqlite3 SUBDIR += php72-dba SUBDIR += php72-interbase - SUBDIR += php72-memcache SUBDIR += php72-mysqli SUBDIR += php72-odbc SUBDIR += php72-pdo diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile index 371149123bbe..99e1438f9501 100644 --- a/databases/pear-DB_DataObject/Makefile +++ b/databases/pear-DB_DataObject/Makefile @@ -11,10 +11,10 @@ COMMENT= SQL Builder, Object Interface to Database Tables LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/docs/LICENCE.txt -BUILD_DEPENDS= pear-DB>=1.7.0:databases/pear-DB \ - pear-Date>=1.4.3:devel/pear-Date -RUN_DEPENDS= pear-DB>=1.7.0:databases/pear-DB \ - pear-Date>=1.4.3:devel/pear-Date +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \ + ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR} +RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \ + ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR} USES= pear @@ -23,7 +23,7 @@ OPTIONS_DEFINE= PEAR_MDB2 PEAR_VALIDATE PEAR_MDB2_DESC= PEAR::MDB2 support PEAR_VALIDATE_DESC= PEAR::Validate support -PEAR_MDB2_RUN_DEPENDS= pear-MDB2>=2.3.0:databases/pear-MDB2 -PEAR_VALIDATE_RUN_DEPENDS= pear-Validate>=0.1.1:devel/pear-Validate +PEAR_MDB2_RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=2.3.0:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_VALIDATE_RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.1.1:devel/pear-Validate@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/databases/pear-DB_DataObject_FormBuilder/Makefile b/databases/pear-DB_DataObject_FormBuilder/Makefile index ba19bd845610..9b6e8504ed84 100644 --- a/databases/pear-DB_DataObject_FormBuilder/Makefile +++ b/databases/pear-DB_DataObject_FormBuilder/Makefile @@ -8,17 +8,17 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= Automatically build HTML_QuickForm objects using DB_DataObject -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject -RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} USES= pear OPTIONS_DEFINE= PEAR_DATE PEAR_HTML_TABLE PEAR_DATE_DESC= PEAR::Date support PEAR_HTML_TABLE_DESC= PEAR::HTML_Table support -PEAR_DATE_RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date -PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table +PEAR_DATE_RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} +PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/databases/pear-DB_Pager/Makefile b/databases/pear-DB_Pager/Makefile index 5c5f172dd046..70426af073bc 100644 --- a/databases/pear-DB_Pager/Makefile +++ b/databases/pear-DB_Pager/Makefile @@ -10,8 +10,8 @@ COMMENT= PEAR Database Abstraction Layer LICENSE= GPLv3 -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-DB_QueryTool/Makefile b/databases/pear-DB_QueryTool/Makefile index 1a73b3f7a104..f02f93bbf673 100644 --- a/databases/pear-DB_QueryTool/Makefile +++ b/databases/pear-DB_QueryTool/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR OO-interface for easily retrieving and modifying data in a DB -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-DB_Sqlite_Tools/Makefile b/databases/pear-DB_Sqlite_Tools/Makefile index 298bfe4c63e6..b6c2ff326af2 100644 --- a/databases/pear-DB_Sqlite_Tools/Makefile +++ b/databases/pear-DB_Sqlite_Tools/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= an object oriented interface to backup Sqlite databases -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-DB_Table/Makefile b/databases/pear-DB_Table/Makefile index bf6db912c4c3..24419c95558a 100644 --- a/databases/pear-DB_Table/Makefile +++ b/databases/pear-DB_Table/Makefile @@ -17,8 +17,8 @@ PEAR_HTML_QUICKFORM_DESC= PEAR::HTML_QuickForm support PEAR_DB_DESC= PEAR::DB support PEAR_MDB2_DESC= PEAR::MDB2 support -PEAR_HTML_QUICKFORM_RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 +PEAR_HTML_QUICKFORM_RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/databases/pear-DB_ldap/Makefile b/databases/pear-DB_ldap/Makefile index d2a0a2dd9c58..4c0acaad30b1 100644 --- a/databases/pear-DB_ldap/Makefile +++ b/databases/pear-DB_ldap/Makefile @@ -8,8 +8,8 @@ CATEGORIES= databases net pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR DB compliant interface to LDAP servers -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-DB_ldap2/Makefile b/databases/pear-DB_ldap2/Makefile index 9d791d0b6d51..388334bf0007 100644 --- a/databases/pear-DB_ldap2/Makefile +++ b/databases/pear-DB_ldap2/Makefile @@ -9,8 +9,8 @@ CATEGORIES= databases net pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR DB compliant interface to LDAP v2 and v3 database -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USE_PHP= ldap USES= pear php diff --git a/databases/pear-DoctrineCommon/Makefile b/databases/pear-DoctrineCommon/Makefile index 9a8c322f5dbd..7f3aa247eb53 100644 --- a/databases/pear-DoctrineCommon/Makefile +++ b/databases/pear-DoctrineCommon/Makefile @@ -11,9 +11,6 @@ COMMENT= Shared code for Doctrine PHP object relational mapper LICENSE= LGPL21 -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine -RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine - USES= pear PEAR_CHANNEL= doctrine diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile index eb25d2fb5c26..cad8d44db855 100644 --- a/databases/pear-DoctrineDBAL/Makefile +++ b/databases/pear-DoctrineDBAL/Makefile @@ -11,10 +11,8 @@ COMMENT= Database abstraction layer used to power the ORM package LICENSE= LGPL21 -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine -RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \ - ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \ - ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console +RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \ + ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT=MYSQL diff --git a/databases/pear-DoctrineORM/Makefile b/databases/pear-DoctrineORM/Makefile index 8296f39c90fc..fdfa21441bb3 100644 --- a/databases/pear-DoctrineORM/Makefile +++ b/databases/pear-DoctrineORM/Makefile @@ -11,12 +11,10 @@ COMMENT= Primary package containing the Doctrine ORM LICENSE= LGPL21 -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine -RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \ - ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \ - ${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL \ - ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console \ - ${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml +RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \ + ${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL@${PHP_FLAVOR} \ + ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} \ + ${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml@${PHP_FLAVOR} USES= pear PEAR_CHANNEL= doctrine diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile index fe46be51385d..769532f316e4 100644 --- a/databases/pear-Horde_Db/Makefile +++ b/databases/pear-Horde_Db/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Db PORTVERSION= 2.4.0 CATEGORIES= databases www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Database Libraries diff --git a/databases/pear-Horde_HashTable/Makefile b/databases/pear-Horde_HashTable/Makefile index 447057e73ce3..86508e1f1fa4 100644 --- a/databases/pear-Horde_HashTable/Makefile +++ b/databases/pear-Horde_HashTable/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_HashTable PORTVERSION= 1.2.6 CATEGORIES= databases www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Hash Table Interface diff --git a/databases/pear-Horde_Mongo/Makefile b/databases/pear-Horde_Mongo/Makefile index 75991dac51a0..23e0bec03430 100644 --- a/databases/pear-Horde_Mongo/Makefile +++ b/databases/pear-Horde_Mongo/Makefile @@ -3,12 +3,10 @@ PORTNAME= Horde_Mongo PORTVERSION= 1.1.0 CATEGORIES= databases www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Mongo Configuration USES= horde -#RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:databases/pecl-mongo .include <bsd.port.mk> diff --git a/databases/pear-MDB/Makefile b/databases/pear-MDB/Makefile index 10eecaa12b7e..db1bc0cf45c2 100644 --- a/databases/pear-MDB/Makefile +++ b/databases/pear-MDB/Makefile @@ -8,8 +8,8 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR unified API for DB access, based on user meta data -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-MDB2_Driver_mysql/Makefile b/databases/pear-MDB2_Driver_mysql/Makefile index c417f2fa957c..e0392c3efffa 100644 --- a/databases/pear-MDB2_Driver_mysql/Makefile +++ b/databases/pear-MDB2_Driver_mysql/Makefile @@ -10,7 +10,7 @@ COMMENT= PEAR MySQL MDB2 driver LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2 +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes diff --git a/databases/pear-MDB2_Driver_mysqli/Makefile b/databases/pear-MDB2_Driver_mysqli/Makefile index 42f05e067393..d2e96565724c 100644 --- a/databases/pear-MDB2_Driver_mysqli/Makefile +++ b/databases/pear-MDB2_Driver_mysqli/Makefile @@ -10,7 +10,7 @@ COMMENT= PEAR MySQL MDB2 driver LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2 +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes diff --git a/databases/pear-MDB2_Driver_pgsql/Makefile b/databases/pear-MDB2_Driver_pgsql/Makefile index 7717d0eb39f3..209c4d2ca57a 100644 --- a/databases/pear-MDB2_Driver_pgsql/Makefile +++ b/databases/pear-MDB2_Driver_pgsql/Makefile @@ -10,7 +10,7 @@ COMMENT= PEAR pgsql MDB2 driver LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2 +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes diff --git a/databases/pear-MDB2_Schema/Makefile b/databases/pear-MDB2_Schema/Makefile index d124e794c675..e057654ebb60 100644 --- a/databases/pear-MDB2_Schema/Makefile +++ b/databases/pear-MDB2_Schema/Makefile @@ -8,14 +8,14 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR XML based database schema manager -BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 \ - ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \ - ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer -RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 \ - ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \ - ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \ + ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \ + ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-MDB_QueryTool/Makefile b/databases/pear-MDB_QueryTool/Makefile index f127c1cf7b8d..7d079680d1a2 100644 --- a/databases/pear-MDB_QueryTool/Makefile +++ b/databases/pear-MDB_QueryTool/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR OO-interface for easily retrieving and modifying data in a DB -BUILD_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log -RUN_DEPENDS:= ${PEARDIR}/MDB.php:databases/pear-MDB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-Structures_DataGrid_DataSource_Array/Makefile b/databases/pear-Structures_DataGrid_DataSource_Array/Makefile index c0aa57ff17c5..e7e2b0935b43 100644 --- a/databases/pear-Structures_DataGrid_DataSource_Array/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_Array/Makefile @@ -8,8 +8,8 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using arrays -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile b/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile index 7132d7e19a6e..90c07cc34298 100644 --- a/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile @@ -8,8 +8,8 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using CSV files -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-Structures_DataGrid_DataSource_DB/Makefile b/databases/pear-Structures_DataGrid_DataSource_DB/Makefile index 6663dc35c90f..cba2c00b4102 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DB/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DB/Makefile @@ -8,9 +8,9 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DB datasource driver for pear-Structures_DataGrid -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile b/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile index 111f103074b6..a22565f22c92 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::DB and an SQL query -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USES= pear USE_PHP= mysql diff --git a/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile b/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile index 468cc7598f4d..1a4693f036f3 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::DB_Table -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/Table.php:databases/pear-DB_Table -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/Table.php:databases/pear-DB_Table +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/Table.php:databases/pear-DB_Table@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/Table.php:databases/pear-DB_Table@${PHP_FLAVOR} USES= pear USE_PHP= mysql diff --git a/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile b/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile index 04891241697f..9241e5f966fb 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::DB_DataObject -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} USES= pear USE_PHP= mysql diff --git a/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile b/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile index c05ed6246e64..3d0734d5658d 100644 --- a/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile @@ -8,10 +8,10 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::MDB2 and an SQL query -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/MDB2.php:databases/pear-MDB2 -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/MDB2.php:databases/pear-MDB2 +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} USES= pear USE_PHP= mysql diff --git a/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile b/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile index 2158b10a369c..2039826882d2 100644 --- a/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile @@ -8,8 +8,8 @@ CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PHP Data Objects (PDO) and an SQL query -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear diff --git a/databases/pear-XML_Query2XML/Makefile b/databases/pear-XML_Query2XML/Makefile index dbece87337fb..3a8ac749c44a 100644 --- a/databases/pear-XML_Query2XML/Makefile +++ b/databases/pear-XML_Query2XML/Makefile @@ -8,8 +8,8 @@ CATEGORIES= databases pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class transform SQL queries into XML data -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} OPTIONS_DEFINE= PEAR_MDB2 PEAR_NET_LDAP2 PEAR_MDB2_DESC= Add support for pear-MDB2 @@ -17,7 +17,7 @@ PEAR_NET_LDAP2_DESC= Add support for pear-Net_LDAP2 USES= pear -PEAR_MDB2_BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_NET_LDAP2_BUILD_DEPENDS= ${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2 +PEAR_MDB2_BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_NET_LDAP2_BUILD_DEPENDS= ${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/databases/pecl-memcached2/Makefile b/databases/pecl-memcached2/Makefile index 9c3bcafe9c38..8281dc3cf06a 100644 --- a/databases/pecl-memcached2/Makefile +++ b/databases/pecl-memcached2/Makefile @@ -5,7 +5,6 @@ PORTNAME= memcached PORTVERSION= 2.2.0 PORTREVISION= 5 CATEGORIES= databases -PKGNAMESUFFIX= 2 MAINTAINER= sunpoet@FreeBSD.org COMMENT= PHP extension for interfacing with memcached via libmemcached library diff --git a/databases/pecl-rrd1/Makefile b/databases/pecl-rrd1/Makefile index 6e46c2c27170..a0e0ae3cbedd 100644 --- a/databases/pecl-rrd1/Makefile +++ b/databases/pecl-rrd1/Makefile @@ -3,7 +3,6 @@ PORTNAME= rrd DISTVERSION= 1.1.3 CATEGORIES= databases pear -PKGNAMESUFFIX= 1 MAINTAINER= daniel@blodan.se COMMENT= PHP bindings to rrd tool system diff --git a/databases/php-mdcached/Makefile b/databases/php-mdcached/Makefile index ab719844596d..c0191445fca1 100644 --- a/databases/php-mdcached/Makefile +++ b/databases/php-mdcached/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 1.0.9 PORTREVISION= 1 CATEGORIES= databases devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} EXTRACT_SUFX= .tgz MAINTAINER= ivoras@FreeBSD.org diff --git a/databases/php70-memcache/Makefile b/databases/php-memcache/Makefile index b3135f45cb03..5f9482f7a253 100644 --- a/databases/php70-memcache/Makefile +++ b/databases/php-memcache/Makefile @@ -4,10 +4,10 @@ PORTNAME= memcache PORTVERSION= 3.0.9 CATEGORIES= databases -PKGNAMEPREFIX= php70- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Memcached extension for PHP 7.0 +COMMENT= Memcached extension for PHP LICENSE= PHP30 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -17,8 +17,7 @@ OPTIONS_DEFINE= EXAMPLES PORTSCOUT= skipv:start CONFIGURE_ARGS= --with-zlib-dir=/usr -IGNORE_WITH_PHP=56 71 72 -PHP_VER= 70 +IGNORE_WITH_PHP=56 USE_CSTD= gnu89 USE_PHP= session:build zlib:build USES= dos2unix php:ext diff --git a/databases/php70-memcache/distinfo b/databases/php-memcache/distinfo index f4f854a98d92..f4f854a98d92 100644 --- a/databases/php70-memcache/distinfo +++ b/databases/php-memcache/distinfo diff --git a/databases/php70-memcache/pkg-descr b/databases/php-memcache/pkg-descr index 51e485441a51..51e485441a51 100644 --- a/databases/php70-memcache/pkg-descr +++ b/databases/php-memcache/pkg-descr diff --git a/databases/php70-memcache/pkg-plist b/databases/php-memcache/pkg-plist index 5c859776e721..5c859776e721 100644 --- a/databases/php70-memcache/pkg-plist +++ b/databases/php-memcache/pkg-plist diff --git a/databases/php70-memcached/Makefile b/databases/php-memcached/Makefile index e4b50aaf2565..ae89a4f7ec06 100644 --- a/databases/php70-memcached/Makefile +++ b/databases/php-memcached/Makefile @@ -3,7 +3,7 @@ PORTNAME= memcached PORTVERSION= 3.0.0b1 CATEGORIES= databases -PKGNAMEPREFIX= php70- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= townwear@gmail.com COMMENT= PHP extension for interfacing with memcached via libmemcached library @@ -18,8 +18,7 @@ OPTIONS_DEFINE= SASL CONFIGURE_ARGS= --disable-memcached-sasl --enable-memcached-json --with-libmemcached-dir=${LOCALBASE} USES= pkgconfig php:ext USE_PHP= session:build json:build -PHP_VER= 70 -IGNORE_WITH_PHP=56 71 72 +IGNORE_WITH_PHP=56 USE_GITHUB= yes GH_ACCOUNT= php-memcached-dev diff --git a/databases/php70-memcached/distinfo b/databases/php-memcached/distinfo index 3913fe6ca215..3913fe6ca215 100644 --- a/databases/php70-memcached/distinfo +++ b/databases/php-memcached/distinfo diff --git a/databases/php70-memcached/pkg-descr b/databases/php-memcached/pkg-descr index 5a1a885e88a0..5a1a885e88a0 100644 --- a/databases/php70-memcached/pkg-descr +++ b/databases/php-memcached/pkg-descr diff --git a/databases/php5-pdo_cassandra/Makefile b/databases/php5-pdo_cassandra/Makefile index f17c826de5ff..99b3f8960f82 100644 --- a/databases/php5-pdo_cassandra/Makefile +++ b/databases/php5-pdo_cassandra/Makefile @@ -5,7 +5,7 @@ PORTNAME= pdo_cassandra PORTVERSION= 0.2.1 PORTREVISION= 14 CATEGORIES= databases -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= gasol.wu@gmail.com COMMENT= PDO driver for Apache Cassandra diff --git a/databases/php5-tarantool/Makefile b/databases/php5-tarantool/Makefile index b80e9e310374..0fad5407bea2 100644 --- a/databases/php5-tarantool/Makefile +++ b/databases/php5-tarantool/Makefile @@ -5,7 +5,7 @@ PORTNAME= tarantool PORTVERSION= 0.1.0 PORTEPOCH= 1 CATEGORIES= databases -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= PECL PHP driver for Tarantool diff --git a/databases/php7-tarantool/Makefile b/databases/php7-tarantool/Makefile index 637dd46ec018..d95f9edb1a6e 100644 --- a/databases/php7-tarantool/Makefile +++ b/databases/php7-tarantool/Makefile @@ -5,7 +5,7 @@ PORTNAME= tarantool PORTVERSION= 0.3.0 PORTREVISION= 1 CATEGORIES= databases -PKGNAMEPREFIX= php7- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= PECL PHP driver for Tarantool diff --git a/databases/php71-memcache/Makefile b/databases/php71-memcache/Makefile deleted file mode 100644 index 90772fa5f8ac..000000000000 --- a/databases/php71-memcache/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Gerrit Beine <tux@pinguru.net> -# $FreeBSD$ - -PORTNAME= memcache -PORTVERSION= 3.0.9 -CATEGORIES= databases -PKGNAMEPREFIX= php71- - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Memcached extension for PHP 7.1 - -LICENSE= PHP30 -LICENSE_FILE= ${WRKSRC}/LICENSE - -OPTIONS_DEFINE= EXAMPLES - -PORTSCOUT= skipv:start - -CONFIGURE_ARGS= --with-zlib-dir=/usr -IGNORE_WITH_PHP=56 70 72 -PHP_VER= 71 -USE_CSTD= gnu89 -USE_PHP= session:build zlib:build -USES= dos2unix php:ext - -GH_ACCOUNT= websupport-sk -GH_PROJECT= pecl-${PORTNAME} -GH_TAGNAME= e702b5f -USE_GITHUB= yes - -post-install-EXAMPLES-on: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ - ${INSTALL_DATA} ${WRKSRC}/example.php ${STAGEDIR}${EXAMPLESDIR}/ - -.include <bsd.port.mk> diff --git a/databases/php71-memcache/distinfo b/databases/php71-memcache/distinfo deleted file mode 100644 index f4f854a98d92..000000000000 --- a/databases/php71-memcache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1512806606 -SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 -SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 diff --git a/databases/php71-memcache/pkg-descr b/databases/php71-memcache/pkg-descr deleted file mode 100644 index 51e485441a51..000000000000 --- a/databases/php71-memcache/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Memcached is a caching daemon designed especially for dynamic web applications -to decrease database load by storing objects in memory. This extension allows -you to work with memcached through handy OO and procedural interfaces. - -Note that this port uses unofficial development from -https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). - -WWW: https://github.com/websupport-sk/pecl-memcache diff --git a/databases/php71-memcache/pkg-plist b/databases/php71-memcache/pkg-plist deleted file mode 100644 index 5c859776e721..000000000000 --- a/databases/php71-memcache/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php diff --git a/databases/php72-memcache/Makefile b/databases/php72-memcache/Makefile deleted file mode 100644 index f5d65f455afd..000000000000 --- a/databases/php72-memcache/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Gerrit Beine <tux@pinguru.net> -# $FreeBSD$ - -PORTNAME= memcache -PORTVERSION= 3.0.9 -CATEGORIES= databases -PKGNAMEPREFIX= php72- - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Memcached extension for PHP 7.2 - -LICENSE= PHP30 -LICENSE_FILE= ${WRKSRC}/LICENSE - -OPTIONS_DEFINE= EXAMPLES - -PORTSCOUT= skipv:start - -CONFIGURE_ARGS= --with-zlib-dir=/usr -IGNORE_WITH_PHP=56 70 71 -PHP_VER= 72 -USE_CSTD= gnu89 -USE_PHP= session:build zlib:build -USES= dos2unix php:ext - -GH_ACCOUNT= websupport-sk -GH_PROJECT= pecl-${PORTNAME} -GH_TAGNAME= e702b5f -USE_GITHUB= yes - -post-install-EXAMPLES-on: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ - ${INSTALL_DATA} ${WRKSRC}/example.php ${STAGEDIR}${EXAMPLESDIR}/ - -.include <bsd.port.mk> diff --git a/databases/php72-memcache/distinfo b/databases/php72-memcache/distinfo deleted file mode 100644 index f4f854a98d92..000000000000 --- a/databases/php72-memcache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1512806606 -SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 -SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 diff --git a/databases/php72-memcache/pkg-descr b/databases/php72-memcache/pkg-descr deleted file mode 100644 index 51e485441a51..000000000000 --- a/databases/php72-memcache/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Memcached is a caching daemon designed especially for dynamic web applications -to decrease database load by storing objects in memory. This extension allows -you to work with memcached through handy OO and procedural interfaces. - -Note that this port uses unofficial development from -https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). - -WWW: https://github.com/websupport-sk/pecl-memcache diff --git a/databases/php72-memcache/pkg-plist b/databases/php72-memcache/pkg-plist deleted file mode 100644 index 5c859776e721..000000000000 --- a/databases/php72-memcache/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php diff --git a/deskutils/egroupware/Makefile b/deskutils/egroupware/Makefile index cadd07c53612..4102789a3650 100644 --- a/deskutils/egroupware/Makefile +++ b/deskutils/egroupware/Makefile @@ -13,15 +13,15 @@ COMMENT= Web-based GroupWare system LICENSE= GPLv2 LICENSE_FILE= ${WRKDIR}/${PORTNAME:tl}/doc/LICENSE -RUN_DEPENDS= ${LOCALBASE}/share/pear/Net/Sieve.php:net/pear-Net_Sieve \ - ${LOCALBASE}/share/pear/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client \ - ${LOCALBASE}/share/pear/Horde/Nls.php:devel/pear-Horde_Nls \ - ${LOCALBASE}/share/pear/Horde/Mail/Transport.php:mail/pear-Horde_Mail \ - ${LOCALBASE}/share/pear/Horde/Smtp.php:mail/pear-Horde_Smtp \ - ${LOCALBASE}/share/pear/Horde/Compress.php:archivers/pear-Horde_Compress \ - ${LOCALBASE}/share/pear/Horde/Icalendar.php:devel/pear-Horde_Icalendar \ - ${LOCALBASE}/share/pear/Horde/Mapi.php:mail/pear-Horde_Mapi \ - ${LOCALBASE}/share/pear/Horde/Crypt.php:security/pear-Horde_Crypt +RUN_DEPENDS= ${LOCALBASE}/share/pear/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Nls.php:devel/pear-Horde_Nls@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Mail/Transport.php:mail/pear-Horde_Mail@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Smtp.php:mail/pear-Horde_Smtp@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Compress.php:archivers/pear-Horde_Compress@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Icalendar.php:devel/pear-Horde_Icalendar@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Mapi.php:mail/pear-Horde_Mapi@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Crypt.php:security/pear-Horde_Crypt@${PHP_FLAVOR} USES= cpe php tar:bzip2 USE_PHP= bcmath bz2 ctype json session simplexml tidy xmlreader zlib diff --git a/deskutils/horde-groupware/Makefile b/deskutils/horde-groupware/Makefile index a62efce6780a..20719818ad43 100644 --- a/deskutils/horde-groupware/Makefile +++ b/deskutils/horde-groupware/Makefile @@ -3,7 +3,7 @@ PORTNAME= groupware PORTVERSION= 5.2.22 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Groupware diff --git a/deskutils/horde-kronolith/Makefile b/deskutils/horde-kronolith/Makefile index 81086b96e63a..30681c966eff 100644 --- a/deskutils/horde-kronolith/Makefile +++ b/deskutils/horde-kronolith/Makefile @@ -4,7 +4,7 @@ PORTNAME= kronolith PORTVERSION= 4.2.23 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based calendar @@ -54,9 +54,9 @@ USE_HORDE_RUN= Horde_Role \ Horde_Util \ Horde_View -RUN_DEPENDS+= ${PEARDIR}/Date.php:devel/pear-Date +RUN_DEPENDS+= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} -DATE_HOLIDAYS_RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +DATE_HOLIDAYS_RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} TIMEOBJECTS_USE= HORDE_RUN=timeobjects XMLWRITER_USE= PHP=xmlwriter diff --git a/deskutils/horde-mnemo/Makefile b/deskutils/horde-mnemo/Makefile index 69a3845dcf04..33baefbd68fe 100644 --- a/deskutils/horde-mnemo/Makefile +++ b/deskutils/horde-mnemo/Makefile @@ -4,7 +4,7 @@ PORTNAME= mnemo PORTVERSION= 4.2.14 PORTREVISION= 1 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based notes manager diff --git a/deskutils/horde-nag/Makefile b/deskutils/horde-nag/Makefile index 878b753e7d68..9c7b82d70007 100644 --- a/deskutils/horde-nag/Makefile +++ b/deskutils/horde-nag/Makefile @@ -3,7 +3,7 @@ PORTNAME= nag PORTVERSION= 4.2.17 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based task list manager 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 diff --git a/dns/pear-File_DNS/Makefile b/dns/pear-File_DNS/Makefile index 71f8bf7535df..4a376e8c4a81 100644 --- a/dns/pear-File_DNS/Makefile +++ b/dns/pear-File_DNS/Makefile @@ -8,8 +8,8 @@ CATEGORIES= dns devel pear MAINTAINER= chris@ctgameinfo.com COMMENT= PEAR class to read and write RFC1033-style DNS Zonefiles -BUILD_DEPENDS= ${PEARDIR}/File.php:sysutils/pear-File -RUN_DEPENDS= ${PEARDIR}/File.php:sysutils/pear-File +BUILD_DEPENDS= ${PEARDIR}/File.php:sysutils/pear-File@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/File.php:sysutils/pear-File@${PHP_FLAVOR} USES= pear diff --git a/finance/php-tclink/Makefile b/finance/php-tclink/Makefile index e7f7433926fe..86bd4fe5b5d2 100644 --- a/finance/php-tclink/Makefile +++ b/finance/php-tclink/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 4.0.2 PORTREVISION= 2 CATEGORIES= finance MASTER_SITES= https://vault.trustcommerce.com/downloads/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-${PORTVERSION}-php MAINTAINER= mbowie@buzmo.com diff --git a/ftp/Makefile b/ftp/Makefile index c59645292701..847e63e50640 100644 --- a/ftp/Makefile +++ b/ftp/Makefile @@ -62,17 +62,14 @@ SUBDIR += pavuk SUBDIR += pear-Net_FTP SUBDIR += pftpd + SUBDIR += php-fastdfs SUBDIR += php56-curl - SUBDIR += php56-fastdfs SUBDIR += php56-ftp SUBDIR += php70-curl - SUBDIR += php70-fastdfs SUBDIR += php70-ftp SUBDIR += php71-curl - SUBDIR += php71-fastdfs SUBDIR += php71-ftp SUBDIR += php72-curl - SUBDIR += php72-fastdfs SUBDIR += php72-ftp SUBDIR += phpwebftp SUBDIR += plasma-applet-ftpmonitor diff --git a/ftp/horde-gollem/Makefile b/ftp/horde-gollem/Makefile index 24839c7dfa8a..72dc12c262cb 100644 --- a/ftp/horde-gollem/Makefile +++ b/ftp/horde-gollem/Makefile @@ -4,7 +4,7 @@ PORTNAME= gollem PORTVERSION= 3.0.12 CATEGORIES= ftp www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Web-based File Manager diff --git a/ftp/php56-fastdfs/Makefile b/ftp/php-fastdfs/Makefile index ea2e5e097937..82e6c1d7ed92 100644 --- a/ftp/php56-fastdfs/Makefile +++ b/ftp/php-fastdfs/Makefile @@ -3,11 +3,10 @@ PORTNAME= fastdfs DISTVERSION= 5.0.11 CATEGORIES= ftp -PKGNAMEPREFIX?= php56- -IGNORE_WITH_PHP?= 70 71 72 +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= daniel@blodan.se -COMMENT?= PHP 5.6 module for accessing a FastDFS cluster +COMMENT?= PHP module for accessing a FastDFS cluster LICENSE= GPLv3+ @@ -20,7 +19,6 @@ GH_PROJECT= fastdfs GH_TAGNAME= 1e50b4f USES= php:ext -PHP_VER?= 56 WRKSRC_SUBDIR= php_client CONFIGURE_ENV= ROOT=${LOCALBASE} diff --git a/ftp/php56-fastdfs/distinfo b/ftp/php-fastdfs/distinfo index e6d441229a4b..e6d441229a4b 100644 --- a/ftp/php56-fastdfs/distinfo +++ b/ftp/php-fastdfs/distinfo diff --git a/ftp/php56-fastdfs/pkg-descr b/ftp/php-fastdfs/pkg-descr index d90caa5fc86a..d90caa5fc86a 100644 --- a/ftp/php56-fastdfs/pkg-descr +++ b/ftp/php-fastdfs/pkg-descr diff --git a/ftp/php56-fastdfs/pkg-message b/ftp/php-fastdfs/pkg-message index 993d158f9115..993d158f9115 100644 --- a/ftp/php56-fastdfs/pkg-message +++ b/ftp/php-fastdfs/pkg-message diff --git a/ftp/php70-fastdfs/Makefile b/ftp/php70-fastdfs/Makefile deleted file mode 100644 index 47e7e0bb792b..000000000000 --- a/ftp/php70-fastdfs/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../php56-fastdfs - -PKGNAMEPREFIX= php70- - -COMMENT= PHP 7 module for accessing a FastDFS cluster - -IGNORE_WITH_PHP= 56 71 72 -PHP_VER= 70 - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php71-fastdfs/Makefile b/ftp/php71-fastdfs/Makefile deleted file mode 100644 index fd0b7708f285..000000000000 --- a/ftp/php71-fastdfs/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../php56-fastdfs - -PKGNAMEPREFIX= php71- - -COMMENT= PHP 7.1 module for accessing a FastDFS cluster - -IGNORE_WITH_PHP= 56 70 72 -PHP_VER= 71 - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php72-fastdfs/Makefile b/ftp/php72-fastdfs/Makefile deleted file mode 100644 index d98e66b5e2f6..000000000000 --- a/ftp/php72-fastdfs/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../php56-fastdfs - -PKGNAMEPREFIX= php72- - -COMMENT= PHP 7.2 module for accessing a FastDFS cluster - -IGNORE_WITH_PHP= 56 70 71 -PHP_VER= 72 - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/pear-Horde_Image/Makefile b/graphics/pear-Horde_Image/Makefile index dbc8e2132622..2b193cd9a84b 100644 --- a/graphics/pear-Horde_Image/Makefile +++ b/graphics/pear-Horde_Image/Makefile @@ -3,7 +3,7 @@ PORTNAME= Horde_Image PORTVERSION= 2.5.2 CATEGORIES= graphics www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde Image API diff --git a/graphics/pear-Image_Barcode/Makefile b/graphics/pear-Image_Barcode/Makefile index 52493eb2645a..1a58aaf4cb24 100644 --- a/graphics/pear-Image_Barcode/Makefile +++ b/graphics/pear-Image_Barcode/Makefile @@ -14,6 +14,6 @@ USES= pear php OPTIONS_DEFINE= PEAR_PHP_COMPAT PEAR_PHP_COMPAT_DESC= PEAR::PHP_Compat support -PEAR_PHP_COMPAT_RUN_DEPENDS= ${PEARDIR}/PHP/Compat.php:devel/pear-PHP_Compat +PEAR_PHP_COMPAT_RUN_DEPENDS= ${PEARDIR}/PHP/Compat.php:devel/pear-PHP_Compat@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile index cbbcc425e8ed..3f8f3e77a65e 100644 --- a/graphics/pear-Image_Canvas/Makefile +++ b/graphics/pear-Image_Canvas/Makefile @@ -9,7 +9,7 @@ CATEGORIES= graphics www pear MAINTAINER= numisemis@yahoo.com COMMENT= OO PEAR common interface to image drawing -RUN_DEPENDS= ${PEARDIR}/Image/Color.php:graphics/pear-Image_Color +RUN_DEPENDS= ${PEARDIR}/Image/Color.php:graphics/pear-Image_Color@${PHP_FLAVOR} USE_PHP= gd USES= dos2unix pear php diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile index 2a1fdfb9171a..2669f2747fab 100644 --- a/graphics/pear-Image_Graph/Makefile +++ b/graphics/pear-Image_Graph/Makefile @@ -8,8 +8,8 @@ CATEGORIES= graphics www pear MAINTAINER= joneum@FreeBSD.org COMMENT= OO PEAR graph rendering package -RUN_DEPENDS= ${PEARDIR}/Log.php:sysutils/pear-Log \ - ${PEARDIR}/Image/Canvas.php:graphics/pear-Image_Canvas +RUN_DEPENDS= ${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \ + ${PEARDIR}/Image/Canvas.php:graphics/pear-Image_Canvas@${PHP_FLAVOR} USES= dos2unix pear DOS2UNIX_REGEX= .*php$$ diff --git a/graphics/pecl-qrencode/Makefile b/graphics/pecl-qrencode/Makefile index b5f16197360d..34326111c3b4 100644 --- a/graphics/pecl-qrencode/Makefile +++ b/graphics/pecl-qrencode/Makefile @@ -6,8 +6,6 @@ PORTVERSION= 0.6 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= graphics pear -PKGNAMEPREFIX= pecl- -DIST_SUBDIR= PECL MAINTAINER= vanilla@FreeBSD.org COMMENT= PECL extension for generate qrcode @@ -17,7 +15,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libqrencode.so:graphics/libqrencode \ libpng.so:graphics/png -USES= php:ext +USES= php:pecl USE_GITHUB= yes GH_ACCOUNT= vanillahsu GH_PROJECT= pecl-qrencode diff --git a/graphics/pecl-qrencode/pkg-descr b/graphics/pecl-qrencode/pkg-descr index f9e5600e948b..4495d9e75689 100644 --- a/graphics/pecl-qrencode/pkg-descr +++ b/graphics/pecl-qrencode/pkg-descr @@ -1,3 +1,3 @@ A PECL extension for generate qrcode. -WWW: https://github.com/vanillahsu/pecl-qrencode +WWW: https://github.com/vanillahsu/pecl-qrencode@${PHP_FLAVOR} diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile index 650bc3428149..7ddc9505e62d 100644 --- a/graphics/php-facedetect/Makefile +++ b/graphics/php-facedetect/Makefile @@ -5,7 +5,7 @@ PORTNAME= facedetect PORTVERSION= 1.1 PORTREVISION= 6 CATEGORIES= graphics -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= mm@FreeBSD.org COMMENT= Face detection extension for PHP using OpenCV library diff --git a/graphics/php-geos/Makefile b/graphics/php-geos/Makefile index cd3a85bdf4de..4741161b251a 100644 --- a/graphics/php-geos/Makefile +++ b/graphics/php-geos/Makefile @@ -6,9 +6,9 @@ PORTVERSION= 1.0.0 CATEGORIES= graphics MASTER_SITES= https://git.osgeo.org/gogs/geos/php-geos/archive/ \ LOCAL/sunpoet/${PKGNAMEPREFIX}${PORTNAME} -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} DISTNAME= ${DISTVERSION} -DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} +DIST_SUBDIR= php-${PORTNAME} MAINTAINER= sunpoet@FreeBSD.org COMMENT= PHP bindings for GEOS @@ -24,6 +24,6 @@ LIB_DEPENDS= libgeos_c.so:graphics/geos LDFLAGS+= -L${PREFIX}/lib USES= php:ext -WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME} +WRKSRC= ${WRKDIR}/php-${PORTNAME} .include <bsd.port.mk> diff --git a/graphics/php-libpuzzle/Makefile b/graphics/php-libpuzzle/Makefile index ebba77f8bbf2..711bb183be57 100644 --- a/graphics/php-libpuzzle/Makefile +++ b/graphics/php-libpuzzle/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/release/ \ ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= cyberbotx@cyberbotx.com COMMENT= PHP extension for Puzzle library to find similar pictures diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile index 680614c632c4..a88268c75375 100644 --- a/graphics/php-magickwand/Makefile +++ b/graphics/php-magickwand/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 1.0.9 PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.magickwand.org/download/php/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} DISTNAME= MagickWandForPHP-${PORTVERSION}-2 MAINTAINER= ports@FreeBSD.org diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile index 67c8e5f206fe..365b5c08ac1e 100644 --- a/graphics/php5-ffmpeg/Makefile +++ b/graphics/php5-ffmpeg/Makefile @@ -7,7 +7,7 @@ DISTVERSIONPREFIX= php- PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= LOCAL/sunpoet -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= FFmpeg shared extension for php diff --git a/japanese/php5-mecab/Makefile b/japanese/php5-mecab/Makefile index 35ba72e8924e..b99e00e08486 100644 --- a/japanese/php5-mecab/Makefile +++ b/japanese/php5-mecab/Makefile @@ -19,6 +19,6 @@ CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config .include <bsd.port.pre.mk> -PKGNAMEPREFIX:= ${PKGNAMEPREFIX}php5- +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${PHP_PKGNAMEPREFIX} .include <bsd.port.post.mk> diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index ff53ae0f2848..612bd060453c 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -1,6 +1,6 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USES+= php:ext +USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 56 IGNORE_WITH_PHP= 70 diff --git a/lang/php70/Makefile.ext b/lang/php70/Makefile.ext index ee5ca6692d4d..0983dfe908fe 100644 --- a/lang/php70/Makefile.ext +++ b/lang/php70/Makefile.ext @@ -2,7 +2,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USES+= php:ext +USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 70 IGNORE_WITH_PHP= 56 diff --git a/lang/php71/Makefile.ext b/lang/php71/Makefile.ext index fabe0694ef25..dc60a841413f 100644 --- a/lang/php71/Makefile.ext +++ b/lang/php71/Makefile.ext @@ -2,7 +2,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USES+= php:ext +USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 71 IGNORE_WITH_PHP= 55 56 70 diff --git a/lang/php72/Makefile.ext b/lang/php72/Makefile.ext index 08aae1a16d01..de51747412ae 100644 --- a/lang/php72/Makefile.ext +++ b/lang/php72/Makefile.ext @@ -2,7 +2,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USES+= php:ext +USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 72 IGNORE_WITH_PHP= 56 70 71 diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile index 2600c3294a3e..0047ac71cb32 100644 --- a/mail/horde-imp/Makefile +++ b/mail/horde-imp/Makefile @@ -3,7 +3,7 @@ PORTNAME= imp PORTVERSION= 6.2.21 CATEGORIES= mail www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based webmail system diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile index 832653a4166d..de10a134a360 100644 --- a/mail/horde-ingo/Makefile +++ b/mail/horde-ingo/Makefile @@ -3,7 +3,7 @@ PORTNAME= ingo PORTVERSION= 3.2.16 CATEGORIES= mail www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde email filter rules manager @@ -29,7 +29,7 @@ USE_HORDE_RUN= Horde_Role \ Horde_Util # Optional but we want it -RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve \ - ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \ + ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index 8916e31e1807..3def4d26bb73 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -3,7 +3,7 @@ PORTNAME= turba PORTVERSION= 4.2.21 PORTREVISION= 1 -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- CATEGORIES= mail www pear MAINTAINER= horde@FreeBSD.org diff --git a/mail/horde-webmail/Makefile b/mail/horde-webmail/Makefile index 0af44992cada..9bb3c5578a99 100644 --- a/mail/horde-webmail/Makefile +++ b/mail/horde-webmail/Makefile @@ -3,7 +3,7 @@ PORTNAME= webmail PORTVERSION= 5.2.22 CATEGORIES= mail www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Groupware Webmail Edition diff --git a/mail/pear-Horde_Imap_Client/Makefile b/mail/pear-Horde_Imap_Client/Makefile index 8f8b4d1992a7..7ab035cc7fe4 100644 --- a/mail/pear-Horde_Imap_Client/Makefile +++ b/mail/pear-Horde_Imap_Client/Makefile @@ -3,7 +3,7 @@ PORTNAME= Horde_Imap_Client PORTVERSION= 2.29.15 CATEGORIES= mail www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde IMAP abstraction interface @@ -24,6 +24,6 @@ SASL_DESC= Support SASL Authentication IMAP_USE= PHP=imap MBSTRING_USE= PHP=mbstring -SASL_RUN_DEPENDS= ${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL +SASL_RUN_DEPENDS= ${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Horde_Mail/Makefile b/mail/pear-Horde_Mail/Makefile index 98f898a019ee..b8d777d263a8 100644 --- a/mail/pear-Horde_Mail/Makefile +++ b/mail/pear-Horde_Mail/Makefile @@ -17,6 +17,6 @@ USE_HORDE_RUN= Horde_Exception \ #USE_HORDE_RUN+= Horde_Mime # Optional but we want it -RUN_DEPENDS+= ${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP +RUN_DEPENDS+= ${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Horde_Mail_Autoconfig/Makefile b/mail/pear-Horde_Mail_Autoconfig/Makefile index 7099333cc197..203da37b8607 100644 --- a/mail/pear-Horde_Mail_Autoconfig/Makefile +++ b/mail/pear-Horde_Mail_Autoconfig/Makefile @@ -14,6 +14,6 @@ USE_HORDE_RUN= Horde_Exception \ Horde_Mail \ Horde_Smtp -RUN_DEPENDS+= ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2 +RUN_DEPENDS+= ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Horde_Mapi/Makefile b/mail/pear-Horde_Mapi/Makefile index 3de656ccde54..1a2eacf5d031 100644 --- a/mail/pear-Horde_Mapi/Makefile +++ b/mail/pear-Horde_Mapi/Makefile @@ -4,7 +4,7 @@ PORTNAME= Horde_Mapi PORTVERSION= 1.0.8 PORTREVISION= 1 CATEGORIES= mail www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde MAPI utility library @@ -15,6 +15,6 @@ USE_HORDE_RUN= Horde_Date \ USE_PHP+= bcmath -RUN_DEPENDS+= ${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger +RUN_DEPENDS+= ${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Horde_Smtp/Makefile b/mail/pear-Horde_Smtp/Makefile index 9450cc3e7d09..bf3dee8495b7 100644 --- a/mail/pear-Horde_Smtp/Makefile +++ b/mail/pear-Horde_Smtp/Makefile @@ -3,7 +3,7 @@ PORTNAME= Horde_Smtp PORTVERSION= 1.9.5 CATEGORIES= mail www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde SMTP Client diff --git a/mail/pear-MIME_Type/Makefile b/mail/pear-MIME_Type/Makefile index b676db2e623a..bdff6f0e0ee6 100644 --- a/mail/pear-MIME_Type/Makefile +++ b/mail/pear-MIME_Type/Makefile @@ -16,6 +16,6 @@ PEAR_SYSTEM_COMMAND_DESC= PEAR::System_Command support USES= pear NO_ARCH= yes -PEAR_SYSTEM_COMMAND_RUN_DEPENDS= ${PEARDIR}/System/Command.php:devel/pear-System_Command +PEAR_SYSTEM_COMMAND_RUN_DEPENDS= ${PEARDIR}/System/Command.php:devel/pear-System_Command@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile index 9f5a1e4beded..97cd4cdd5271 100644 --- a/mail/pear-Mail/Makefile +++ b/mail/pear-Mail/Makefile @@ -16,6 +16,6 @@ PEAR_NET_SMTP_DESC= PEAR::Net_SMTP support USES= pear -PEAR_NET_SMTP_RUN_DEPENDS= ${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP +PEAR_NET_SMTP_RUN_DEPENDS= ${PEARDIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile index 8a9bab00f45a..8dabc66fe17a 100644 --- a/mail/pear-Mail_Queue/Makefile +++ b/mail/pear-Mail_Queue/Makefile @@ -9,10 +9,10 @@ CATEGORIES= mail www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class for put mails in queue and send them later in background -BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail \ - ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime -RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail \ - ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime +BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \ + ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \ + ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} USES= pear @@ -21,8 +21,8 @@ PEAR_DB_DESC= PEAR::DB support PEAR_MDB_DESC= PEAR::MDB support PEAR_MDB2_DESC= PEAR::MDB2 support -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/mail/pear-Mail_mimeDecode/Makefile b/mail/pear-Mail_mimeDecode/Makefile index 6deba882a068..f7c1f418d74f 100644 --- a/mail/pear-Mail_mimeDecode/Makefile +++ b/mail/pear-Mail_mimeDecode/Makefile @@ -10,7 +10,7 @@ COMMENT= Provides a class to decode mime messages LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime +RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} USES= pear NO_ARCH= yes diff --git a/mail/pear-Net_Cyrus/Makefile b/mail/pear-Net_Cyrus/Makefile index 70628afcdaa7..db69a2eec518 100644 --- a/mail/pear-Net_Cyrus/Makefile +++ b/mail/pear-Net_Cyrus/Makefile @@ -8,10 +8,10 @@ CATEGORIES= mail net pear MAINTAINER= bra@fsn.hu COMMENT= PEAR class to administer Cyrus IMAP servers -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR} USES= pear diff --git a/mail/pear-Net_IMAP/Makefile b/mail/pear-Net_IMAP/Makefile index 840e5bb4a1b5..e9579b8b7bb0 100644 --- a/mail/pear-Net_IMAP/Makefile +++ b/mail/pear-Net_IMAP/Makefile @@ -10,8 +10,8 @@ COMMENT= PEAR class that provides an implementation of the IMAP protocol LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= pear diff --git a/mail/pear-Net_LMTP/Makefile b/mail/pear-Net_LMTP/Makefile index e45d8fa8dd07..e669958d1c8c 100644 --- a/mail/pear-Net_LMTP/Makefile +++ b/mail/pear-Net_LMTP/Makefile @@ -10,7 +10,7 @@ COMMENT= PEAR implementation of the RFC2033 LMTP protocol LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= pear diff --git a/mail/pecl-mailparse2/Makefile b/mail/pecl-mailparse2/Makefile index bd2a67aa5583..a9faf5de778b 100644 --- a/mail/pecl-mailparse2/Makefile +++ b/mail/pecl-mailparse2/Makefile @@ -5,7 +5,6 @@ PORTNAME= mailparse PORTVERSION= 2.1.6 PORTREVISION= 1 CATEGORIES= mail www -PKGNAMESUFFIX= 2 MAINTAINER= dbaio@FreeBSD.org COMMENT= PECL extension to create and decode MIME messages diff --git a/mail/phplist/Makefile b/mail/phplist/Makefile index 7eaa03bacd7b..f3b6fe36103b 100644 --- a/mail/phplist/Makefile +++ b/mail/phplist/Makefile @@ -12,7 +12,7 @@ COMMENT= Full-featured open-source newsletter manager LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request +RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} USES= cpe tar:tgz php:web USE_PHP= hash iconv imap mysqli pcre session xml zlib diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile index 36dd635ba7a8..7f62a9b7677a 100644 --- a/mail/squirrelmail-change_sqlpass-plugin/Makefile +++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile @@ -12,7 +12,7 @@ COMMENT= Allows users to change their passwords stored in a SQL database USE_SM_COMPAT= yes -RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB +RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR} SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile index 9b5941330f76..eeb63afd2899 100644 --- a/mail/squirrelmail-sasql-plugin/Makefile +++ b/mail/squirrelmail-sasql-plugin/Makefile @@ -9,7 +9,7 @@ CATEGORIES= mail www MAINTAINER= ports@FreeBSD.org COMMENT= Edit SpamAssassin settings stored in an SQL DB -RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB +RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR} USE_SM_COMPAT= yes USE_GENERIC_PKGMESSAGE= yes diff --git a/math/pecl-bitset2/Makefile b/math/pecl-bitset2/Makefile index 388b1b5269a0..e78bf6e3fd10 100644 --- a/math/pecl-bitset2/Makefile +++ b/math/pecl-bitset2/Makefile @@ -4,7 +4,6 @@ PORTNAME= bitset PORTVERSION= 2.0.4 CATEGORIES= math -PKGNAMESUFFIX= 2 MAINTAINER= sunpoet@FreeBSD.org COMMENT= PECL extension for manipulating bitsets diff --git a/math/pecl-stats2/Makefile b/math/pecl-stats2/Makefile index af228d89683f..f46e87f31272 100644 --- a/math/pecl-stats2/Makefile +++ b/math/pecl-stats2/Makefile @@ -3,7 +3,6 @@ PORTNAME= stats PORTVERSION= 2.0.3 CATEGORIES= math textproc pear -PKGNAMESUFFIX= 2 MAINTAINER= dbaio@FreeBSD.org COMMENT= PECL extension with routines for statistical computation diff --git a/misc/pear-Services_Weather/Makefile b/misc/pear-Services_Weather/Makefile index fab195acef8e..c5aa7cc7b676 100644 --- a/misc/pear-Services_Weather/Makefile +++ b/misc/pear-Services_Weather/Makefile @@ -11,7 +11,7 @@ COMMENT= PEAR interface to various online weather-services LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request +RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} PORTSCOUT= skipv:1.4.7 @@ -26,10 +26,10 @@ PEAR_DB_DESC= PEAR::DB support PEAR_SOAP_DESC= PEAR::SOAP support PEAR_XML_SERIALIZER_DESC= PEAR::XML::Serializer support -PEAR_NET_FTP_BUILD_DEPENDS= ${PEARDIR}/Net/FTP.php:ftp/pear-Net_FTP -PEAR_CACHE_BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache -PEAR_DB_BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:net/pear-SOAP -PEAR_XML_SERIALIZER_BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +PEAR_NET_FTP_BUILD_DEPENDS= ${PEARDIR}/Net/FTP.php:ftp/pear-Net_FTP@${PHP_FLAVOR} +PEAR_CACHE_BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} +PEAR_DB_BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:net/pear-SOAP@${PHP_FLAVOR} +PEAR_XML_SERIALIZER_BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/multimedia/php-pHash/Makefile b/multimedia/php-pHash/Makefile index b4a592170480..4692231ab23f 100644 --- a/multimedia/php-pHash/Makefile +++ b/multimedia/php-pHash/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 2 CATEGORIES= multimedia devel MASTER_SITES= http://phash.org/releases/ \ http://www.cyberbotx.com/pHash/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= cyberbotx@cyberbotx.com COMMENT= PHP extension for the pHash perceptual hash library diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile index 951cc2102d4c..97309c36ab7a 100644 --- a/multimedia/zoneminder/Makefile +++ b/multimedia/zoneminder/Makefile @@ -82,9 +82,9 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLDIRS=site \ .include <bsd.port.pre.mk> .if ${PHP_VER} >= 70 -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR} .else -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4 +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu4@${PHP_FLAVOR} .endif PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/net-im/pecl-stomp2/Makefile b/net-im/pecl-stomp2/Makefile index 6f747787b329..abe238e10a05 100644 --- a/net-im/pecl-stomp2/Makefile +++ b/net-im/pecl-stomp2/Makefile @@ -3,7 +3,6 @@ PORTNAME= stomp PORTVERSION= 2.0.1 CATEGORIES= net-im pear -PKGNAMESUFFIX= 2 MAINTAINER= dbaio@FreeBSD.org COMMENT= PECL extension of stomp client diff --git a/net-mgmt/icingaweb2/Makefile b/net-mgmt/icingaweb2/Makefile index 08b0fc6561f3..baf11d504b8c 100644 --- a/net-mgmt/icingaweb2/Makefile +++ b/net-mgmt/icingaweb2/Makefile @@ -40,7 +40,7 @@ NLS_USE= php=intl PGSQL_USE= PHP=pdo_pgsql,pgsql MYSQL_USE= PHP=pdo_mysql LDAP_USE= PHP=ldap -PDF_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick +PDF_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick@${PHP_FLAVOR} post-patch: ${REINPLACE_CMD} 's%\(/etc/icingaweb2\)%${PREFIX}\1%g' \ diff --git a/net-mgmt/klg/Makefile b/net-mgmt/klg/Makefile index 70afd76c8ddf..fc29b0796e8e 100644 --- a/net-mgmt/klg/Makefile +++ b/net-mgmt/klg/Makefile @@ -11,7 +11,7 @@ COMMENT= PHP-based looking glass for Cisco, Juniper and Quagga/Zebra routers LICENSE= BSD3CLAUSE -USES= tar:txz +USES= tar:txz php USE_MYSQL= yes USE_PHP= mysql pcre sockets xml WANT_PHP_WEB= yes @@ -33,10 +33,14 @@ OPTIONS_DEFAULT= SSH2 SSH2_DESC= SSH2 support for router access -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MSSH2} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2 +. if ${PHP_VER} < 70 +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2-0@${PHP_FLAVOR} +. else +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/ssh2.so:security/pecl-ssh2@${PHP_FLAVOR} +. endif .endif do-install: @@ -47,4 +51,4 @@ do-install: ${CP} ${WRKSRC}/klg_config.php ${STAGEDIR}/${WWWDIR}/klg_config.php.sample ${CP} ${WRKSRC}/klg_template.html ${STAGEDIR}/${WWWDIR}/klg_template.html.sample -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index f55c9b14d68d..aac727459d8b 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -49,8 +49,8 @@ NO_BUILD= yes RUN_DEPENDS+= rrdtool:databases/rrdtool \ dot:graphics/graphviz \ - ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \ - ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \ + ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \ snmpget:net-mgmt/net-snmp \ bash:shells/bash \ sudo:security/sudo diff --git a/net-mgmt/nagiosql/Makefile b/net-mgmt/nagiosql/Makefile index dcbe666adf80..cc8a7c0e5f40 100644 --- a/net-mgmt/nagiosql/Makefile +++ b/net-mgmt/nagiosql/Makefile @@ -15,7 +15,7 @@ COMMENT= Web based administration tool for Nagios LICENSE= GPLv2 RUN_DEPENDS= nagios:net-mgmt/nagios \ - ${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT + ${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR} USE_MYSQL= yes USES= cpe gettext tar:bzip2 diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index 4d2f47db23b2..2b01f60c55f5 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -35,8 +35,8 @@ NO_BUILD= yes RUN_DEPENDS+= rrdtool:databases/rrdtool \ dot:graphics/graphviz \ mtr:net/mtr-nox11 \ - ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4 \ - ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6 \ + ${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \ snmpget:net-mgmt/net-snmp \ sudo:security/sudo LIB_DEPENDS+= libpng.so:graphics/png diff --git a/net-mgmt/phpipam/Makefile b/net-mgmt/phpipam/Makefile index cfa0b983a353..06c782912fc1 100644 --- a/net-mgmt/phpipam/Makefile +++ b/net-mgmt/phpipam/Makefile @@ -11,7 +11,7 @@ COMMENT= PHP IP Address Management IPv4/IPv6 LICENSE= GPLv3 -RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear +RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR} NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/net-mgmt/phpweathermap/Makefile b/net-mgmt/phpweathermap/Makefile index 47a86d157ce7..e2bc5c26bda7 100644 --- a/net-mgmt/phpweathermap/Makefile +++ b/net-mgmt/phpweathermap/Makefile @@ -14,7 +14,7 @@ COMMENT= Network visualisation tool with web editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear \ +RUN_DEPENDS= ${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear@${PHP_FLAVOR} \ rrdtool:databases/rrdtool NO_BUILD= yes diff --git a/net/pear-Auth_RADIUS/Makefile b/net/pear-Auth_RADIUS/Makefile index 4dedf58a5b62..cf01780f8166 100644 --- a/net/pear-Auth_RADIUS/Makefile +++ b/net/pear-Auth_RADIUS/Makefile @@ -11,6 +11,6 @@ COMMENT= PEAR wrapper classes for the RADIUS PECL LICNSE= BSD3CLAUSE USE_PHP= radius -USES= pear php +USES= pear php:flavors .include <bsd.port.mk> diff --git a/net/pear-Horde_Kolab_Server/Makefile b/net/pear-Horde_Kolab_Server/Makefile index 6a1e5f903c9d..49f4cf25545f 100644 --- a/net/pear-Horde_Kolab_Server/Makefile +++ b/net/pear-Horde_Kolab_Server/Makefile @@ -4,7 +4,7 @@ PORTNAME= Horde_Kolab_Server DISTVERSION= 2.0.5 CATEGORIES= net www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde library for manipulating the Kolab user database diff --git a/net/pear-Net_CDDB/Makefile b/net/pear-Net_CDDB/Makefile index a3e84c896943..bdd6e5231df9 100644 --- a/net/pear-Net_CDDB/Makefile +++ b/net/pear-Net_CDDB/Makefile @@ -8,12 +8,12 @@ CATEGORIES= net audio www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class that access and query CDDB audio-CD servers -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \ - ${PEARDIR}/MDB2.php:databases/pear-MDB2 -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request \ - ${PEARDIR}/MDB2.php:databases/pear-MDB2 +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \ + ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} \ + ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} USES= dos2unix pear diff --git a/net/pear-Net_DNSBL/Makefile b/net/pear-Net_DNSBL/Makefile index 42c24b660b97..f396f7ec49d2 100644 --- a/net/pear-Net_DNSBL/Makefile +++ b/net/pear-Net_DNSBL/Makefile @@ -11,14 +11,14 @@ COMMENT= PEAR DNSBL Checker LICENSE= PHP30 -BUILD_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \ - ${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP \ - ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2 \ - ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 -RUN_DEPENDS:= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \ - ${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP \ - ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2 \ - ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 +BUILD_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \ + ${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP@${PHP_FLAVOR} \ + ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \ + ${PEARDIR}/Net/CheckIP.php:net/pear-Net_CheckIP@${PHP_FLAVOR} \ + ${PEARDIR}/Net/DNS2.php:dns/pear-Net_DNS2@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_Dict/Makefile b/net/pear-Net_Dict/Makefile index 36398aeda4e1..9a3f8a32b582 100644 --- a/net/pear-Net_Dict/Makefile +++ b/net/pear-Net_Dict/Makefile @@ -8,10 +8,10 @@ CATEGORIES= net www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR interface to the DICT protocol -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Cache.php:sysutils/pear-Cache -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Cache.php:sysutils/pear-Cache +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_Finger/Makefile b/net/pear-Net_Finger/Makefile index 102e6c2cf92a..9c9bc356ad13 100644 --- a/net/pear-Net_Finger/Makefile +++ b/net/pear-Net_Finger/Makefile @@ -8,8 +8,8 @@ CATEGORIES= net www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class that provides a tool for querying finger servers -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_Geo/Makefile b/net/pear-Net_Geo/Makefile index b67b14975b63..db027c93b297 100644 --- a/net/pear-Net_Geo/Makefile +++ b/net/pear-Net_Geo/Makefile @@ -8,10 +8,10 @@ CATEGORIES= net pear MAINTAINER= joneum@FreeBSD.org COMMENT= Geographical locations based on Internet address -BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer -RUN_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_GeoIP/Makefile b/net/pear-Net_GeoIP/Makefile index 8abd569655e9..8d2a2a4b47d9 100644 --- a/net/pear-Net_GeoIP/Makefile +++ b/net/pear-Net_GeoIP/Makefile @@ -10,10 +10,10 @@ DISTNAME= Net_GeoIP-1.0.0RC1 MAINTAINER= joneum@FreeBSD.org COMMENT= Library to perform geo-location lookups of IP addresses -BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer -RUN_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_NNTP/Makefile b/net/pear-Net_NNTP/Makefile index 013d9ba17ed4..10c83f4bbcbf 100644 --- a/net/pear-Net_NNTP/Makefile +++ b/net/pear-Net_NNTP/Makefile @@ -14,8 +14,8 @@ LICENSE_NAME= W3C IPR SOFTWARE NOTICE LICENSE_FILE= ${WRKSRC}/LICENSE.md LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} NO_ARCH= yes diff --git a/net/pear-Net_Nmap/Makefile b/net/pear-Net_Nmap/Makefile index 17fc3295ea28..1a911ea01f15 100644 --- a/net/pear-Net_Nmap/Makefile +++ b/net/pear-Net_Nmap/Makefile @@ -10,8 +10,8 @@ COMMENT= Simple Wrapper Class for the Nmap Utility LICENSE= LGPL3 -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -RUN_DEPENDS:= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_POP3/Makefile b/net/pear-Net_POP3/Makefile index 6a674b7f082b..b69881ed43e2 100644 --- a/net/pear-Net_POP3/Makefile +++ b/net/pear-Net_POP3/Makefile @@ -8,8 +8,8 @@ CATEGORIES= net pear MAINTAINER= joneum@FreeBSD.org COMMENT= Provides a POP3 class to access POP3 server -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_SMS/Makefile b/net/pear-Net_SMS/Makefile index d428628bbb8d..51bbea46f3ec 100644 --- a/net/pear-Net_SMS/Makefile +++ b/net/pear-Net_SMS/Makefile @@ -8,10 +8,10 @@ CATEGORIES= net pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR SMS functionality -BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail \ - ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request -RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail \ - ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request +BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} USE_PHP= gettext USES= pear php diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile index 2c68680c1443..b453a7006e0c 100644 --- a/net/pear-Net_SMTP/Makefile +++ b/net/pear-Net_SMTP/Makefile @@ -10,8 +10,8 @@ COMMENT= PEAR class that provides an implementation of the SMTP protocol LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} NO_ARCH= yes USES= pear @@ -19,6 +19,6 @@ USES= pear OPTIONS_DEFINE= PEAR_AUTH_SASL PEAR_AUTH_SASL_DESC= PEAR::Auth_SASL support -PEAR_AUTH_SASL_BUILD_DEPENDS= ${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL +PEAR_AUTH_SASL_BUILD_DEPENDS= ${PEARDIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile index 0e94422c0d02..9933fd9f50db 100644 --- a/net/pear-Net_Sieve/Makefile +++ b/net/pear-Net_Sieve/Makefile @@ -10,8 +10,8 @@ COMMENT= PEAR class to handle talking to timsieved LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_Vpopmaild/Makefile b/net/pear-Net_Vpopmaild/Makefile index 0d8281780176..894160104860 100644 --- a/net/pear-Net_Vpopmaild/Makefile +++ b/net/pear-Net_Vpopmaild/Makefile @@ -8,10 +8,10 @@ CATEGORIES= net mail pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR Class for accessing Vpopmail's vpopmaild daemon -BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Log.php:sysutils/pear-Log -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Log.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear diff --git a/net/pear-Net_Whois/Makefile b/net/pear-Net_Whois/Makefile index 398e02eb49b2..4833906976e2 100644 --- a/net/pear-Net_Whois/Makefile +++ b/net/pear-Net_Whois/Makefile @@ -10,6 +10,6 @@ COMMENT= Tool to query internet domain name services USES= pear -RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket +RUN_DEPENDS= ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile index d0ffd4fb1e60..fe986994d02a 100644 --- a/net/pear-SOAP/Makefile +++ b/net/pear-SOAP/Makefile @@ -8,8 +8,8 @@ CATEGORIES= net www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR SOAP Client/Server for PHP -BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request -RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request +BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} USES= pear @@ -18,8 +18,8 @@ PEAR_MAIL_DESC= PEAR::Mail support PEAR_MAIL_MIME_DESC= PEAR::Mail::Mime support PEAR_NET_DIME_DESC= PEAR::Net::DIME support -PEAR_MAIL_BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail -PEAR_MAIL_MIME_BUILD_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime -PEAR_NET_DIME_BUILD_DEPENDS= ${PEARDIR}/Net/DIME.php:net/pear-Net_DIME +PEAR_MAIL_BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} +PEAR_MAIL_MIME_BUILD_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} +PEAR_NET_DIME_BUILD_DEPENDS= ${PEARDIR}/Net/DIME.php:net/pear-Net_DIME@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/net/pear-Services_Twitter/Makefile b/net/pear-Services_Twitter/Makefile index d0b6f69a9361..bea94f052e45 100644 --- a/net/pear-Services_Twitter/Makefile +++ b/net/pear-Services_Twitter/Makefile @@ -8,8 +8,8 @@ CATEGORIES= net www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PHP interface to Twitter's API -BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 -RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 +BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} USE_PHP= json simplexml mbstring diff --git a/net/pear-XML_RPC2/Makefile b/net/pear-XML_RPC2/Makefile index 083671dc3b8a..9a067ab75a26 100644 --- a/net/pear-XML_RPC2/Makefile +++ b/net/pear-XML_RPC2/Makefile @@ -10,10 +10,10 @@ COMMENT= XML-RPC client/server library LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \ - ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 -RUN_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite \ - ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 +BUILD_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} \ + ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR} USE_PHP= curl USES= pear diff --git a/net/pecl-oauth2/Makefile b/net/pecl-oauth2/Makefile index 94d187fa0c80..e8af3c2b34f9 100644 --- a/net/pecl-oauth2/Makefile +++ b/net/pecl-oauth2/Makefile @@ -3,7 +3,6 @@ PORTNAME= oauth PORTVERSION= 2.0.2 CATEGORIES= net pear -PKGNAMESUFFIX= 2 MAINTAINER= dbaio@FreeBSD.org COMMENT= Php interface to the OAuth Protocol diff --git a/security/base/Makefile b/security/base/Makefile index 201e071b9cdf..accd7233ad5d 100644 --- a/security/base/Makefile +++ b/security/base/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/docs/GPL RUN_DEPENDS= ${ADODB_DIR}/adodb.inc.php:databases/adodb5 \ - ${LOCALBASE}/share/pear/Image/Graph.php:graphics/pear-Image_Graph \ - ${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail \ - ${LOCALBASE}/share/pear/Mail/mime.php:mail/pear-Mail_Mime + ${LOCALBASE}/share/pear/Image/Graph.php:graphics/pear-Image_Graph@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} USE_PHP= gd gettext pcre session zlib ctype diff --git a/security/maia/Makefile b/security/maia/Makefile index 9fb28cdef7a1..17482474abf4 100644 --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -108,26 +108,26 @@ USE_PHP= bcmath ctype dom gettext hash iconv imap json mbstring \ mcrypt pdo pdo_sqlite posix session simplexml sockets \ sqlite3 tokenizer xml wddx xmlreader xmlwriter xmlrpc -RUN_DEPENDS+= ${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime \ - ${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode \ - ${PEAR_DIR}/DB.php:databases/pear-DB \ - ${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager \ - ${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP \ - ${PEAR_DIR}/Log.php:sysutils/pear-Log \ - ${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier \ - ${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP \ - ${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3 \ - ${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL \ - ${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color \ - ${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas \ - ${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph \ - ${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman \ - ${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words \ - ${PEAR_DIR}/MDB2.php:databases/pear-MDB2 \ - ${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql \ - ${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 \ - ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt +RUN_DEPENDS+= ${PEAR_DIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \ + ${PEAR_DIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \ + ${PEAR_DIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEAR_DIR}/Pager/Pager.php:devel/pear-Pager@${PHP_FLAVOR} \ + ${PEAR_DIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEAR_DIR}/Net/SMTP.php:net/pear-Net_SMTP@${PHP_FLAVOR} \ + ${PEAR_DIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} \ + ${PEAR_DIR}/HTMLPurifier.php:devel/pear-htmlpurifier@${PHP_FLAVOR} \ + ${PEAR_DIR}/Net/IMAP.php:mail/pear-Net_IMAP@${PHP_FLAVOR} \ + ${PEAR_DIR}/Net/POP3.php:net/pear-Net_POP3@${PHP_FLAVOR} \ + ${PEAR_DIR}/Auth/SASL.php:security/pear-Auth_SASL@${PHP_FLAVOR} \ + ${PEAR_DIR}/Image/Color.php:graphics/pear-Image_Color@${PHP_FLAVOR} \ + ${PEAR_DIR}/Image/Canvas.php:graphics/pear-Image_Canvas@${PHP_FLAVOR} \ + ${PEAR_DIR}/Image/Graph.php:graphics/pear-Image_Graph@${PHP_FLAVOR} \ + ${PEAR_DIR}/Numbers/Roman.php:textproc/pear-Numbers_Roman@${PHP_FLAVOR} \ + ${PEAR_DIR}/Numbers/Words.php:textproc/pear-Numbers_Words@${PHP_FLAVOR} \ + ${PEAR_DIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ + ${PEAR_DIR}/MDB2/Driver/mysql.php:databases/pear-MDB2_Driver_mysql@${PHP_FLAVOR} \ + ${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2@${PHP_FLAVOR} \ + ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/scrypt.so:security/pecl-scrypt@${PHP_FLAVOR} PLIST_SUB+= WEBHOST="" .else PLIST_SUB+= WEBHOST="@comment " diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile index 0212f84769be..890cba7d74df 100644 --- a/security/mailzu/Makefile +++ b/security/mailzu/Makefile @@ -15,10 +15,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${LOCALBASE}/sbin/amavisd:security/amavisd-new \ - ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime \ - ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket \ - ${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \ + ${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR} \ + ${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} PEARDIR?= ${LOCALBASE}/share/pear PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" diff --git a/security/nextcloud-passman/Makefile b/security/nextcloud-passman/Makefile index b981f5c3429d..051d11f6bad2 100644 --- a/security/nextcloud-passman/Makefile +++ b/security/nextcloud-passman/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= nextcloud>=9:www/nextcloud WRKSRC= ${WRKDIR}/${PORTNAME} - +USES= php NO_BUILD= yes NO_ARCH= yes diff --git a/security/nextcloud-twofactor_totp/Makefile b/security/nextcloud-twofactor_totp/Makefile index 707d5a0ab970..5276b21e99af 100644 --- a/security/nextcloud-twofactor_totp/Makefile +++ b/security/nextcloud-twofactor_totp/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud>=12:www/nextcloud +USES= php NO_BUILD= yes NO_ARCH= yes diff --git a/security/nextcloud-twofactor_u2f/Makefile b/security/nextcloud-twofactor_u2f/Makefile index 24dcf8508e23..099ae06d7d39 100644 --- a/security/nextcloud-twofactor_u2f/Makefile +++ b/security/nextcloud-twofactor_u2f/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= nextcloud>=12:www/nextcloud +USES= php NO_BUILD= yes NO_ARCH= yes diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile index c46c42f9241a..e5834d33de79 100644 --- a/security/pear-Auth/Makefile +++ b/security/pear-Auth/Makefile @@ -25,17 +25,17 @@ PEAR_FILE_SMBPASSWD_DESC= PEAR::File_SMBPasswd support PEAR_SOAP_DESC= PEAR::SOAP support PEAR_NET_VPOPMAILD_DESC= PEAR::Net_Vpopmaild support -PEAR_LOG_RUN_DEPENDS= ${PEARDIR}/Log/syslog.php:sysutils/pear-Log -PEAR_FILE_PASSWD_RUN_DEPENDS= ${PEARDIR}/File/Passwd.php:security/pear-File_Passwd -PEAR_CRYPT_CHAP_RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP -PEAR_NET_POP3_RUN_DEPENDS= ${PEARDIR}/Net/POP3.php:net/pear-Net_POP3 -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_AUTH_RADIUS_RUN_DEPENDS= ${PEARDIR}/Auth/RADIUS.php:net/pear-Auth_RADIUS -PEAR_FILE_SMBPASSWD_RUN_DEPENDS= ${PEARDIR}/File/SMBPasswd.php:security/pear-File_SMBPasswd -PEAR_SOAP_RUN_DEPENDS= ${PEARDIR}/SOAP/Base.php:net/pear-SOAP -PEAR_NET_VPOPMAILD_RUN_DEPENDS= ${PEARDIR}/Net/Vpopmaild.php:net/pear-Net_Vpopmaild +PEAR_LOG_RUN_DEPENDS= ${PEARDIR}/Log/syslog.php:sysutils/pear-Log@${PHP_FLAVOR} +PEAR_FILE_PASSWD_RUN_DEPENDS= ${PEARDIR}/File/Passwd.php:security/pear-File_Passwd@${PHP_FLAVOR} +PEAR_CRYPT_CHAP_RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR} +PEAR_NET_POP3_RUN_DEPENDS= ${PEARDIR}/Net/POP3.php:net/pear-Net_POP3@${PHP_FLAVOR} +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_AUTH_RADIUS_RUN_DEPENDS= ${PEARDIR}/Auth/RADIUS.php:net/pear-Auth_RADIUS@${PHP_FLAVOR} +PEAR_FILE_SMBPASSWD_RUN_DEPENDS= ${PEARDIR}/File/SMBPasswd.php:security/pear-File_SMBPasswd@${PHP_FLAVOR} +PEAR_SOAP_RUN_DEPENDS= ${PEARDIR}/SOAP/Base.php:net/pear-SOAP@${PHP_FLAVOR} +PEAR_NET_VPOPMAILD_RUN_DEPENDS= ${PEARDIR}/Net/Vpopmaild.php:net/pear-Net_Vpopmaild@${PHP_FLAVOR} post-extract: @${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Auth.php diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile index d47ee7ea95d0..de449e04b31f 100644 --- a/security/pear-Auth_SASL/Makefile +++ b/security/pear-Auth_SASL/Makefile @@ -10,7 +10,7 @@ COMMENT= PEAR abstraction of various SASL mechanism responses LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-Auth>=0:security/pear-Auth +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Auth>=0:security/pear-Auth@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes diff --git a/security/pear-Crypt_GPG/Makefile b/security/pear-Crypt_GPG/Makefile index cb6ac30b7ad8..5dab682da296 100644 --- a/security/pear-Crypt_GPG/Makefile +++ b/security/pear-Crypt_GPG/Makefile @@ -11,7 +11,7 @@ COMMENT= GNU Privacy Guard (GPG) LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= pear-Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}Console_CommandLine>=1.1.10:devel/pear-Console_CommandLine@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes diff --git a/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile index 701ee1ab5090..6b420fd8dff2 100644 --- a/security/pear-File_Passwd/Makefile +++ b/security/pear-File_Passwd/Makefile @@ -13,6 +13,6 @@ USES= pear OPTIONS_DEFINE= PEAR_CRYPT_CHAP PEAR_CRYPT_CHAP_DESC= PEAR::Crypt_CHAP support -PEAR_CRYPT_CHAP_RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP +PEAR_CRYPT_CHAP_RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/security/pear-File_SMBPasswd/Makefile b/security/pear-File_SMBPasswd/Makefile index d906750c77b9..f44882e99edb 100644 --- a/security/pear-File_SMBPasswd/Makefile +++ b/security/pear-File_SMBPasswd/Makefile @@ -8,8 +8,8 @@ CATEGORIES= security www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class for managing SAMBA style password files -BUILD_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP -RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP +BUILD_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP@${PHP_FLAVOR} USES= pear php USE_PHP= hash diff --git a/security/pear-Horde_Crypt/Makefile b/security/pear-Horde_Crypt/Makefile index fd722d5e4cc6..5c17f8a72960 100644 --- a/security/pear-Horde_Crypt/Makefile +++ b/security/pear-Horde_Crypt/Makefile @@ -4,7 +4,7 @@ PORTNAME= Horde_Crypt DISTVERSION= 2.7.11 CATEGORIES= security www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde Cryptography API diff --git a/security/pear-Horde_Crypt_Blowfish/Makefile b/security/pear-Horde_Crypt_Blowfish/Makefile index ca89fcef4186..b5a459362056 100644 --- a/security/pear-Horde_Crypt_Blowfish/Makefile +++ b/security/pear-Horde_Crypt_Blowfish/Makefile @@ -4,7 +4,7 @@ PORTNAME= Horde_Crypt_Blowfish PORTVERSION= 1.1.2 CATEGORIES= security www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde blowfish encryption for PHP string data diff --git a/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile index 0dfdef96ff78..40fd732bf1dc 100644 --- a/security/pear-LiveUser/Makefile +++ b/security/pear-LiveUser/Makefile @@ -8,8 +8,8 @@ CATEGORIES= security www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR user authentication and permission management framework -BUILD_DEPENDS= ${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher -RUN_DEPENDS= ${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher +BUILD_DEPENDS= ${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Event/Dispatcher.php:devel/pear-Event_Dispatcher@${PHP_FLAVOR} PORTSCOUT= skipv:0.61 @@ -23,11 +23,11 @@ PEAR_LOG_DESC= PEAR::Log support PEAR_XML_TREE_DESC= PEAR::XML_Tree support PEAR_CRYPT_RC4_DESC= PEAR::Crypt_RC4 support -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_LOG_RUN_DEPENDS= ${PEARDIR}/Log/null.php:sysutils/pear-Log -PEAR_XML_TREE_RUN_DEPENDS= ${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree -PEAR_CRYPT_RC4_RUN_DEPENDS= ${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4 +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_LOG_RUN_DEPENDS= ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +PEAR_XML_TREE_RUN_DEPENDS= ${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree@${PHP_FLAVOR} +PEAR_CRYPT_RC4_RUN_DEPENDS= ${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile index 4e20b8237e95..c7fb81a7aed7 100644 --- a/security/pear-LiveUser_Admin/Makefile +++ b/security/pear-LiveUser_Admin/Makefile @@ -9,8 +9,8 @@ CATEGORIES= security www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR user authentication and permission management framework -BUILD_DEPENDS= ${PEARDIR}/LiveUser.php:security/pear-LiveUser -RUN_DEPENDS= ${PEARDIR}/LiveUser.php:security/pear-LiveUser +BUILD_DEPENDS= ${PEARDIR}/LiveUser.php:security/pear-LiveUser@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/LiveUser.php:security/pear-LiveUser@${PHP_FLAVOR} OPTIONS_DEFINE= PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_LOG PEAR_XML_TREE PEAR_CRYPT_RC4 @@ -23,11 +23,11 @@ PEAR_CRYPT_RC4_DESC= PEAR::Crypt_RC4 support USES= pear -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_LOG_RUN_DEPENDS= ${PEARDIR}/Log.php:sysutils/pear-Log -PEAR_XML_TREE_RUN_DEPENDS= ${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree -PEAR_CRYPT_RC4_RUN_DEPENDS= ${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4 +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_LOG_RUN_DEPENDS= ${PEARDIR}/Log.php:sysutils/pear-Log@${PHP_FLAVOR} +PEAR_XML_TREE_RUN_DEPENDS= ${PEARDIR}/XML/Tree.php:devel/pear-XML_Tree@${PHP_FLAVOR} +PEAR_CRYPT_RC4_RUN_DEPENDS= ${PEARDIR}/Crypt/Rc4.php:security/pear-Crypt_RC4@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/security/pecl-ssh2-0/Makefile b/security/pecl-ssh2-0/Makefile index 122ba47d1240..458bd85d06e0 100644 --- a/security/pecl-ssh2-0/Makefile +++ b/security/pecl-ssh2-0/Makefile @@ -4,7 +4,6 @@ PORTNAME= ssh2 PORTVERSION= 0.13 CATEGORIES= security pear -PKGNAMESUFFIX= -0 MAINTAINER= dbaio@FreeBSD.org COMMENT= PECL extension to the libssh2 library diff --git a/security/php-suhosin/Makefile b/security/php-suhosin/Makefile index ae80b1b3c64e..1b01c949c49e 100644 --- a/security/php-suhosin/Makefile +++ b/security/php-suhosin/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.9.38 PORTREVISION= 3 CATEGORIES= security MASTER_SITES= http://download.suhosin.org/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= ale@FreeBSD.org COMMENT= PHP extension that implements high-level protections diff --git a/security/snuffleupagus/Makefile b/security/snuffleupagus/Makefile index 31516fa7b70e..c3a59e8088f4 100644 --- a/security/snuffleupagus/Makefile +++ b/security/snuffleupagus/Makefile @@ -4,6 +4,7 @@ PORTNAME= snuffleupagus DISTVERSIONPREFIX=v DISTVERSION= 0.2.1 CATEGORIES= security +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= franco@opnsense.org COMMENT= Security module for PHP 7+ diff --git a/sysutils/pear-Cache/Makefile b/sysutils/pear-Cache/Makefile index 9c993df98d5f..7df4d0d28a0d 100644 --- a/sysutils/pear-Cache/Makefile +++ b/sysutils/pear-Cache/Makefile @@ -9,8 +9,8 @@ CATEGORIES= sysutils www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR framework for caching of arbitrary data -BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request -RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request +BUILD_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR} USES= pear diff --git a/sysutils/pear-Horde_Log/Makefile b/sysutils/pear-Horde_Log/Makefile index 093b26193bf5..43a32ca54813 100644 --- a/sysutils/pear-Horde_Log/Makefile +++ b/sysutils/pear-Horde_Log/Makefile @@ -4,7 +4,7 @@ PORTNAME= Horde_Log PORTVERSION= 2.3.0 CATEGORIES= sysutils www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde Logging library diff --git a/sysutils/pear-Horde_Vfs/Makefile b/sysutils/pear-Horde_Vfs/Makefile index 6976743bb9ee..28b35d4efb99 100644 --- a/sysutils/pear-Horde_Vfs/Makefile +++ b/sysutils/pear-Horde_Vfs/Makefile @@ -3,7 +3,7 @@ PORTNAME= Horde_Vfs PORTVERSION= 2.4.0 CATEGORIES= sysutils www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= horde@FreeBSD.org COMMENT= Horde Virtual File System API diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile index dcb1b1c979a5..c313a0970877 100644 --- a/sysutils/pear-Log/Makefile +++ b/sysutils/pear-Log/Makefile @@ -18,9 +18,9 @@ PEAR_MDB2_DESC= PEAR::MDB2 support PEAR_MAIL_DESC= PEAR::Mail support PHP_SQLITE_DESC= PHP sqlite support (php5 only) -PEAR_DB_BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB2_BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_MAIL_BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail +PEAR_DB_BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB2_BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_MAIL_BUILD_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} PHP_SQLITE_USE= PHP=sqlite3 .include <bsd.port.mk> diff --git a/sysutils/pear-Translation2/Makefile b/sysutils/pear-Translation2/Makefile index 20e3aef6e483..7bc5da375763 100644 --- a/sysutils/pear-Translation2/Makefile +++ b/sysutils/pear-Translation2/Makefile @@ -24,13 +24,13 @@ PEAR_FILE_GETTEXT_DESC= PEAR::File_Gettext support PEAR_I18NV2_DESC= PEAR::I18Nv2 support PEAR_XML_SERIALIZER_DESC= PEAR::XML_Serializer support -PEAR_CACHE_LITE_RUN_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_DB_DATAOBJECT_RUN_DEPENDS= ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject -PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_FILE_GETTEXT_RUN_DEPENDS= ${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext -PEAR_I18NV2_RUN_DEPENDS= ${PEARDIR}/File/I18Nv2.php:sysutils/pear-I18Nv2 -PEAR_XML_SERIALIZER_RUN_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +PEAR_CACHE_LITE_RUN_DEPENDS= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_DB_DATAOBJECT_RUN_DEPENDS= ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} +PEAR_MDB_RUN_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_FILE_GETTEXT_RUN_DEPENDS= ${PEARDIR}/File/Gettext.php:sysutils/pear-File_Gettext@${PHP_FLAVOR} +PEAR_I18NV2_RUN_DEPENDS= ${PEARDIR}/File/I18Nv2.php:sysutils/pear-I18Nv2@${PHP_FLAVOR} +PEAR_XML_SERIALIZER_RUN_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} .include <bsd.port.mk> diff --git a/textproc/libmrss-php/Makefile b/textproc/libmrss-php/Makefile index 67da576abb8e..4e55f1995bfa 100644 --- a/textproc/libmrss-php/Makefile +++ b/textproc/libmrss-php/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.19.2 PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= http://www.autistici.org/bakunin/libmrss/ -PKGNAMESUFFIX= -php +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= ports@FreeBSD.org COMMENT= PHP library for parsing, writing, and creating RSS diff --git a/textproc/pear-File_MARC/Makefile b/textproc/pear-File_MARC/Makefile index 14dfa1f91fbb..7d737175a6ce 100644 --- a/textproc/pear-File_MARC/Makefile +++ b/textproc/pear-File_MARC/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= ISPN ISPN_DESC= Validation class for ISPN (International Standard Product Numbers) -ISPN_RUN_DEPENDS= ${PEARDIR}/Validate/ISPN.php:textproc/pear-Validate_ISPN +ISPN_RUN_DEPENDS= ${PEARDIR}/Validate/ISPN.php:textproc/pear-Validate_ISPN@${PHP_FLAVOR} USES= pear NO_ARCH= yes diff --git a/textproc/pear-Numbers_Words/Makefile b/textproc/pear-Numbers_Words/Makefile index a43156dd170a..f8abe878f11b 100644 --- a/textproc/pear-Numbers_Words/Makefile +++ b/textproc/pear-Numbers_Words/Makefile @@ -8,8 +8,8 @@ CATEGORIES= textproc pear MAINTAINER= meritus@innervision.pl COMMENT= PEAR package provides methods for spelling numerals in words -BUILD_DEPENDS= ${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger -RUN_DEPENDS= ${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger +BUILD_DEPENDS= ${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Math/BigInteger.php:math/pear-Math_BigInteger@${PHP_FLAVOR} USES= pear diff --git a/textproc/pear-Spreadsheet_Excel_Writer/Makefile b/textproc/pear-Spreadsheet_Excel_Writer/Makefile index 7af62f4f148b..1ea00160b7e9 100644 --- a/textproc/pear-Spreadsheet_Excel_Writer/Makefile +++ b/textproc/pear-Spreadsheet_Excel_Writer/Makefile @@ -10,8 +10,8 @@ COMMENT= PEAR class for writing Microsoft Excel files LICENSE= LGPL3 -BUILD_DEPENDS= ${PEARDIR}/OLE.php:devel/pear-OLE -RUN_DEPENDS= ${PEARDIR}/OLE.php:devel/pear-OLE +BUILD_DEPENDS= ${PEARDIR}/OLE.php:devel/pear-OLE@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/OLE.php:devel/pear-OLE@${PHP_FLAVOR} USES= pear NO_ARCH= yes diff --git a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile index 5a6671dbd2a1..ae352a6579b1 100644 --- a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile +++ b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile @@ -8,8 +8,8 @@ CATEGORIES= textproc databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using RSS files -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear USE_PHP= mysql diff --git a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile index d51e2b4c6396..aa8d65a87b1e 100644 --- a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile +++ b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile @@ -8,8 +8,8 @@ CATEGORIES= textproc databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using XML files -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear USE_PHP= mysql diff --git a/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile b/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile index 24dd3a671cd2..784745585732 100644 --- a/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile +++ b/textproc/pear-Structures_DataGrid_Renderer_CSV/Makefile @@ -8,8 +8,8 @@ CATEGORIES= textproc databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= Renderer driver that generates a CSV string -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear diff --git a/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile b/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile index 7a71f870cd74..d617ed3d114d 100644 --- a/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile +++ b/textproc/pear-Structures_DataGrid_Renderer_XLS/Makefile @@ -8,10 +8,10 @@ CATEGORIES= textproc databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= Renderer driver that generates a XLS string -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \ - ${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \ - ${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \ + ${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \ + ${PEARDIR}/Spreadsheet/Excel/Writer.php:textproc/pear-Spreadsheet_Excel_Writer@${PHP_FLAVOR} USES= pear diff --git a/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile b/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile index f1f0c0bd571a..5c46086a978b 100644 --- a/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile +++ b/textproc/pear-Structures_DataGrid_Renderer_XML/Makefile @@ -8,10 +8,10 @@ CATEGORIES= textproc databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= Renderer driver that generates a XML string -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \ - ${PEARDIR}/XML/Util.php:devel/pear-XML_Util -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array \ - ${PEARDIR}/XML/Util.php:devel/pear-XML_Util +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR} USES= pear diff --git a/textproc/pear-Symfony_Component_Yaml/Makefile b/textproc/pear-Symfony_Component_Yaml/Makefile index 22f23513f1c2..17bc70bec7df 100644 --- a/textproc/pear-Symfony_Component_Yaml/Makefile +++ b/textproc/pear-Symfony_Component_Yaml/Makefile @@ -5,7 +5,7 @@ PORTNAME= Yaml PORTVERSION= 2.4.4 CATEGORIES= textproc pear MASTER_SITES= http://pear.symfony.com/get/ -PKGNAMEPREFIX= pear-Symfony_Component_ +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX}Symfony_Component_ DIST_SUBDIR= Symfony2 MAINTAINER= joneum@FreeBSD.org @@ -13,9 +13,6 @@ COMMENT= Symfony2 Yaml 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/textproc/pear-Text_Highlighter/Makefile b/textproc/pear-Text_Highlighter/Makefile index ce6c9cbff08d..ad198b44e60f 100644 --- a/textproc/pear-Text_Highlighter/Makefile +++ b/textproc/pear-Text_Highlighter/Makefile @@ -10,8 +10,8 @@ COMMENT= PEAR Syntax highlighting LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= pear NO_ARCH= yes diff --git a/textproc/pear-Text_Template/Makefile b/textproc/pear-Text_Template/Makefile index 7d5ae32c27a4..88df6e736edf 100644 --- a/textproc/pear-Text_Template/Makefile +++ b/textproc/pear-Text_Template/Makefile @@ -5,14 +5,11 @@ PORTNAME= Text_Template PORTVERSION= 1.2.0 CATEGORIES= textproc www pear MASTER_SITES= http://pear.phpunit.de/get/ -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= joneum@FreeBSD.org COMMENT= Simple template engine -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit -RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit - USES= pear PEAR_CHANNEL= phpunit diff --git a/textproc/pear-Validate_ISPN/Makefile b/textproc/pear-Validate_ISPN/Makefile index 6f8ea221ebc3..8367a75bbe9b 100644 --- a/textproc/pear-Validate_ISPN/Makefile +++ b/textproc/pear-Validate_ISPN/Makefile @@ -11,7 +11,7 @@ COMMENT= Validation class for ISPN (International Standard Product Numbers) LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PEARDIR}/Validate.php:devel/pear-Validate +RUN_DEPENDS= ${PEARDIR}/Validate.php:devel/pear-Validate@${PHP_FLAVOR} USES= pear NO_ARCH= yes diff --git a/textproc/pear-XML_Beautifier/Makefile b/textproc/pear-XML_Beautifier/Makefile index 1366fcd1ae93..2c4dab73cd86 100644 --- a/textproc/pear-XML_Beautifier/Makefile +++ b/textproc/pear-XML_Beautifier/Makefile @@ -8,10 +8,10 @@ CATEGORIES= textproc devel pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class to format XML documents -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \ - ${PEARDIR}/XML/Util.php:devel/pear-XML_Util -RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \ - ${PEARDIR}/XML/Util.php:devel/pear-XML_Util +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR} USES= pear diff --git a/textproc/pear-XML_DTD/Makefile b/textproc/pear-XML_DTD/Makefile index 22b3e50b1712..e9b783b6502e 100644 --- a/textproc/pear-XML_DTD/Makefile +++ b/textproc/pear-XML_DTD/Makefile @@ -8,8 +8,8 @@ CATEGORIES= textproc devel pear MAINTAINER= joneum@FreeBSD.org COMMENT= Parsing of DTD files and DTD validation of XML files -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= dos2unix pear diff --git a/textproc/pear-XML_Wddx/Makefile b/textproc/pear-XML_Wddx/Makefile index fbfeee06b389..96884406cf50 100644 --- a/textproc/pear-XML_Wddx/Makefile +++ b/textproc/pear-XML_Wddx/Makefile @@ -8,8 +8,8 @@ CATEGORIES= textproc devel pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR Wddx pretty serializer and deserializer -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} NO_ARCH= yes USES= pear diff --git a/textproc/pear-YAML/Makefile b/textproc/pear-YAML/Makefile index 681205bcecd3..4de709cae667 100644 --- a/textproc/pear-YAML/Makefile +++ b/textproc/pear-YAML/Makefile @@ -5,14 +5,11 @@ PORTNAME= YAML PORTVERSION= 1.0.6 CATEGORIES= textproc www pear MASTER_SITES= http://pear.symfony-project.com/get/ -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= joneum@FreeBSD.org COMMENT= The Symfony YAML Component -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony -RUN_DEPENDS= ${PEARDIR}/.channels/pear.symfony-project.com.reg:devel/pear-channel-symfony - USES= pear PEAR_CHANNEL= symfony diff --git a/textproc/pecl-xdiff2/Makefile b/textproc/pecl-xdiff2/Makefile index 565f6eb200df..e74f17a7a19a 100644 --- a/textproc/pecl-xdiff2/Makefile +++ b/textproc/pecl-xdiff2/Makefile @@ -3,7 +3,6 @@ PORTNAME= xdiff PORTVERSION= 2.0.1 CATEGORIES= textproc pear -PKGNAMESUFFIX= 2 MAINTAINER= dbaio@FreeBSD.org COMMENT= PECL extension to create/apply binary and text patches diff --git a/textproc/pecl-yaml1/Makefile b/textproc/pecl-yaml1/Makefile index 1cad0e27369b..f968bbfe2daa 100644 --- a/textproc/pecl-yaml1/Makefile +++ b/textproc/pecl-yaml1/Makefile @@ -4,7 +4,6 @@ PORTNAME= yaml PORTVERSION= 1.3.1 CATEGORIES= textproc pear -PKGNAMESUFFIX= 1 MAINTAINER= dbaio@FreeBSD.org COMMENT= YAML-1.1 parser and emitter diff --git a/textproc/php-mecab/Makefile b/textproc/php-mecab/Makefile index 66af20db3e3c..13553335c387 100644 --- a/textproc/php-mecab/Makefile +++ b/textproc/php-mecab/Makefile @@ -1,11 +1,12 @@ # Created by: Gasol Wu <gasol.wu@gmail.com> # $FreeBSD$ -PORTNAME= php-mecab +PORTNAME= mecab PORTVERSION= 0.6.0 PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= textproc +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= gasol.wu@gmail.com COMMENT= PHP bindings of the MeCab @@ -16,10 +17,10 @@ LIB_DEPENDS= libmecab.so:japanese/mecab USE_GITHUB= yes GH_ACCOUNT= rsky +GH_PROJECT= php-${PORTNAME} WRKSRC_SUBDIR= mecab CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config USES= php:ext -PHP_MODNAME= mecab .include <bsd.port.mk> 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 |