[pkgsrc/trunk]: pkgsrc/lang Fix problem by PHP_BASE_VERS related changes.

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/869775a03fb3
branches:  trunk
changeset: 648670:869775a03fb3
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Mar 16 00:26:31 2015 +0000

description:
Fix problem by PHP_BASE_VERS related changes.

diffstat:

 lang/php/common.mk         |  4 ++--
 lang/php54/Makefile        |  4 ++--
 lang/php54/Makefile.common |  3 +--
 lang/php55/Makefile        |  4 ++--
 lang/php55/Makefile.common |  3 +--
 lang/php56/Makefile        |  4 ++--
 lang/php56/Makefile.common |  3 +--
 7 files changed, 11 insertions(+), 14 deletions(-)

diffs (109 lines):

diff -r 1c71a64eece4 -r 869775a03fb3 lang/php/common.mk
--- a/lang/php/common.mk        Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php/common.mk        Mon Mar 16 00:26:31 2015 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: common.mk,v 1.3 2015/03/15 15:25:09 taca Exp $
+# $NetBSD: common.mk,v 1.4 2015/03/16 00:26:31 taca Exp $
 # used by lang/php54/Makefile.common
 # used by lang/php55/Makefile.common
 # 
 .if !defined(PHPCOMMON_MK)
 PHPCOMMON_MK=  defined
 
-DISTNAME?=             php-${PHP_BASE_VERS}
+DISTNAME?=             php-${PHP_VERSION}
 
 .if !defined(PECL_VERSION)
 MASTER_SITES?=         http://www.php.net/distributions/ \
diff -r 1c71a64eece4 -r 869775a03fb3 lang/php54/Makefile
--- a/lang/php54/Makefile       Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php54/Makefile       Mon Mar 16 00:26:31 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2015/02/19 09:37:36 taca Exp $
+# $NetBSD: Makefile,v 1.28 2015/03/16 00:26:31 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
-PKGNAME=               php-${PHP_BASE_VERS}
+PKGNAME=               php-${PHP_VERSION}
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
diff -r 1c71a64eece4 -r 869775a03fb3 lang/php54/Makefile.common
--- a/lang/php54/Makefile.common        Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php54/Makefile.common        Mon Mar 16 00:26:31 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2014/10/05 16:41:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2015/03/16 00:26:31 taca Exp $
 # used by lang/php54/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php54-extensions/Makefile
@@ -6,7 +6,6 @@
 # used by databases/php-sqlrelay/Makefile
 
 PHP_VERSION_REQD=      54
-PHP_BASE_VERS=         ${PHP54_VERSION}
 
 .include "../../lang/php/common.mk"
 
diff -r 1c71a64eece4 -r 869775a03fb3 lang/php55/Makefile
--- a/lang/php55/Makefile       Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php55/Makefile       Mon Mar 16 00:26:31 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2015/02/19 13:35:24 taca Exp $
+# $NetBSD: Makefile,v 1.20 2015/03/16 00:26:31 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
-PKGNAME=               php-${PHP_BASE_VERS}
+PKGNAME=               php-${PHP_VERSION}
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
diff -r 1c71a64eece4 -r 869775a03fb3 lang/php55/Makefile.common
--- a/lang/php55/Makefile.common        Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php55/Makefile.common        Mon Mar 16 00:26:31 2015 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2013/10/25 21:47:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2015/03/16 00:26:31 taca Exp $
 # used by lang/php55/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php55-extensions/Makefile
 
 PHP_VERSION_REQD=      55
-PHP_BASE_VERS=         ${PHP55_VERSION}
 
 .include "../../lang/php/common.mk"
 
diff -r 1c71a64eece4 -r 869775a03fb3 lang/php56/Makefile
--- a/lang/php56/Makefile       Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php56/Makefile       Mon Mar 16 00:26:31 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2015/02/20 01:17:49 taca Exp $
+# $NetBSD: Makefile,v 1.5 2015/03/16 00:26:31 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
-PKGNAME=               php-${PHP_BASE_VERS}
+PKGNAME=               php-${PHP_VERSION}
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
diff -r 1c71a64eece4 -r 869775a03fb3 lang/php56/Makefile.common
--- a/lang/php56/Makefile.common        Mon Mar 16 00:16:18 2015 +0000
+++ b/lang/php56/Makefile.common        Mon Mar 16 00:26:31 2015 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2014/11/24 15:37:08 taca Exp $
+# $NetBSD: Makefile.common,v 1.2 2015/03/16 00:26:31 taca Exp $
 # used by lang/php56/Makefile.php
 # used by lang/php/ext.mk
 # used by meta-pkgs/php56-extensions/Makefile
 
 PHP_VERSION_REQD=      56
-PHP_BASE_VERS=         ${PHP56_VERSION}
 
 .include "../../lang/php/common.mk"