xorgproto: update to 2019.2nb3.

Do not install legacy headers any longer. The modular-xorg meta package
builds without them now.

4 files changed, 4 insertions, 80 deletions

diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index 8b0abf24b91..2cbfa5a826d 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2019/11/23 11:41:20 nia Exp $
+# $NetBSD: Makefile,v 1.11 2019/11/25 10:07:43 wiz Exp $
 
 DISTNAME=		xorgproto-2019.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,9 +14,6 @@ LICENSE=		mit
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c
 
-# some packages need the old headers
-CONFIGURE_ARGS+=	--enable-legacy
-
 # Force a consistent PLIST.
 CONFIGURE_ENV+=		MISC_MAN_SUFFIX="7"
 
diff --git a/x11/xorgproto/PLIST b/x11/xorgproto/PLIST
index 3cff5710277..d23518f7b88 100644
--- a/x11/xorgproto/PLIST
+++ b/x11/xorgproto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/11/15 10:01:35 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/11/25 10:07:43 wiz Exp $
 include/GL/glxint.h
 include/GL/glxmd.h
 include/GL/glxproto.h
@@ -6,8 +6,6 @@ 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,8 +33,6 @@ include/X11/dri/xf86driproto.h
 include/X11/dri/xf86dristr.h
 include/X11/extensions/EVI.h
 include/X11/extensions/EVIproto.h
-include/X11/extensions/Print.h
-include/X11/extensions/Printstr.h
 include/X11/extensions/XI.h
 include/X11/extensions/XI2.h
 include/X11/extensions/XI2proto.h
@@ -46,7 +42,6 @@ include/X11/extensions/XKBproto.h
 include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBstr.h
 include/X11/extensions/XResproto.h
-include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xv.h
 include/X11/extensions/XvMC.h
 include/X11/extensions/XvMCproto.h
@@ -72,15 +67,10 @@ include/X11/extensions/dpmsproto.h
 include/X11/extensions/dri2proto.h
 include/X11/extensions/dri2tokens.h
 include/X11/extensions/dri3proto.h
-include/X11/extensions/evieproto.h
-include/X11/extensions/fontcache.h
-include/X11/extensions/fontcacheP.h
-include/X11/extensions/fontcachstr.h
 include/X11/extensions/ge.h
 include/X11/extensions/geproto.h
 include/X11/extensions/lbx.h
 include/X11/extensions/lbxproto.h
-include/X11/extensions/lgewire.h
 include/X11/extensions/mitmiscconst.h
 include/X11/extensions/mitmiscproto.h
 include/X11/extensions/multibufconst.h
@@ -108,10 +98,6 @@ include/X11/extensions/shmstr.h
 include/X11/extensions/syncconst.h
 include/X11/extensions/syncproto.h
 include/X11/extensions/syncstr.h
-include/X11/extensions/windowswm.h
-include/X11/extensions/windowswmstr.h
-include/X11/extensions/xcalibrateproto.h
-include/X11/extensions/xcalibratewire.h
 include/X11/extensions/xcmiscproto.h
 include/X11/extensions/xcmiscstr.h
 include/X11/extensions/xf86bigfont.h
@@ -124,10 +110,6 @@ 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/xf86rush.h
-include/X11/extensions/xf86rushstr.h
 include/X11/extensions/xf86vm.h
 include/X11/extensions/xf86vmproto.h
 include/X11/extensions/xf86vmstr.h
@@ -137,13 +119,6 @@ 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
@@ -152,7 +127,6 @@ include/X11/fonts/fontstruct.h
 include/X11/fonts/fsmasks.h
 include/X11/keysym.h
 include/X11/keysymdef.h
-man/man7/Xprint.7
 share/doc/bigreqsproto/bigreq.xml
 share/doc/fontsproto/fsproto.xml
 share/doc/kbproto/XKBproto-1.svg
@@ -228,33 +202,23 @@ share/pkgconfig/damageproto.pc
 share/pkgconfig/dmxproto.pc
 share/pkgconfig/dri2proto.pc
 share/pkgconfig/dri3proto.pc
-share/pkgconfig/evieproto.pc
 share/pkgconfig/fixesproto.pc
-share/pkgconfig/fontcacheproto.pc
 share/pkgconfig/fontsproto.pc
 share/pkgconfig/glproto.pc
 share/pkgconfig/inputproto.pc
 share/pkgconfig/kbproto.pc
-share/pkgconfig/lg3dproto.pc
 share/pkgconfig/presentproto.pc
-share/pkgconfig/printproto.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/xcalibrateproto.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/xf86rushproto.pc
 share/pkgconfig/xf86vidmodeproto.pc
 share/pkgconfig/xineramaproto.pc
 share/pkgconfig/xproto.pc
-share/pkgconfig/xproxymngproto.pc
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
index 9e8631d4867..bf919560ef2 100644
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2019/11/15 10:01:35 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2019/11/25 10:07:43 wiz Exp $
 
 SHA1 (xorgproto-2019.2.tar.bz2) = 2dedbe3e4daccf0c3d675759ed82161a3e4cf1b5
 RMD160 (xorgproto-2019.2.tar.bz2) = f29bf0b62d163ac97096201bc4d74559c441d0dd
 SHA512 (xorgproto-2019.2.tar.bz2) = cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904
 Size (xorgproto-2019.2.tar.bz2) = 847374 bytes
-SHA1 (patch-Makefile.in) = 4ef6cd0b2f0c02cd9d59f4f8a3f8997746e6f76c
diff --git a/x11/xorgproto/patches/patch-Makefile.in b/x11/xorgproto/patches/patch-Makefile.in
deleted file mode 100644
index 6c050e2daf3..00000000000
--- a/x11/xorgproto/patches/patch-Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.2 2019/11/15 10:01:35 ryoon Exp $
-
-* XKBgeom.h is provided by libX11 1.6.9
-* vlcXvMC.h is provided by libXvMC 1.0.12
-
---- Makefile.in.orig	2019-10-17 16:02:37.000000000 +0000
-+++ Makefile.in
-@@ -89,8 +89,6 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h
--@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -272,8 +270,7 @@ am__fontcache_HEADERS_DIST = include/X11
- am__kb_HEADERS_DIST = include/X11/extensions/XKB.h \
- 	include/X11/extensions/XKBproto.h \
- 	include/X11/extensions/XKBsrv.h \
--	include/X11/extensions/XKBstr.h \
--	include/X11/extensions/XKBgeom.h
-+	include/X11/extensions/XKBstr.h
- am__lg3d_HEADERS_DIST = include/X11/extensions/lgewire.h
- am__print_HEADERS_DIST = include/X11/extensions/Print.h \
- 	include/X11/extensions/Printstr.h
-@@ -287,8 +284,7 @@ am__trap_HEADERS_DIST = include/X11/exte
- am__video_HEADERS_DIST = include/X11/extensions/Xv.h \
- 	include/X11/extensions/XvMC.h \
- 	include/X11/extensions/XvMCproto.h \
--	include/X11/extensions/Xvproto.h \
--	include/X11/extensions/vldXvMC.h
-+	include/X11/extensions/Xvproto.h
- am__windowswm_HEADERS_DIST = include/X11/extensions/windowswm.h \
- 	include/X11/extensions/windowswmstr.h
- am__xf86misc_HEADERS_DIST = include/X11/extensions/xf86misc.h \