Mon Mar 26 02:33:41 2018 UTC ()
add support for netbsd-6 and netbsd-7.  sort of works.  the
failures i see are more generic and not x11 at this point.


(mrg)
diff -r1.2 -r1.3 pkgsrc/x11/xorgproto/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/x11/xorgproto/builtin.mk
cvs diff -r1.2 -r1.3 pkgsrc/x11/xorgproto/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/buildlink3.mk 2018/03/07 12:00:13 1.2
+++ pkgsrc/x11/xorgproto/buildlink3.mk 2018/03/26 02:33:41 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.2 2018/03/07 12:00:13 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2018/03/26 02:33:41 mrg Exp $
2 2
3BUILDLINK_TREE+= xorgproto 3BUILDLINK_TREE+= xorgproto
4 4
5.if !defined(XORGPROTO_BUILDLINK3_MK) 5.if !defined(XORGPROTO_BUILDLINK3_MK)
6XORGPROTO_BUILDLINK3_MK:= 6XORGPROTO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2018.1 8BUILDLINK_API_DEPENDS.xorgproto+= xorgproto>=2016.1
9BUILDLINK_PKGSRCDIR.xorgproto?= ../../x11/xorgproto 9BUILDLINK_PKGSRCDIR.xorgproto?= ../../x11/xorgproto
10BUILDLINK_DEPMETHOD.xorgproto?= build 10BUILDLINK_DEPMETHOD.xorgproto?= build
11.endif # XORGPROTO_BUILDLINK3_MK 11.endif # XORGPROTO_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -xorgproto 13BUILDLINK_TREE+= -xorgproto
cvs diff -r1.2 -r1.3 pkgsrc/x11/xorgproto/builtin.mk (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/builtin.mk 2018/03/14 09:37:35 1.2
+++ pkgsrc/x11/xorgproto/builtin.mk 2018/03/26 02:33:41 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: builtin.mk,v 1.2 2018/03/14 09:37:35 mrg Exp $ 1# $NetBSD: builtin.mk,v 1.3 2018/03/26 02:33:41 mrg Exp $
2 2
3BUILTIN_PKG:= xorgproto 3BUILTIN_PKG:= xorgproto
4 4
5PRE_XORGPROTO_LIST_MISSING = \ 5PRE_XORGPROTO_LIST_MISSING = \
6 applewmproto \ 6 applewmproto \
7 dmxproto \ 7 dmxproto \
8 lg3dproto \ 8 lg3dproto \
9 printproto \ 9 printproto \
10 windowswmproto \ 10 windowswmproto \
11 xcalibrateproto \ 11 xcalibrateproto \
12 xf86rushproto 12 xf86rushproto
13PRE_XORGPROTO_LIST = \ 13PRE_XORGPROTO_LIST = \
14 bigreqsproto \ 14 bigreqsproto \
@@ -35,25 +35,31 @@ PRE_XORGPROTO_LIST = \ @@ -35,25 +35,31 @@ PRE_XORGPROTO_LIST = \
35 xextproto \ 35 xextproto \
36 xf86bigfontproto \ 36 xf86bigfontproto \
37 xf86dgaproto \ 37 xf86dgaproto \
38 xf86driproto \ 38 xf86driproto \
39 xf86miscproto \ 39 xf86miscproto \
40 xf86vidmodeproto \ 40 xf86vidmodeproto \
41 xineramaproto \ 41 xineramaproto \
42 xproxymngproto 42 xproxymngproto
43 43
44# Make xproto last, for the version matching. 44# Make xproto last, for the version matching.
45PRE_XORGPROTO_LIST += \ 45PRE_XORGPROTO_LIST += \
46 xproto 46 xproto
47 47
 48# NetBSD-current (with modern xorgproto) has 7.0.32.
 49# NetBSD-8 has 7.0.31.
 50# NetBSD-7 has 7.0.26.
 51# NetBSD-6 has 7.0.22.
48BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n \ 52BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n \
 53 -e 's/Version: 7\.0\.32/2018.4/p' \
49 -e 's/Version: 7\.0\.31/2018.1/p' \ 54 -e 's/Version: 7\.0\.31/2018.1/p' \
50 -e 's/Version: 7\.0\.32/2018.4/p' 55 -e 's/Version: 7\.0\.26/2017.1/p' \
 56 -e 's/Version: 7\.0\.22/2016.1/p'
51 57
52.for _p in ${PRE_XORGPROTO_LIST} 58.for _p in ${PRE_XORGPROTO_LIST}
53PKGCONFIG_FILE.xorgproto= ${X11BASE}/lib/pkgconfig/${_p}.pc 59PKGCONFIG_FILE.xorgproto= ${X11BASE}/lib/pkgconfig/${_p}.pc
54PKGCONFIG_FILE.xorgproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/${_p}.pc 60PKGCONFIG_FILE.xorgproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/${_p}.pc
55PKGCONFIG_FILE.xorgproto+= ${X11BASE}/share/pkgconfig/${_p}.pc 61PKGCONFIG_FILE.xorgproto+= ${X11BASE}/share/pkgconfig/${_p}.pc
56.endfor 62.endfor
57 63
58.include "../../mk/buildlink3/pkgconfig-builtin.mk" 64.include "../../mk/buildlink3/pkgconfig-builtin.mk"
59.include "../../mk/x11.builtin.mk" 65.include "../../mk/x11.builtin.mk"