Index: Mk/Uses/php.mk =================================================================== --- Mk/Uses/php.mk +++ Mk/Uses/php.mk @@ -4,7 +4,17 @@ # # Feature: php # Usage: USES=php -# Valid ARGS: (none) +# Valid ARGS: (none), phpize, ext, zend, build, cli, cgi, mod, web, embed +# +# - phpize : Use to build a PHP extension. +# - ext : Use to build, install and register a PHP extension. +# - zend : Use to build, install and register a Zend extension. +# - build : Set PHP also as a build dependency. +# - cli : Want the CLI version of PHP. +# - cgi : Want the CGI version of PHP. +# - mod : Want the Apache Module for PHP. +# - web : Want the Apache Module or the CGI version of PHP. +# - embed : Want the embedded library version of PHP. # # If the port requires a predefined set of PHP extensions, they can be # listed in this way: @@ -15,15 +25,6 @@ # # 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. -# USE_PHPIZE=yes - Use to build a PHP extension. -# USE_PHPEXT=yes - Use to build, install and register a PHP extension. -# USE_ZENDEXT=yes - Use to build, install and register a Zend extension. -# USE_PHP_BUILD=yes - Set PHP also as a build dependency. -# WANT_PHP_CLI=yes - Want the CLI version of PHP. -# WANT_PHP_CGI=yes - Want the CGI version of PHP. -# WANT_PHP_MOD=yes - Want the Apache Module for PHP. -# WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP. -# WANT_PHP_EMB=yes - Want the embedded library version of PHP. # # You may combine multiple WANT_PHP_* knobs. # Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI. @@ -43,6 +44,44 @@ 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 +. if defined(USE_PHPEXT) && empty(php_ARGS:Mext) +php_ARGS+= ext +. endif +. if defined(USE_ZENDEXT) && empty(php_ARGS:Mzend) +php_ARGS+= zend +. endif +. if defined(USE_PHP_BUILD) && empty(php_ARGS:Mbuild) +php_ARGS+= build +. endif +. if defined(WANT_PHP_CLI) && empty(php_ARGS:Mcli) +php_ARGS+= cli +. endif +. if defined(WANT_PHP_CGI) && empty(php_ARGS:Mcgi) +php_ARGS+= cgi +. endif +. if defined(WANT_PHP_MOD) && empty(php_ARGS:Mmod) +php_ARGS+= mod +. endif +. if defined(WANT_PHP_WEB) && empty(php_ARGS:Mweb) +php_ARGS+= web +. endif +. if defined(WANT_PHP_EMB) && empty(php_ARGS:Membed) +php_ARGS+= embed +. endif + +. 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: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 +. if ${php_ARGS:Mext} && ${php_ARGS:Mzend} +DEV_WARNING+= "USES=php:ext is included in USES=php:zend, so it is not needed" +. endif + PHPBASE?= ${LOCALBASE} . if exists(${PHPBASE}/etc/php.conf) .include "${PHPBASE}/etc/php.conf" @@ -98,16 +137,16 @@ . endfor . endif -. if defined(WANT_PHP_WEB) -. if defined(WANT_PHP_CGI) || defined(WANT_PHP_MOD) +. if ${php_ARGS:Mweb} +. if ${php_ARGS:Mcgi} || ${php_ARGS:Mmod} check-makevars:: - @${ECHO_CMD} "If you define WANT_PHP_WEB you cannot set also WANT_PHP_CGI" - @${ECHO_CMD} "or WANT_PHP_MOD. Use only one of them." + @${ECHO_CMD} "If you use :web you cannot also use :cgi" + @${ECHO_CMD} "or :mod. Use only one of them." @${FALSE} . endif . endif -. if defined(WANT_PHP_CGI) +. if ${php_ARGS:Mcgi} . if defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "" check-makevars:: @${ECHO_CMD} "This port requires the CGI version of PHP, but you have already" @@ -116,7 +155,7 @@ . endif . endif -. if defined(WANT_PHP_CLI) +. if ${php_ARGS:Mcli} . if defined(PHP_VERSION) && ${PHP_SAPI:Mcli} == "" check-makevars:: @${ECHO_CMD} "This port requires the CLI version of PHP, but you have already" @@ -125,7 +164,7 @@ . endif . endif -. if defined(WANT_PHP_EMB) +. if ${php_ARGS:Membed} . if defined(PHP_VERSION) && ${PHP_SAPI:Membed} == "" check-makevars:: @${ECHO_CMD} "This port requires the embedded library version of PHP, but you have already" @@ -137,11 +176,11 @@ PHP_PORT?= lang/php${PHP_VER} MOD_PHP_PORT?= www/mod_php${PHP_VER} -. if defined(USE_PHP_BUILD) +. if ${php_ARGS:Mbuild} BUILD_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} . endif RUN_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} -. if defined(WANT_PHP_MOD) || (defined(WANT_PHP_WEB) && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "") +. if ${php_ARGS:Mmod} || (${php_ARGS:Mweb} && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "") USE_APACHE_RUN= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" RUN_DEPENDS+= ${PHPBASE}/${APACHEMODDIR}/libphp5.so:${MOD_PHP_PORT} @@ -150,7 +189,7 @@ PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR} SUB_LIST+= PHP_EXT_DIR=${PHP_EXT_DIR} -. if defined(USE_PHPIZE) || defined(USE_PHPEXT) || defined(USE_ZENDEXT) +. if ${php_ARGS:Mphpize} || ${php_ARGS:Mext} || ${php_ARGS:Mzend} BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PHP_PORT} GNU_CONFIGURE= yes USE_AUTOTOOLS+= autoconf:env @@ -172,7 +211,7 @@ _INCLUDE_USES_PHP_POST_MK=yes -. if (defined(USE_PHPEXT) || defined(USE_ZENDEXT)) +. if ${php_ARGS:Mext} || ${php_ARGS:Mzend} PHP_MODNAME?= ${PORTNAME} PHP_HEADER_DIRS?= "" @@ -206,7 +245,7 @@ >> ${TMPPLIST} @${ECHO_CMD} "@dir etc/php" \ >> ${TMPPLIST} -. if defined(USE_ZENDEXT) +. if ${php_ARGS:Mzend} @${ECHO_CMD} "@exec echo zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \ >> ${TMPPLIST} . else @@ -215,7 +254,7 @@ . endif @${ECHO_CMD} "@unexec cp %D/etc/php/extensions.ini %D/etc/php/extensions.ini.orig" \ >> ${TMPPLIST} -. if defined(USE_ZENDEXT) +. if ${php_ARGS:Mzend} @${ECHO_CMD} "@unexec grep -v zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}\\\.so %D/etc/php/extensions.ini.orig > %D/etc/php/extensions.ini || true" \ >> ${TMPPLIST} . else @@ -235,7 +274,7 @@ @${ECHO_CMD} "The following line has been added to your ${PREFIX}/etc/php/extensions.ini" @${ECHO_CMD} "configuration file to automatically load the installed extension:" @${ECHO_CMD} "" -. if defined(USE_ZENDEXT) +. if ${php_ARGS:Mzend} @${ECHO_CMD} "zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" . else @${ECHO_CMD} "extension=${PHP_MODNAME}.so" @@ -245,7 +284,7 @@ . endif # Extensions -. if ${USE_PHP:tl} != "yes" +. if defined(USE_PHP) && ${USE_PHP:tl} != "yes" # non-version specific components _USE_PHP_ALL= apc bcmath bitset bz2 calendar ctype curl dba dom \ exif fileinfo filter ftp gd gettext gmp \ @@ -297,7 +336,6 @@ mbstring_DEPENDS= converters/php${PHP_VER}-mbstring mcrypt_DEPENDS= security/php${PHP_VER}-mcrypt memcache_DEPENDS= databases/pecl-memcache -mhash_DEPENDS= security/php${PHP_VER}-mhash mssql_DEPENDS= databases/php${PHP_VER}-mssql mysql_DEPENDS= databases/php${PHP_VER}-mysql mysqli_DEPENDS= databases/php${PHP_VER}-mysqli @@ -347,23 +385,18 @@ zlib_DEPENDS= archivers/php${PHP_VER}-zlib . for extension in ${USE_PHP} -. if ${_USE_PHP_VER${PHP_VER}:M${extension}} != "" -. if ${PHP_EXT_INC:M${extension}} == "" -. if defined(USE_PHP_BUILD) -BUILD_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS} +ext= ${extension} +. if ${_USE_PHP_VER${PHP_VER}:M${ext:S/:build//}} != "" +. if ${PHP_EXT_INC:M${ext:S/:build//}} == "" +. if !empty(php_ARGS:Mbuild) || !empty(extension:M*\:build) +BUILD_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS} . endif -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS} +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS} . endif . else -ext= ${extension} -. if ${ext} == "mhash" -. if defined(USE_PHP_BUILD) -BUILD_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${hash_DEPENDS} -. endif -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${hash_DEPENDS} -. elif ${ext:tl} != "yes" +. if ${ext:tl} != "yes" check-makevars:: - @${ECHO_CMD} "Unknown extension ${extension} for PHP ${PHP_VER}." + @${ECHO_CMD} "Unknown extension ${extension:S/:build//} for PHP ${PHP_VER}." @${FALSE} . endif . endif Index: Mk/bsd.sanity.mk =================================================================== --- Mk/bsd.sanity.mk +++ Mk/bsd.sanity.mk @@ -177,7 +177,10 @@ PYDISTUTILS_AUTOPLIST PYTHON_PY3K_PLIST_HACK PYDISTUTILS_NOEGGINFO \ USE_PYTHON_PREFIX USE_BZIP2 USE_XZ USE_PGSQL NEED_ROOT \ UNIQUENAME LATEST_LINK USE_SQLITE USE_FIREBIRD -SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY USE_BDB USE_MYSQL WANT_MYSQL_VER +SANITY_DEPRECATED= PYTHON_PKGNAMESUFFIX USE_AUTOTOOLS PLIST_DIRSTRY \ + USE_BDB USE_MYSQL WANT_MYSQL_VER USE_PHPIZE USE_PHPEXT \ + USE_ZENDEXT USE_PHP_BUILD WANT_PHP_CLI WANT_PHP_CGI \ + WANT_PHP_MOD WANT_PHP_WEB WANT_PHP_EMB SANITY_NOTNEEDED= WX_UNICODE USE_AUTOTOOLS_ALT= USES=autoreconf and GNU_CONFIGURE=yes @@ -221,6 +224,15 @@ USE_BDB_ALT= USES=bdb:${USE_BDB} USE_MYSQL_ALT= USES=mysql:${USE_MYSQL} WANT_MYSQL_VER_ALT= USES=mysql:${WANT_MYSQL_VER} +USE_PHPIZE_ALT= USES=php:phpize +USE_PHPEXT_ALT= USES=php:ext +USE_ZENDEXT_ALT= USES=php:zend +USE_PHP_BUILD_ALT= USES=php:build +WANT_PHP_CLI_ALT= USES=php:cli +WANT_PHP_CGI_ALT= USES=php:cgi +WANT_PHP_MOD_ALT= USES=php:mod +WANT_PHP_WEB_ALT= USES=php:web +WANT_PHP_EMB_ALT= USES=php:embed .for a in ${SANITY_DEPRECATED} .if defined(${a}) Index: archivers/pecl-lzf/Makefile =================================================================== --- archivers/pecl-lzf/Makefile +++ archivers/pecl-lzf/Makefile @@ -14,9 +14,7 @@ LICENSE= PHP202 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz CONFIGURE_ARGS= --enable-lzf WRKSRC= ${WRKDIR}/${DISTNAME:tu} Index: archivers/pecl-phk/Makefile =================================================================== --- archivers/pecl-phk/Makefile +++ archivers/pecl-phk/Makefile @@ -15,10 +15,8 @@ BROKEN_powerpc64= Does not build -USES= tar:tgz -USE_PHP= hash -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= hash:build IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-phk Index: archivers/pecl-rar/Makefile =================================================================== --- archivers/pecl-rar/Makefile +++ archivers/pecl-rar/Makefile @@ -13,10 +13,8 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= spl -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext tar:tgz +USE_PHP= spl:build IGNORE_WITH_PHP= 70 Index: archivers/php-horde_lz4/Makefile =================================================================== --- archivers/php-horde_lz4/Makefile +++ archivers/php-horde_lz4/Makefile @@ -12,8 +12,7 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Horde LZ4 Compression Extension for php -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-horde_lz4 Index: archivers/php5-snappy/Makefile =================================================================== --- archivers/php5-snappy/Makefile +++ archivers/php5-snappy/Makefile @@ -17,8 +17,7 @@ LIB_DEPENDS+= libsnappy.so:archivers/snappy CONFIGURE_ARGS+= --with-snappy-includedir=${LOCALBASE}/include -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext PHP_MODNAME= snappy WRKSRC= ${WRKDIR}/${PROJECTHOST} OPTIONS_DEFINE= TEST Index: benchmarks/phoronix-test-suite/Makefile =================================================================== --- benchmarks/phoronix-test-suite/Makefile +++ benchmarks/phoronix-test-suite/Makefile @@ -12,11 +12,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +USES= php:cli,build USE_GCC= any USE_PHP= ctype curl dom filter gd hash json openssl pcntl posix session \ simplexml sockets sqlite3 zip zlib -USE_PHP_BUILD= yes -WANT_PHP_CLI= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/phoronix-test-suite Index: chinese/php-cconv/Makefile =================================================================== --- chinese/php-cconv/Makefile +++ chinese/php-cconv/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libcconv.so:chinese/cconv CONFIGURE_ARGS= --with-cconv-dir=${LOCALBASE} -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 post-patch: Index: converters/pecl-fribidi/Makefile =================================================================== --- converters/pecl-fribidi/Makefile +++ converters/pecl-fribidi/Makefile @@ -14,9 +14,7 @@ LIB_DEPENDS= libfribidi.so:converters/fribidi -USES= pkgconfig tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext pkgconfig tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-fribidi=${LOCALBASE} Index: converters/pecl-igbinary/Makefile =================================================================== --- converters/pecl-igbinary/Makefile +++ converters/pecl-igbinary/Makefile @@ -18,10 +18,7 @@ BROKEN_powerpc64= does not build IGNORE_WITH_PHP=70 -USE_PHP= session -USE_PHP_BUILD= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USES= tar:tgz +USE_PHP= session:build +USES= php:ext tar:tgz .include Index: converters/php5-bsdconv/Makefile =================================================================== --- converters/php5-bsdconv/Makefile +++ converters/php5-bsdconv/Makefile @@ -17,11 +17,7 @@ GH_ACCOUNT= buganini GH_PROJECT= php-${PORTNAME} -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes -PHP_MODNAME= ${PORTNAME} +USES= php:ext IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-bsdconv=${LOCALBASE} Index: databases/pecl-chdb/Makefile =================================================================== --- databases/pecl-chdb/Makefile +++ databases/pecl-chdb/Makefile @@ -16,11 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcmph.so:devel/cmph RUN_DEPENDS= ${LOCALBASE}/lib/libcmph.so:devel/cmph -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= chdb +USES= php:ext IGNORE_WITH_PHP= 70 CFLAGS+= -L${LOCALBASE}/lib Index: databases/pecl-dbase/Makefile =================================================================== --- databases/pecl-dbase/Makefile +++ databases/pecl-dbase/Makefile @@ -14,8 +14,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: databases/pecl-drizzle/Makefile =================================================================== --- databases/pecl-drizzle/Makefile +++ databases/pecl-drizzle/Makefile @@ -15,9 +15,7 @@ LIB_DEPENDS= libdrizzle.so:databases/libdrizzle -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 OPTIONS_DEFINE= DOCS EXAMPLES Index: databases/pecl-leveldb/Makefile =================================================================== --- databases/pecl-leveldb/Makefile +++ databases/pecl-leveldb/Makefile @@ -15,11 +15,7 @@ LIB_DEPENDS= libleveldb.so:databases/leveldb -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes -USE_PHPIZE= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: databases/pecl-mdbtools/Makefile =================================================================== --- databases/pecl-mdbtools/Makefile +++ databases/pecl-mdbtools/Makefile @@ -17,10 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libmdb.a:databases/mdbtools RUN_DEPENDS= ${LOCALBASE}/lib/libmdb.a:databases/mdbtools -USES= pkgconfig tar:tgz -USE_PHP= yes -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext pkgconfig tar:tgz IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS= --with-mdbtools=${LOCALBASE} Index: databases/pecl-memcache/Makefile =================================================================== --- databases/pecl-memcache/Makefile +++ databases/pecl-memcache/Makefile @@ -21,11 +21,8 @@ CONFIGURE_ARGS= --with-zlib-dir=/usr IGNORE_WITH_PHP=70 USE_CSTD= gnu89 -USE_PHP= zlib session -USE_PHP_BUILD= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USES= dos2unix tar:tgz +USE_PHP= zlib:build session:build +USES= dos2unix php:ext tar:tgz post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ Index: databases/pecl-memcached/Makefile =================================================================== --- databases/pecl-memcached/Makefile +++ databases/pecl-memcached/Makefile @@ -24,11 +24,8 @@ CONFIGURE_ARGS= --with-libmemcached-dir=${LOCALBASE} IGNORE_WITH_PHP=70 -USE_PHP= json session -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes -USES= pkgconfig tar:tgz +USE_PHP= json:build session:build +USES= php:ext pkgconfig tar:tgz IGBINARY_CONFIGURE_ENABLE= memcached-igbinary IGBINARY_USE= PHP=igbinary Index: databases/pecl-mongo/Makefile =================================================================== --- databases/pecl-mongo/Makefile +++ databases/pecl-mongo/Makefile @@ -15,10 +15,8 @@ BUILD_DEPENDS= re2c>=0.13.4:devel/re2c -USES= tar:tgz -USE_PHP= spl -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= spl:build CONFIGURE_ARGS= --enable-mongo SUB_FILES= pkg-message IGNORE_WITH_PHP= 70 Index: databases/pecl-mongodb/Makefile =================================================================== --- databases/pecl-mongodb/Makefile +++ databases/pecl-mongodb/Makefile @@ -12,9 +12,7 @@ LICENSE= APACHE20 -USES= tar:tgz -USE_PHP= spl -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= spl:build .include Index: databases/pecl-mysqlnd_ms/Makefile =================================================================== --- databases/pecl-mysqlnd_ms/Makefile +++ databases/pecl-mysqlnd_ms/Makefile @@ -12,10 +12,8 @@ MAINTAINER= johnpupu@gmail.com COMMENT= Replication and load balancing plugin for mysqlnd -USE_PHP= json -USE_PHP_BUILD= yes -USE_PHPEXT= yes -USE_PHPIZE= yes +USES= php:ext +USE_PHP= json:build IGNORE_WITH_PHP= 56 70 .include Index: databases/pecl-mysqlnd_qc/Makefile =================================================================== --- databases/pecl-mysqlnd_qc/Makefile +++ databases/pecl-mysqlnd_qc/Makefile @@ -12,9 +12,7 @@ MAINTAINER= johnpupu@gmail.com COMMENT= Query cache plugin for mysqlnd -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes +USES= php:ext IGNORE_WITH_PHP= 56 70 .include Index: databases/pecl-pdo_user/Makefile =================================================================== --- databases/pecl-pdo_user/Makefile +++ databases/pecl-pdo_user/Makefile @@ -17,11 +17,8 @@ WRKSRC= ${WRKDIR}/PDO_USER-${PORTVERSION} -USE_PHP= pdo -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= pdo_user +USES= php:ext +USE_PHP= pdo:build IGNORE_WITH_PHP= 70 .include Index: databases/pecl-rrd/Makefile =================================================================== --- databases/pecl-rrd/Makefile +++ databases/pecl-rrd/Makefile @@ -18,8 +18,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: databases/pecl-tokyo_tyrant/Makefile =================================================================== --- databases/pecl-tokyo_tyrant/Makefile +++ databases/pecl-tokyo_tyrant/Makefile @@ -17,11 +17,8 @@ LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant -USES= pkgconfig tar:tgz -USE_PHP= session -USE_PHP_BUILD= spl -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext pkgconfig tar:tgz +USE_PHP= session:build IGNORE_WITH_PHP= 70 .include Index: databases/php-adodb-ext/Makefile =================================================================== --- databases/php-adodb-ext/Makefile +++ databases/php-adodb-ext/Makefile @@ -14,17 +14,14 @@ WRKSRC= ${WRKDIR}/adodb-${PORTVERSION:S/.//} -USES= dos2unix zip -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= adodb +USES= dos2unix php:ext zip IGNORE_WITH_PHP=56 70 SUB_FILES= pkg-message .include -.if ${PHP_VER} == "5" || ${PHP_VER} == "54" || ${PHP_VER} == "55" +.if ${PHP_VER} == "55" EXTRA_PATCHES= ${PATCHDIR}/extra-patch-php54-adodb.c .endif Index: databases/php-mdcached/Makefile =================================================================== --- databases/php-mdcached/Makefile +++ databases/php-mdcached/Makefile @@ -15,10 +15,9 @@ LIB_DEPENDS= libmdcached.so:databases/mdcached -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-mdcached -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}/client_php/${PORTNAME} +WRKSRC_SUBDIR= ${PORTNAME}/client_php/${PORTNAME} .include Index: databases/php5-pdo_cassandra/Makefile =================================================================== --- databases/php5-pdo_cassandra/Makefile +++ databases/php5-pdo_cassandra/Makefile @@ -21,11 +21,9 @@ GH_PROJECT= php-${PORTNAME} GH_TAGNAME= 7debd5b -USES= compiler:c++11-lib pkgconfig +USES= compiler:c++11-lib php:ext pkgconfig USE_CXXSTD= c++11 -USE_PHP_BUILD= yes -USE_PHP= pdo -USE_PHPEXT= yes +USE_PHP= pdo:build IGNORE_WITH_PHP= 70 Index: databases/php5-tarantool/Makefile =================================================================== --- databases/php5-tarantool/Makefile +++ databases/php5-tarantool/Makefile @@ -9,12 +9,9 @@ MAINTAINER= vg@FreeBSD.org COMMENT= PECL PHP driver for Tarantool/Box +USES= php:ext USE_GITHUB= yes -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -PHP_MODNAME= ${PORTNAME} GH_PROJECT= ${PORTNAME}-php GH_TAGNAME= c1c5d5f TR_VER= 20151222 Index: databases/php55-redis/Makefile =================================================================== --- databases/php55-redis/Makefile +++ databases/php55-redis/Makefile @@ -17,21 +17,18 @@ GH_ACCOUNT= nicolasff GH_PROJECT= phpredis -USE_PHP= session -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext +USE_PHP= session:build PHP_DEFAULT= 5.5 IGNORE_WITH_PHP= 56 70 -PHP_MODNAME= redis - OPTIONS_DEFINE= IGBINARY IGBINARY_DESC= Build with Igbinary serializer .include .if ${PORT_OPTIONS:MIGBINARY} -USE_PHP+= igbinary +USE_PHP+= igbinary:build CONFIGURE_ARGS+=--enable-redis-igbinary .else CONFIGURE_ARGS+=--disable-redis-igbinary Index: databases/php56-redis/Makefile =================================================================== --- databases/php56-redis/Makefile +++ databases/php56-redis/Makefile @@ -13,9 +13,8 @@ BROKEN_powerpc64= Does not build -USE_PHP= session -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext +USE_PHP= session:build PHP_DEFAULT= 5.6 IGNORE_WITH_PHP= 55 70 @@ -23,8 +22,6 @@ GH_ACCOUNT= nicolasff GH_PROJECT= phpredis -PHP_MODNAME= redis - OPTIONS_DEFINE= IGBINARY IGBINARY_DESC= Build with Igbinary serializer Index: databases/vfront/Makefile =================================================================== --- databases/vfront/Makefile +++ databases/vfront/Makefile @@ -17,7 +17,7 @@ NO_ARCH= yes PLIST= ${WRKDIR}/pkg-plist -USE_PHP= yes +USES= php OPTIONS_MULTI= database OPTIONS_MULTI_database= MYSQL PGSQL Index: databases/xapian-bindings/Makefile =================================================================== --- databases/xapian-bindings/Makefile +++ databases/xapian-bindings/Makefile @@ -34,7 +34,7 @@ LUA_USES= lua PHP_CONFIGURE_ENV= PHP_CONFIG=${LOCALBASE}/bin/php-config PHP_CONFIGURE_WITH= php -PHP_USE= PHP=yes PHP_BUILD=yes +PHP_USES= php:build PYTHON_CONFIGURE_ENV= PYTHON_LIB=${PYTHON_SITELIBDIR} PYTHON_CONFIGURE_WITH= python PYTHON_USES= python:2 Index: devel/ioncube/Makefile =================================================================== --- devel/ioncube/Makefile +++ devel/ioncube/Makefile @@ -15,7 +15,7 @@ ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes -USE_PHP= yes +USES= php SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME} Index: devel/pear-Horde_Nls/Makefile =================================================================== --- devel/pear-Horde_Nls/Makefile +++ devel/pear-Horde_Nls/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= GEOIP GEOIP_DESC= Depend on geoip PHP extension -GEOIP_USE= PHP=yes +GEOIP_USES= php GEOIP_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:net/pecl-geoip .include Index: devel/pear-VersionControl_SVN/Makefile =================================================================== --- devel/pear-VersionControl_SVN/Makefile +++ devel/pear-VersionControl_SVN/Makefile @@ -13,7 +13,6 @@ BUILD_DEPENDS= pear-XML_Parser>=1.3.4:devel/pear-XML_Parser RUN_DEPENDS= pear-XML_Parser>=1.3.4:devel/pear-XML_Parser -USE_PHP= yes USES= pear .include Index: devel/pear/Makefile =================================================================== --- devel/pear/Makefile +++ devel/pear/Makefile @@ -13,14 +13,12 @@ BROKEN_powerpc64= Does not build -USES= cpe tar:bzip2 +USES= cpe php:cli tar:bzip2 CPE_VENDOR= php NO_BUILD= yes NO_ARCH= yes -WANT_PHP_CLI= yes -USE_PHP= pcre xml zlib -USE_PHP_BUILD= yes +USE_PHP= pcre:build xml:build zlib:build PEARDIR= ${PREFIX}/share/pear Index: devel/pecl-APCu/Makefile =================================================================== --- devel/pecl-APCu/Makefile +++ devel/pecl-APCu/Makefile @@ -17,13 +17,8 @@ CONFLICTS= pecl-APC-[0-9]* CFLAGS+= -I${LOCALBASE}/include -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes IGNORE_WITH_PHP= 70 -USES= tar:tgz +USES= php:ext tar:tgz PHP_MODNAME= ${PORTNAME:tl} -WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${PORTVERSION} .include Index: devel/pecl-automap/Makefile =================================================================== --- devel/pecl-automap/Makefile +++ devel/pecl-automap/Makefile @@ -13,11 +13,8 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= spl -USE_PHP_BUILD= yes -USE_PHPEXT= yes -PHP_MODNAME= automap +USES= php:ext tar:tgz +USE_PHP= spl:build IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS= --enable-automap Index: devel/pecl-bbcode/Makefile =================================================================== --- devel/pecl-bbcode/Makefile +++ devel/pecl-bbcode/Makefile @@ -14,10 +14,7 @@ LICENSE= PHP301 BSD3CLAUSE LICENSE_COMB= multi -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS= --enable-bbcode Index: devel/pecl-bcompiler/Makefile =================================================================== --- devel/pecl-bcompiler/Makefile +++ devel/pecl-bcompiler/Makefile @@ -13,9 +13,8 @@ LICENSE= PHP202 -USES= tar:tgz -USE_PHP= bz2 -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= bz2:build IGNORE_WITH_PHP=56 70 CONFIGURE_ARGS= --enable-bcompiler Index: devel/pecl-dio/Makefile =================================================================== --- devel/pecl-dio/Makefile +++ devel/pecl-dio/Makefile @@ -13,8 +13,7 @@ LICENSE= PHP30 -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/pecl-eio/Makefile =================================================================== --- devel/pecl-eio/Makefile +++ devel/pecl-eio/Makefile @@ -15,8 +15,7 @@ LICENSE= PHP301 CONFIGURE_ARGS= --enable-eio -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/pecl-ev/Makefile =================================================================== --- devel/pecl-ev/Makefile +++ devel/pecl-ev/Makefile @@ -15,11 +15,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-event/Makefile =================================================================== --- devel/pecl-event/Makefile +++ devel/pecl-event/Makefile @@ -18,11 +18,9 @@ BROKEN_powerpc64= does not build -USES= tar:tgz +USES= php:ext tar:tgz USE_OPENSSL= yes CONFIGURE_ARGS= --with-openssl-dir=${OPENSSLBASE} -USE_PHP= sockets -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USE_PHP= sockets:build .include Index: devel/pecl-expect/Makefile =================================================================== --- devel/pecl-expect/Makefile +++ devel/pecl-expect/Makefile @@ -16,9 +16,7 @@ LIB_DEPENDS= libexpect.so:lang/expect -USES= tar:tgz tcl:86 -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz tcl:86 IGNORE_WITH_PHP= 70 CFLAGS+= -I${TCL_INCLUDEDIR} Index: devel/pecl-gearman/Makefile =================================================================== --- devel/pecl-gearman/Makefile +++ devel/pecl-gearman/Makefile @@ -15,11 +15,8 @@ LIB_DEPENDS= libgearman.so:devel/gearmand -USES= tar:tgz +USES= php:ext tar:tgz CONFIGURE_ARGS= --with-gearman -PHP_MODNAME= ${PORTNAME} -USE_PHP= yes -USE_PHPEXT= yes IGNORE_WITH_PHP= 70 .include Index: devel/pecl-hidef/Makefile =================================================================== --- devel/pecl-hidef/Makefile +++ devel/pecl-hidef/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS= --enable-hidef Index: devel/pecl-hrtime/Makefile =================================================================== --- devel/pecl-hrtime/Makefile +++ devel/pecl-hrtime/Makefile @@ -13,8 +13,6 @@ LICENSE= BSD2CLAUSE -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz .include Index: devel/pecl-htscanner/Makefile =================================================================== --- devel/pecl-htscanner/Makefile +++ devel/pecl-htscanner/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP30 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-htscanner Index: devel/pecl-inotify/Makefile =================================================================== --- devel/pecl-inotify/Makefile +++ devel/pecl-inotify/Makefile @@ -17,10 +17,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/pecl-intl/Makefile =================================================================== --- devel/pecl-intl/Makefile +++ devel/pecl-intl/Makefile @@ -16,9 +16,7 @@ LIB_DEPENDS= libicui18n.so:devel/icu -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-jsmin/Makefile =================================================================== --- devel/pecl-jsmin/Makefile +++ devel/pecl-jsmin/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-json_post/Makefile =================================================================== --- devel/pecl-json_post/Makefile +++ devel/pecl-json_post/Makefile @@ -16,9 +16,7 @@ BROKEN_powerpc64= Does not build -USES= tar:tgz -USE_PHP= json -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= json:build .include Index: devel/pecl-jsonc/Makefile =================================================================== --- devel/pecl-jsonc/Makefile +++ devel/pecl-jsonc/Makefile @@ -15,11 +15,9 @@ LIB_DEPENDS= libjson-c.so:devel/json-c -USES= pkgconfig tar:tgz +USES= php:ext pkgconfig tar:tgz CONFIGURE_ARGS= --with-jsonc --with-libjson MAKE_ARGS= EXTRA_CFLAGS=-DCOMPILE_DL_JSON=1 -USE_PHP= yes -USE_PHPEXT= yes IGNORE_WITH_PHP=70 CONFLICTS_INSTALL= php54-json-5* php55-json-5* php5-json-5* Index: devel/pecl-jsond/Makefile =================================================================== --- devel/pecl-jsond/Makefile +++ devel/pecl-jsond/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-jsonnet/Makefile =================================================================== --- devel/pecl-jsonnet/Makefile +++ devel/pecl-jsonnet/Makefile @@ -19,10 +19,8 @@ LIB_DEPENDS= libjsonnet.so:devel/jsonnet -USES= tar:tgz -USE_PHP= json -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext tar:tgz +USE_PHP= json:build CONFIGURE_ARGS= --with-jsonnet=${LOCALBASE} IGNORE_WITH_PHP= 70 Index: devel/pecl-judy/Makefile =================================================================== --- devel/pecl-judy/Makefile +++ devel/pecl-judy/Makefile @@ -19,8 +19,7 @@ BUILD_DEPENDS= Judy>=0:devel/judy CONFIGURE_ARGS= --with-judy=${LOCALBASE} -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/pecl-libevent/Makefile =================================================================== --- devel/pecl-libevent/Makefile +++ devel/pecl-libevent/Makefile @@ -15,13 +15,8 @@ LIB_DEPENDS= libevent.so:devel/libevent2 -USES= tar:tgz +USES= php:ext tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= libevent IGNORE_WITH_PHP= 70 .include Index: devel/pecl-mcve/Makefile =================================================================== --- devel/pecl-mcve/Makefile +++ devel/pecl-mcve/Makefile @@ -16,10 +16,8 @@ LIB_DEPENDS= libmonetra.so:devel/libmonetra -USES= tar:tgz +USES= php:ext tar:tgz USE_OPENSSL= yes -USE_PHP= yes -USE_PHPEXT= yes IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS+= --with-mcve="${LOCALBASE}" Index: devel/pecl-memoize/Makefile =================================================================== --- devel/pecl-memoize/Makefile +++ devel/pecl-memoize/Makefile @@ -14,9 +14,7 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz CONFIGURE_ARGS= --enable-memoize IGNORE_WITH_PHP= 70 Index: devel/pecl-msgpack/Makefile =================================================================== --- devel/pecl-msgpack/Makefile +++ devel/pecl-msgpack/Makefile @@ -15,10 +15,8 @@ BROKEN_powerpc64= Does not build -USES= tar:tgz -USE_PHP= session -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext tar:tgz +USE_PHP= session:build IGNORE_WITH_PHP= 70 .include Index: devel/pecl-ncurses/Makefile =================================================================== --- devel/pecl-ncurses/Makefile +++ devel/pecl-ncurses/Makefile @@ -14,11 +14,7 @@ LICENSE= PHP301 -USES= ncurses -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes -WANT_PHP_CLI= yes +USES= php:ext,cli ncurses IGNORE_WITH_PHP=70 .include Index: devel/pecl-newt/Makefile =================================================================== --- devel/pecl-newt/Makefile +++ devel/pecl-newt/Makefile @@ -13,12 +13,7 @@ LIB_DEPENDS= libnewt.so:devel/newt -USES= tar:tgz -USE_PHP= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes -PHP_MODNAME= newt +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 post-patch: Index: devel/pecl-operator/Makefile =================================================================== --- devel/pecl-operator/Makefile +++ devel/pecl-operator/Makefile @@ -13,10 +13,7 @@ LICENSE= PHP30 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PORTNAME} +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 post-extract:: Index: devel/pecl-params/Makefile =================================================================== --- devel/pecl-params/Makefile +++ devel/pecl-params/Makefile @@ -11,10 +11,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= PECL extension for a userspace equivalent of zend_parse_parameters() -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-params Index: devel/pecl-propro/Makefile =================================================================== --- devel/pecl-propro/Makefile +++ devel/pecl-propro/Makefile @@ -16,9 +16,7 @@ PORTSCOUT= limit:^1.* -USES= gmake tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= gmake php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-propro2/Makefile =================================================================== --- devel/pecl-propro2/Makefile +++ devel/pecl-propro2/Makefile @@ -16,9 +16,7 @@ PORTSCOUT= limit:^2.* -USES= gmake tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= gmake php:ext tar:tgz IGNORE_WITH_PHP= 55 56 CONFLICTS= pecl-propro-1* Index: devel/pecl-pthreads/Makefile =================================================================== --- devel/pecl-pthreads/Makefile +++ devel/pecl-pthreads/Makefile @@ -15,12 +15,7 @@ CFLAGS+= -I${LOCALBASE}/include -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= pthreads -USES= tar:tgz +USES= php:ext tar:tgz .include Index: devel/pecl-qb/Makefile =================================================================== --- devel/pecl-qb/Makefile +++ devel/pecl-qb/Makefile @@ -14,9 +14,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz USE_GCC= any IGNORE_WITH_PHP= 70 Index: devel/pecl-raphf/Makefile =================================================================== --- devel/pecl-raphf/Makefile +++ devel/pecl-raphf/Makefile @@ -16,9 +16,7 @@ PORTSCOUT= limit:^1.* -USES= gmake tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= gmake php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-raphf2/Makefile =================================================================== --- devel/pecl-raphf2/Makefile +++ devel/pecl-raphf2/Makefile @@ -16,9 +16,7 @@ PORTSCOUT= limit:^2.* -USES= gmake tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= gmake php:ext tar:tgz IGNORE_WITH_PHP= 55 56 CONFLICTS= pecl-raphf-1* Index: devel/pecl-runkit/Makefile =================================================================== --- devel/pecl-runkit/Makefile +++ devel/pecl-runkit/Makefile @@ -13,10 +13,7 @@ LICENSE= PHP30 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= runkit +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-runkit=classkit Index: devel/pecl-scream/Makefile =================================================================== --- devel/pecl-scream/Makefile +++ devel/pecl-scream/Makefile @@ -14,8 +14,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 test: build Index: devel/pecl-shape/Makefile =================================================================== --- devel/pecl-shape/Makefile +++ devel/pecl-shape/Makefile @@ -16,10 +16,7 @@ LIB_DEPENDS= libshp.so:devel/shapelib -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz PHP_MODNAME= shp IGNORE_WITH_PHP= 56 70 Index: devel/pecl-spl_types/Makefile =================================================================== --- devel/pecl-spl_types/Makefile +++ devel/pecl-spl_types/Makefile @@ -19,9 +19,7 @@ RE2C_RUN_DEPENDS= re2c:devel/re2c USE_PHP= spl -#USE_PHP_BUILD= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-spl-types Index: devel/pecl-spread/Makefile =================================================================== --- devel/pecl-spread/Makefile +++ devel/pecl-spread/Makefile @@ -17,9 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/sp.h:net/spread4 RUN_DEPENDS= ${LOCALBASE}/include/sp.h:net/spread4 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS+= --with-spread=${LOCALBASE} Index: devel/pecl-statgrab/Makefile =================================================================== --- devel/pecl-statgrab/Makefile +++ devel/pecl-statgrab/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libstatgrab0.so:devel/libstatgrab0 -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-statgrab=${LOCALBASE} Index: devel/pecl-strict/Makefile =================================================================== --- devel/pecl-strict/Makefile +++ devel/pecl-strict/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-svn/Makefile =================================================================== --- devel/pecl-svn/Makefile +++ devel/pecl-svn/Makefile @@ -16,9 +16,7 @@ LIB_DEPENDS= libsvn_client-1.so:devel/subversion18 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-swoole/Makefile =================================================================== --- devel/pecl-swoole/Makefile +++ devel/pecl-swoole/Makefile @@ -14,10 +14,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:tgz +USES= php:ext tar:tgz CFLAGS+= -I${LOCALBASE}/include -PHP_MODNAME= ${PORTNAME} USE_PHP= pcre -USE_PHPEXT= yes .include Index: devel/pecl-sync/Makefile =================================================================== --- devel/pecl-sync/Makefile +++ devel/pecl-sync/Makefile @@ -14,8 +14,7 @@ LICENSE= MIT -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/pecl-test_helpers/Makefile =================================================================== --- devel/pecl-test_helpers/Makefile +++ devel/pecl-test_helpers/Makefile @@ -14,13 +14,8 @@ LICENSE= BSD3CLAUSE CONFIGURE_ARGS= --enable-test-helpers -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USES= tar:tgz +USES= php:ext tar:tgz SUB_FILES= pkg-message IGNORE_WITH_PHP= 70 -PKGMESSAGE= ${WRKDIR}/pkg-message - .include Index: devel/pecl-trace/Makefile =================================================================== --- devel/pecl-trace/Makefile +++ devel/pecl-trace/Makefile @@ -13,14 +13,11 @@ LICENSE= APACHE20 -WRKSRC= ${WRKDIR}/${DISTNAME}/extension +WRKSRC_SUBDIR= extension CMDTOOLSRC= ${WRKSRC}/../cmdtool GNU_CONFIGURE= yes -USES= gmake shebangfix tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= gmake php:ext shebangfix tar:tgz IGNORE_WITH_PHP= 70 SHEBANG_FILES= ${CMDTOOLSRC}/phptrace Index: devel/pecl-uopz/Makefile =================================================================== --- devel/pecl-uopz/Makefile +++ devel/pecl-uopz/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/pecl-uploadprogress/Makefile =================================================================== --- devel/pecl-uploadprogress/Makefile +++ devel/pecl-uploadprogress/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-uploadprogress Index: devel/pecl-uri_template/Makefile =================================================================== --- devel/pecl-uri_template/Makefile +++ devel/pecl-uri_template/Makefile @@ -14,8 +14,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/pecl-uuid/Makefile =================================================================== --- devel/pecl-uuid/Makefile +++ devel/pecl-uuid/Makefile @@ -15,8 +15,6 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz .include Index: devel/pecl-vld/Makefile =================================================================== --- devel/pecl-vld/Makefile +++ devel/pecl-vld/Makefile @@ -13,9 +13,7 @@ LICENSE= BSD2CLAUSE -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-vld Index: devel/pecl-weakref/Makefile =================================================================== --- devel/pecl-weakref/Makefile +++ devel/pecl-weakref/Makefile @@ -15,10 +15,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CFLAGS+= -I${LOCALBASE}/include Index: devel/pecl-xhprof/Makefile =================================================================== --- devel/pecl-xhprof/Makefile +++ devel/pecl-xhprof/Makefile @@ -15,9 +15,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/extension -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext ONLY_FOR_ARCHS= i386 amd64 IGNORE_WITH_PHP= 70 Index: devel/pecl-yac/Makefile =================================================================== --- devel/pecl-yac/Makefile +++ devel/pecl-yac/Makefile @@ -14,9 +14,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 OPTIONS_DEFINE= MSGPACK Index: devel/pecl-zookeeper/Makefile =================================================================== --- devel/pecl-zookeeper/Makefile +++ devel/pecl-zookeeper/Makefile @@ -16,10 +16,8 @@ LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper -USE_PHP= session -USE_PHP_BUILD= session -USE_PHPEXT= yes -USES= tar:tgz +USE_PHP= session:build +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 post-install: Index: devel/php-jq/Makefile =================================================================== --- devel/php-jq/Makefile +++ devel/php-jq/Makefile @@ -17,11 +17,8 @@ GH_ACCOUNT= kjdev GH_PROJECT= php-ext-jq -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes IGNORE_WITH_PHP= 70 -USES= tar:tgz +USES= php:ext tar:tgz JQ_CMD= ${LOCALBASE}/bin/jq Index: devel/php-maxminddb/Makefile =================================================================== --- devel/php-maxminddb/Makefile +++ devel/php-maxminddb/Makefile @@ -23,10 +23,6 @@ WRKSRC_SUBDIR= ext -USE_PHP= yes -IGNORE_WITH_PHP=4 -USE_PHPIZE= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz .include Index: devel/php-memoize/Makefile =================================================================== --- devel/php-memoize/Makefile +++ devel/php-memoize/Makefile @@ -13,10 +13,7 @@ USE_GITHUB= yes GH_ACCOUNT= arraypad -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes +USES= php:ext PHP_MODNAME= memoize IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-memoize @@ -27,21 +24,13 @@ MEMCACHED_DESC= Enable memcached storage module MEMORY_DESC= Enable the memoize memory storage module -.include +APC_CONFIGURE_ENABLE= memoize-apc +APC_BUILD_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC -.if ${PORT_OPTIONS:MAPC} -CONFIGURE_ARGS+= --enable-memoize-apc -BUILD_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:www/pecl-APC -.endif +MEMCACHED_CONFIGURE_WITH= memoize-memcached +MEMCACHED_BUILD_DEPENDS= libmemcached>0:databases/libmemcached +MEMCACHED_RUN_DEPENDS= libmemcached>0:databases/libmemcached -.if ${PORT_OPTIONS:MMEMCACHED} -CONFIGURE_ARGS+= --with-memoize-memcached -BUILD_DEPENDS+= libmemcached>0:databases/libmemcached -RUN_DEPENDS+= libmemcached>0:databases/libmemcached -.endif +MEMORY_CONFIGURE_OFF= --disable-memoize-memory -.if empty(PORT_OPTIONS:MMEMORY) -CONFIGURE_ARGS+= --disable-memoize-memory -.endif - -.include +.include Index: devel/php-scalar_objects/Makefile =================================================================== --- devel/php-scalar_objects/Makefile +++ devel/php-scalar_objects/Makefile @@ -16,10 +16,7 @@ GH_ACCOUNT= nikic GH_TAGNAME= baf4985 -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/php-uprofiler/Makefile =================================================================== --- devel/php-uprofiler/Makefile +++ devel/php-uprofiler/Makefile @@ -17,11 +17,8 @@ GH_ACCOUNT= FriendsOfPHP GH_TAGNAME= 483c1e5 -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/extension -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -USES= tar:tgz +WRKSRC_SUBDIR= extension +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: devel/php-xdebug/Makefile =================================================================== --- devel/php-xdebug/Makefile +++ devel/php-xdebug/Makefile @@ -13,10 +13,7 @@ LICENSE= PHP30 CONFIGURE_ARGS= --enable-xdebug -USE_PHP= yes -USE_PHPIZE= yes -USE_ZENDEXT= yes -USES= tar:tgz +USES= php:zend tar:tgz SUB_FILES= pkg-message Index: devel/php5-blitz-devel/Makefile =================================================================== --- devel/php5-blitz-devel/Makefile +++ devel/php5-blitz-devel/Makefile @@ -13,9 +13,7 @@ CONFLICTS= php5-blitz-0.6* -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext PHP_MODNAME= blitz IGNORE_WITH_PHP= 70 Index: devel/php5-blitz/Makefile =================================================================== --- devel/php5-blitz/Makefile +++ devel/php5-blitz/Makefile @@ -12,9 +12,7 @@ CONFLICTS= php5-blitz-devel-[0-9]* -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/php5-dav/Makefile =================================================================== --- devel/php5-dav/Makefile +++ devel/php5-dav/Makefile @@ -16,10 +16,7 @@ LIB_DEPENDS= libneon.so:www/neon -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= dav +USES= php:ext IGNORE_WITH_PHP= 70 Index: devel/php5-geshi/Makefile =================================================================== --- devel/php5-geshi/Makefile +++ devel/php5-geshi/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv2 +USES= php USE_GITHUB= yes GH_ACCOUNT= GeSHi GH_PROJECT= geshi-1.0 NO_BUILD= yes -USE_PHP= yes OPTIONS_DEFINE= DOCS NO_ARCH= yes Index: devel/php5-ice/Makefile =================================================================== --- devel/php5-ice/Makefile +++ devel/php5-ice/Makefile @@ -23,8 +23,7 @@ MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \ PHP_HOME=${LOCALBASE} OPTIMIZE=yes -USE_PHP= yes -USE_PHP_BUILD= yes +USES+= php IGNORE_WITH_PHP=70 BUILD_WRKSRC= ${WRKSRC}/php INSTALL_WRKSRC= ${WRKSRC}/php Index: devel/php5-msgpack/Makefile =================================================================== --- devel/php5-msgpack/Makefile +++ devel/php5-msgpack/Makefile @@ -15,11 +15,8 @@ GH_TAGNAME= 980a652 WRKSRC_SUBDIR= php -USE_PHP= session -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -PHP_MODNAME= msgpack +USES= php:ext +USE_PHP= session:build IGNORE_WITH_PHP= 70 Index: devel/php5-pinba/Makefile =================================================================== --- devel/php5-pinba/Makefile +++ devel/php5-pinba/Makefile @@ -17,9 +17,7 @@ GH_PROJECT= pinba_extension GH_TAGNAME= f76b673 -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= pinba +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: devel/php5-thrift/Makefile =================================================================== --- devel/php5-thrift/Makefile +++ devel/php5-thrift/Makefile @@ -10,10 +10,7 @@ MAINTAINER= webmaster@kibab.com COMMENT= PHP interface to Thrift -USE_PHP= yes - -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext PHP_MODNAME= thrift_protocol IGNORE_WITH_PHP= 70 Index: dns/pear-Net_DNS/Makefile =================================================================== --- dns/pear-Net_DNS/Makefile +++ dns/pear-Net_DNS/Makefile @@ -10,7 +10,7 @@ COMMENT= Resolver library used to communicate with a DNS server PORTSCOUT= skipv:1.00b2,1.00b1 -USE_PHP= mhash +USE_PHP= hash USES= pear .include Index: finance/myphpmoney/Makefile =================================================================== --- finance/myphpmoney/Makefile +++ finance/myphpmoney/Makefile @@ -15,9 +15,7 @@ WEBGRP?= www APACHEDIR= ${PREFIX}/www/data INSTALLDIR= ${APACHEDIR}/myphpmoney -USES= tar:bzip2 -USE_PHP= yes -WANT_PHP_WEB= yes +USES= php:web tar:bzip2 NO_BUILD= yes PLIST_SUB+= INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,} WWWOWN="${WEBOWN}" WWWGRP="${WEBGRP}" Index: finance/php-tclink/Makefile =================================================================== --- finance/php-tclink/Makefile +++ finance/php-tclink/Makefile @@ -12,8 +12,7 @@ MAINTAINER= mbowie@buzmo.com COMMENT= PHP extension for TrustCommerce credit card processing -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext USE_OPENSSL= yes IGNORE_WITH_PHP= 70 Index: graphics/geos/Makefile =================================================================== --- graphics/geos/Makefile +++ graphics/geos/Makefile @@ -26,7 +26,7 @@ PHP_BUILD_DEPENDS= swig3.0:devel/swig30 PHP_CONFIGURE_ENABLE= php -PHP_USE= PHP=yes PHP_BUILD=yes +PHP_USES= php:build PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 PYTHON_CONFIGURE_ENABLE=python PYTHON_USES= python:2 Index: graphics/graphviz/Makefile =================================================================== --- graphics/graphviz/Makefile +++ graphics/graphviz/Makefile @@ -92,7 +92,7 @@ qt4=linguist_build,corelib,gui GHOSTSCRIPT_USES=ghostscript PERL_USES= perl5 -PHP_USE= PHP=yes PHP_BUILD=yes +PHP_USES= php:build PYTHON_USES= python:2.7,build RUBY_USE= RUBY=yes LUA_USES= lua Index: graphics/pear-Image_Graph/Makefile =================================================================== --- graphics/pear-Image_Graph/Makefile +++ graphics/pear-Image_Graph/Makefile @@ -11,7 +11,6 @@ RUN_DEPENDS= ${PEARDIR}/Log.php:sysutils/pear-Log \ ${PEARDIR}/Image/Canvas.php:graphics/pear-Image_Canvas -USE_PHP= yes USES= dos2unix pear DOS2UNIX_REGEX= .*php$$ Index: graphics/pecl-gmagick/Makefile =================================================================== --- graphics/pecl-gmagick/Makefile +++ graphics/pecl-gmagick/Makefile @@ -15,10 +15,8 @@ LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick -USES= tar:tgz +USES= php:ext tar:tgz -USE_PHP= yes -USE_PHPEXT= yes IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-gmagick=${LOCALBASE} Index: graphics/pecl-imagick/Makefile =================================================================== --- graphics/pecl-imagick/Makefile +++ graphics/pecl-imagick/Makefile @@ -18,9 +18,7 @@ X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick-nox11 -USES= pkgconfig tar:tgz localbase -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext pkgconfig tar:tgz localbase CONFIGURE_ARGS= --with-imagick=${LOCALBASE} Index: graphics/pecl-imlib2/Makefile =================================================================== --- graphics/pecl-imlib2/Makefile +++ graphics/pecl-imlib2/Makefile @@ -16,9 +16,7 @@ LIB_DEPENDS= libImlib2.so:graphics/imlib2 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 # libImlib2 may or may not depend on X, however, Index: graphics/pecl-qrencode/Makefile =================================================================== --- graphics/pecl-qrencode/Makefile +++ graphics/pecl-qrencode/Makefile @@ -13,9 +13,7 @@ LIB_DEPENDS= libqrencode.so:graphics/libqrencode -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:bzip2 +USES= php:ext tar:bzip2 IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-qrencode=${LOCALBASE} Index: graphics/php-facedetect/Makefile =================================================================== --- graphics/php-facedetect/Makefile +++ graphics/php-facedetect/Makefile @@ -22,9 +22,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lopencv_core -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext CONFIGURE_ARGS+= --with-facedetect Index: graphics/php-gdal/Makefile =================================================================== --- graphics/php-gdal/Makefile +++ graphics/php-gdal/Makefile @@ -23,9 +23,7 @@ IGNORE_WITH_PHP=70 MAKEFILE= GNUmakefile PHP_MOD_NAME= php_${PORTNAME} -USE_PHP= yes -USE_PHP_BUILD= yes -USES= gmake localbase tar:xz +USES= php:build gmake localbase tar:xz WRKSRC_SUBDIR= swig/php Index: graphics/php-libpuzzle/Makefile =================================================================== --- graphics/php-libpuzzle/Makefile +++ graphics/php-libpuzzle/Makefile @@ -18,11 +18,7 @@ LIB_DEPENDS= libpuzzle.so:graphics/libpuzzle \ libgd.so:graphics/gd -USES= tar:bzip2 -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext tar:bzip2 IGNORE_WITH_PHP= 70 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/php/${PORTNAME} Index: graphics/php-magickwand/Makefile =================================================================== --- graphics/php-magickwand/Makefile +++ graphics/php-magickwand/Makefile @@ -14,9 +14,7 @@ LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick -USES= pkgconfig -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext pkgconfig IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-magickwand=${LOCALBASE} Index: graphics/php5-ffmpeg/Makefile =================================================================== --- graphics/php5-ffmpeg/Makefile +++ graphics/php5-ffmpeg/Makefile @@ -18,9 +18,6 @@ libavutil.so:multimedia/ffmpeg IGNORE_WITH_PHP=70 -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USES= localbase tar:xz +USES= localbase php:ext tar:xz .include Index: graphics/phplot/Makefile =================================================================== --- graphics/phplot/Makefile +++ graphics/phplot/Makefile @@ -19,8 +19,7 @@ NO_ARCH= yes NO_BUILD= yes -USES= zip -USE_PHP= yes +USES= php zip PHPLOT_DIR= ${STAGEDIR}${PREFIX}/include/php/phplot Index: japanese/guesswork-classic/Makefile =================================================================== --- japanese/guesswork-classic/Makefile +++ japanese/guesswork-classic/Makefile @@ -17,8 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/smarty/Smarty.class.php:www/smarty2 NO_BUILD= yes -USE_PHP= yes -WANT_PHP_WEB= yes +USES= php:web SUB_FILES= pkg-message Index: japanese/php5-mecab/Makefile =================================================================== --- japanese/php5-mecab/Makefile +++ japanese/php5-mecab/Makefile @@ -12,8 +12,7 @@ LIB_DEPENDS= libmecab.so:japanese/mecab -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config Index: lang/pecl-perl/Makefile =================================================================== --- lang/pecl-perl/Makefile +++ lang/pecl-perl/Makefile @@ -13,12 +13,8 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -USE_PHP_BUILD= yes IGNORE_WITH_PHP= 70 -USES= perl5 tar:tgz +USES= perl5 php:ext tar:tgz .include Index: lang/php55-extensions/Makefile =================================================================== --- lang/php55-extensions/Makefile +++ lang/php55-extensions/Makefile @@ -9,11 +9,9 @@ MAINTAINER= ale@FreeBSD.org COMMENT= "meta-port" to install PHP extensions -USES= metaport -USE_PHP= yes +USES= metaport php PHP_DEFAULT= 5.5 IGNORE_WITH_PHP=56 70 -USE_PHP_BUILD= yes OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM EXIF FILEINFO FILTER FTP GD GETTEXT \ Index: lang/php55/Makefile =================================================================== --- lang/php55/Makefile +++ lang/php55/Makefile @@ -93,7 +93,7 @@ .endif .if defined(PKGNAMEPREFIX) -USE_PHP= yes +USES+= php PHP_DEFAULT= 5.5 IGNORE_WITH_PHP=53 54 5 USE_APACHE= 22+ Index: lang/php55/Makefile.ext =================================================================== --- lang/php55/Makefile.ext +++ lang/php55/Makefile.ext @@ -1,7 +1,6 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USE_PHP= yes -USE_PHPEXT= yes +USES+= php:ext PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_DEFAULT= 5.5 IGNORE_WITH_PHP= 56 70 @@ -232,8 +231,7 @@ .if ${PHP_MODNAME} == "pdo_dblib" CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build OPTIONS_DEFINE= MSSQL @@ -243,8 +241,7 @@ .if ${PHP_MODNAME} == "pdo_firebird" CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build USES+= firebird .endif @@ -255,16 +252,14 @@ MYSQLND_DESC= Use MySQL Native Driver -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_odbc" LIB_DEPENDS+= libodbc.so:databases/unixODBC CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_pgsql" @@ -272,16 +267,14 @@ CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_sqlite" USES+= sqlite CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pgsql" @@ -294,8 +287,7 @@ CONFIGURE_ARGS+=--enable-phar \ --with-pcre-dir=${LOCALBASE} -USE_PHP= hash -USE_PHP_BUILD= yes +USE_PHP= hash:build .endif .if ${PHP_MODNAME} == "posix" @@ -308,8 +300,7 @@ CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} # Ugly hack to load session before psell to avoid crashes -USE_PHP= session -USE_PHP_BUILD= yes +USE_PHP= session:build .endif .if ${PHP_MODNAME} == "readline" @@ -357,8 +348,7 @@ USE_GNOME= libxml2 -USE_PHP= session -USE_PHP_BUILD= yes +USE_PHP= session:build .endif .if ${PHP_MODNAME} == "sockets" @@ -404,8 +394,7 @@ USE_GNOME= libxml2 -USE_PHP= xml session -USE_PHP_BUILD= yes +USE_PHP= xml:build session:build .endif .if ${PHP_MODNAME} == "xml" @@ -421,8 +410,7 @@ USE_GNOME= libxml2 -USE_PHP= dom -USE_PHP_BUILD= yes +USE_PHP= dom:build .endif .if ${PHP_MODNAME} == "xmlrpc" @@ -435,8 +423,7 @@ PHP_HEADER_DIRS=libxmlrpc -USE_PHP= xml -USE_PHP_BUILD= yes +USE_PHP= xml:build .endif .if ${PHP_MODNAME} == "xmlwriter" @@ -450,8 +437,7 @@ CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} USE_GNOME= libxslt -USE_PHP= dom xml -USE_PHP_BUILD= yes +USE_PHP= dom:build xml:build .endif .if ${PHP_MODNAME} == "zip" Index: lang/php56-extensions/Makefile =================================================================== --- lang/php56-extensions/Makefile +++ lang/php56-extensions/Makefile @@ -9,11 +9,9 @@ MAINTAINER= ale@FreeBSD.org COMMENT= "meta-port" to install PHP extensions -USES= metaport -USE_PHP= yes +USES= metaport php PHP_DEFAULT= 5.6 IGNORE_WITH_PHP= 55 70 -USE_PHP_BUILD= yes OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM EXIF FILEINFO FILTER FTP GD GETTEXT \ Index: lang/php56/Makefile =================================================================== --- lang/php56/Makefile +++ lang/php56/Makefile @@ -88,7 +88,7 @@ .endif .if defined(PKGNAMEPREFIX) -USE_PHP= yes +USES+= php PHP_DEFAULT= 5.6 IGNORE_WITH_PHP=53 54 5 USE_APACHE= 22+ Index: lang/php56/Makefile.ext =================================================================== --- lang/php56/Makefile.ext +++ lang/php56/Makefile.ext @@ -1,7 +1,6 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USE_PHP= yes -USE_PHPEXT= yes +USES+= php:ext PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_DEFAULT= 5.6 IGNORE_WITH_PHP= 55 70 @@ -232,8 +231,7 @@ .if ${PHP_MODNAME} == "pdo_dblib" CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build OPTIONS_DEFINE= MSSQL @@ -243,8 +241,7 @@ .if ${PHP_MODNAME} == "pdo_firebird" CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build USES+= firebird .endif @@ -255,16 +252,14 @@ MYSQLND_DESC= Use MySQL Native Driver -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_odbc" LIB_DEPENDS+= libodbc.so:databases/unixODBC CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_pgsql" @@ -272,16 +267,14 @@ CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_sqlite" USES+= sqlite CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pgsql" @@ -294,8 +287,7 @@ CONFIGURE_ARGS+=--enable-phar \ --with-pcre-dir=${LOCALBASE} -USE_PHP= hash -USE_PHP_BUILD= yes +USE_PHP= hash:build .endif .if ${PHP_MODNAME} == "posix" @@ -308,8 +300,7 @@ CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} # Ugly hack to load session before psell to avoid crashes -USE_PHP= session -USE_PHP_BUILD= yes +USE_PHP= session:build .endif .if ${PHP_MODNAME} == "readline" @@ -357,8 +348,7 @@ USE_GNOME= libxml2 -USE_PHP= session -USE_PHP_BUILD= yes +USE_PHP= session:build .endif .if ${PHP_MODNAME} == "sockets" @@ -404,8 +394,7 @@ USE_GNOME= libxml2 -USE_PHP= xml session -USE_PHP_BUILD= yes +USE_PHP= xml:build session:build .endif .if ${PHP_MODNAME} == "xml" @@ -421,8 +410,7 @@ USE_GNOME= libxml2 -USE_PHP= dom -USE_PHP_BUILD= yes +USE_PHP= dom:build .endif .if ${PHP_MODNAME} == "xmlrpc" @@ -435,8 +423,7 @@ PHP_HEADER_DIRS=libxmlrpc -USE_PHP= xml -USE_PHP_BUILD= yes +USE_PHP= xml:build .endif .if ${PHP_MODNAME} == "xmlwriter" @@ -450,8 +437,7 @@ CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} USE_GNOME= libxslt -USE_PHP= dom xml -USE_PHP_BUILD= yes +USE_PHP= dom:build xml:build .endif .if ${PHP_MODNAME} == "zip" Index: lang/php70-extensions/Makefile =================================================================== --- lang/php70-extensions/Makefile +++ lang/php70-extensions/Makefile @@ -9,11 +9,9 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= "meta-port" to install PHP extensions -USES= metaport -USE_PHP= yes +USES= metaport php PHP_DEFAULT= 7.0 IGNORE_WITH_PHP= 55 56 -USE_PHP_BUILD= yes OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM EXIF FILEINFO FILTER FTP GD GETTEXT \ Index: lang/php70/Makefile =================================================================== --- lang/php70/Makefile +++ lang/php70/Makefile @@ -83,7 +83,7 @@ .endif .if defined(PKGNAMEPREFIX) -USE_PHP= yes +USES+= php PHP_DEFAULT= 7.0 IGNORE_WITH_PHP= 55 56 USE_APACHE= 22+ Index: lang/php70/Makefile.ext =================================================================== --- lang/php70/Makefile.ext +++ lang/php70/Makefile.ext @@ -1,7 +1,6 @@ COMMENT= The ${PHP_MODNAME} shared extension for php -USE_PHP= yes -USE_PHPEXT= yes +USES+= php:ext PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_DEFAULT= 7.0 IGNORE_WITH_PHP= 55 56 @@ -225,8 +224,7 @@ .if ${PHP_MODNAME} == "pdo_dblib" CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build OPTIONS_DEFINE= MSSQL @@ -237,16 +235,14 @@ CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} USES+= firebird -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_odbc" LIB_DEPENDS+= libodbc.so:databases/unixODBC CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_mysql" @@ -255,8 +251,7 @@ MYSQLND_DESC= Use MySQL Native Driver -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_pgsql" @@ -264,16 +259,14 @@ CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pdo_sqlite" USES+= sqlite CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} -USE_PHP= pdo -USE_PHP_BUILD= yes +USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pgsql" @@ -286,8 +279,7 @@ CONFIGURE_ARGS+=--enable-phar \ --with-pcre-dir=${LOCALBASE} -USE_PHP= hash -USE_PHP_BUILD= yes +USE_PHP= hash:build .endif .if ${PHP_MODNAME} == "posix" @@ -300,8 +292,7 @@ CONFIGURE_ARGS+=--with-pspell=${LOCALBASE} # Ugly hack to load session before psell to avoid crashes -USE_PHP= session -USE_PHP_BUILD= yes +USE_PHP= session:build .endif .if ${PHP_MODNAME} == "readline" @@ -349,8 +340,7 @@ USE_GNOME= libxml2 -USE_PHP= session -USE_PHP_BUILD= yes +USE_PHP= session:build .endif .if ${PHP_MODNAME} == "sockets" @@ -396,8 +386,7 @@ USE_GNOME= libxml2 -USE_PHP= xml session -USE_PHP_BUILD= yes +USE_PHP= xml:build session:build .endif .if ${PHP_MODNAME} == "xml" @@ -413,8 +402,7 @@ USE_GNOME= libxml2 -USE_PHP= dom -USE_PHP_BUILD= yes +USE_PHP= dom:build .endif .if ${PHP_MODNAME} == "xmlrpc" @@ -427,8 +415,7 @@ PHP_HEADER_DIRS=libxmlrpc -USE_PHP= xml -USE_PHP_BUILD= yes +USE_PHP= xml:build .endif .if ${PHP_MODNAME} == "xmlwriter" @@ -442,8 +429,7 @@ CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} USE_GNOME= libxslt -USE_PHP= dom xml -USE_PHP_BUILD= yes +USE_PHP= dom:build xml:build .endif .if ${PHP_MODNAME} == "zip" Index: lang/php_doc/Makefile =================================================================== --- lang/php_doc/Makefile +++ lang/php_doc/Makefile @@ -19,7 +19,6 @@ japanese/php_doc \ polish/php_doc -USE_PHPIZE= yes PHP_LANG?= en PHP_LANGS?= ${PHP_HTML_CHUNKED} ${PHP_HTML_NORMAL} PHP_HTML_CHUNKED= br de en fr ja pl ro tr Index: mail/mlmmj/Makefile =================================================================== --- mail/mlmmj/Makefile +++ mail/mlmmj/Makefile @@ -25,8 +25,7 @@ PERL_RUN_DEPENDS= p5-URI>0:net/p5-URI \ p5-CGI-FastTemplate>0:www/p5-CGI-FastTemplate \ p5-HTML-Parser>0:www/p5-HTML-Parser -PHP_USE= php=yes -PHP_VERS= WANT_PHP_WEB=yes +PHP_USES= php:web post-patch: @${REINPLACE_CMD} -e \ Index: mail/pecl-esmtp/Makefile =================================================================== --- mail/pecl-esmtp/Makefile +++ mail/pecl-esmtp/Makefile @@ -16,9 +16,7 @@ LIB_DEPENDS= libesmtp.so:mail/libesmtp -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 OPTIONS_DEFINE= RE2C Index: mail/pecl-mailparse/Makefile =================================================================== --- mail/pecl-mailparse/Makefile +++ mail/pecl-mailparse/Makefile @@ -15,12 +15,8 @@ BROKEN_powerpc64= Does not build -USES= tar:tgz -USE_PHP= mbstring -USE_PHPIZE= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes -PHP_MODNAME= mailparse +USES= php:ext tar:tgz +USE_PHP= mbstring:build IGNORE_WITH_PHP= 70 .include Index: mail/pecl-pop3/Makefile =================================================================== --- mail/pecl-pop3/Makefile +++ mail/pecl-pop3/Makefile @@ -12,11 +12,7 @@ MAINTAINER= buganini@gmail.com COMMENT= POP3 Client Library for PHP -USE_PHP= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes -PHP_MODNAME= pop3 +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: mail/phpmailer/Makefile =================================================================== --- mail/phpmailer/Makefile +++ mail/phpmailer/Makefile @@ -18,8 +18,7 @@ NO_BUILD= yes NO_ARCH= yes -USE_PHP= yes -USES= dos2unix +USES= dos2unix php SUB_FILES= pkg-message Index: mail/squirrelmail/Makefile =================================================================== --- mail/squirrelmail/Makefile +++ mail/squirrelmail/Makefile @@ -19,7 +19,7 @@ # patches, but the only guaranteed compatibility is with php 5.3. # If you encounter problems, downgrade to php 5.3. -USE_PHP= session mhash gettext mbstring pcre openssl xml +USE_PHP= session hash gettext mbstring pcre openssl xml WANT_PHP_WEB= yes USES= cpe gettext perl5 tar:bzip2 Index: math/pecl-big_int/Makefile =================================================================== --- math/pecl-big_int/Makefile +++ math/pecl-big_int/Makefile @@ -11,9 +11,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Functions for calculations with arbitrary length integers and bitsets -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 DOCS= CREDITS INSTALL LICENSE README docs/index.html libbig_int/CREDITS \ Index: math/pecl-bitset/Makefile =================================================================== --- math/pecl-bitset/Makefile +++ math/pecl-bitset/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE IGNORE_WITH_PHP=55 56 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz .include Index: math/pecl-bitset2/Makefile =================================================================== --- math/pecl-bitset2/Makefile +++ math/pecl-bitset2/Makefile @@ -18,8 +18,6 @@ PORTSCOUT= limit:^2\. IGNORE_WITH_PHP=70 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz .include Index: math/pecl-stats/Makefile =================================================================== --- math/pecl-stats/Makefile +++ math/pecl-stats/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP30 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: math/pecl-trader/Makefile =================================================================== --- math/pecl-trader/Makefile +++ math/pecl-trader/Makefile @@ -14,8 +14,7 @@ LICENSE= BSD2CLAUSE -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: math/rkward-kde4/Makefile =================================================================== --- math/rkward-kde4/Makefile +++ math/rkward-kde4/Makefile @@ -21,9 +21,7 @@ script svg uic_build webkit xml USE_XORG= x11 USE_KDE4= automoc4 kdelibs -USE_PHP= yes -WANT_PHP_CLI= yes -USES= cmake gettext fortran shared-mime-info +USES= cmake gettext fortran php:cli shared-mime-info INSTALLS_ICONS= yes CFLAGS+= -I${LOCALBASE}/include Index: misc/achievo/Makefile =================================================================== --- misc/achievo/Makefile +++ misc/achievo/Makefile @@ -12,8 +12,7 @@ MAINTAINER= kevin@caomhin.demon.co.uk COMMENT= Flexible web-based resource management tool -USE_PHP= yes -WANT_PHP_MOD= yes +USES= php:mod WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_BUILD= YES Index: misc/pecl-timezonedb/Makefile =================================================================== --- misc/pecl-timezonedb/Makefile +++ misc/pecl-timezonedb/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFIGURE_ARGS= --enable-timezonedb -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz .include Index: multimedia/php-pHash/Makefile =================================================================== --- multimedia/php-pHash/Makefile +++ multimedia/php-pHash/Makefile @@ -16,10 +16,7 @@ LIB_DEPENDS= libpHash.so:multimedia/pHash -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext WRKSRC_SUBDIR= bindings/php Index: net-im/pecl-stomp/Makefile =================================================================== --- net-im/pecl-stomp/Makefile +++ net-im/pecl-stomp/Makefile @@ -12,10 +12,7 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: net-mgmt/icingaweb2/Makefile =================================================================== --- net-mgmt/icingaweb2/Makefile +++ net-mgmt/icingaweb2/Makefile @@ -18,7 +18,7 @@ NO_BUILD= yes -USE_PHP_BUILD= yes # Needed for creation of webserver configs during installation +USES= php:build USE_PHP= ctype dom gd gettext hash json openssl session sockets SUB_FILES= pkg-message Index: net-mgmt/nagios/Makefile =================================================================== --- net-mgmt/nagios/Makefile +++ net-mgmt/nagios/Makefile @@ -17,9 +17,8 @@ PORTSCOUT= limit:^3. -USES= cpe perl5 +USES= cpe perl5 php USE_PERL5= build -USE_PHP= yes USE_RC_SUBR= nagios CONFLICTS= nagios-[12].* nagios-devel-* nagios4-* Index: net-mgmt/percona-monitoring-plugins/Makefile =================================================================== --- net-mgmt/percona-monitoring-plugins/Makefile +++ net-mgmt/percona-monitoring-plugins/Makefile @@ -22,13 +22,11 @@ p5-Time-HiRes>=0:devel/p5-Time-HiRes \ bash:shells/bash -USES= shebangfix perl5 +USES= shebangfix perl5 php:cli USE_PERL5= run SHEBANG_FILES= nagios/bin/pmp-check-pt-table-checksum \ cacti/bin/pmp-cacti-* USE_MYSQL= yes -USE_PHP= yes -WANT_PHP_CLI= yes NO_BUILD= yes NO_ARCH= yes Index: net/pear-Net_DNSBL/Makefile =================================================================== --- net/pear-Net_DNSBL/Makefile +++ net/pear-Net_DNSBL/Makefile @@ -17,7 +17,6 @@ ${PEARDIR}/Net/DNS/RR/A.php:dns/pear-Net_DNS \ ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2 -USE_PHP= yes USES= pear PORTSCOUT= skipv:1.3.0a1 Index: net/pecl-amqp/Makefile =================================================================== --- net/pecl-amqp/Makefile +++ net/pecl-amqp/Makefile @@ -15,9 +15,7 @@ LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c-devel -PHP_MODNAME= ${PORTNAME} -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 .include Index: net/pecl-apn/Makefile =================================================================== --- net/pecl-apn/Makefile +++ net/pecl-apn/Makefile @@ -17,9 +17,7 @@ LIB_DEPENDS= libcapn.so:net/libcapn -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext CONFIGURE_ARGS= --with-apn=${LOCALBASE} IGNORE_WITH_PHP= 70 Index: net/pecl-cvsclient/Makefile =================================================================== --- net/pecl-cvsclient/Makefile +++ net/pecl-cvsclient/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP202 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 .include Index: net/pecl-geoip/Makefile =================================================================== --- net/pecl-geoip/Makefile +++ net/pecl-geoip/Makefile @@ -15,9 +15,7 @@ LIB_DEPENDS= libGeoIP.so:net/GeoIP -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 post-patch: Index: net/pecl-gupnp/Makefile =================================================================== --- net/pecl-gupnp/Makefile +++ net/pecl-gupnp/Makefile @@ -15,9 +15,7 @@ LIB_DEPENDS= libgupnp-1.0.so:net/gupnp -USE_PHP= yes -USE_PHPEXT= yes -USES= pkgconfig tar:tgz +USES= php:ext pkgconfig tar:tgz IGNORE_WITH_PHP= 70 post-patch: Index: net/pecl-ip2location/Makefile =================================================================== --- net/pecl-ip2location/Makefile +++ net/pecl-ip2location/Makefile @@ -15,10 +15,7 @@ LIB_DEPENDS= libIP2Location.so:net/ip2location -USES= tar:tgz -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: net/pecl-mosquitto/Makefile =================================================================== --- net/pecl-mosquitto/Makefile +++ net/pecl-mosquitto/Makefile @@ -16,9 +16,7 @@ BUILD_DEPENDS= mosquitto>=0:net/mosquitto -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: net/pecl-oauth/Makefile =================================================================== --- net/pecl-oauth/Makefile +++ net/pecl-oauth/Makefile @@ -20,9 +20,7 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: net/pecl-radius/Makefile =================================================================== --- net/pecl-radius/Makefile +++ net/pecl-radius/Makefile @@ -13,9 +13,7 @@ LICENSE= BSD3CLAUSE -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-radius Index: net/pecl-smbclient/Makefile =================================================================== --- net/pecl-smbclient/Makefile +++ net/pecl-smbclient/Makefile @@ -15,10 +15,7 @@ LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes -USES= tar:tgz +USES= php:ext tar:tgz CONFIGURE_ARGS= --with-libsmbclient=${LOCALBASE} Index: net/pecl-yaz/Makefile =================================================================== --- net/pecl-yaz/Makefile +++ net/pecl-yaz/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libyaz.so:net/yaz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --with-yaz=${LOCALBASE} Index: net/pecl-yp/Makefile =================================================================== --- net/pecl-yp/Makefile +++ net/pecl-yp/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP301 -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: net/pecl-zmq/Makefile =================================================================== --- net/pecl-zmq/Makefile +++ net/pecl-zmq/Makefile @@ -15,9 +15,6 @@ LIB_DEPENDS= libzmq.so:net/libzmq4 -USES= tar:tgz pkgconfig -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext pkgconfig tar:tgz .include Index: net/scr_ipfm/Makefile =================================================================== --- net/scr_ipfm/Makefile +++ net/scr_ipfm/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_BUILD= yes -USE_PHP= yes +USES= php MYADMDIR?= www/data/scr_ipfm PLIST_SUB= MYADMDIR=${MYADMDIR} SUB_FILES= pkg-message Index: net/self-service-password/Makefile =================================================================== --- net/self-service-password/Makefile +++ net/self-service-password/Makefile @@ -18,7 +18,7 @@ NO_BUILD= yes NO_ARCH= yes -USE_PHP= ldap openssl session hash mhash mcrypt mbstring filter +USE_PHP= ldap openssl session hash hash mcrypt mbstring filter WANT_PHP_WEB= yes Index: print/pecl-haru/Makefile =================================================================== --- print/pecl-haru/Makefile +++ print/pecl-haru/Makefile @@ -16,9 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/hpdf.h:print/libharu RUN_DEPENDS:= ${LOCALBASE}/include/hpdf.h:print/libharu -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS+= --with-haru=${LOCALBASE} Index: print/pecl-pdflib/Makefile =================================================================== --- print/pecl-pdflib/Makefile +++ print/pecl-pdflib/Makefile @@ -18,9 +18,8 @@ LIB_DEPENDS= libpdf.so:print/pdflib -USE_PHP= gd -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext +USE_PHP= gd:build PHP_MODNAME= pdf IGNORE_WITH_PHP= 70 Index: print/pecl-ps/Makefile =================================================================== --- print/pecl-ps/Makefile +++ print/pecl-ps/Makefile @@ -15,10 +15,7 @@ LIB_DEPENDS= libps.so:print/pslib -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PORTNAME} +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 post-patch: Index: security/cryptstring/Makefile =================================================================== --- security/cryptstring/Makefile +++ security/cryptstring/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD2CLAUSE NO_BUILD= yes -USE_PHP= mcrypt mhash +USE_PHP= mcrypt hash do-install: ${MKDIR} ${STAGEDIR}${DATADIR} Index: security/lasso/Makefile =================================================================== --- security/lasso/Makefile +++ security/lasso/Makefile @@ -43,8 +43,7 @@ LDFLAGS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libexpat.so:textproc/expat2 PLIST_SUB+= PHP5="" -USE_PHP= yes -USE_PHP_BUILD= yes +USES+= php:build .else CONFIGURE_ARGS+= --disable-php5 PLIST_SUB+= PHP5="@comment " Index: security/pear-Crypt_CHAP/Makefile =================================================================== --- security/pear-Crypt_CHAP/Makefile +++ security/pear-Crypt_CHAP/Makefile @@ -9,6 +9,6 @@ COMMENT= PEAR class for generating CHAP packets USES= pear -USE_PHP= mcrypt mhash +USE_PHP= mcrypt hash .include Index: security/pear-File_SMBPasswd/Makefile =================================================================== --- security/pear-File_SMBPasswd/Makefile +++ security/pear-File_SMBPasswd/Makefile @@ -12,6 +12,6 @@ RUN_DEPENDS= ${PEARDIR}/Crypt/CHAP.php:security/pear-Crypt_CHAP USES= pear -USE_PHP= mhash +USE_PHP= hash .include Index: security/pear-Horde_Crypt_Blowfish/Makefile =================================================================== --- security/pear-Horde_Crypt_Blowfish/Makefile +++ security/pear-Horde_Crypt_Blowfish/Makefile @@ -17,7 +17,7 @@ OPENSSL_DESC= Depend on OpenSSL PHP extension USES= horde -MHASH_USE= PHP=mhash +MHASH_USE= PHP=hash OPENSSL_USE= PHP=openssl .include Index: security/pear-Text_Password/Makefile =================================================================== --- security/pear-Text_Password/Makefile +++ security/pear-Text_Password/Makefile @@ -8,7 +8,6 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= PEAR random password creator -USE_PHP= yes USES= pear WRKSRC= ${WRKDIR}/Text_Password-${PORTVERSION} Index: security/pecl-crack/Makefile =================================================================== --- security/pecl-crack/Makefile +++ security/pecl-crack/Makefile @@ -16,12 +16,7 @@ LIB_DEPENDS= libcrack.so:security/cracklib -USES= tar:tgz -USE_PHP= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes -PHP_MODNAME= crack +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 EXTRACT_AFTER_ARGS=--no-same-permissions --no-same-owner --exclude libcrack Index: security/pecl-crypto/Makefile =================================================================== --- security/pecl-crypto/Makefile +++ security/pecl-crypto/Makefile @@ -13,11 +13,8 @@ LICENSE= PHP301 -USES= tar:tgz +USES= php:ext tar:tgz CONFIGURE_ARGS= --with-crypto USE_OPENSSL= yes -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes .include Index: security/pecl-gnupg/Makefile =================================================================== --- security/pecl-gnupg/Makefile +++ security/pecl-gnupg/Makefile @@ -18,9 +18,7 @@ CONFIGURE_ARGS= --with-gnupg=${LOCALBASE}/include IGNORE_WITH_PHP=70 -USE_PHP= yes -USE_PHPEXT= yes -USES= localbase tar:tgz +USES= localbase php:ext tar:tgz post-patch: @${REINPLACE_CMD} -e 's|$$GNUPG_DIR/lib|${LOCALBASE}/lib|; s| -ldl||g' ${WRKSRC}/config.m4 Index: security/pecl-pam/Makefile =================================================================== --- security/pecl-pam/Makefile +++ security/pecl-pam/Makefile @@ -12,10 +12,7 @@ LICENSE= PHP202 -USES= tar:tgz -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: security/pecl-scrypt/Makefile =================================================================== --- security/pecl-scrypt/Makefile +++ security/pecl-scrypt/Makefile @@ -15,10 +15,8 @@ BROKEN_powerpc64= Does not build -USES= compiler tar:tgz -USE_PHP= hash -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= compiler php:ext tar:tgz +USE_PHP= hash:build INSTALL_TARGET= install-strip IGNORE_WITH_PHP= 70 Index: security/pecl-ssh2/Makefile =================================================================== --- security/pecl-ssh2/Makefile +++ security/pecl-ssh2/Makefile @@ -14,9 +14,7 @@ LIB_DEPENDS= libssh2.so:security/libssh2 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CPPFLAGS+= -I${LOCALBASE}/include Index: security/pecl-tcpwrap/Makefile =================================================================== --- security/pecl-tcpwrap/Makefile +++ security/pecl-tcpwrap/Makefile @@ -13,9 +13,7 @@ LICENSE= PHP202 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 post-patch: Index: security/php-suhosin/Makefile =================================================================== --- security/php-suhosin/Makefile +++ security/php-suhosin/Makefile @@ -16,9 +16,8 @@ OPTIONS_DEFINE= EXAMPLES -USE_PHP= session -USE_PHPEXT= yes -USE_PHP_BUILD= yes +USES= php:ext +USE_PHP= session:build IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-suhosin Index: security/snortreport/Makefile =================================================================== --- security/snortreport/Makefile +++ security/snortreport/Makefile @@ -18,23 +18,16 @@ BARNYARD_RUN_DEPENDS= barnyard2:security/barnyard2 JPGRAPH_RUN_DEPENDS= ${LOCALBASE}/share/jpgraph/jpgraph.php:graphics/jpgraph2 -.include NO_BUILD= yes SUB_FILES= pkg-message PORTDOCS= INSTALL Performance.txt create_indexes.sql FTYPES= css html js php phps png sample -USE_PHP= yes -WANT_PHP_WEB= yes +USES= php:web -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif +MYSQL_USE= php=mysql +PGSQL_USE= php=pgsql pre-everything:: @${ECHO} "" @@ -50,10 +43,8 @@ ${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 750 -d ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${FTYPES:S|^|${WRKSRC}/*|} ${STAGEDIR}${WWWDIR} -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.endif .include Index: sysutils/gosa/Makefile =================================================================== --- sysutils/gosa/Makefile +++ sysutils/gosa/Makefile @@ -19,7 +19,7 @@ pecl-imagick>=2.2.2:graphics/pecl-imagick USES= tar:bzip2 -USE_PHP= gettext iconv imap ldap mbstring mhash mysql pcre posix \ +USE_PHP= gettext iconv imap ldap mbstring hash mysql pcre posix \ session spl xml zlib NO_BUILD= yes Index: sysutils/pear-File_Gettext/Makefile =================================================================== --- sysutils/pear-File_Gettext/Makefile +++ sysutils/pear-File_Gettext/Makefile @@ -9,6 +9,5 @@ COMMENT= PEAR GNU Gettext file parser USES= pear -USE_PHP= yes .include Index: sysutils/pear-Log/Makefile =================================================================== --- sysutils/pear-Log/Makefile +++ sysutils/pear-Log/Makefile @@ -11,7 +11,6 @@ LICENSE= MIT USES= pear -USE_PHP= yes OPTIONS_DEFINE= PEAR_DB PEAR_MDB2 PEAR_MAIL PEAR_SQLITE PEAR_DB_DESC= PEAR::DB support Index: sysutils/pear-Translation2/Makefile =================================================================== --- sysutils/pear-Translation2/Makefile +++ sysutils/pear-Translation2/Makefile @@ -12,7 +12,6 @@ USES= pear shebangfix SHEBANG_FILES= scripts/t2xmlchk.php NO_ARCH= yes -USE_PHP= yes OPTIONS_DEFINE= PEAR_CACHE_LITE PEAR_DB PEAR_DB_DATAOBJECT PEAR_MDB PEAR_MDB2 \ PEAR_FILE_GETTEXT PEAR_I18NV2 PEAR_XML_SERIALIZER Index: sysutils/pecl-mogilefs/Makefile =================================================================== --- sysutils/pecl-mogilefs/Makefile +++ sysutils/pecl-mogilefs/Makefile @@ -16,10 +16,7 @@ LIB_DEPENDS= libneon.so:www/neon -USE_PHP= yes -USE_PHP_BUILD= spl -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext IGNORE_WITH_PHP= 70 post-extract: Index: sysutils/pecl-proctitle/Makefile =================================================================== --- sysutils/pecl-proctitle/Makefile +++ sysutils/pecl-proctitle/Makefile @@ -12,7 +12,6 @@ MAINTAINER= flo@FreeBSD.org COMMENT= PECL extension that allows changing the current process' name -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext .include Index: textproc/libmrss-php/Makefile =================================================================== --- textproc/libmrss-php/Makefile +++ textproc/libmrss-php/Makefile @@ -20,11 +20,9 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USES= libtool +USES= libtool php:ext USE_LDCONFIG= yes -USE_PHP= yes -USE_PHPEXT= yes PHP_MODNAME= mrss IGNORE_WITH_PHP= 70 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/phpmrss Index: textproc/mysqlviz/Makefile =================================================================== --- textproc/mysqlviz/Makefile +++ textproc/mysqlviz/Makefile @@ -12,9 +12,7 @@ LICENSE= GPLv3 NO_BUILD= yes -USES= tar:bzip2 -USE_PHP= yes -WANT_PHP_CLI= yes +USES= php:cli tar:bzip2 PLIST_FILES= bin/${PORTNAME} Index: textproc/pecl-cld/Makefile =================================================================== --- textproc/pecl-cld/Makefile +++ textproc/pecl-cld/Makefile @@ -16,11 +16,7 @@ LIB_DEPENDS= libcld.so:devel/cld CONFIGURE_ARGS= --enable-cld --with-libcld-dir=${LOCALBASE}/lib -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPIZE= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 post-install: Index: textproc/pecl-ctemplate/Makefile =================================================================== --- textproc/pecl-ctemplate/Makefile +++ textproc/pecl-ctemplate/Makefile @@ -13,9 +13,7 @@ LIB_DEPENDS= libctemplate.so:textproc/google-ctemplate -USES= tar:xz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:xz USE_GITHUB= yes GH_ACCOUNT= vanillahsu GH_PROJECT= pecl-ctemplate Index: textproc/pecl-doublemetaphone/Makefile =================================================================== --- textproc/pecl-doublemetaphone/Makefile +++ textproc/pecl-doublemetaphone/Makefile @@ -14,10 +14,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-doublemetaphone Index: textproc/pecl-enchant/Makefile =================================================================== --- textproc/pecl-enchant/Makefile +++ textproc/pecl-enchant/Makefile @@ -15,10 +15,7 @@ LIB_DEPENDS= libenchant.so:textproc/enchant -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= ${PORTNAME} +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS+= --with-enchant=${LOCALBASE} Index: textproc/pecl-html_parse/Makefile =================================================================== --- textproc/pecl-html_parse/Makefile +++ textproc/pecl-html_parse/Makefile @@ -16,10 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libekhtml.a:textproc/ekhtml RUN_DEPENDS= ${LOCALBASE}/lib/libekhtml.a:textproc/ekhtml -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 CONFIGURE_ARGS= --enable-html_parse Index: textproc/pecl-stem/Makefile =================================================================== --- textproc/pecl-stem/Makefile +++ textproc/pecl-stem/Makefile @@ -14,9 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 post-configure: Index: textproc/pecl-syck/Makefile =================================================================== --- textproc/pecl-syck/Makefile +++ textproc/pecl-syck/Makefile @@ -18,10 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libsyck.a:textproc/syck -USES= tar:tgz -USE_PHP= spl hash -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= spl:build hash:build IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-syck Index: textproc/pecl-wbxml/Makefile =================================================================== --- textproc/pecl-wbxml/Makefile +++ textproc/pecl-wbxml/Makefile @@ -14,12 +14,10 @@ LIB_DEPENDS= libwbxml2.so:textproc/wbxml2 -USES=tar:tgz +USES= php:ext tar:tgz CONFIGURE_ARGS= --with-wbxml=${LOCALBASE} \ --with-libexpat-dir=${LOCALBASE} -USE_PHP= yes -USE_PHPEXT= yes IGNORE_WITH_PHP= 70 post-patch: Index: textproc/pecl-xdiff/Makefile =================================================================== --- textproc/pecl-xdiff/Makefile +++ textproc/pecl-xdiff/Makefile @@ -15,9 +15,7 @@ LIB_DEPENDS= libxdiff.so:textproc/libxdiff -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 LDFLAGS+= -L${LOCALBASE}/lib Index: textproc/pecl-xslcache/Makefile =================================================================== --- textproc/pecl-xslcache/Makefile +++ textproc/pecl-xslcache/Makefile @@ -13,10 +13,8 @@ LICENSE= PHP301 -USES= tar:tgz -USE_PHP= dom xml xsl -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= dom:build xml:build xsl:build IGNORE_WITH_PHP= 70 .include Index: textproc/pecl-yaml/Makefile =================================================================== --- textproc/pecl-yaml/Makefile +++ textproc/pecl-yaml/Makefile @@ -16,10 +16,7 @@ LIB_DEPENDS= libyaml.so:textproc/libyaml -USES= tar:tgz -USE_PHP= yes -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: textproc/php-mecab/Makefile =================================================================== --- textproc/php-mecab/Makefile +++ textproc/php-mecab/Makefile @@ -1,11 +1,10 @@ # Created by: Gasol Wu # $FreeBSD$ -PORTNAME= mecab +PORTNAME= php-mecab PORTVERSION= 0.6.0 DISTVERSIONPREFIX= v CATEGORIES= textproc -PKGNAMEPREFIX= php- MAINTAINER= gasol.wu@gmail.com COMMENT= PHP bindings of the MeCab @@ -16,13 +15,9 @@ USE_GITHUB= yes GH_ACCOUNT= rsky -GH_PROJECT= ${PKGNAMEPREFIX}${PORTNAME} -WRKSRC= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}/mecab +WRKSRC_SUBDIR= mecab CONFIGURE_ARGS+= --with-mecab=${LOCALBASE}/bin/mecab-config -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz .include Index: textproc/redland-bindings/Makefile =================================================================== --- textproc/redland-bindings/Makefile +++ textproc/redland-bindings/Makefile @@ -28,7 +28,7 @@ PERL_USES= perl5 PERL_USE= PERL5=build,run PHP_CONFIGURE_WITH= php -PHP_USE= PHP=yes PHP_BUILD=yes +PHP_USES= php:build PYTHON_CONFIGURE_WITH= python PYTHON_USES= python RUBY_CONFIGURE_WITH= ruby Index: textproc/zorba/Makefile =================================================================== --- textproc/zorba/Makefile +++ textproc/zorba/Makefile @@ -64,7 +64,7 @@ .if ${PORT_OPTIONS:MPHP} USE_PHP= tokenizer -USE_PHP_BUILD= yes +USES+= php:build WITH_SWIG= yes CMAKE_ARGS+= -DPHP5_INSTALL_PATH:FILEPATH="lib/php/${PHP_EXT_DIR}" PLIST_SUB+= PHP_EXTLIBDIR="lib/php/${PHP_EXT_DIR}" Index: www/ach/Makefile =================================================================== --- www/ach/Makefile +++ www/ach/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 USE_MYSQL= yes -USE_PHP= yes +USES= php USE_GITHUB= yes GH_ACCOUNT= Burton GH_PROJECT= Analysis-of-Competing-Hypotheses Index: www/caldavzap/Makefile =================================================================== --- www/caldavzap/Makefile +++ www/caldavzap/Makefile @@ -14,8 +14,7 @@ LICENSE= AGPLv3 WRKSRC= ${WRKDIR}/${PORTNAME} -USE_PHP= yes -USES= zip +USES= php zip NO_BUILD= yes do-install: Index: www/crp/Makefile =================================================================== --- www/crp/Makefile +++ www/crp/Makefile @@ -12,8 +12,7 @@ MAINTAINER= lars.eggert@gmx.net COMMENT= Automates the process of being the program chair of a conference -USE_PHP= yes -WANT_PHP_WEB= yes +USES= php:web NO_BUILD= yes PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" Index: www/dddbl/Makefile =================================================================== --- www/dddbl/Makefile +++ www/dddbl/Makefile @@ -9,13 +9,11 @@ MAINTAINER= tz@FreeBSD.org COMMENT= Definition Driven Database Layer for PHP -USES= tar:bzip2 +USES= php tar:bzip2 NO_BUILD= yes NO_ARCH= yes -USE_PHP= yes - WRKSRC= ${WRKDIR}/dddbl2 do-install: Index: www/encode-explorer/Makefile =================================================================== --- www/encode-explorer/Makefile +++ www/encode-explorer/Makefile @@ -11,9 +11,7 @@ MAINTAINER= fw@moov.de COMMENT= PHP script to browse, create folders, upload files etc -USE_PHP= yes -WANT_PHP_WEB= yes -USES= zip +USES= php:web zip NO_BUILD= yes OPTIONS_DEFINE= DOCS Index: www/flat-frog/Makefile =================================================================== --- www/flat-frog/Makefile +++ www/flat-frog/Makefile @@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_BUILD= yes -USE_PHP= yes -USES= zip +USES= php zip OPTIONS_DEFINE= DOCS EXAMPLES Index: www/fluxbb/Makefile =================================================================== --- www/fluxbb/Makefile +++ www/fluxbb/Makefile @@ -14,10 +14,9 @@ BROKEN_powerpc64= Does not build -USES= cpe +USES= cpe php SUB_FILES= pkg-message NO_BUILD= yes -USE_PHP= yes OPTIONS_DEFINE= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= MYSQL Index: www/geeklog/Makefile =================================================================== --- www/geeklog/Makefile +++ www/geeklog/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2+ -USES= cpe +USES= cpe php PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" SUB_FILES= pkg-message @@ -20,7 +20,6 @@ USE_MYSQL= yes NO_BUILD= yes -USE_PHP= yes do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} Index: www/iwebcal/Makefile =================================================================== --- www/iwebcal/Makefile +++ www/iwebcal/Makefile @@ -10,10 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webbased iCal calendar viewer -USES= tar:tgz +USES= php tar:tgz NO_BUILD= yes NO_ARCH= yes -USE_PHP= yes WRKSRC= ${WRKDIR}/iWebCal PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" Index: www/mod_myvhost/Makefile =================================================================== --- www/mod_myvhost/Makefile +++ www/mod_myvhost/Makefile @@ -35,8 +35,7 @@ .if ${PORT_OPTIONS:MPHP_MODULE} MAKE_ENV+= WITH_PHP=true -USE_PHP= yes -WANT_PHP_MOD= yes +USES+= php:mod .endif pre-patch: Index: www/mod_vhs/Makefile =================================================================== --- www/mod_vhs/Makefile +++ www/mod_vhs/Makefile @@ -14,12 +14,9 @@ MANUAL_PACKAGE_BUILD= needs apr with LDAP and DBD options enabled -USES= cpe +USES= php:mod,build cpe CPE_VENDOR= xavier_beaudouin USE_APACHE= 22+ -USE_PHP= yes -USE_PHP_BUILD= yes -WANT_PHP_MOD= yes AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= *.c Index: www/pecl-APC/Makefile =================================================================== --- www/pecl-APC/Makefile +++ www/pecl-APC/Makefile @@ -31,9 +31,7 @@ PHP_MODNAME= ${PORTNAME:tl} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message -USE_PHP= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz PORTDOCS= CHANGELOG INSTALL NOTICE apc.php Index: www/pecl-amfext/Makefile =================================================================== --- www/pecl-amfext/Makefile +++ www/pecl-amfext/Makefile @@ -14,9 +14,7 @@ LICENSE= PHP30 -USES= dos2unix libtool tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= dos2unix libtool php:ext tar:tgz PHP_MODNAME= amf IGNORE_WITH_PHP= 70 Index: www/pecl-http/Makefile =================================================================== --- www/pecl-http/Makefile +++ www/pecl-http/Makefile @@ -26,9 +26,7 @@ PHP_DEFAULT= 7.0 IGNORE_WITH_PHP= 55 56 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz CONFLICTS= pecl-http[12]* .include Index: www/pecl-http1/Makefile =================================================================== --- www/pecl-http1/Makefile +++ www/pecl-http1/Makefile @@ -17,10 +17,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes -PHP_MODNAME= http +USES= php:ext tar:tgz IGNORE_WITH_PHP= 56 70 CONFLICTS= pecl-http-* Index: www/pecl-http2/Makefile =================================================================== --- www/pecl-http2/Makefile +++ www/pecl-http2/Makefile @@ -24,9 +24,7 @@ libevent.so:devel/libevent2 IGNORE_WITH_PHP=70 -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz CONFLICTS= pecl-http1* pecl-http-* .include Index: www/pecl-solr/Makefile =================================================================== --- www/pecl-solr/Makefile +++ www/pecl-solr/Makefile @@ -16,10 +16,8 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libxml2.so:textproc/libxml2 -USE_PHP= json -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes +USES= php:ext +USE_PHP= json:build IGNORE_WITH_PHP= 70 .include Index: www/pecl-sphinx/Makefile =================================================================== --- www/pecl-sphinx/Makefile +++ www/pecl-sphinx/Makefile @@ -15,9 +15,7 @@ LIB_DEPENDS= libsphinxclient.so:textproc/libsphinxclient -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 SUB_FILES= pkg-message Index: www/pecl-swish/Makefile =================================================================== --- www/pecl-swish/Makefile +++ www/pecl-swish/Makefile @@ -16,9 +16,7 @@ BUILD_DEPENDS= swish-config:www/swish-e RUN_DEPENDS:= swish-config:www/swish-e -USES= tar:tgz -USE_PHP= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-swish --with-swish=${LOCALBASE}/bin Index: www/pecl-twig/Makefile =================================================================== --- www/pecl-twig/Makefile +++ www/pecl-twig/Makefile @@ -13,10 +13,7 @@ LICENSE= BSD3CLAUSE -USE_PHP= yes -USE_PHPIZE= yes -USE_PHPEXT= yes -USES= tar:tgz +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: www/pecl-varnish/Makefile =================================================================== --- www/pecl-varnish/Makefile +++ www/pecl-varnish/Makefile @@ -20,10 +20,8 @@ BUILD_DEPENDS= varnish4>=0:www/varnish4 -USES= tar:tgz -USE_PHP= hash -USE_PHP_BUILD= yes -USE_PHPEXT= yes +USES= php:ext tar:tgz +USE_PHP= hash:build IGNORE_WITH_PHP= 52 Index: www/pecl-yaf/Makefile =================================================================== --- www/pecl-yaf/Makefile +++ www/pecl-yaf/Makefile @@ -18,11 +18,7 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-php-config=${PREFIX}/bin/php-config -USES= tar:tgz -PHP_MODNAME= ${PORTNAME:tl} -USE_PHP= yes -USE_PHPEXT= yes -USE_PHPIZE= yes +USES= php:ext tar:tgz IGNORE_WITH_PHP= 70 .include Index: www/pecl-yar/Makefile =================================================================== --- www/pecl-yar/Makefile +++ www/pecl-yar/Makefile @@ -15,12 +15,8 @@ BROKEN_powerpc64= Does not build -USES= tar:tgz -PHP_MODNAME= yar -USE_PHP= json curl -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes +USES= php:ext tar:tgz +USE_PHP= json:build curl:build IGNORE_WITH_PHP= 70 CFLAGS+= -I${LOCALBASE}/include Index: www/phalcon/Makefile =================================================================== --- www/phalcon/Makefile +++ www/phalcon/Makefile @@ -11,10 +11,8 @@ LICENSE= BSD3CLAUSE -USE_PHP= hash pdo -USE_PHPEXT= yes -USE_PHPIZE= yes -USE_PHP_BUILD= yes +USES= php:ext +USE_PHP= hash:build pdo:build IGNORE_WITH_PHP= 70 ONLY_FOR_ARCHS= amd64 i386 Index: www/php-screw/Makefile =================================================================== --- www/php-screw/Makefile +++ www/php-screw/Makefile @@ -13,9 +13,8 @@ CRYPTKEY?= 11152, 368, 192, 1281, 62 -USES= libtool +USES= php:phpize libtool USE_PHP= zlib -USE_PHPIZE= yes PLIST_SUB= PHP_EXTDIR="${PHP_EXT_DIR}" SUB_FILES= pkg-message Index: www/php-templates/Makefile =================================================================== --- www/php-templates/Makefile +++ www/php-templates/Makefile @@ -15,10 +15,8 @@ COMMENT= Template framework for PHP WRKSRC= ${WRKDIR}/templates -USES= dos2unix +USES= dos2unix php:phpize -USE_PHP= yes -USE_PHPIZE= yes IGNORE_WITH_PHP= 70 CONFIGURE_ARGS= --enable-templates=shared Index: www/php55-opcache/Makefile =================================================================== --- www/php55-opcache/Makefile +++ www/php55-opcache/Makefile @@ -7,6 +7,6 @@ PKGNAMESUFFIX= -opcache -USE_ZENDEXT= yes +USES= php:zend .include "${MASTERDIR}/Makefile" Index: www/php56-opcache/Makefile =================================================================== --- www/php56-opcache/Makefile +++ www/php56-opcache/Makefile @@ -7,6 +7,6 @@ PKGNAMESUFFIX= -opcache -USE_ZENDEXT= yes +USES= php:zend .include "${MASTERDIR}/Makefile" Index: www/php70-opcache/Makefile =================================================================== --- www/php70-opcache/Makefile +++ www/php70-opcache/Makefile @@ -7,6 +7,6 @@ PKGNAMESUFFIX= -opcache -USE_ZENDEXT= yes +USES= php:zend .include "${MASTERDIR}/Makefile" Index: www/phpbb3/Makefile =================================================================== --- www/phpbb3/Makefile +++ www/phpbb3/Makefile @@ -16,8 +16,7 @@ CONFLICTS= phpbb-tw-[0-9]* phpbb-devel-[0-9]* \ phpbb-[0-2]* -USES= tar:bzip2 -USE_PHP= yes +USES= php tar:bzip2 OPTIONS_DEFINE= DOCS Index: www/phpgroupware/Makefile =================================================================== --- www/phpgroupware/Makefile +++ www/phpgroupware/Makefile @@ -8,9 +8,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Web based GroupWare system -USES= tar:bzip2 -USE_PHP= yes -WANT_PHP_MOD= yes +USES= php:mod tar:bzip2 IGNORE_WITH_PHP= 70 NO_BUILD= yes Index: www/phpmustache/Makefile =================================================================== --- www/phpmustache/Makefile +++ www/phpmustache/Makefile @@ -16,8 +16,7 @@ GH_ACCOUNT= bobthecow GH_PROJECT= mustache.php -USE_PHP= yes -USE_PHP_BUILD= yes +USES= php:build NO_ARCH= yes SUB_FILES= pkg-message Index: www/phpwebapp/Makefile =================================================================== --- www/phpwebapp/Makefile +++ www/phpwebapp/Makefile @@ -11,9 +11,7 @@ NO_ARCH= yes NO_BUILD= yes -USE_PHP= yes -USES= shebangfix -WANT_PHP_WEB= yes +USES= php:web shebangfix SHEBANG_FILES= web_app/boxes/menu/edit/xsl/test/*.sh \ web_app/boxes/webnotes/db/dump.sh \ Index: www/pnews/Makefile =================================================================== --- www/pnews/Makefile +++ www/pnews/Makefile @@ -13,8 +13,7 @@ LICENSE= GPLv2+ -USES= tar:tgz -USE_PHP= yes +USES= php tar:tgz NO_BUILD= yes PNEWSDIR?= www/pnews Index: www/pserv/Makefile =================================================================== --- www/pserv/Makefile +++ www/pserv/Makefile @@ -21,24 +21,19 @@ OPTIONS_DEFAULT= LOG PHP LOG_DESC= Enable loggin -.include - -.if ${PORT_OPTIONS:MPHP} -USE_PHP= yes -WANT_PHP_CGI= yes -.endif +PHP_USES= php:cgi post-patch: @${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g;s|%%LOCALBASE%%|${LOCALBASE}|g" \ ${WRKSRC}/defaults/pserv.conf ${WRKSRC}/sources/main.h -.if ! ${PORT_OPTIONS:MLOG} + +post-patch-LOG-off: @${REINPLACE_CMD} "s|define LOG|undef LOG|" \ ${WRKSRC}/sources/main.h -.endif -.if ! ${PORT_OPTIONS:MPHP} + +post-patch-PHP-off: @${REINPLACE_CMD} "s|define PHP|undef PHP|" \ ${WRKSRC}/sources/main.h -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sources/pserv ${STAGEDIR}${PREFIX}/sbin/ Index: www/punbb/Makefile =================================================================== --- www/punbb/Makefile +++ www/punbb/Makefile @@ -23,8 +23,7 @@ SUB_FILES= pkg-message NO_BUILD= yes -USE_PHP= yes -USES= tar:bzip2 +USES= php tar:bzip2 OPTIONS_DEFINE= LANGUAGE_PACK EXTRAS OPTIONS_DEFAULT= LANGUAGE_PACK EXTRAS Index: www/skytemplate/Makefile =================================================================== --- www/skytemplate/Makefile +++ www/skytemplate/Makefile @@ -11,8 +11,7 @@ MAINTAINER= munggo@gmail.com COMMENT= Yet another PHP compiling template engine -USE_PHP= yes -WANT_PHP_WEB= yes +USES= php:web NO_BUILD= yes SUB_FILES= pkg-message Index: www/suphp/Makefile =================================================================== --- www/suphp/Makefile +++ www/suphp/Makefile @@ -13,14 +13,12 @@ COMMENT= Securely execute PHP scripts under Apache GNU_CONFIGURE= yes -USES= autoreconf libtool +USES= autoreconf libtool php:cgi SUB_FILES= pkg-message USE_APACHE= 22+ CFLAGS+= -I${LOCALBASE}/include USE_CSTD= gnu89 -USE_PHP= yes -WANT_PHP_CGI= yes MYPORTDOCS= apache/CONFIG \ apache/INSTALL \ Index: www/template_/Makefile =================================================================== --- www/template_/Makefile +++ www/template_/Makefile @@ -15,8 +15,7 @@ WRKSRC= ${WRKDIR} FETCH_ARGS+= -o ${DISTNAME}.tar.gz -USE_PHP= yes -WANT_PHP_WEB= yes +USES= php:web NO_WRKSUBDIR= yes NO_BUILD= yes Index: www/thundercache/Makefile =================================================================== --- www/thundercache/Makefile +++ www/thundercache/Makefile @@ -53,7 +53,7 @@ .endif .if ${PORT_OPTIONS:MPHP} -USE_PHP+= curl pcre bcmath pdo mcrypt mhash session +USE_PHP+= curl pcre bcmath pdo mcrypt hash session . if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pdo_pgsql pgsql . endif Index: www/thundersnarf/Makefile =================================================================== --- www/thundersnarf/Makefile +++ www/thundersnarf/Makefile @@ -36,7 +36,7 @@ .endif .if ${PORT_OPTIONS:MPHP} -USE_PHP+= curl pcre bcmath pdo mcrypt mhash session pgsql spl dom xmlrpc ctype openssl simplexml soap json +USE_PHP+= curl pcre bcmath pdo mcrypt hash session pgsql spl dom xmlrpc ctype openssl simplexml soap json . if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pdo_pgsql pgsql . endif Index: www/webgrind/Makefile =================================================================== --- www/webgrind/Makefile +++ www/webgrind/Makefile @@ -18,7 +18,7 @@ SNAPSHOT= 20140207 -USE_PHP= yes +USES= php NO_BUILD= yes NO_ARCH= yes Index: www/xcache/Makefile =================================================================== --- www/xcache/Makefile +++ www/xcache/Makefile @@ -11,9 +11,7 @@ LICENSE= BSD3CLAUSE -USES= tar:bzip2 -USE_PHP= yes -USE_PHPIZE= yes +USES= php:phpize tar:bzip2 CONFIGURE_ARGS= --enable-xcache=shared Index: www/zen-cart/Makefile =================================================================== --- www/zen-cart/Makefile +++ www/zen-cart/Makefile @@ -15,12 +15,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt -USES= dos2unix shebangfix zip +USES= dos2unix php:web shebangfix zip SHEBANG_FILES= editors/htmlarea/examples/2-areas.cgi \ editors/htmlarea/examples/test.cgi \ editors/htmlarea/plugins/SpellChecker/spell-check-logic.cgi -USE_PHP= yes -WANT_PHP_WEB= yes DOS2UNIX_REGEX= .*\.php NO_BUILD= yes