CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "matthew green" <mrg%netbsd.org@localhost>
Date: Tue, 13 Mar 2018 02:06:13 +0000

Module Name:    pkgsrc
Committed By:   mrg
Date:           Tue Mar 13 02:06:12 UTC 2018

Modified Files:
        pkgsrc/pkgtools/x11-links: Makefile buildlink3.mk
Added Files:
        pkgsrc/pkgtools/x11-links/files: xorg.xorgproto
        pkgsrc/x11/xorgproto: builtin.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/pkgtools/x11-links/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.xorgproto
cvs rdiff -u -r0 -r1.1 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/pkgtools/x11-links/Makefile
diff -u pkgsrc/pkgtools/x11-links/Makefile:1.178 pkgsrc/pkgtools/x11-links/Makefile:1.179
--- pkgsrc/pkgtools/x11-links/Makefile:1.178    Fri Mar  2 15:14:12 2018
+++ pkgsrc/pkgtools/x11-links/Makefile  Tue Mar 13 02:06:12 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.178 2018/03/02 15:14:12 wiz Exp $
+# $NetBSD: Makefile,v 1.179 2018/03/13 02:06:12 mrg Exp $
 #
 # NOTE:        If you update this package, then you'll likely need to also update
 #      the x11-links dependency in buildlink3.mk to the correct version,
 #      usually the most recent.
 
-PKGNAME=       x11-links-1.07
+PKGNAME=       x11-links-1.08
 CATEGORIES=    pkgtools x11
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -u pkgsrc/pkgtools/x11-links/buildlink3.mk:1.72 pkgsrc/pkgtools/x11-links/buildlink3.mk:1.73
--- pkgsrc/pkgtools/x11-links/buildlink3.mk:1.72        Fri Mar  2 15:14:12 2018
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk     Tue Mar 13 02:06:12 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.72 2018/03/02 15:14:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.73 2018/03/13 02:06:12 mrg Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+=      x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=1.07
+BUILDLINK_API_DEPENDS.x11-links+=      x11-links>=1.08
 BUILDLINK_PKGSRCDIR.x11-links?=                ../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=                build
 

Added files:

