fix the xorgproto list to include everything in all the subdirs they

may exist in.  i rebuilt the contents from the other xorg*proto
files here, which should make them functionally equivalent.

fixes builds of eg, devel/imake and devel/pango with native x11.

bump version to 1.09.

3 files changed, 96 insertions, 48 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index d724b1b5b6d..d2b232094b1 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.179 2018/03/13 02:06:12 mrg Exp $
+# $NetBSD: Makefile,v 1.180 2018/03/14 02:11:04 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.08
+PKGNAME=	x11-links-1.09
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index d1a697af5b6..00d220c8acd 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.73 2018/03/13 02:06:12 mrg Exp $
+# $NetBSD: buildlink3.mk,v 1.74 2018/03/14 02:11:04 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.08
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=1.09
 BUILDLINK_PKGSRCDIR.x11-links?=		../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=		build
 
diff --git a/pkgtools/x11-links/files/xorg.xorgproto b/pkgtools/x11-links/files/xorg.xorgproto
index 5af3798e297..5e6eb10f8e3 100644
--- a/pkgtools/x11-links/files/xorg.xorgproto
+++ b/pkgtools/x11-links/files/xorg.xorgproto
@@ -1,13 +1,10 @@
-# $NetBSD: xorg.xorgproto,v 1.1 2018/03/13 02:06:12 mrg Exp $
+# $NetBSD: xorg.xorgproto,v 1.2 2018/03/14 02:11:04 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
@@ -35,49 +32,67 @@ include/X11/dri/xf86driproto.h
 include/X11/dri/xf86dristr.h
 include/X11/extensions/EVI.h
 include/X11/extensions/EVIproto.h
+include/X11/extensions/XEVIstr.h
+include/X11/extensions/XI.h
 include/X11/extensions/XI.h
 include/X11/extensions/XI2.h
 include/X11/extensions/XI2proto.h
+include/X11/extensions/XInput.h
+include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
+include/X11/extensions/XIproto.h
 include/X11/extensions/XIproto.h
 include/X11/extensions/XKB.h
+include/X11/extensions/XKB.h
+include/X11/extensions/XKBgeom.h
 include/X11/extensions/XKBgeom.h
 include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBproto.h
+include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBstr.h
-include/X11/extensions/XResproto.h
+include/X11/extensions/XKBstr.h
+include/X11/extensions/XTest.h
+include/X11/extensions/Xagsrv.h
+include/X11/extensions/Xagstr.h
+include/X11/extensions/Xcupstr.h
+include/X11/extensions/Xdbeproto.h
+include/X11/extensions/Xinerama.h
 include/X11/extensions/Xv.h
 include/X11/extensions/XvMC.h
 include/X11/extensions/XvMCproto.h
 include/X11/extensions/Xvproto.h
+include/X11/extensions/Xxf86dga.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/dpmsstr.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/lbxdeltastr.h
+include/X11/extensions/lbxopts.h
 include/X11/extensions/lbxproto.h
+include/X11/extensions/lbxstr.h
+include/X11/extensions/lbxzlib.h
 include/X11/extensions/mitmiscconst.h
 include/X11/extensions/mitmiscproto.h
+include/X11/extensions/mitmiscstr.h
 include/X11/extensions/multibufconst.h
 include/X11/extensions/multibufproto.h
+include/X11/extensions/multibufst.h
+include/X11/extensions/panoramiXext.h
 include/X11/extensions/panoramiXproto.h
 include/X11/extensions/presentproto.h
 include/X11/extensions/presenttokens.h
@@ -92,6 +107,7 @@ include/X11/extensions/saver.h
 include/X11/extensions/saverproto.h
 include/X11/extensions/secur.h
 include/X11/extensions/securproto.h
+include/X11/extensions/securstr.h
 include/X11/extensions/shapeconst.h
 include/X11/extensions/shapeproto.h
 include/X11/extensions/shapestr.h
@@ -102,22 +118,19 @@ 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/xf86dga1.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
@@ -127,53 +140,62 @@ 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/extensions/xteststr.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
+lib/pkgconfig/bigreqsproto.pc
+lib/pkgconfig/compositeext.pc
+lib/pkgconfig/compositeproto.pc
+lib/pkgconfig/damageproto.pc
+lib/pkgconfig/dri2proto.pc
+lib/pkgconfig/fixesproto.pc
+lib/pkgconfig/fontsproto.pc
+lib/pkgconfig/glproto.pc
+lib/pkgconfig/inputproto.pc
+lib/pkgconfig/kbproto.pc
+lib/pkgconfig/presentproto.pc
+lib/pkgconfig/printproto.pc
+lib/pkgconfig/randrproto.pc
+lib/pkgconfig/recordproto.pc
+lib/pkgconfig/renderproto.pc
+lib/pkgconfig/resourceproto.pc
+lib/pkgconfig/scrnsaverproto.pc
+lib/pkgconfig/trapproto.pc
+lib/pkgconfig/videoproto.pc
+lib/pkgconfig/xcb-proto.pc
+lib/pkgconfig/xcmiscproto.pc
+lib/pkgconfig/xextensions.pc
+lib/pkgconfig/xextproto.pc
+lib/pkgconfig/xf86bigfontproto.pc
+lib/pkgconfig/xf86dgaproto.pc
+lib/pkgconfig/xf86driproto.pc
+lib/pkgconfig/xf86miscproto.pc
+lib/pkgconfig/xf86vidmode.pc
+lib/pkgconfig/xf86vidmodeproto.pc
+lib/pkgconfig/xineramaproto.pc
+lib/pkgconfig/xproto.pc
+lib/pkgconfig/xxf86dga.pc
+share/doc/presentproto/presentproto.txt
+share/doc/randrproto/randrproto.txt
 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/xcb-proto.pc
 share/pkgconfig/xcmiscproto.pc
 share/pkgconfig/xextproto.pc
 share/pkgconfig/xf86bigfontproto.pc
@@ -183,4 +205,30 @@ share/pkgconfig/xf86miscproto.pc
 share/pkgconfig/xf86vidmodeproto.pc
 share/pkgconfig/xineramaproto.pc
 share/pkgconfig/xproto.pc
-share/pkgconfig/xproxymngproto.pc
+share/xcb/bigreq.xml
+share/xcb/composite.xml
+share/xcb/damage.xml
+share/xcb/dpms.xml
+share/xcb/dri2.xml
+share/xcb/glx.xml
+share/xcb/randr.xml
+share/xcb/record.xml
+share/xcb/render.xml
+share/xcb/res.xml
+share/xcb/screensaver.xml
+share/xcb/shape.xml
+share/xcb/shm.xml
+share/xcb/sync.xml
+share/xcb/xc_misc.xml
+share/xcb/xcb.xsd
+share/xcb/xevie.xml
+share/xcb/xf86dri.xml
+share/xcb/xfixes.xml
+share/xcb/xinerama.xml
+share/xcb/xinput.xml
+share/xcb/xprint.xml
+share/xcb/xproto.xml
+share/xcb/xselinux.xml
+share/xcb/xtest.xml
+share/xcb/xv.xml
+share/xcb/xvmc.xml