Attachment 209084 Details for Bug 241904 – PHP_VERSION -> PHP_VER check

[patch] PHP_VERSION -> PHP_VER check

Mk_Uses_php.mk.diff (text/plain), 1.72 KB, created by Dima Panov on 2019-11-12 04:52:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2019-11-12 04:52:16 UTC

Size: 1.72 KB

patch

obsolete

>Index: Mk/Uses/php.mk
>===================================================================
>--- Mk/Uses/php.mk	(revision 517300)
>+++ Mk/Uses/php.mk	(working copy)
>@@ -241,7 +241,7 @@
> .  endif
> 
> .  if ${php_ARGS:Mcgi}
>-.    if defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == ""
>+.    if defined(PHP_VER) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == ""
> check-makevars::
> 		@${ECHO_CMD} "This port requires the CGI version of PHP, but you have already"
> 		@${ECHO_CMD} "installed a PHP port without CGI."
>@@ -250,7 +250,7 @@
> .  endif
> 
> .  if ${php_ARGS:Mcli}
>-.    if defined(PHP_VERSION) && ${PHP_SAPI:Mcli} == ""
>+.    if defined(PHP_VER) && ${PHP_SAPI:Mcli} == ""
> check-makevars::
> 		@${ECHO_CMD} "This port requires the CLI version of PHP, but you have already"
> 		@${ECHO_CMD} "installed a PHP port without CLI."
>@@ -259,7 +259,7 @@
> .  endif
> 
> .  if ${php_ARGS:Membed}
>-.    if defined(PHP_VERSION) && ${PHP_SAPI:Membed} == ""
>+.    if defined(PHP_VER) && ${PHP_SAPI:Membed} == ""
> check-makevars::
> 		@${ECHO_CMD} "This port requires the embedded library version of PHP, but you have already"
> 		@${ECHO_CMD} "installed a PHP port without the embedded library."
>@@ -274,7 +274,7 @@
> BUILD_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
> .  endif
> RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
>-.  if  ${php_ARGS:Mmod} || (${php_ARGS:Mweb} && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "")
>+.  if  ${php_ARGS:Mmod} || (${php_ARGS:Mweb} && defined(PHP_VER) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "")
> USE_APACHE_RUN=	22+
> .include "${PORTSDIR}/Mk/Uses/apache.mk"
> # libphpX.so only has the major version number in it, so remove the last digit of PHP_VER to get it.

Actions: View | Diff

Attachments on bug 241904: 209084