Index: pkgsrc/pkgtools/x11-links/files/xorg.xorgproto
diff -u /dev/null pkgsrc/pkgtools/x11-links/files/xorg.xorgproto:1.1
--- /dev/null   Tue Mar 13 02:06:13 2018
+++ pkgsrc/pkgtools/x11-links/files/xorg.xorgproto      Tue Mar 13 02:06:12 2018
@@ -0,0 +1,186 @@
+# $NetBSD: xorg.xorgproto,v 1.1 2018/03/13 02:06:12 mrg Exp $
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+include/GL/internal/glcore.h
+include/X11/DECkeysym.h
+include/X11/HPkeysym.h
+include/X11/PM/PM.h
+include/X11/PM/PMproto.h
+include/X11/Sunkeysym.h
+include/X11/X.h
+include/X11/XF86keysym.h
+include/X11/XWDFile.h
+include/X11/Xalloca.h
+include/X11/Xarch.h
+include/X11/Xatom.h
+include/X11/Xdefs.h
+include/X11/Xfuncproto.h
+include/X11/Xfuncs.h
+include/X11/Xmd.h
+include/X11/Xos.h
+include/X11/Xos_r.h
+include/X11/Xosdefs.h
+include/X11/Xpoll.h
+include/X11/Xproto.h
+include/X11/Xprotostr.h
+include/X11/Xthreads.h
+include/X11/Xw32defs.h
+include/X11/Xwindows.h
+include/X11/Xwinsock.h
+include/X11/ap_keysym.h
+include/X11/dri/xf86dri.h
+include/X11/dri/xf86driproto.h
+include/X11/dri/xf86dristr.h
+include/X11/extensions/EVI.h
+include/X11/extensions/EVIproto.h
+include/X11/extensions/XI.h
+include/X11/extensions/XI2.h
+include/X11/extensions/XI2proto.h
+include/X11/extensions/XIproto.h
+include/X11/extensions/XKB.h
+include/X11/extensions/XKBgeom.h
+include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBsrv.h
+include/X11/extensions/XKBstr.h
+include/X11/extensions/XResproto.h
+include/X11/extensions/Xv.h
+include/X11/extensions/XvMC.h
+include/X11/extensions/XvMCproto.h
+include/X11/extensions/Xvproto.h
+include/X11/extensions/ag.h
+include/X11/extensions/agproto.h
+include/X11/extensions/applewmconst.h
+include/X11/extensions/applewmproto.h
+include/X11/extensions/bigreqsproto.h
+include/X11/extensions/bigreqstr.h
+include/X11/extensions/composite.h
+include/X11/extensions/compositeproto.h
+include/X11/extensions/cup.h
+include/X11/extensions/cupproto.h
+include/X11/extensions/damageproto.h
+include/X11/extensions/damagewire.h
+include/X11/extensions/dbe.h
+include/X11/extensions/dbeproto.h
+include/X11/extensions/dmx.h
+include/X11/extensions/dmxproto.h
+include/X11/extensions/dpmsconst.h
+include/X11/extensions/dpmsproto.h
+include/X11/extensions/dri2proto.h
+include/X11/extensions/dri2tokens.h
+include/X11/extensions/dri3proto.h
+include/X11/extensions/ge.h
+include/X11/extensions/geproto.h
+include/X11/extensions/lbx.h
+include/X11/extensions/lbxproto.h
+include/X11/extensions/mitmiscconst.h
+include/X11/extensions/mitmiscproto.h
+include/X11/extensions/multibufconst.h
+include/X11/extensions/multibufproto.h
+include/X11/extensions/panoramiXproto.h
+include/X11/extensions/presentproto.h
+include/X11/extensions/presenttokens.h
+include/X11/extensions/randr.h
+include/X11/extensions/randrproto.h
+include/X11/extensions/recordconst.h
+include/X11/extensions/recordproto.h
+include/X11/extensions/recordstr.h
+include/X11/extensions/render.h
+include/X11/extensions/renderproto.h
+include/X11/extensions/saver.h
+include/X11/extensions/saverproto.h
+include/X11/extensions/secur.h
+include/X11/extensions/securproto.h
+include/X11/extensions/shapeconst.h
+include/X11/extensions/shapeproto.h
+include/X11/extensions/shapestr.h
+include/X11/extensions/shm.h
+include/X11/extensions/shmproto.h
+include/X11/extensions/shmstr.h
+include/X11/extensions/syncconst.h
+include/X11/extensions/syncproto.h
+include/X11/extensions/syncstr.h
+include/X11/extensions/vldXvMC.h
+include/X11/extensions/windowswm.h
+include/X11/extensions/windowswmstr.h
+include/X11/extensions/xcmiscproto.h
+include/X11/extensions/xcmiscstr.h
+include/X11/extensions/xf86bigfont.h
+include/X11/extensions/xf86bigfproto.h
+include/X11/extensions/xf86bigfstr.h
+include/X11/extensions/xf86dga.h
+include/X11/extensions/xf86dga1const.h
+include/X11/extensions/xf86dga1proto.h
+include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgaconst.h
+include/X11/extensions/xf86dgaproto.h
+include/X11/extensions/xf86dgastr.h
+include/X11/extensions/xf86misc.h
+include/X11/extensions/xf86mscstr.h
+include/X11/extensions/xf86vm.h
+include/X11/extensions/xf86vmproto.h
+include/X11/extensions/xf86vmstr.h
+include/X11/extensions/xfixesproto.h
+include/X11/extensions/xfixeswire.h
+include/X11/extensions/xtestconst.h
+include/X11/extensions/xtestext1const.h
+include/X11/extensions/xtestext1proto.h
+include/X11/extensions/xtestproto.h
+include/X11/extensions/xtrapbits.h
+include/X11/extensions/xtrapddmi.h
+include/X11/extensions/xtrapdi.h
+include/X11/extensions/xtrapemacros.h
+include/X11/extensions/xtraplib.h
+include/X11/extensions/xtraplibp.h
+include/X11/extensions/xtrapproto.h
+include/X11/fonts/FS.h
+include/X11/fonts/FSproto.h
+include/X11/fonts/font.h
+include/X11/fonts/fontproto.h
+include/X11/fonts/fontstruct.h
+include/X11/fonts/fsmasks.h
+include/X11/keysym.h
+include/X11/keysymdef.h
+share/doc/xorgproto/PM_spec
+share/doc/xorgproto/compositeproto.txt
+share/doc/xorgproto/damageproto.txt
+share/doc/xorgproto/dri2proto.txt
+share/doc/xorgproto/dri3proto.txt
+share/doc/xorgproto/fixesproto.txt
+share/doc/xorgproto/presentproto.txt
+share/doc/xorgproto/randrproto.txt
+share/doc/xorgproto/renderproto.txt
+share/doc/xorgproto/resproto.txt
+share/doc/xorgproto/xv-protocol-v2.txt
+share/pkgconfig/applewmproto.pc
+share/pkgconfig/bigreqsproto.pc
+share/pkgconfig/compositeproto.pc
+share/pkgconfig/damageproto.pc
+share/pkgconfig/dmxproto.pc
+share/pkgconfig/dri2proto.pc
+share/pkgconfig/dri3proto.pc
+share/pkgconfig/fixesproto.pc
+share/pkgconfig/fontsproto.pc
+share/pkgconfig/glproto.pc
+share/pkgconfig/inputproto.pc
+share/pkgconfig/kbproto.pc
+share/pkgconfig/presentproto.pc
+share/pkgconfig/randrproto.pc
+share/pkgconfig/recordproto.pc
+share/pkgconfig/renderproto.pc
+share/pkgconfig/resourceproto.pc
+share/pkgconfig/scrnsaverproto.pc
+share/pkgconfig/trapproto.pc
+share/pkgconfig/videoproto.pc
+share/pkgconfig/windowswmproto.pc
+share/pkgconfig/xcmiscproto.pc
+share/pkgconfig/xextproto.pc
+share/pkgconfig/xf86bigfontproto.pc
+share/pkgconfig/xf86dgaproto.pc
+share/pkgconfig/xf86driproto.pc
+share/pkgconfig/xf86miscproto.pc
+share/pkgconfig/xf86vidmodeproto.pc
+share/pkgconfig/xineramaproto.pc
+share/pkgconfig/xproto.pc
+share/pkgconfig/xproxymngproto.pc

Index: pkgsrc/x11/xorgproto/builtin.mk
diff -u /dev/null pkgsrc/x11/xorgproto/builtin.mk:1.1
--- /dev/null   Tue Mar 13 02:06:13 2018
+++ pkgsrc/x11/xorgproto/builtin.mk     Tue Mar 13 02:06:12 2018
@@ -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"

Prev by Date: CVS commit: pkgsrc/devel/py-manticore
Next by Date: CVS commit: pkgsrc/www/py-django-cms
Previous by Thread: CVS commit: pkgsrc/devel/py-manticore
Next by Thread: CVS commit: pkgsrc/www/py-django-cms
Indexes:

Home | Main Index | Thread Index | Old Index