pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/php Make PHP_BASE_VERS to initial php{53,54,55,56...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e92eef8b3008
branches:  trunk
changeset: 648493:e92eef8b3008
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Mar 15 11:50:53 2015 +0000

description:
Make PHP_BASE_VERS to initial php{53,54,55,56} version imported.

So, update of php{53,54,55,56} dose not change minimum version of depending
php{53,54,55,56} any more.

Since it relax minimum version, no need to bump PKGREVISION of each pacakge
depending to php{53,54,55,56}.  If a package requires specific (and later)
versino of PHP, it should already specify such a version in dependency.

diffstat:

 lang/php/phpversion.mk |  19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r ea8790dc867f -r e92eef8b3008 lang/php/phpversion.mk
--- a/lang/php/phpversion.mk    Sun Mar 15 10:02:23 2015 +0000
+++ b/lang/php/phpversion.mk    Sun Mar 15 11:50:53 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: phpversion.mk,v 1.88 2015/02/20 01:17:49 taca Exp $
+# $NetBSD: phpversion.mk,v 1.89 2015/03/15 11:50:53 taca Exp $
 #
 # This file selects a PHP version, based on the user's preferences and
 # the installed packages. It does not add a dependency on the PHP
@@ -191,22 +191,26 @@
 #
 .if ${_PHP_VERSION} == "53"
 PHPPKGSRCDIR=          ../../lang/php53
-PHP_BASE_VERS=         ${PHP53_VERSION}
+PHP_VERSION=           ${PHP53_VERSION}
+PHP_INITIAL_TEENY=     2
 PHP_PKG_PREFIX=                php53
 PHP_EXTENSION_DIR=     lib/php/${PHP53_RELDATE}
 .elif ${_PHP_VERSION} == "54"
 PHPPKGSRCDIR=          ../../lang/php54
-PHP_BASE_VERS=         ${PHP54_VERSION}
+PHP_VERSION=           ${PHP54_VERSION}
+PHP_INITIAL_TEENY=     4
 PHP_PKG_PREFIX=                php54
 PHP_EXTENSION_DIR=     lib/php/${PHP54_RELDATE}
 .elif ${_PHP_VERSION} == "55"
 PHPPKGSRCDIR=          ../../lang/php55
-PHP_BASE_VERS=         ${PHP55_VERSION}
+PHP_VERSION=           ${PHP55_VERSION}
+PHP_INITIAL_TEENY=     1
 PHP_PKG_PREFIX=                php55
 PHP_EXTENSION_DIR=     lib/php/${PHP55_RELDATE}
 .elif ${_PHP_VERSION} == "56"
 PHPPKGSRCDIR=          ../../lang/php56
-PHP_BASE_VERS=         ${PHP56_VERSION}
+PHP_VERSION=           ${PHP56_VERSION}
+PHP_INITIAL_TEENY=     3
 PHP_PKG_PREFIX=                php56
 PHP_EXTENSION_DIR=     lib/php/${PHP56_RELDATE}
 .else
@@ -214,6 +218,11 @@
 PKG_FAIL_REASON+=      "${PKG_PHP} is not a valid package"
 .endif
 
+_PHP_VER_MAJOR=                ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
+_PHP_VER_MINOR=                ${PHP_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
+
+PHP_BASE_VERS= ${_PHP_VER_MAJOR}.${_PHP_VER_MINOR}.${PHP_INITIAL_TEENY}
+
 #
 # check installed version aginst required:
 #



Home | Main Index | Thread Index | Old Index