From 23df78d74c003ebddd987e3b0997d51968489c5a Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 13 Mar 2018 02:06:12 +0000 Subject: fake up xorgproto support for native xsrc. it has some failings but is likely sufficient: - add xorgproto support to x11-links, bump version - add a builtin.mk for xorgproto. check for the list of packages that xorgproto covers, eliding the few that native xsrc never installed, and making sure xproto is last. use the BUILTIN_VERSION_SCRIPT method to convert Version: 7.0.31 into the necessary 2018.1. the missing packages are a problem, but since we've never had a report about it, it's not a big problem. the things newer xorgproto has that are wanted may be a problem, but probably only for X11_TYPE!=native builds that don't really need these. longer term native xsrc will get xorgproto (and maybe even for netbsd-8), though i'm not sure it will help any unless we make our native xsrc install a fake xorgproto.pc that pkgsrc can find an use -- currently xorgproto installs .pc files for all the replaced packages, but not one for itself, so the hack of finding xproto version and switching may still be needed. ok @wiz. --- x11/xorgproto/builtin.mk | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 x11/xorgproto/builtin.mk (limited to 'x11/xorgproto') diff --git a/x11/xorgproto/builtin.mk b/x11/xorgproto/builtin.mk new file mode 100644 index 00000000000..d3e37cd2536 --- /dev/null +++ b/x11/xorgproto/builtin.mk @@ -0,0 +1,57 @@ +# $NetBSD: builtin.mk,v 1.1 2018/03/13 02:06:12 mrg Exp $ + +BUILTIN_PKG:= xorgproto + +PRE_XORGPROTO_LIST_MISSING = \ + applewmproto \ + dmxproto \ + lg3dproto \ + printproto \ + windowswmproto \ + xcalibrateproto \ + xf86rushproto +PRE_XORGPROTO_LIST = \ + bigreqsproto \ + compositeproto \ + damageproto \ + dri2proto \ + dri3proto \ + evieproto \ + fixesproto \ + fontcacheproto \ + fontsproto \ + glproto \ + inputproto \ + kbproto \ + presentproto \ + randrproto \ + recordproto \ + renderproto \ + resourceproto \ + scrnsaverproto \ + trapproto \ + videoproto \ + xcmiscproto \ + xextproto \ + xf86bigfontproto \ + xf86dgaproto \ + xf86driproto \ + xf86miscproto \ + xf86vidmodeproto \ + xineramaproto \ + xproxymngproto + +# Make xproto last, for the version matching. +PRE_XORGPROTO_LIST += \ + xproto + +BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n -e 's/Version: 7\.0\.31/2018.1/p' + +.for _p in ${PRE_XORGPROTO_LIST} +PKGCONFIG_FILE.xorgproto= ${X11BASE}/lib/pkgconfig/${_p}.pc +PKGCONFIG_FILE.xorgproto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/${_p}.pc +PKGCONFIG_FILE.xorgproto+= ${X11BASE}/share/pkgconfig/${_p}.pc +.endfor + +.include "../../mk/buildlink3/pkgconfig-builtin.mk" +.include "../../mk/x11.builtin.mk" -- cgit v1.2.3