svn commit: r418853 - in head/lang: php55 php55-extensions php56 php56-extensions php70 php70-extensions
Bryan Drewery
bdrewery at FreeBSD.org
Wed Jul 20 20:04:52 UTC 2016
Author: bdrewery
Date: Wed Jul 20 20:04:50 2016
New Revision: 418853
URL: https://svnweb.freebsd.org/changeset/ports/418853
Log:
If DEFAULT_VERSIONS=php=* is set, then PHP_DEFAULT will be overridden
in bsd.default-versions.mk later, and the value from the Makefile will
not be used at all. We would change bsd.default-versions.mk, but really
these ports should not be changing what the "default" it. Change to
modifying what the "current" version is as PHP_VER.
This fixes some cases of 'make check-sanity' not passing for php extension
ports in Poudriere where there is no LOCALBASE/etc/php.conf to set a proper
PHP_VER. In these cases the PHP_DEFAULT value (of 5.6) is used rather than
the version set by the extension Makefile and the later checks for
whether that version has that extension may incorrectly error.
Modified:
head/lang/php55-extensions/Makefile
head/lang/php55/Makefile
head/lang/php55/Makefile.ext
head/lang/php56-extensions/Makefile
head/lang/php56/Makefile
head/lang/php56/Makefile.ext
head/lang/php70-extensions/Makefile
head/lang/php70/Makefile
head/lang/php70/Makefile.ext
Modified: head/lang/php55-extensions/Makefile
==============================================================================
--- head/lang/php55-extensions/Makefile Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php55-extensions/Makefile Wed Jul 20 20:04:50 2016 (r418853)
@@ -10,7 +10,7 @@ MAINTAINER= ale at FreeBSD.org
COMMENT= "meta-port" to install PHP extensions
USES= metaport php
-PHP_DEFAULT= 5.5
+PHP_VER= 55
IGNORE_WITH_PHP=56 70
OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
Modified: head/lang/php55/Makefile
==============================================================================
--- head/lang/php55/Makefile Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php55/Makefile Wed Jul 20 20:04:50 2016 (r418853)
@@ -94,7 +94,7 @@ IGNORE= doesn't install the Apache modu
.if defined(PKGNAMEPREFIX)
USES+= php
-PHP_DEFAULT= 5.5
+PHP_VER= 55
IGNORE_WITH_PHP=53 54 5
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
Modified: head/lang/php55/Makefile.ext
==============================================================================
--- head/lang/php55/Makefile.ext Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php55/Makefile.ext Wed Jul 20 20:04:50 2016 (r418853)
@@ -2,7 +2,7 @@ COMMENT= The ${PHP_MODNAME} shared exten
USES+= php:ext
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
-PHP_DEFAULT= 5.5
+PHP_VER= 55
IGNORE_WITH_PHP= 56 70
EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME}
Modified: head/lang/php56-extensions/Makefile
==============================================================================
--- head/lang/php56-extensions/Makefile Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php56-extensions/Makefile Wed Jul 20 20:04:50 2016 (r418853)
@@ -10,7 +10,7 @@ MAINTAINER= ale at FreeBSD.org
COMMENT= "meta-port" to install PHP extensions
USES= metaport php
-PHP_DEFAULT= 5.6
+PHP_VER= 56
IGNORE_WITH_PHP= 55 70
OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
Modified: head/lang/php56/Makefile
==============================================================================
--- head/lang/php56/Makefile Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php56/Makefile Wed Jul 20 20:04:50 2016 (r418853)
@@ -89,7 +89,7 @@ CONFIGURE_ARGS+=--enable-fpm \
.if defined(PKGNAMEPREFIX)
USES+= php
-PHP_DEFAULT= 5.6
+PHP_VER= 56
IGNORE_WITH_PHP=53 54 5
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
Modified: head/lang/php56/Makefile.ext
==============================================================================
--- head/lang/php56/Makefile.ext Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php56/Makefile.ext Wed Jul 20 20:04:50 2016 (r418853)
@@ -2,7 +2,7 @@ COMMENT= The ${PHP_MODNAME} shared exten
USES+= php:ext
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
-PHP_DEFAULT= 5.6
+PHP_VER= 56
IGNORE_WITH_PHP= 55 70
EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME}
Modified: head/lang/php70-extensions/Makefile
==============================================================================
--- head/lang/php70-extensions/Makefile Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php70-extensions/Makefile Wed Jul 20 20:04:50 2016 (r418853)
@@ -10,7 +10,7 @@ MAINTAINER= miwi at FreeBSD.org
COMMENT= "meta-port" to install PHP extensions
USES= metaport php
-PHP_DEFAULT= 7.0
+PHP_VER= 70
IGNORE_WITH_PHP= 55 56
OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
Modified: head/lang/php70/Makefile
==============================================================================
--- head/lang/php70/Makefile Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php70/Makefile Wed Jul 20 20:04:50 2016 (r418853)
@@ -84,7 +84,7 @@ CONFIGURE_ARGS+=--enable-fpm \
.if defined(PKGNAMEPREFIX)
USES+= php
-PHP_DEFAULT= 7.0
+PHP_VER= 70
IGNORE_WITH_PHP= 55 56
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
Modified: head/lang/php70/Makefile.ext
==============================================================================
--- head/lang/php70/Makefile.ext Wed Jul 20 19:56:26 2016 (r418852)
+++ head/lang/php70/Makefile.ext Wed Jul 20 20:04:50 2016 (r418853)
@@ -2,7 +2,7 @@ COMMENT= The ${PHP_MODNAME} shared exten
USES+= php:ext
PHP_MODNAME= ${PKGNAMESUFFIX:S/-//}
-PHP_DEFAULT= 7.0
+PHP_VER= 70
IGNORE_WITH_PHP= 55 56
EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME}
More information about the svn-ports-head
mailing list