Page MenuHomeFreeBSD
Files F139443450

D6936.id17811.diff
No OneTemporary
Actions

D6936.id17811.diff
View Options

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,34 @@
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
+
PHPBASE?= ${LOCALBASE}
. if exists(${PHPBASE}/etc/php.conf)
.include "${PHPBASE}/etc/php.conf"
@@ -98,16 +127,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 +145,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 +154,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 +166,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 +179,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 +201,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 +235,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 +244,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 +264,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"
@@ -349,7 +378,7 @@
. for extension in ${USE_PHP}
. if ${_USE_PHP_VER${PHP_VER}:M${extension}} != ""
. if ${PHP_EXT_INC:M${extension}} == ""
-. if defined(USE_PHP_BUILD)
+. if ${php_ARGS:Mbuild}
BUILD_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS}
. endif
RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${${extension}_DEPENDS}
@@ -357,7 +386,7 @@
. else
ext= ${extension}
. if ${ext} == "mhash"
-. if defined(USE_PHP_BUILD)
+. if ${php_ARGS:Mbuild}
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}
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})

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 13, 3:52 AM (16 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26920437
Default Alt Text
D6936.id17811.diff (8 KB)

Event Timeline