CVS commit: pkgsrc/lang

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Feb  5 11:21:56 UTC 2018

Modified Files:
        pkgsrc/lang/php70: buildlink3.mk
        pkgsrc/lang/php71: buildlink3.mk
        pkgsrc/lang/php72: buildlink3.mk

Log Message:
php7*: Standardise on major.minor.99 usage in buildlink3.mk

With the introduction of beta and rc releases of php7* into pkgsrc the pattern
matching is often incorrect (for example the current version of php-7.1.0rc6
breaks both <7.1.0 and >=7.1.0).  Using .99 is not ideal but does at least
avoid the confusion developers seem to be having with the pmatch ordering.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php70/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php71/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/php72/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php70/buildlink3.mk
diff -u pkgsrc/lang/php70/buildlink3.mk:1.3 pkgsrc/lang/php70/buildlink3.mk:1.4
--- pkgsrc/lang/php70/buildlink3.mk:1.3 Tue Sep 26 14:02:32 2017
+++ pkgsrc/lang/php70/buildlink3.mk     Mon Feb  5 11:21:56 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/09/26 14:02:32 roy Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/02/05 11:21:56 jperkin Exp $
 
 BUILDLINK_TREE+=       php
 
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.0.0<7.1.0
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.0.0<7.1.0
+BUILDLINK_API_DEPENDS.php+=    php>=7.0.0<7.0.99
+BUILDLINK_ABI_DEPENDS.php+=    php>=7.0.0<7.0.99
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php70
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/lang/php71/buildlink3.mk
diff -u pkgsrc/lang/php71/buildlink3.mk:1.4 pkgsrc/lang/php71/buildlink3.mk:1.5
--- pkgsrc/lang/php71/buildlink3.mk:1.4 Sun Nov 26 19:14:34 2017
+++ pkgsrc/lang/php71/buildlink3.mk     Mon Feb  5 11:21:56 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/11/26 19:14:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/02/05 11:21:56 jperkin Exp $
 
 BUILDLINK_TREE+=       php
 
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.1.0<7.1.99
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.1.0<7.1.99
+BUILDLINK_API_DEPENDS.php+=    php>=7.0.99<7.1.99
+BUILDLINK_ABI_DEPENDS.php+=    php>=7.0.99<7.1.99
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php71
 
 .include "../../textproc/libxml2/buildlink3.mk"

Index: pkgsrc/lang/php72/buildlink3.mk
diff -u pkgsrc/lang/php72/buildlink3.mk:1.2 pkgsrc/lang/php72/buildlink3.mk:1.3
--- pkgsrc/lang/php72/buildlink3.mk:1.2 Mon Feb  5 08:51:25 2018
+++ pkgsrc/lang/php72/buildlink3.mk     Mon Feb  5 11:21:56 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/02/05 08:51:25 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/02/05 11:21:56 jperkin Exp $
 
 BUILDLINK_TREE+=       php
 
 .if !defined(PHP_BUILDLINK3_MK)
 PHP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.php+=    php>=7.2.2nb2<7.3
-BUILDLINK_ABI_DEPENDS.php+=    php>=7.2.2nb2<7.3
+BUILDLINK_API_DEPENDS.php+=    php>=7.1.99<7.2.99
+BUILDLINK_ABI_DEPENDS.php+=    php>=7.1.99<7.2.99
 BUILDLINK_PKGSRCDIR.php?=      ../../lang/php72
 
 .include "../../textproc/libxml2/buildlink3.mk"