CVS commit: pkgsrc/x11/xorgproto

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Mar 26 02:33:41 UTC 2018

Modified Files:
        pkgsrc/x11/xorgproto: buildlink3.mk builtin.mk

Log Message:
add support for netbsd-6 and netbsd-7.  sort of works.  the
failures i see are more generic and not x11 at this point.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xorgproto/buildlink3.mk \
    pkgsrc/x11/xorgproto/builtin.mk

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

Modified files:

Index: pkgsrc/x11/xorgproto/buildlink3.mk
diff -u pkgsrc/x11/xorgproto/buildlink3.mk:1.2 pkgsrc/x11/xorgproto/buildlink3.mk:1.3
--- pkgsrc/x11/xorgproto/buildlink3.mk:1.2      Wed Mar  7 12:00:13 2018
+++ pkgsrc/x11/xorgproto/buildlink3.mk  Mon Mar 26 02:33:41 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/03/07 12:00:13 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/03/26 02:33:41 mrg Exp $
 
 BUILDLINK_TREE+=       xorgproto
 
 .if !defined(XORGPROTO_BUILDLINK3_MK)
 XORGPROTO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xorgproto+=      xorgproto>=2018.1
+BUILDLINK_API_DEPENDS.xorgproto+=      xorgproto>=2016.1
 BUILDLINK_PKGSRCDIR.xorgproto?=                ../../x11/xorgproto
 BUILDLINK_DEPMETHOD.xorgproto?=                build
 .endif # XORGPROTO_BUILDLINK3_MK
Index: pkgsrc/x11/xorgproto/builtin.mk
diff -u pkgsrc/x11/xorgproto/builtin.mk:1.2 pkgsrc/x11/xorgproto/builtin.mk:1.3
--- pkgsrc/x11/xorgproto/builtin.mk:1.2 Wed Mar 14 09:37:35 2018
+++ pkgsrc/x11/xorgproto/builtin.mk     Mon Mar 26 02:33:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2018/03/14 09:37:35 mrg Exp $
+# $NetBSD: builtin.mk,v 1.3 2018/03/26 02:33:41 mrg Exp $
 
 BUILTIN_PKG:=  xorgproto
 
@@ -45,9 +45,15 @@ PRE_XORGPROTO_LIST = \
 PRE_XORGPROTO_LIST += \
        xproto
 
+# NetBSD-current (with modern xorgproto) has 7.0.32.
+# NetBSD-8 has 7.0.31.
+# NetBSD-7 has 7.0.26.
+# NetBSD-6 has 7.0.22.
 BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n \
+       -e 's/Version: 7\.0\.32/2018.4/p' \
        -e 's/Version: 7\.0\.31/2018.1/p' \
-       -e 's/Version: 7\.0\.32/2018.4/p'
+       -e 's/Version: 7\.0\.26/2017.1/p' \
+       -e 's/Version: 7\.0\.22/2016.1/p'
 
 .for _p in ${PRE_XORGPROTO_LIST}
 PKGCONFIG_FILE.xorgproto=      ${X11BASE}/lib/pkgconfig/${_p}.pc