Mon Nov 25 10:07:43 2019 UTC ()
xorgproto: update to 2019.2nb3.

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


(wiz)
diff -r1.10 -r1.11 pkgsrc/x11/xorgproto/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/xorgproto/PLIST
diff -r1.9 -r1.10 pkgsrc/x11/xorgproto/distinfo
diff -r1.2 -r0 pkgsrc/x11/xorgproto/patches/patch-Makefile.in
cvs diff -r1.10 -r1.11 pkgsrc/x11/xorgproto/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/Makefile 2019/11/23 11:41:20 1.10
+++ pkgsrc/x11/xorgproto/Makefile 2019/11/25 10:07:43 1.11
@@ -1,32 +1,29 @@ @@ -1,32 +1,29 @@
1# $NetBSD: Makefile,v 1.10 2019/11/23 11:41:20 nia Exp $ 1# $NetBSD: Makefile,v 1.11 2019/11/25 10:07:43 wiz Exp $
2 2
3DISTNAME= xorgproto-2019.2 3DISTNAME= xorgproto-2019.2
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= x11 devel 5CATEGORIES= x11 devel
6MASTER_SITES= ${MASTER_SITE_XORG:=proto/} 6MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Various X headers from Xorg X11 11COMMENT= Various X headers from Xorg X11
12LICENSE= mit 12LICENSE= mit
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LANGUAGES= c 15USE_LANGUAGES= c
16 16
17# some packages need the old headers 
18CONFIGURE_ARGS+= --enable-legacy 
19 
20# Force a consistent PLIST. 17# Force a consistent PLIST.
21CONFIGURE_ENV+= MISC_MAN_SUFFIX="7" 18CONFIGURE_ENV+= MISC_MAN_SUFFIX="7"
22 19
23PKGCONFIG_OVERRIDE+= applewmproto.pc.in 20PKGCONFIG_OVERRIDE+= applewmproto.pc.in
24PKGCONFIG_OVERRIDE+= bigreqsproto.pc.in 21PKGCONFIG_OVERRIDE+= bigreqsproto.pc.in
25PKGCONFIG_OVERRIDE+= compositeproto.pc.in 22PKGCONFIG_OVERRIDE+= compositeproto.pc.in
26PKGCONFIG_OVERRIDE+= damageproto.pc.in 23PKGCONFIG_OVERRIDE+= damageproto.pc.in
27PKGCONFIG_OVERRIDE+= dmxproto.pc.in 24PKGCONFIG_OVERRIDE+= dmxproto.pc.in
28PKGCONFIG_OVERRIDE+= dri2proto.pc.in 25PKGCONFIG_OVERRIDE+= dri2proto.pc.in
29PKGCONFIG_OVERRIDE+= dri3proto.pc.in 26PKGCONFIG_OVERRIDE+= dri3proto.pc.in
30PKGCONFIG_OVERRIDE+= fixesproto.pc.in 27PKGCONFIG_OVERRIDE+= fixesproto.pc.in
31PKGCONFIG_OVERRIDE+= fontsproto.pc.in 28PKGCONFIG_OVERRIDE+= fontsproto.pc.in
32PKGCONFIG_OVERRIDE+= glproto.pc.in 29PKGCONFIG_OVERRIDE+= glproto.pc.in
cvs diff -r1.6 -r1.7 pkgsrc/x11/xorgproto/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/PLIST 2019/11/15 10:01:35 1.6
+++ pkgsrc/x11/xorgproto/PLIST 2019/11/25 10:07:43 1.7
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1@comment $NetBSD: PLIST,v 1.6 2019/11/15 10:01:35 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.7 2019/11/25 10:07:43 wiz Exp $
2include/GL/glxint.h 2include/GL/glxint.h
3include/GL/glxmd.h 3include/GL/glxmd.h
4include/GL/glxproto.h 4include/GL/glxproto.h
5include/GL/glxtokens.h 5include/GL/glxtokens.h
6include/GL/internal/glcore.h 6include/GL/internal/glcore.h
7include/X11/DECkeysym.h 7include/X11/DECkeysym.h
8include/X11/HPkeysym.h 8include/X11/HPkeysym.h
9include/X11/PM/PM.h 
10include/X11/PM/PMproto.h 
11include/X11/Sunkeysym.h 9include/X11/Sunkeysym.h
12include/X11/X.h 10include/X11/X.h
13include/X11/XF86keysym.h 11include/X11/XF86keysym.h
14include/X11/XWDFile.h 12include/X11/XWDFile.h
15include/X11/Xalloca.h 13include/X11/Xalloca.h
16include/X11/Xarch.h 14include/X11/Xarch.h
17include/X11/Xatom.h 15include/X11/Xatom.h
18include/X11/Xdefs.h 16include/X11/Xdefs.h
19include/X11/Xfuncproto.h 17include/X11/Xfuncproto.h
20include/X11/Xfuncs.h 18include/X11/Xfuncs.h
21include/X11/Xmd.h 19include/X11/Xmd.h
22include/X11/Xos.h 20include/X11/Xos.h
23include/X11/Xos_r.h 21include/X11/Xos_r.h
@@ -25,72 +23,64 @@ include/X11/Xosdefs.h @@ -25,72 +23,64 @@ include/X11/Xosdefs.h
25include/X11/Xpoll.h 23include/X11/Xpoll.h
26include/X11/Xproto.h 24include/X11/Xproto.h
27include/X11/Xprotostr.h 25include/X11/Xprotostr.h
28include/X11/Xthreads.h 26include/X11/Xthreads.h
29include/X11/Xw32defs.h 27include/X11/Xw32defs.h
30include/X11/Xwindows.h 28include/X11/Xwindows.h
31include/X11/Xwinsock.h 29include/X11/Xwinsock.h
32include/X11/ap_keysym.h 30include/X11/ap_keysym.h
33include/X11/dri/xf86dri.h 31include/X11/dri/xf86dri.h
34include/X11/dri/xf86driproto.h 32include/X11/dri/xf86driproto.h
35include/X11/dri/xf86dristr.h 33include/X11/dri/xf86dristr.h
36include/X11/extensions/EVI.h 34include/X11/extensions/EVI.h
37include/X11/extensions/EVIproto.h 35include/X11/extensions/EVIproto.h
38include/X11/extensions/Print.h 
39include/X11/extensions/Printstr.h 
40include/X11/extensions/XI.h 36include/X11/extensions/XI.h
41include/X11/extensions/XI2.h 37include/X11/extensions/XI2.h
42include/X11/extensions/XI2proto.h 38include/X11/extensions/XI2proto.h
43include/X11/extensions/XIproto.h 39include/X11/extensions/XIproto.h
44include/X11/extensions/XKB.h 40include/X11/extensions/XKB.h
45include/X11/extensions/XKBproto.h 41include/X11/extensions/XKBproto.h
46include/X11/extensions/XKBsrv.h 42include/X11/extensions/XKBsrv.h
47include/X11/extensions/XKBstr.h 43include/X11/extensions/XKBstr.h
48include/X11/extensions/XResproto.h 44include/X11/extensions/XResproto.h
49include/X11/extensions/Xeviestr.h 
50include/X11/extensions/Xv.h 45include/X11/extensions/Xv.h
51include/X11/extensions/XvMC.h 46include/X11/extensions/XvMC.h
52include/X11/extensions/XvMCproto.h 47include/X11/extensions/XvMCproto.h
53include/X11/extensions/Xvproto.h 48include/X11/extensions/Xvproto.h
54include/X11/extensions/ag.h 49include/X11/extensions/ag.h
55include/X11/extensions/agproto.h 50include/X11/extensions/agproto.h
56include/X11/extensions/applewmconst.h 51include/X11/extensions/applewmconst.h
57include/X11/extensions/applewmproto.h 52include/X11/extensions/applewmproto.h
58include/X11/extensions/bigreqsproto.h 53include/X11/extensions/bigreqsproto.h
59include/X11/extensions/bigreqstr.h 54include/X11/extensions/bigreqstr.h
60include/X11/extensions/composite.h 55include/X11/extensions/composite.h
61include/X11/extensions/compositeproto.h 56include/X11/extensions/compositeproto.h
62include/X11/extensions/cup.h 57include/X11/extensions/cup.h
63include/X11/extensions/cupproto.h 58include/X11/extensions/cupproto.h
64include/X11/extensions/damageproto.h 59include/X11/extensions/damageproto.h
65include/X11/extensions/damagewire.h 60include/X11/extensions/damagewire.h
66include/X11/extensions/dbe.h 61include/X11/extensions/dbe.h
67include/X11/extensions/dbeproto.h 62include/X11/extensions/dbeproto.h
68include/X11/extensions/dmx.h 63include/X11/extensions/dmx.h
69include/X11/extensions/dmxproto.h 64include/X11/extensions/dmxproto.h
70include/X11/extensions/dpmsconst.h 65include/X11/extensions/dpmsconst.h
71include/X11/extensions/dpmsproto.h 66include/X11/extensions/dpmsproto.h
72include/X11/extensions/dri2proto.h 67include/X11/extensions/dri2proto.h
73include/X11/extensions/dri2tokens.h 68include/X11/extensions/dri2tokens.h
74include/X11/extensions/dri3proto.h 69include/X11/extensions/dri3proto.h
75include/X11/extensions/evieproto.h 
76include/X11/extensions/fontcache.h 
77include/X11/extensions/fontcacheP.h 
78include/X11/extensions/fontcachstr.h 
79include/X11/extensions/ge.h 70include/X11/extensions/ge.h
80include/X11/extensions/geproto.h 71include/X11/extensions/geproto.h
81include/X11/extensions/lbx.h 72include/X11/extensions/lbx.h
82include/X11/extensions/lbxproto.h 73include/X11/extensions/lbxproto.h
83include/X11/extensions/lgewire.h 
84include/X11/extensions/mitmiscconst.h 74include/X11/extensions/mitmiscconst.h
85include/X11/extensions/mitmiscproto.h 75include/X11/extensions/mitmiscproto.h
86include/X11/extensions/multibufconst.h 76include/X11/extensions/multibufconst.h
87include/X11/extensions/multibufproto.h 77include/X11/extensions/multibufproto.h
88include/X11/extensions/panoramiXproto.h 78include/X11/extensions/panoramiXproto.h
89include/X11/extensions/presentproto.h 79include/X11/extensions/presentproto.h
90include/X11/extensions/presenttokens.h 80include/X11/extensions/presenttokens.h
91include/X11/extensions/randr.h 81include/X11/extensions/randr.h
92include/X11/extensions/randrproto.h 82include/X11/extensions/randrproto.h
93include/X11/extensions/recordconst.h 83include/X11/extensions/recordconst.h
94include/X11/extensions/recordproto.h 84include/X11/extensions/recordproto.h
95include/X11/extensions/recordstr.h 85include/X11/extensions/recordstr.h
96include/X11/extensions/render.h 86include/X11/extensions/render.h
@@ -98,71 +88,55 @@ include/X11/extensions/renderproto.h @@ -98,71 +88,55 @@ include/X11/extensions/renderproto.h
98include/X11/extensions/saver.h 88include/X11/extensions/saver.h
99include/X11/extensions/saverproto.h 89include/X11/extensions/saverproto.h
100include/X11/extensions/secur.h 90include/X11/extensions/secur.h
101include/X11/extensions/securproto.h 91include/X11/extensions/securproto.h
102include/X11/extensions/shapeconst.h 92include/X11/extensions/shapeconst.h
103include/X11/extensions/shapeproto.h 93include/X11/extensions/shapeproto.h
104include/X11/extensions/shapestr.h 94include/X11/extensions/shapestr.h
105include/X11/extensions/shm.h 95include/X11/extensions/shm.h
106include/X11/extensions/shmproto.h 96include/X11/extensions/shmproto.h
107include/X11/extensions/shmstr.h 97include/X11/extensions/shmstr.h
108include/X11/extensions/syncconst.h 98include/X11/extensions/syncconst.h
109include/X11/extensions/syncproto.h 99include/X11/extensions/syncproto.h
110include/X11/extensions/syncstr.h 100include/X11/extensions/syncstr.h
111include/X11/extensions/windowswm.h 
112include/X11/extensions/windowswmstr.h 
113include/X11/extensions/xcalibrateproto.h 
114include/X11/extensions/xcalibratewire.h 
115include/X11/extensions/xcmiscproto.h 101include/X11/extensions/xcmiscproto.h
116include/X11/extensions/xcmiscstr.h 102include/X11/extensions/xcmiscstr.h
117include/X11/extensions/xf86bigfont.h 103include/X11/extensions/xf86bigfont.h
118include/X11/extensions/xf86bigfproto.h 104include/X11/extensions/xf86bigfproto.h
119include/X11/extensions/xf86bigfstr.h 105include/X11/extensions/xf86bigfstr.h
120include/X11/extensions/xf86dga.h 106include/X11/extensions/xf86dga.h
121include/X11/extensions/xf86dga1const.h 107include/X11/extensions/xf86dga1const.h
122include/X11/extensions/xf86dga1proto.h 108include/X11/extensions/xf86dga1proto.h
123include/X11/extensions/xf86dga1str.h 109include/X11/extensions/xf86dga1str.h
124include/X11/extensions/xf86dgaconst.h 110include/X11/extensions/xf86dgaconst.h
125include/X11/extensions/xf86dgaproto.h 111include/X11/extensions/xf86dgaproto.h
126include/X11/extensions/xf86dgastr.h 112include/X11/extensions/xf86dgastr.h
127include/X11/extensions/xf86misc.h 
128include/X11/extensions/xf86mscstr.h 
129include/X11/extensions/xf86rush.h 
130include/X11/extensions/xf86rushstr.h 
131include/X11/extensions/xf86vm.h 113include/X11/extensions/xf86vm.h
132include/X11/extensions/xf86vmproto.h 114include/X11/extensions/xf86vmproto.h
133include/X11/extensions/xf86vmstr.h 115include/X11/extensions/xf86vmstr.h
134include/X11/extensions/xfixesproto.h 116include/X11/extensions/xfixesproto.h
135include/X11/extensions/xfixeswire.h 117include/X11/extensions/xfixeswire.h
136include/X11/extensions/xtestconst.h 118include/X11/extensions/xtestconst.h
137include/X11/extensions/xtestext1const.h 119include/X11/extensions/xtestext1const.h
138include/X11/extensions/xtestext1proto.h 120include/X11/extensions/xtestext1proto.h
139include/X11/extensions/xtestproto.h 121include/X11/extensions/xtestproto.h
140include/X11/extensions/xtrapbits.h 
141include/X11/extensions/xtrapddmi.h 
142include/X11/extensions/xtrapdi.h 
143include/X11/extensions/xtrapemacros.h 
144include/X11/extensions/xtraplib.h 
145include/X11/extensions/xtraplibp.h 
146include/X11/extensions/xtrapproto.h 
147include/X11/fonts/FS.h 122include/X11/fonts/FS.h
148include/X11/fonts/FSproto.h 123include/X11/fonts/FSproto.h
149include/X11/fonts/font.h 124include/X11/fonts/font.h
150include/X11/fonts/fontproto.h 125include/X11/fonts/fontproto.h
151include/X11/fonts/fontstruct.h 126include/X11/fonts/fontstruct.h
152include/X11/fonts/fsmasks.h 127include/X11/fonts/fsmasks.h
153include/X11/keysym.h 128include/X11/keysym.h
154include/X11/keysymdef.h 129include/X11/keysymdef.h
155man/man7/Xprint.7 
156share/doc/bigreqsproto/bigreq.xml 130share/doc/bigreqsproto/bigreq.xml
157share/doc/fontsproto/fsproto.xml 131share/doc/fontsproto/fsproto.xml
158share/doc/kbproto/XKBproto-1.svg 132share/doc/kbproto/XKBproto-1.svg
159share/doc/kbproto/XKBproto-10.svg 133share/doc/kbproto/XKBproto-10.svg
160share/doc/kbproto/XKBproto-11.svg 134share/doc/kbproto/XKBproto-11.svg
161share/doc/kbproto/XKBproto-2.svg 135share/doc/kbproto/XKBproto-2.svg
162share/doc/kbproto/XKBproto-3.svg 136share/doc/kbproto/XKBproto-3.svg
163share/doc/kbproto/XKBproto-4.svg 137share/doc/kbproto/XKBproto-4.svg
164share/doc/kbproto/XKBproto-5.svg 138share/doc/kbproto/XKBproto-5.svg
165share/doc/kbproto/XKBproto-6.svg 139share/doc/kbproto/XKBproto-6.svg
166share/doc/kbproto/XKBproto-7.svg 140share/doc/kbproto/XKBproto-7.svg
167share/doc/kbproto/XKBproto-8.svg 141share/doc/kbproto/XKBproto-8.svg
168share/doc/kbproto/XKBproto-9.svg 142share/doc/kbproto/XKBproto-9.svg
@@ -218,43 +192,33 @@ share/doc/xorgproto/resproto.txt @@ -218,43 +192,33 @@ share/doc/xorgproto/resproto.txt
218share/doc/xorgproto/xv-protocol-v2.txt 192share/doc/xorgproto/xv-protocol-v2.txt
219share/doc/xproto/encoding.xml 193share/doc/xproto/encoding.xml
220share/doc/xproto/glossary.xml 194share/doc/xproto/glossary.xml
221share/doc/xproto/keysyms.xml 195share/doc/xproto/keysyms.xml
222share/doc/xproto/sect1-9.xml 196share/doc/xproto/sect1-9.xml
223share/doc/xproto/x11protocol.xml 197share/doc/xproto/x11protocol.xml
224share/pkgconfig/applewmproto.pc 198share/pkgconfig/applewmproto.pc
225share/pkgconfig/bigreqsproto.pc 199share/pkgconfig/bigreqsproto.pc
226share/pkgconfig/compositeproto.pc 200share/pkgconfig/compositeproto.pc
227share/pkgconfig/damageproto.pc 201share/pkgconfig/damageproto.pc
228share/pkgconfig/dmxproto.pc 202share/pkgconfig/dmxproto.pc
229share/pkgconfig/dri2proto.pc 203share/pkgconfig/dri2proto.pc
230share/pkgconfig/dri3proto.pc 204share/pkgconfig/dri3proto.pc
231share/pkgconfig/evieproto.pc 
232share/pkgconfig/fixesproto.pc 205share/pkgconfig/fixesproto.pc
233share/pkgconfig/fontcacheproto.pc 
234share/pkgconfig/fontsproto.pc 206share/pkgconfig/fontsproto.pc
235share/pkgconfig/glproto.pc 207share/pkgconfig/glproto.pc
236share/pkgconfig/inputproto.pc 208share/pkgconfig/inputproto.pc
237share/pkgconfig/kbproto.pc 209share/pkgconfig/kbproto.pc
238share/pkgconfig/lg3dproto.pc 
239share/pkgconfig/presentproto.pc 210share/pkgconfig/presentproto.pc
240share/pkgconfig/printproto.pc 
241share/pkgconfig/randrproto.pc 211share/pkgconfig/randrproto.pc
242share/pkgconfig/recordproto.pc 212share/pkgconfig/recordproto.pc
243share/pkgconfig/renderproto.pc 213share/pkgconfig/renderproto.pc
244share/pkgconfig/resourceproto.pc 214share/pkgconfig/resourceproto.pc
245share/pkgconfig/scrnsaverproto.pc 215share/pkgconfig/scrnsaverproto.pc
246share/pkgconfig/trapproto.pc 
247share/pkgconfig/videoproto.pc 216share/pkgconfig/videoproto.pc
248share/pkgconfig/windowswmproto.pc 
249share/pkgconfig/xcalibrateproto.pc 
250share/pkgconfig/xcmiscproto.pc 217share/pkgconfig/xcmiscproto.pc
251share/pkgconfig/xextproto.pc 218share/pkgconfig/xextproto.pc
252share/pkgconfig/xf86bigfontproto.pc 219share/pkgconfig/xf86bigfontproto.pc
253share/pkgconfig/xf86dgaproto.pc 220share/pkgconfig/xf86dgaproto.pc
254share/pkgconfig/xf86driproto.pc 221share/pkgconfig/xf86driproto.pc
255share/pkgconfig/xf86miscproto.pc 
256share/pkgconfig/xf86rushproto.pc 
257share/pkgconfig/xf86vidmodeproto.pc 222share/pkgconfig/xf86vidmodeproto.pc
258share/pkgconfig/xineramaproto.pc 223share/pkgconfig/xineramaproto.pc
259share/pkgconfig/xproto.pc 224share/pkgconfig/xproto.pc
260share/pkgconfig/xproxymngproto.pc 
cvs diff -r1.9 -r1.10 pkgsrc/x11/xorgproto/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/distinfo 2019/11/15 10:01:35 1.9
+++ pkgsrc/x11/xorgproto/distinfo 2019/11/25 10:07:43 1.10
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.9 2019/11/15 10:01:35 ryoon Exp $ 1$NetBSD: distinfo,v 1.10 2019/11/25 10:07:43 wiz Exp $
2 2
3SHA1 (xorgproto-2019.2.tar.bz2) = 2dedbe3e4daccf0c3d675759ed82161a3e4cf1b5 3SHA1 (xorgproto-2019.2.tar.bz2) = 2dedbe3e4daccf0c3d675759ed82161a3e4cf1b5
4RMD160 (xorgproto-2019.2.tar.bz2) = f29bf0b62d163ac97096201bc4d74559c441d0dd 4RMD160 (xorgproto-2019.2.tar.bz2) = f29bf0b62d163ac97096201bc4d74559c441d0dd
5SHA512 (xorgproto-2019.2.tar.bz2) = cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904 5SHA512 (xorgproto-2019.2.tar.bz2) = cbfdf6bb3d58d4d4e7788c9ed779402352715e9899f65594fbc527b3178f1dc5e03cebc8ba5a863b3c196a1a0f2026c2d0438207ca19f81f3c8b7da0c0667904
6Size (xorgproto-2019.2.tar.bz2) = 847374 bytes 6Size (xorgproto-2019.2.tar.bz2) = 847374 bytes
7SHA1 (patch-Makefile.in) = 4ef6cd0b2f0c02cd9d59f4f8a3f8997746e6f76c 
File Deleted: pkgsrc/x11/xorgproto/patches/Attic/patch-Makefile.in