Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -9964,6 +9964,8 @@ www/rubygem-scrapi||2018-02-14|Has expired: No longer maintained upstream devel/boost-python3-libs|devel/boost-python-libs@py36|2018-02-15|Flavorize net/quagga-esr|net/quagga|2018-02-15|Fixes available, go back to the regular quagga +<<<<<<< HEAD +<<<<<<< HEAD sysutils/krename-kde4|sysutils/krename|2018-02-16|Renamed to sysutils/krename net/grive|net/grive2|2018-02-17|Has expired: Unmaintained by upstream, use net/grive2 instead textproc/rubygem-sass-rails5|textproc/rubygem-sass-rails-rails4|2018-02-18|Rename to match our rubygems naming @@ -9972,3 +9974,14 @@ devel/elixir-sorted_set||2018-02-19|Has expired: No longer maintained upstream devel/elixir-red_black_tree||2018-02-19|Has expired: No longer maintained upstream emulators/wine-staging|emulators/wine-devel|2018-02-20|Broken for months, abandoned upstream +databases/php70-memcache|databases/php-memcache@php70|2018-02-20|Merge into a flavorized version +databases/php71-memcache|databases/php-memcache@php71|2018-02-20|Merge into a flavorized version +databases/php72-memcache|databases/php-memcache@php72|2018-02-20|Merge into a flavorized version +ftp/php56-fastdfs|ftp/php-fastdfs@php56|2018-02-19|Metge into flavorized version +ftp/php70-fastdfs|ftp/php-fastdfs@php70|2018-02-19|Metge into flavorized version +ftp/php71-fastdfs|ftp/php-fastdfs@php71|2018-02-19|Metge into flavorized version +ftp/php72-fastdfs|ftp/php-fastdfs@php72|2018-02-19|Metge into flavorized version +www/unit-php56|www/unit-php@php56|2018-02-19|Metge into flavorized version +www/unit-php70|www/unit-php@php70|2018-02-19|Metge into flavorized version +www/unit-php71|www/unit-php@php71|2018-02-19|Metge into flavorized version +www/unit-php72|www/unit-php@php72|2018-02-19|Metge into flavorized version Index: Mk/Uses/horde.mk =================================================================== --- Mk/Uses/horde.mk +++ Mk/Uses/horde.mk @@ -11,10 +11,6 @@ MASTER_SITES?= http://pear.horde.org/get/ -BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde -RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde - -PKGNAMEPREFIX?= pear- HORDE_DIR?= www/horde CONFLICTS+= horde3-*.[0-9]* @@ -142,7 +138,7 @@ . if !defined(horde-${DEP}-DEPEND) UNKNOWN_HORDE_PACKAGES+= ${DEP} . else -RUN_DEPENDS+= ${horde-${DEP}-DEPEND} +RUN_DEPENDS+= ${horde-${DEP}-DEPEND}@${PHP_FLAVOR} . endif . endfor .endif @@ -152,7 +148,7 @@ . if !defined(horde-${DEP}-DEPEND) UNKNOWN_HORDE_PACKAGES+= ${DEP} . else -BUILD_DEPENDS+= ${horde-${DEP}-DEPEND} +BUILD_DEPENDS+= ${horde-${DEP}-DEPEND}@${PHP_FLAVOR} . endif . endfor .endif Index: Mk/Uses/pear.mk =================================================================== --- Mk/Uses/pear.mk +++ Mk/Uses/pear.mk @@ -4,7 +4,10 @@ # # Feature: pear # Usage: USES=pear -# Valid ARGS: none +# Valid ARGS: env +# +# - env : Only provide the environment variables, no fetch/build/install +# targets. # # MAINTAINER= portmgr@FreeBSD.org @@ -12,35 +15,51 @@ _INCLUDE_USES_PEAR_MK= yes _USES_POST+= pear -.if !empty(pear_ARGS) -IGNORE+= USES=pear takes not arguments -.endif +_valid_pear_ARGS= env + +# Sanity check +. for arg in ${pear_ARGS} +. if empty(_valid_pear_ARGS:M${arg}) +IGNORE= Incorrect 'USES+= pear:${cmake_ARGS}' usage: argument [${arg}] is not recognized +. endif +. endfor +php_ARGS+= flavors +.include "${USESDIR}/php.mk" + +. if empty(pear_ARGS:Menv) MASTER_SITES?= http://pear.php.net/get/ EXTRACT_SUFX?= .tgz DIST_SUBDIR?= PEAR -BUILD_DEPENDS+= pear:devel/pear -RUN_DEPENDS+= pear:devel/pear - -.if !defined(USE_PHPIZE) +. if !defined(USE_PHPIZE) NO_BUILD= yes -.endif +. endif +. endif -.if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != "" -PKGNAMEPREFIX?= pear-${PEAR_CHANNEL}- +BUILD_DEPENDS+= pear:devel/pear@${PHP_FLAVOR} +RUN_DEPENDS+= pear:devel/pear@${PHP_FLAVOR} + +PEAR_PKGNAMEPREFIX= php${PHP_VER}-pear- + +. if defined(PEAR_CHANNEL) && ${PEAR_CHANNEL} != "" +PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX= php${PHP_VER}-pear-${PEAR_CHANNEL}- +PKGNAMEPREFIX?= ${PEAR_${PEAR_CHANNEL:tu}_PKGNAMEPREFIX} PEARPKGREF= ${PEAR_CHANNEL}/${PORTNAME} -.else -PKGNAMEPREFIX?= pear- +PEAR_CHANNEL_VER?= >=0 +BUILD_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR} +RUN_DEPENDS+= ${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR} +. else +PKGNAMEPREFIX?= ${PEAR_PKGNAMEPREFIX} PEARPKGREF= ${PORTNAME} -.endif +. endif -.if exists(${LOCALBASE}/bin/php-config) +. if exists(${LOCALBASE}/bin/php-config) PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix -.else +. else PHP_BASE= ${LOCALBASE} -.endif +. endif PEAR= ${LOCALBASE}/bin/pear LPEARDIR= share/pear LPKGREGDIR= ${LPEARDIR}/packages/${PKGNAME} @@ -58,32 +77,36 @@ SQLSDIR= ${PHP_BASE}/${LSQLSDIR} SCRIPTFILESDIR= ${LOCALBASE}/bin TESTSDIR= ${PHP_BASE}/${LTESTSDIR} -.if defined(CATEGORY) && !empty(CATEGORY) +. if defined(CATEGORY) && !empty(CATEGORY) LINSTDIR= ${LPEARDIR}/${CATEGORY} -.else +. else LINSTDIR= ${LPEARDIR} -.endif +. endif INSTDIR= ${PHP_BASE}/${LINSTDIR} SUB_LIST+= PKG_NAME=${PEARPKGREF} -.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist) +. if empty(pear_ARGS:Menv) +. if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist) PLIST= ${WRKDIR}/PLIST -.endif +. endif +PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install +PKGDEINSTALL?= ${WRKDIR}/pear-deinstall +. endif + PLIST_SUB+= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \ TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \ SCRIPTFILESDIR=${LCRIPTSDIR} -PKGINSTALL?= ${PORTSDIR}/devel/pear/pear-install -PKGDEINSTALL?= ${WRKDIR}/pear-deinstall - .endif .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_PEAR_POST_MK) _INCLUDE_USES_PEAR_POST_MK= yes +. if empty(pear_ARGS:Menv) + _USES_install+= 250:pear-pre-install pear-pre-install: -.if exists(${LOCALBASE}/lib/php.DIST_PHP) \ +. if exists(${LOCALBASE}/lib/php.DIST_PHP) \ || exists(${PHP_BASE}/lib/php.DIST_PHP) \ || exists(${LOCALBASE}/.PEAR.pkg) \ || exists(${PHP_BASE}/.PEAR.pkg) @@ -92,7 +115,7 @@ @${ECHO_MSG} " Please deinstall your installed pear- ports." @${ECHO_MSG} "" @${FALSE} -.endif +. endif DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' \ | ( while read r; do \ @@ -108,16 +131,16 @@ done \ ) | ${SORT} -ur -.if !defined(USE_PHPIZE) +. if !defined(USE_PHPIZE) _USES_install+= 260:do-autogenerate-plist do-autogenerate-plist: @${ECHO_MSG} "===> Generating packing list with pear" @${LN} -sf ${WRKDIR}/package.xml ${WRKSRC}/package.xml @cd ${WRKSRC} && ${PEAR} install -n -f -P ${WRKDIR}/inst package.xml > /dev/null 2> /dev/null -.for R in .channels .depdb .depdblock .filemap .lock .registry +. for R in .channels .depdb .depdblock .filemap .lock .registry @${RM} -r ${WRKDIR}/inst/${PREFIX}/${LPEARDIR}/${R} @${RM} -r ${WRKDIR}/inst/${R} -.endfor +. endfor @FILES=`cd ${WRKDIR}/inst && ${FIND} . -type f | ${CUT} -c 2- | \ ${GREP} -v -E "^${PREFIX}/"` || exit 0; \ ${ECHO_CMD} $${FILES}; if ${TEST} -n "$${FILES}"; then \ @@ -131,11 +154,11 @@ do-install: @cd ${WRKSRC} && ${PEAR} install -n -f -P ${STAGEDIR} package.xml # Clean up orphans re-generated by pear-install -.for R in .channels .depdb .depdblock .filemap .lock .registry +. for R in .channels .depdb .depdblock .filemap .lock .registry @${RM} -r ${STAGEDIR}${PREFIX}/${LPEARDIR}/${R} @${RM} -r ${STAGEDIR}/${R} -.endfor -.endif +. endfor +. endif _USES_install+= 270:do-generate-deinstall-script do-generate-deinstall-script: @@ -149,4 +172,6 @@ show-depends: patch @${PEAR} package-dependencies ${WRKDIR}/package.xml +. endif + .endif Index: Mk/Uses/php.mk =================================================================== --- Mk/Uses/php.mk +++ Mk/Uses/php.mk @@ -16,6 +16,9 @@ # - web : Want the Apache Module or the CGI version of PHP. # - embed : Want the embedded library version of PHP. # - pecl : Fetches from PECL. +# - flavors : Generates flavors for supported versions. +# (implied by phpize,ext,zend,pecl) +# - noflavors: Prevents generation of flavor. # # If the port requires a predefined set of PHP extensions, they can be # listed in this way: @@ -43,7 +46,6 @@ # # The port can set these options in its Makefile before bsd.port.pre.mk: # -# DEFAULT_PHP_VER=N - Use PHP version N if PHP is not yet installed. # IGNORE_WITH_PHP=N - The port doesn't work with PHP version N. # # You may combine multiple WANT_PHP_* knobs. @@ -58,10 +60,6 @@ _INCLUDE_USES_PHP_MK= yes -. if defined(DEFAULT_PHP_VER) -WARNING+= "DEFAULT_PHP_VER is defined, consider using DEFAULT_VERSIONS=php=${DEFAULT_PHP_VER} instead" -. endif - . if defined(USE_PHPIZE) && empty(php_ARGS:Mphpize) php_ARGS+= phpize . endif @@ -84,6 +82,9 @@ . if ${php_ARGS:Mbuild} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} ) DEV_WARNING+= "USES=php:build is included in USES=php:phpize, USES=php:ext, and USES=php:zend, so it is not needed" . endif +. if ${php_ARGS:Mflavors} && ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} ) +DEV_WARNINGS+= "USES=php:flavors is included in phpize, ext, zend and pecl, so it is not needed." +. endif . if ${php_ARGS:Mphpize} && ( ${php_ARGS:Mext} || ${php_ARGS:Mzend} ) DEV_WARNING+= "USES=php:phpize is included in USES=php:ext and USES=php:zend, so it is not needed" . endif @@ -94,26 +95,91 @@ DEV_WARNING+= "USES=php:ext is included in USES=php:pecl, so it is not needed" . endif +. if ( ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} || ${php_ARGS:Mpecl} ) && !${php_ARGS:Mnoflavors} +php_ARGS+= flavors +. endif + +. if ${php_ARGS:Mnoflavors} && ${php_ARGS:Mflavors} +php_ARGS:= ${php_ARGS:Nflavors} +. endif + + . if ${php_ARGS:Mpecl} php_ARGS+= ext +. if !defined(USE_GITHUB) EXTRACT_SUFX= .tgz MASTER_SITES= http://pecl.php.net/get/ -PKGNAMEPREFIX= pecl- +. endif +PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX} DIST_SUBDIR= PECL . endif PHPBASE?= ${LOCALBASE} + +_ALL_PHP_VERSIONS= 56 70 71 72 + +# Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) .include "${PHPBASE}/etc/php.conf" . if !defined(PHP_EXT_DIR) PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p' . endif +_INSTALLED_PHP_VER:= ${PHP_VER} +# If we have an installed version of PHP, and this does not support it, set +# IGNORE to fail early as you cannot install two different versions of PHP at +# the same time anyway. +. if defined(IGNORE_WITH_PHP) && ${IGNORE_WITH_PHP:M${_INSTALLED_PHP_VER}} +IGNORE= does not work with PHP versions "${IGNORE_WITH_PHP}" and "${_INSTALLED_PHP_VER}" is installed. +. endif + . else -DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//} +PHP_VER?= ${PHP_DEFAULT:S/.//} +. endif # .if exists(${PHPBASE}/etc/php.conf) + +# Use the "default" php version as th first version for flavors, so that it +# gets to be the default flavor. +_ALL_FLAVOR_VERSIONS= ${PHP_VER} ${_ALL_PHP_VERSIONS:N${PHP_VER}} + +# If we want flavors, fill in FLAVORS with the allowed PHP versions, if some +# cannot be used, or all of them if they all can. +# Then if there is no flavor set, use the first one as the default. +. if ${php_ARGS:Mflavors} +. if empty(FLAVORS) +. if defined(IGNORE_WITH_PHP) +. for _v in ${_ALL_FLAVOR_VERSIONS} +. if empty(IGNORE_WITH_PHP:M${_v}) +# Avoid a leading space in FLAVORS. +. if empty(FLAVORS) +FLAVORS:= php${_v} +. else +FLAVORS:= ${FLAVORS} php${_v} +. endif +. endif +. endfor +. else # defined(IGNORE_WITH_PHP) +FLAVORS:= ${_ALL_FLAVOR_VERSIONS:S/^/php/} +. endif # defined(IGNORE_WITH_PHP) +. endif +. if empty(FLAVOR) +FLAVOR= ${FLAVORS:[1]} +. endif +. endif + +# This variable is for dependencies lines, so you write: +# ${PHP_PKGNAMEPREFIX}foo:devel/php-foo@${PHP_FLAVOR} +PHP_FLAVOR= php${PHP_VER} +# So, we have PHP flavors, set PHP_VER accordingly. +. if ${FLAVOR:Mphp[0-9][0-9]} +PHP_VER= ${FLAVOR:S/^php//} +. endif + +# If lang/php is not installed, or if we have a php flavor but want a non +# default one, we need to overwrite those. +. if empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || \ + (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]}) # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -PHP_VER?= ${DEFAULT_PHP_VER} . if ${PHP_VER} == 72 PHP_EXT_DIR= 20170718 PHP_EXT_INC= pcre spl @@ -132,6 +198,8 @@ PHP_EXT_INC= pcre spl . endif +# Some dark magic to figure out what the PHP_EXT_DIR should be WRT the +# installed Apache port. HTTPD?= ${LOCALBASE}/sbin/httpd . if exists(${HTTPD}) APACHE_THR!= ${HTTPD} -V | ${AWK} '/threaded/ {print $2}' @@ -148,8 +216,12 @@ PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug . endif PHP_SAPI?= "" -. endif # .if exists(${PHPBASE}/etc/php.conf) -PHP_EXT_INC?= "" +. endif # empty(PHP_EXT_DIR) || empty(PHP_EXT_INC) || (${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]}) + +# Set a few PKGNAME(PRE|SUF)FIX to be used in ports. +PHP_PKGNAMEPREFIX= php${PHP_VER}- +PHP_PKGNAMESUFFIX= -php${PHP_VER} +PECL_PKGNAMEPREFIX= php${PHP_VER}-pecl- . if defined(IGNORE_WITH_PHP) . for VER in ${IGNORE_WITH_PHP} @@ -220,7 +292,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config -configure-message: phpize-message do-phpize +_USES_configure+= 190:phpize-message 250:do-phpize phpize-message: @${ECHO_MSG} "===> PHPizing for ${PKGNAME}" @@ -308,9 +380,9 @@ bcmath_DEPENDS= math/php${PHP_VER}-bcmath . if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72 -bitset_DEPENDS= math/pecl-bitset +bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR} . else -bitset_DEPENDS= math/pecl-bitset2 +bitset_DEPENDS= math/pecl-bitset2@${PHP_FLAVOR} . endif bz2_DEPENDS= archivers/php${PHP_VER}-bz2 calendar_DEPENDS= misc/php${PHP_VER}-calendar @@ -329,31 +401,31 @@ gmp_DEPENDS= math/php${PHP_VER}-gmp hash_DEPENDS= security/php${PHP_VER}-hash iconv_DEPENDS= converters/php${PHP_VER}-iconv -igbinary_DEPENDS= converters/pecl-igbinary +igbinary_DEPENDS= converters/pecl-igbinary@${PHP_FLAVOR} imap_DEPENDS= mail/php${PHP_VER}-imap interbase_DEPENDS= databases/php${PHP_VER}-interbase . if ${PHP_VER} == 70 || ${PHP_VER} == 71 || ${PHP_VER} == 72 intl_DEPENDS= devel/php${PHP_VER}-intl . else -intl_DEPENDS= devel/pecl-intl +intl_DEPENDS= devel/pecl-intl@${PHP_FLAVOR} . endif json_DEPENDS= devel/php${PHP_VER}-json ldap_DEPENDS= net/php${PHP_VER}-ldap mbstring_DEPENDS= converters/php${PHP_VER}-mbstring . if ${PHP_VER} >= 72 -mcrypt_DEPENDS= security/pecl-mcrypt +mcrypt_DEPENDS= security/pecl-mcrypt@${PHP_FLAVOR} . else mcrypt_DEPENDS= security/php${PHP_VER}-mcrypt . endif . if ${PHP_VER} >= 70 -memcache_DEPENDS= databases/php${PHP_VER}-memcache +memcache_DEPENDS= databases/php-memcache@${PHP_FLAVOR} . else -memcache_DEPENDS= databases/pecl-memcache +memcache_DEPENDS= databases/pecl-memcache@${PHP_FLAVOR} . endif . if ${PHP_VER} >= 70 -memcached_DEPENDS= databases/pecl-memcached +memcached_DEPENDS= databases/pecl-memcached@${PHP_FLAVOR} . else -memcached_DEPENDS= databases/pecl-memcached2 +memcached_DEPENDS= databases/pecl-memcached2@${PHP_FLAVOR} . endif mssql_DEPENDS= databases/php${PHP_VER}-mssql mysql_DEPENDS= databases/php${PHP_VER}-mysql @@ -364,7 +436,7 @@ opcache_DEPENDS= www/php${PHP_VER}-opcache openssl_DEPENDS=security/php${PHP_VER}-openssl pcntl_DEPENDS= devel/php${PHP_VER}-pcntl -pdf_DEPENDS= print/pecl-pdflib +pdf_DEPENDS= print/pecl-pdflib@${PHP_FLAVOR} pdo_DEPENDS= databases/php${PHP_VER}-pdo pdo_dblib_DEPENDS= databases/php${PHP_VER}-pdo_dblib pdo_firebird_DEPENDS= databases/php${PHP_VER}-pdo_firebird @@ -376,10 +448,10 @@ phar_DEPENDS= archivers/php${PHP_VER}-phar posix_DEPENDS= sysutils/php${PHP_VER}-posix pspell_DEPENDS= textproc/php${PHP_VER}-pspell -radius_DEPENDS= net/pecl-radius +radius_DEPENDS= net/pecl-radius@${PHP_FLAVOR} readline_DEPENDS= devel/php${PHP_VER}-readline recode_DEPENDS= converters/php${PHP_VER}-recode -redis_DEPENDS= databases/pecl-redis +redis_DEPENDS= databases/pecl-redis@${PHP_FLAVOR} session_DEPENDS=www/php${PHP_VER}-session shmop_DEPENDS= devel/php${PHP_VER}-shmop simplexml_DEPENDS= textproc/php${PHP_VER}-simplexml Index: archivers/pear-File_Archive/Makefile =================================================================== --- archivers/pear-File_Archive/Makefile +++ archivers/pear-File_Archive/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files -BUILD_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type -RUN_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type +BUILD_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/MIME/Type.php:mail/pear-MIME_Type@${PHP_FLAVOR} USES= pear php NO_ARCH= yes @@ -22,8 +22,8 @@ PEAR_MAIL_MIME_DESC= PEAR::Mail_Mime support PEAR_CACHE_LITE_DESC= PEAR::Cache_Lite support -PEAR_MAIL_RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail -PEAR_MAIL_MIME_RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime -PEAR_CACHE_LITE_RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite +PEAR_MAIL_RUN_DEPENDS= ${PEARDIR}/Mail.php:mail/pear-Mail@${PHP_FLAVOR} +PEAR_MAIL_MIME_RUN_DEPENDS= ${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} +PEAR_CACHE_LITE_RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:sysutils/pear-Cache_Lite@${PHP_FLAVOR} .include Index: archivers/pear-Horde_Compress/Makefile =================================================================== --- archivers/pear-Horde_Compress/Makefile +++ archivers/pear-Horde_Compress/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Compress PORTVERSION= 2.2.1 CATEGORIES= archivers www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Compression API Index: archivers/pear-Horde_Compress_Fast/Makefile =================================================================== --- archivers/pear-Horde_Compress_Fast/Makefile +++ archivers/pear-Horde_Compress_Fast/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Compress_Fast PORTVERSION= 1.1.1 CATEGORIES= archivers www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Fast Compression Library Index: archivers/pear-Horde_Pack/Makefile =================================================================== --- archivers/pear-Horde_Pack/Makefile +++ archivers/pear-Horde_Pack/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Pack PORTVERSION= 1.0.7 CATEGORIES= archivers www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Pack Utility Index: archivers/php-horde_lz4/Makefile =================================================================== --- archivers/php-horde_lz4/Makefile +++ archivers/php-horde_lz4/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 1.0.10 CATEGORIES= archivers pear MASTER_SITES= http://pear.horde.org/get/ -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PECL_PKGNAMEPREFIX} DIST_SUBDIR= PECL MAINTAINER= mm@FreeBSD.org Index: archivers/php-snappy/Makefile =================================================================== --- archivers/php-snappy/Makefile +++ archivers/php-snappy/Makefile @@ -4,7 +4,7 @@ PORTNAME= snappy PORTVERSION= 0.1.9 CATEGORIES= archivers -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= joneum@FreeBSD.org COMMENT= PHP extension for the snappy compression algorithm Index: chinese/php-opencc/Makefile =================================================================== --- chinese/php-opencc/Makefile +++ chinese/php-opencc/Makefile @@ -4,7 +4,7 @@ PORTNAME= opencc PORTVERSION= 0.0.0.20161110 CATEGORIES= chinese -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= gasol.wu@gmail.com COMMENT= OpenCC shared extension for php Index: chinese/phpbb-tw/Makefile =================================================================== --- chinese/phpbb-tw/Makefile +++ chinese/phpbb-tw/Makefile @@ -12,10 +12,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Traditional Chinese version of phpBB -RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear +RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR} CONFLICTS= phpbb-[0-9]* -USES= dos2unix +USES= dos2unix php # Get HOSTNAME .if exists(/sbin/sysctl) Index: converters/php5-bsdconv/Makefile =================================================================== --- converters/php5-bsdconv/Makefile +++ converters/php5-bsdconv/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 11.3.0 PORTREVISION= 1 CATEGORIES= converters -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= buganini@gmail.com COMMENT= PHP wrapper for bsdconv Index: databases/Makefile =================================================================== --- databases/Makefile +++ databases/Makefile @@ -607,6 +607,7 @@ SUBDIR += pguri SUBDIR += pgworksheet SUBDIR += php-mdcached + SUBDIR += php-memcache SUBDIR += php-xapian SUBDIR += php5-pdo_cassandra SUBDIR += php5-tarantool @@ -628,7 +629,6 @@ SUBDIR += php56-sybase_ct SUBDIR += php70-dba SUBDIR += php70-interbase - SUBDIR += php70-memcache SUBDIR += php70-memcached SUBDIR += php70-mysqli SUBDIR += php70-odbc @@ -643,7 +643,6 @@ SUBDIR += php70-sqlite3 SUBDIR += php71-dba SUBDIR += php71-interbase - SUBDIR += php71-memcache SUBDIR += php71-mysqli SUBDIR += php71-odbc SUBDIR += php71-pdo @@ -657,7 +656,6 @@ SUBDIR += php71-sqlite3 SUBDIR += php72-dba SUBDIR += php72-interbase - SUBDIR += php72-memcache SUBDIR += php72-mysqli SUBDIR += php72-odbc SUBDIR += php72-pdo Index: databases/pear-DB_DataObject/Makefile =================================================================== --- databases/pear-DB_DataObject/Makefile +++ databases/pear-DB_DataObject/Makefile @@ -11,10 +11,10 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/docs/LICENCE.txt -BUILD_DEPENDS= pear-DB>=1.7.0:databases/pear-DB \ - pear-Date>=1.4.3:devel/pear-Date -RUN_DEPENDS= pear-DB>=1.7.0:databases/pear-DB \ - pear-Date>=1.4.3:devel/pear-Date +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \ + ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR} +RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR} \ + ${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR} USES= pear @@ -23,7 +23,7 @@ PEAR_MDB2_DESC= PEAR::MDB2 support PEAR_VALIDATE_DESC= PEAR::Validate support -PEAR_MDB2_RUN_DEPENDS= pear-MDB2>=2.3.0:databases/pear-MDB2 -PEAR_VALIDATE_RUN_DEPENDS= pear-Validate>=0.1.1:devel/pear-Validate +PEAR_MDB2_RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=2.3.0:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_VALIDATE_RUN_DEPENDS= ${PEAR_PKGNAMEPREFIX}Validate>=0.1.1:devel/pear-Validate@${PHP_FLAVOR} .include Index: databases/pear-DB_DataObject_FormBuilder/Makefile =================================================================== --- databases/pear-DB_DataObject_FormBuilder/Makefile +++ databases/pear-DB_DataObject_FormBuilder/Makefile @@ -8,17 +8,17 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Automatically build HTML_QuickForm objects using DB_DataObject -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject -RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} USES= pear OPTIONS_DEFINE= PEAR_DATE PEAR_HTML_TABLE PEAR_DATE_DESC= PEAR::Date support PEAR_HTML_TABLE_DESC= PEAR::HTML_Table support -PEAR_DATE_RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date -PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table +PEAR_DATE_RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} +PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:devel/pear-HTML_Table@${PHP_FLAVOR} .include Index: databases/pear-DB_Pager/Makefile =================================================================== --- databases/pear-DB_Pager/Makefile +++ databases/pear-DB_Pager/Makefile @@ -10,8 +10,8 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USES= pear Index: databases/pear-DB_QueryTool/Makefile =================================================================== --- databases/pear-DB_QueryTool/Makefile +++ databases/pear-DB_QueryTool/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR OO-interface for easily retrieving and modifying data in a DB -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear Index: databases/pear-DB_Sqlite_Tools/Makefile =================================================================== --- databases/pear-DB_Sqlite_Tools/Makefile +++ databases/pear-DB_Sqlite_Tools/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= an object oriented interface to backup Sqlite databases -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear Index: databases/pear-DB_Table/Makefile =================================================================== --- databases/pear-DB_Table/Makefile +++ databases/pear-DB_Table/Makefile @@ -17,8 +17,8 @@ PEAR_DB_DESC= PEAR::DB support PEAR_MDB2_DESC= PEAR::MDB2 support -PEAR_HTML_QUICKFORM_RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm -PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 +PEAR_HTML_QUICKFORM_RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} +PEAR_DB_RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +PEAR_MDB2_RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} .include Index: databases/pear-DB_ldap/Makefile =================================================================== --- databases/pear-DB_ldap/Makefile +++ databases/pear-DB_ldap/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR DB compliant interface to LDAP servers -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USES= pear Index: databases/pear-DB_ldap2/Makefile =================================================================== --- databases/pear-DB_ldap2/Makefile +++ databases/pear-DB_ldap2/Makefile @@ -9,8 +9,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR DB compliant interface to LDAP v2 and v3 database -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USE_PHP= ldap USES= pear php Index: databases/pear-DoctrineCommon/Makefile =================================================================== --- databases/pear-DoctrineCommon/Makefile +++ databases/pear-DoctrineCommon/Makefile @@ -11,9 +11,6 @@ LICENSE= LGPL21 -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine -RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine - USES= pear PEAR_CHANNEL= doctrine Index: databases/pear-DoctrineDBAL/Makefile =================================================================== --- databases/pear-DoctrineDBAL/Makefile +++ databases/pear-DoctrineDBAL/Makefile @@ -11,10 +11,8 @@ LICENSE= LGPL21 -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine -RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \ - ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \ - ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console +RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \ + ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} OPTIONS_DEFINE= DBLIB MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT=MYSQL Index: databases/pear-DoctrineORM/Makefile =================================================================== --- databases/pear-DoctrineORM/Makefile +++ databases/pear-DoctrineORM/Makefile @@ -11,12 +11,10 @@ LICENSE= LGPL21 -BUILD_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine -RUN_DEPENDS= ${PEARDIR}/.channels/pear.doctrine-project.org.reg:devel/pear-channel-doctrine \ - ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon \ - ${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL \ - ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console \ - ${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml +RUN_DEPENDS= ${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \ + ${PEARDIR}/Doctrine/DBAL/Version.php:databases/pear-DoctrineDBAL@${PHP_FLAVOR} \ + ${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR} \ + ${PEARDIR}/Symfony/Component/Yaml/Yaml.php:textproc/pear-Symfony_Component_Yaml@${PHP_FLAVOR} USES= pear PEAR_CHANNEL= doctrine Index: databases/pear-Horde_Db/Makefile =================================================================== --- databases/pear-Horde_Db/Makefile +++ databases/pear-Horde_Db/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_Db PORTVERSION= 2.4.0 CATEGORIES= databases www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Database Libraries Index: databases/pear-Horde_HashTable/Makefile =================================================================== --- databases/pear-Horde_HashTable/Makefile +++ databases/pear-Horde_HashTable/Makefile @@ -3,7 +3,6 @@ PORTNAME= Horde_HashTable PORTVERSION= 1.2.6 CATEGORIES= databases www pear -PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Hash Table Interface Index: databases/pear-Horde_Mongo/Makefile =================================================================== --- databases/pear-Horde_Mongo/Makefile +++ databases/pear-Horde_Mongo/Makefile @@ -3,12 +3,11 @@ 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 +#RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:databases/pecl-mongo@${PHP_FLAVOR} .include Index: databases/pear-MDB/Makefile =================================================================== --- databases/pear-MDB/Makefile +++ databases/pear-MDB/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR unified API for DB access, based on user meta data -BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser +BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} USES= pear Index: databases/pear-MDB2_Driver_mysql/Makefile =================================================================== --- databases/pear-MDB2_Driver_mysql/Makefile +++ databases/pear-MDB2_Driver_mysql/Makefile @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2 +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: databases/pear-MDB2_Driver_mysqli/Makefile =================================================================== --- databases/pear-MDB2_Driver_mysqli/Makefile +++ databases/pear-MDB2_Driver_mysqli/Makefile @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2 +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: databases/pear-MDB2_Driver_pgsql/Makefile =================================================================== --- databases/pear-MDB2_Driver_pgsql/Makefile +++ databases/pear-MDB2_Driver_pgsql/Makefile @@ -10,7 +10,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= pear-MDB2>=0:databases/pear-MDB2 +BUILD_DEPENDS= ${PEAR_PKGNAMEPREFIX}MDB2>=0:databases/pear-MDB2@${PHP_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: databases/pear-MDB2_Schema/Makefile =================================================================== --- databases/pear-MDB2_Schema/Makefile +++ databases/pear-MDB2_Schema/Makefile @@ -8,14 +8,14 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR XML based database schema manager -BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 \ - ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \ - ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer -RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 \ - ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser \ - ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \ + ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} \ + ${PEARDIR}/XML/DTD.php:textproc/pear-XML_DTD@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} USES= pear Index: databases/pear-MDB_QueryTool/Makefile =================================================================== --- databases/pear-MDB_QueryTool/Makefile +++ databases/pear-MDB_QueryTool/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR OO-interface for easily retrieving and modifying data in a DB -BUILD_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log -RUN_DEPENDS:= ${PEARDIR}/MDB.php:databases/pear-MDB \ - ${PEARDIR}/Log/null.php:sysutils/pear-Log +BUILD_DEPENDS= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/MDB.php:databases/pear-MDB@${PHP_FLAVOR} \ + ${PEARDIR}/Log/null.php:sysutils/pear-Log@${PHP_FLAVOR} USES= pear Index: databases/pear-Structures_DataGrid_DataSource_Array/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_Array/Makefile +++ databases/pear-Structures_DataGrid_DataSource_Array/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using arrays -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} USES= pear Index: databases/pear-Structures_DataGrid_DataSource_CSV/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_CSV/Makefile +++ databases/pear-Structures_DataGrid_DataSource_CSV/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using CSV files -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear Index: databases/pear-Structures_DataGrid_DataSource_DB/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_DB/Makefile +++ databases/pear-Structures_DataGrid_DataSource_DB/Makefile @@ -8,9 +8,9 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DB datasource driver for pear-Structures_DataGrid -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB.php:databases/pear-DB \ - ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \ + ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear Index: databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile +++ databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::DB and an SQL query -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} USES= pear USE_PHP= mysql Index: databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile +++ databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::DB_Table -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/Table.php:databases/pear-DB_Table -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/Table.php:databases/pear-DB_Table +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/Table.php:databases/pear-DB_Table@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/Table.php:databases/pear-DB_Table@${PHP_FLAVOR} USES= pear USE_PHP= mysql Index: databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile +++ databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::DB_DataObject -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/DB/DataObject.php:databases/pear-DB_DataObject@${PHP_FLAVOR} USES= pear USE_PHP= mysql Index: databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile +++ databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PEAR::MDB2 and an SQL query -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/MDB2.php:databases/pear-MDB2 -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid \ - ${PEARDIR}/MDB2.php:databases/pear-MDB2 +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@${PHP_FLAVOR} \ + ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} USES= pear USE_PHP= mysql Index: databases/pear-Structures_DataGrid_DataSource_PDO/Makefile =================================================================== --- databases/pear-Structures_DataGrid_DataSource_PDO/Makefile +++ databases/pear-Structures_DataGrid_DataSource_PDO/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= DataSource driver using PHP Data Objects (PDO) and an SQL query -BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array -RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array +BUILD_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-Structures_DataGrid_DataSource_Array@${PHP_FLAVOR} USES= pear Index: databases/pear-XML_Query2XML/Makefile =================================================================== --- databases/pear-XML_Query2XML/Makefile +++ databases/pear-XML_Query2XML/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class transform SQL queries into XML data -BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB -RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} OPTIONS_DEFINE= PEAR_MDB2 PEAR_NET_LDAP2 PEAR_MDB2_DESC= Add support for pear-MDB2 @@ -17,7 +17,7 @@ USES= pear -PEAR_MDB2_BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2 -PEAR_NET_LDAP2_BUILD_DEPENDS= ${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2 +PEAR_MDB2_BUILD_DEPENDS= ${PEARDIR}/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} +PEAR_NET_LDAP2_BUILD_DEPENDS= ${PEARDIR}/Net/LDAP2.php:net/pear-Net_LDAP2@${PHP_FLAVOR} .include Index: databases/pecl-memcached2/Makefile =================================================================== --- databases/pecl-memcached2/Makefile +++ databases/pecl-memcached2/Makefile @@ -5,7 +5,6 @@ PORTVERSION= 2.2.0 PORTREVISION= 5 CATEGORIES= databases -PKGNAMESUFFIX= 2 MAINTAINER= sunpoet@FreeBSD.org COMMENT= PHP extension for interfacing with memcached via libmemcached library Index: databases/pecl-rrd1/Makefile =================================================================== --- databases/pecl-rrd1/Makefile +++ databases/pecl-rrd1/Makefile @@ -3,7 +3,6 @@ PORTNAME= rrd DISTVERSION= 1.1.3 CATEGORIES= databases pear -PKGNAMESUFFIX= 1 MAINTAINER= daniel@blodan.se COMMENT= PHP bindings to rrd tool system Index: databases/php-mdcached/Makefile =================================================================== --- databases/php-mdcached/Makefile +++ databases/php-mdcached/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 1 CATEGORIES= databases devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -PKGNAMEPREFIX= php- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} EXTRACT_SUFX= .tgz MAINTAINER= ivoras@FreeBSD.org Index: databases/php-memcache/Makefile =================================================================== --- databases/php-memcache/Makefile +++ databases/php-memcache/Makefile @@ -4,10 +4,10 @@ PORTNAME= memcache PORTVERSION= 3.0.9 CATEGORIES= databases -PKGNAMEPREFIX= php71- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Memcached extension for PHP 7.1 +COMMENT= Memcached extension for PHP LICENSE= PHP30 LICENSE_FILE= ${WRKSRC}/LICENSE @@ -17,8 +17,7 @@ PORTSCOUT= skipv:start CONFIGURE_ARGS= --with-zlib-dir=/usr -IGNORE_WITH_PHP=56 70 72 -PHP_VER= 71 +IGNORE_WITH_PHP=56 USE_CSTD= gnu89 USE_PHP= session:build zlib:build USES= dos2unix php:ext Index: databases/php-memcache/pkg-descr =================================================================== --- databases/php-memcache/pkg-descr +++ databases/php-memcache/pkg-descr @@ -5,4 +5,4 @@ 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 +WWW: https://github.com/websupport-sk/pecl-memcache@${PHP_FLAVOR} Index: databases/php5-pdo_cassandra/Makefile =================================================================== --- databases/php5-pdo_cassandra/Makefile +++ databases/php5-pdo_cassandra/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.2.1 PORTREVISION= 14 CATEGORIES= databases -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= gasol.wu@gmail.com COMMENT= PDO driver for Apache Cassandra Index: databases/php5-tarantool/Makefile =================================================================== --- databases/php5-tarantool/Makefile +++ databases/php5-tarantool/Makefile @@ -5,7 +5,7 @@ PORTVERSION= ${TR_VER} PORTREVISION= 1 CATEGORIES= databases -PKGNAMEPREFIX= php5- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= vg@FreeBSD.org COMMENT= PECL PHP driver for Tarantool/Box Index: databases/php70-memcache/Makefile =================================================================== --- databases/php70-memcache/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Gerrit Beine -# $FreeBSD$ - -PORTNAME= memcache -PORTVERSION= 3.0.9 -CATEGORIES= databases -PKGNAMEPREFIX= php70- - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Memcached extension for PHP 7.0 - -LICENSE= PHP30 -LICENSE_FILE= ${WRKSRC}/LICENSE - -OPTIONS_DEFINE= EXAMPLES - -PORTSCOUT= skipv:start - -CONFIGURE_ARGS= --with-zlib-dir=/usr -IGNORE_WITH_PHP=56 71 72 -PHP_VER= 70 -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 Index: databases/php70-memcache/distinfo =================================================================== --- /dev/null +++ databases/php70-memcache/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1512806606 -SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 -SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 Index: databases/php70-memcache/pkg-plist =================================================================== --- /dev/null +++ databases/php70-memcache/pkg-plist @@ -1 +0,0 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php Index: databases/php70-memcached/Makefile =================================================================== --- databases/php70-memcached/Makefile +++ databases/php70-memcached/Makefile @@ -3,7 +3,7 @@ PORTNAME= memcached PORTVERSION= 3.0.0b1 CATEGORIES= databases -PKGNAMEPREFIX= php70- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= townwear@gmail.com COMMENT= PHP extension for interfacing with memcached via libmemcached library @@ -18,8 +18,7 @@ CONFIGURE_ARGS= --disable-memcached-sasl --enable-memcached-json --with-libmemcached-dir=${LOCALBASE} USES= pkgconfig php:ext USE_PHP= session:build json:build -PHP_VER= 70 -IGNORE_WITH_PHP=56 71 72 +IGNORE_WITH_PHP=56 USE_GITHUB= yes GH_ACCOUNT= php-memcached-dev Index: databases/php71-memcache/distinfo =================================================================== --- databases/php71-memcache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1512806606 -SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 -SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 Index: databases/php71-memcache/pkg-descr =================================================================== --- databases/php71-memcache/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Memcached is a caching daemon designed especially for dynamic web applications -to decrease database load by storing objects in memory. This extension allows -you to work with memcached through handy OO and procedural interfaces. - -Note that this port uses unofficial development from -https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). - -WWW: https://github.com/websupport-sk/pecl-memcache Index: databases/php71-memcache/pkg-plist =================================================================== --- databases/php71-memcache/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php Index: databases/php72-memcache/Makefile =================================================================== --- databases/php72-memcache/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# Created by: Gerrit Beine -# $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 Index: databases/php72-memcache/distinfo =================================================================== --- databases/php72-memcache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1512806606 -SHA256 (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = a7be1b96f4a57acb5808644c6e4b16bb03097ab46a97a576f02750627fcdf854 -SIZE (websupport-sk-pecl-memcache-3.0.9-e702b5f_GH0.tar.gz) = 110689 Index: databases/php72-memcache/pkg-descr =================================================================== --- databases/php72-memcache/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Memcached is a caching daemon designed especially for dynamic web applications -to decrease database load by storing objects in memory. This extension allows -you to work with memcached through handy OO and procedural interfaces. - -Note that this port uses unofficial development from -https://github.com/websupport-sk/pecl-memcache (NON_BLOCKING_IO_php7 branch). - -WWW: https://github.com/websupport-sk/pecl-memcache Index: databases/php72-memcache/pkg-plist =================================================================== --- databases/php72-memcache/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php Index: deskutils/egroupware/Makefile =================================================================== --- deskutils/egroupware/Makefile +++ deskutils/egroupware/Makefile @@ -13,15 +13,15 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKDIR}/${PORTNAME:tl}/doc/LICENSE -RUN_DEPENDS= ${LOCALBASE}/share/pear/Net/Sieve.php:net/pear-Net_Sieve \ - ${LOCALBASE}/share/pear/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client \ - ${LOCALBASE}/share/pear/Horde/Nls.php:devel/pear-Horde_Nls \ - ${LOCALBASE}/share/pear/Horde/Mail/Transport.php:mail/pear-Horde_Mail \ - ${LOCALBASE}/share/pear/Horde/Smtp.php:mail/pear-Horde_Smtp \ - ${LOCALBASE}/share/pear/Horde/Compress.php:archivers/pear-Horde_Compress \ - ${LOCALBASE}/share/pear/Horde/Icalendar.php:devel/pear-Horde_Icalendar \ - ${LOCALBASE}/share/pear/Horde/Mapi.php:mail/pear-Horde_Mapi \ - ${LOCALBASE}/share/pear/Horde/Crypt.php:security/pear-Horde_Crypt +RUN_DEPENDS= ${LOCALBASE}/share/pear/Net/Sieve.php:net/pear-Net_Sieve@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Nls.php:devel/pear-Horde_Nls@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Mail/Transport.php:mail/pear-Horde_Mail@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Smtp.php:mail/pear-Horde_Smtp@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Compress.php:archivers/pear-Horde_Compress@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Icalendar.php:devel/pear-Horde_Icalendar@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Mapi.php:mail/pear-Horde_Mapi@${PHP_FLAVOR} \ + ${LOCALBASE}/share/pear/Horde/Crypt.php:security/pear-Horde_Crypt@${PHP_FLAVOR} USES= cpe php tar:bzip2 USE_PHP= bcmath bz2 ctype json session simplexml tidy xmlreader zlib Index: deskutils/horde-groupware/Makefile =================================================================== --- deskutils/horde-groupware/Makefile +++ deskutils/horde-groupware/Makefile @@ -3,7 +3,7 @@ PORTNAME= groupware PORTVERSION= 5.2.22 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Groupware Index: deskutils/horde-kronolith/Makefile =================================================================== --- deskutils/horde-kronolith/Makefile +++ deskutils/horde-kronolith/Makefile @@ -4,7 +4,7 @@ PORTNAME= kronolith PORTVERSION= 4.2.23 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based calendar @@ -54,9 +54,9 @@ Horde_Util \ Horde_View -RUN_DEPENDS+= ${PEARDIR}/Date.php:devel/pear-Date +RUN_DEPENDS+= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} -DATE_HOLIDAYS_RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +DATE_HOLIDAYS_RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} TIMEOBJECTS_USE= HORDE_RUN=timeobjects XMLWRITER_USE= PHP=xmlwriter Index: deskutils/horde-mnemo/Makefile =================================================================== --- deskutils/horde-mnemo/Makefile +++ deskutils/horde-mnemo/Makefile @@ -4,7 +4,7 @@ PORTVERSION= 4.2.14 PORTREVISION= 1 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based notes manager Index: deskutils/horde-nag/Makefile =================================================================== --- deskutils/horde-nag/Makefile +++ deskutils/horde-nag/Makefile @@ -3,7 +3,7 @@ PORTNAME= nag PORTVERSION= 4.2.17 CATEGORIES= deskutils www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde web based task list manager Index: devel/gitphp/Makefile =================================================================== --- devel/gitphp/Makefile +++ devel/gitphp/Makefile @@ -19,7 +19,7 @@ PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" SUB_FILES= pkg-message -RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff +RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdiff.so:textproc/pecl-xdiff@${PHP_FLAVOR} do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} Index: devel/horde-content/Makefile =================================================================== --- devel/horde-content/Makefile +++ devel/horde-content/Makefile @@ -3,7 +3,7 @@ PORTNAME= content PORTVERSION= 2.0.6 CATEGORIES= devel www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde tagging application Index: devel/horde-timeobjects/Makefile =================================================================== --- devel/horde-timeobjects/Makefile +++ devel/horde-timeobjects/Makefile @@ -3,7 +3,7 @@ PORTNAME= timeobjects PORTVERSION= 2.1.4 CATEGORIES= devel www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde timeobjects application Index: devel/horde-whups/Makefile =================================================================== --- devel/horde-whups/Makefile +++ devel/horde-whups/Makefile @@ -3,7 +3,7 @@ PORTNAME= whups DISTVERSION= 3.0.12 CATEGORIES= devel www pear -PKGNAMEPREFIX= horde- +PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}horde- MAINTAINER= horde@FreeBSD.org COMMENT= Horde bug tracking/ticketing system Index: devel/pear-Config/Makefile =================================================================== --- devel/pear-Config/Makefile +++ devel/pear-Config/Makefile @@ -14,7 +14,7 @@ USES= pear -PEAR_XML_PARSER_RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser -PEAR_XML_UTIL_RUN_DEPENDS= ${PEARDIR}/XML/Util.php:devel/pear-XML_Util +PEAR_XML_PARSER_RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:devel/pear-XML_Parser@${PHP_FLAVOR} +PEAR_XML_UTIL_RUN_DEPENDS= ${PEARDIR}/XML/Util.php:devel/pear-XML_Util@${PHP_FLAVOR} .include Index: devel/pear-Date_Holidays/Makefile =================================================================== --- devel/pear-Date_Holidays/Makefile +++ devel/pear-Date_Holidays/Makefile @@ -8,16 +8,16 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR driver based class to calculate holidays -BUILD_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer -RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date \ - ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer +BUILD_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date.php:devel/pear-Date@${PHP_FLAVOR} \ + ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer@${PHP_FLAVOR} USES= pear OPTIONS_DEFINE= PEAR_CONSOLE_GETARGS PEAR_CONSOLE_GETARGS_DESC= Console::Getargs support -PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs +PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:devel/pear-Console_Getargs@${PHP_FLAVOR} .include Index: devel/pear-Date_Holidays_Austria/Makefile =================================================================== --- devel/pear-Date_Holidays_Austria/Makefile +++ devel/pear-Date_Holidays_Austria/Makefile @@ -9,8 +9,8 @@ LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear NO_ARCH= yes Index: devel/pear-Date_Holidays_Brazil/Makefile =================================================================== --- devel/pear-Date_Holidays_Brazil/Makefile +++ devel/pear-Date_Holidays_Brazil/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Brazil -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Denmark/Makefile =================================================================== --- devel/pear-Date_Holidays_Denmark/Makefile +++ devel/pear-Date_Holidays_Denmark/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Denmark -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Discordian/Makefile =================================================================== --- devel/pear-Date_Holidays_Discordian/Makefile +++ devel/pear-Date_Holidays_Discordian/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate Discordian holidays -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_EnglandWales/Makefile =================================================================== --- devel/pear-Date_Holidays_EnglandWales/Makefile +++ devel/pear-Date_Holidays_EnglandWales/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in England and Wales -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Germany/Makefile =================================================================== --- devel/pear-Date_Holidays_Germany/Makefile +++ devel/pear-Date_Holidays_Germany/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Germany -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Iceland/Makefile =================================================================== --- devel/pear-Date_Holidays_Iceland/Makefile +++ devel/pear-Date_Holidays_Iceland/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Iceland -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Ireland/Makefile =================================================================== --- devel/pear-Date_Holidays_Ireland/Makefile +++ devel/pear-Date_Holidays_Ireland/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Ireland -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Italy/Makefile =================================================================== --- devel/pear-Date_Holidays_Italy/Makefile +++ devel/pear-Date_Holidays_Italy/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Italy -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Japan/Makefile =================================================================== --- devel/pear-Date_Holidays_Japan/Makefile +++ devel/pear-Date_Holidays_Japan/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Japan -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Netherlands/Makefile =================================================================== --- devel/pear-Date_Holidays_Netherlands/Makefile +++ devel/pear-Date_Holidays_Netherlands/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in the Netherlands -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS:= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Norway/Makefile =================================================================== --- devel/pear-Date_Holidays_Norway/Makefile +++ devel/pear-Date_Holidays_Norway/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Norway -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_PHPdotNet/Makefile =================================================================== --- devel/pear-Date_Holidays_PHPdotNet/Makefile +++ devel/pear-Date_Holidays_PHPdotNet/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate birthdays of members of PHP.net -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Romania/Makefile =================================================================== --- devel/pear-Date_Holidays_Romania/Makefile +++ devel/pear-Date_Holidays_Romania/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Romania -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Slovenia/Makefile =================================================================== --- devel/pear-Date_Holidays_Slovenia/Makefile +++ devel/pear-Date_Holidays_Slovenia/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Slovenia -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Sweden/Makefile =================================================================== --- devel/pear-Date_Holidays_Sweden/Makefile +++ devel/pear-Date_Holidays_Sweden/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in Sweden -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_UNO/Makefile =================================================================== --- devel/pear-Date_Holidays_UNO/Makefile +++ devel/pear-Date_Holidays_UNO/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in the UNO -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_USA/Makefile =================================================================== --- devel/pear-Date_Holidays_USA/Makefile +++ devel/pear-Date_Holidays_USA/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in the USA -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-Date_Holidays_Ukraine/Makefile =================================================================== --- devel/pear-Date_Holidays_Ukraine/Makefile +++ devel/pear-Date_Holidays_Ukraine/Makefile @@ -7,8 +7,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Driver based class to calculate holidays in the Ukraine -BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays -RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays +BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:devel/pear-Date_Holidays@${PHP_FLAVOR} USES= pear Index: devel/pear-FSM/Makefile =================================================================== --- devel/pear-FSM/Makefile +++ devel/pear-FSM/Makefile @@ -13,6 +13,6 @@ USES= pear -PEAR_GRAPGHVIZ_RUN_DEPENDS= ${PEARDIR}/GraphViz.php:graphics/pear-Image_GraphViz +PEAR_GRAPGHVIZ_RUN_DEPENDS= ${PEARDIR}/GraphViz.php:graphics/pear-Image_GraphViz@${PHP_FLAVOR} .include Index: devel/pear-File_Iterator/Makefile =================================================================== --- devel/pear-File_Iterator/Makefile +++ devel/pear-File_Iterator/Makefile @@ -4,7 +4,7 @@ PORTNAME= File_Iterator DISTVERSION= 1.4.5 CATEGORIES= devel www pear -PKGNAMEPREFIX= pear- +PKGNAMEPREFIX= ${PEAR_PKGNAMEPREFIX} MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR FileIterator implementation @@ -12,9 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= pear-channel-phpunit>=20110327:devel/pear-channel-phpunit -RUN_DEPENDS= pear-channel-phpunit>=20110327:devel/pear-channel-phpunit - +USES= pear:env +PEAR_CHANNEL= phpunit USE_GITHUB= yes GH_ACCOUNT= sebastianbergmann GH_PROJECT= php-file-iterator Index: devel/pear-HTML_BBCodeParser/Makefile =================================================================== --- devel/pear-HTML_BBCodeParser/Makefile +++ devel/pear-HTML_BBCodeParser/Makefile @@ -8,8 +8,8 @@ MAINTAINER= lewiz@compsoc.man.ac.uk COMMENT= Parser to replace UBB style tags with their HTML equivalents -BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common -RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common +BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_CSS/Makefile =================================================================== --- devel/pear-HTML_CSS/Makefile +++ devel/pear-HTML_CSS/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR class for generating CSS declarations -BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common -RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common +BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_Page2/Makefile =================================================================== --- devel/pear-HTML_Page2/Makefile +++ devel/pear-HTML_Page2/Makefile @@ -9,8 +9,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR base class for XHTML page generation -BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common -RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common +BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm/Makefile =================================================================== --- devel/pear-HTML_QuickForm/Makefile +++ devel/pear-HTML_QuickForm/Makefile @@ -10,8 +10,8 @@ LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common -RUN_DEPENDS:= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common +BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm2/Makefile =================================================================== --- devel/pear-HTML_QuickForm2/Makefile +++ devel/pear-HTML_QuickForm2/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PHP5 rewrite of the HTML_QuickForm package -BUILD_DEPENDS= ${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2 -RUN_DEPENDS= ${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2 +BUILD_DEPENDS= ${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/Common2.php:devel/pear-HTML_Common2@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm_Controller/Makefile =================================================================== --- devel/pear-HTML_QuickForm_Controller/Makefile +++ devel/pear-HTML_QuickForm_Controller/Makefile @@ -10,8 +10,8 @@ LICENSE= PHP301 -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm -RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm_Livesearch/Makefile =================================================================== --- devel/pear-HTML_QuickForm_Livesearch/Makefile +++ devel/pear-HTML_QuickForm_Livesearch/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Element for PEAR::HTML_QuickForm to enable a suggest search -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX -RUN_DEPENDS:= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX@${PHP_FLAVOR} +RUN_DEPENDS:= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/HTML/AJAX.php:www/pear-HTML_AJAX@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile =================================================================== --- devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile +++ devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile @@ -8,8 +8,8 @@ MAINTAINER= chris@smartt.com COMMENT= Implementation of Tableless Renderer for HTML_QuickForm -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm -RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm_SelectFilter/Makefile =================================================================== --- devel/pear-HTML_QuickForm_SelectFilter/Makefile +++ devel/pear-HTML_QuickForm_SelectFilter/Makefile @@ -9,8 +9,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Element for PEAR::HTML_QuickForm that defines dynamic filters -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm -RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_QuickForm_advmultiselect/Makefile =================================================================== --- devel/pear-HTML_QuickForm_advmultiselect/Makefile +++ devel/pear-HTML_QuickForm_advmultiselect/Makefile @@ -8,10 +8,10 @@ MAINTAINER= chris@ctgameinfo.com COMMENT= Element for PEAR::HTML_QuickForm that defines a 2 box multi-select -BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common -RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm \ - ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common +BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:devel/pear-HTML_QuickForm@${PHP_FLAVOR} \ + ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_Select/Makefile =================================================================== --- devel/pear-HTML_Select/Makefile +++ devel/pear-HTML_Select/Makefile @@ -8,8 +8,8 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR::HTML_Select is a class for generating HTML form select elements -BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common -RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common +BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} +RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:devel/pear-HTML_Common@${PHP_FLAVOR} USES= pear Index: devel/pear-HTML_Select_Common/Makefile =================================================================== --- devel/pear-HTML_Select_Common/Makefile +++ devel/pear-HTML_Select_Common/Makefile @@ -8,10 +8,10 @@ MAINTAINER= joneum@FreeBSD.org COMMENT= Some small PEAR classes to handle common