Fri Nov 15 10:01:35 2019 UTC ()
Fix conflict with vlcXvMC.h provided by libXvMC 1.0.12, bump PKGREVISION


(ryoon)
diff -r1.8 -r1.9 pkgsrc/x11/xorgproto/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/xorgproto/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/xorgproto/PLIST
diff -r1.1 -r1.2 pkgsrc/x11/xorgproto/patches/patch-Makefile.in
cvs diff -r1.8 -r1.9 pkgsrc/x11/xorgproto/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/Makefile 2019/11/14 09:44:30 1.8
+++ pkgsrc/x11/xorgproto/Makefile 2019/11/15 10:01:35 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.8 2019/11/14 09:44:30 ryoon Exp $ 1# $NetBSD: Makefile,v 1.9 2019/11/15 10:01:35 ryoon Exp $
2 2
3DISTNAME= xorgproto-2019.2 3DISTNAME= xorgproto-2019.2
4PKGREVISION= 1 4PKGREVISION= 2
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 17# some packages need the old headers
cvs diff -r1.8 -r1.9 pkgsrc/x11/xorgproto/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/distinfo 2019/11/14 09:44:30 1.8
+++ pkgsrc/x11/xorgproto/distinfo 2019/11/15 10:01:35 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2019/11/14 09:44:30 ryoon Exp $ 1$NetBSD: distinfo,v 1.9 2019/11/15 10:01:35 ryoon 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) = d0e0ff3a54547b0415f687ab77a5645906a8debe 7SHA1 (patch-Makefile.in) = 4ef6cd0b2f0c02cd9d59f4f8a3f8997746e6f76c
cvs diff -r1.5 -r1.6 pkgsrc/x11/xorgproto/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/PLIST 2019/11/14 09:44:30 1.5
+++ pkgsrc/x11/xorgproto/PLIST 2019/11/15 10:01:35 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.5 2019/11/14 09:44:30 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.6 2019/11/15 10:01:35 ryoon 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 9include/X11/PM/PM.h
10include/X11/PM/PMproto.h 10include/X11/PM/PMproto.h
11include/X11/Sunkeysym.h 11include/X11/Sunkeysym.h
12include/X11/X.h 12include/X11/X.h
13include/X11/XF86keysym.h 13include/X11/XF86keysym.h
14include/X11/XWDFile.h 14include/X11/XWDFile.h
@@ -98,27 +98,26 @@ include/X11/extensions/renderproto.h @@ -98,27 +98,26 @@ include/X11/extensions/renderproto.h
98include/X11/extensions/saver.h 98include/X11/extensions/saver.h
99include/X11/extensions/saverproto.h 99include/X11/extensions/saverproto.h
100include/X11/extensions/secur.h 100include/X11/extensions/secur.h
101include/X11/extensions/securproto.h 101include/X11/extensions/securproto.h
102include/X11/extensions/shapeconst.h 102include/X11/extensions/shapeconst.h
103include/X11/extensions/shapeproto.h 103include/X11/extensions/shapeproto.h
104include/X11/extensions/shapestr.h 104include/X11/extensions/shapestr.h
105include/X11/extensions/shm.h 105include/X11/extensions/shm.h
106include/X11/extensions/shmproto.h 106include/X11/extensions/shmproto.h
107include/X11/extensions/shmstr.h 107include/X11/extensions/shmstr.h
108include/X11/extensions/syncconst.h 108include/X11/extensions/syncconst.h
109include/X11/extensions/syncproto.h 109include/X11/extensions/syncproto.h
110include/X11/extensions/syncstr.h 110include/X11/extensions/syncstr.h
111include/X11/extensions/vldXvMC.h 
112include/X11/extensions/windowswm.h 111include/X11/extensions/windowswm.h
113include/X11/extensions/windowswmstr.h 112include/X11/extensions/windowswmstr.h
114include/X11/extensions/xcalibrateproto.h 113include/X11/extensions/xcalibrateproto.h
115include/X11/extensions/xcalibratewire.h 114include/X11/extensions/xcalibratewire.h
116include/X11/extensions/xcmiscproto.h 115include/X11/extensions/xcmiscproto.h
117include/X11/extensions/xcmiscstr.h 116include/X11/extensions/xcmiscstr.h
118include/X11/extensions/xf86bigfont.h 117include/X11/extensions/xf86bigfont.h
119include/X11/extensions/xf86bigfproto.h 118include/X11/extensions/xf86bigfproto.h
120include/X11/extensions/xf86bigfstr.h 119include/X11/extensions/xf86bigfstr.h
121include/X11/extensions/xf86dga.h 120include/X11/extensions/xf86dga.h
122include/X11/extensions/xf86dga1const.h 121include/X11/extensions/xf86dga1const.h
123include/X11/extensions/xf86dga1proto.h 122include/X11/extensions/xf86dga1proto.h
124include/X11/extensions/xf86dga1str.h 123include/X11/extensions/xf86dga1str.h
cvs diff -r1.1 -r1.2 pkgsrc/x11/xorgproto/patches/Attic/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/x11/xorgproto/patches/Attic/patch-Makefile.in 2019/11/14 09:44:30 1.1
+++ pkgsrc/x11/xorgproto/patches/Attic/patch-Makefile.in 2019/11/15 10:01:35 1.2
@@ -1,24 +1,36 @@ @@ -1,24 +1,36 @@
1$NetBSD: patch-Makefile.in,v 1.1 2019/11/14 09:44:30 ryoon Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2019/11/15 10:01:35 ryoon Exp $
2 2
3* XKBgeom.h is provided by libX11 1.6.9 3* XKBgeom.h is provided by libX11 1.6.9
 4* vlcXvMC.h is provided by libXvMC 1.0.12
4 5
5--- Makefile.in.orig 2019-10-17 16:02:37.000000000 +0000 6--- Makefile.in.orig 2019-10-17 16:02:37.000000000 +0000
6+++ Makefile.in 7+++ Makefile.in
7@@ -89,7 +89,6 @@ PRE_UNINSTALL = : 8@@ -89,8 +89,6 @@ PRE_UNINSTALL = :
8 POST_UNINSTALL = : 9 POST_UNINSTALL = :
9 build_triplet = @build@ 10 build_triplet = @build@
10 host_triplet = @host@ 11 host_triplet = @host@
11-@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h 12-@LEGACY_TRUE@am__append_1 = include/X11/extensions/XKBgeom.h
12 @LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h 13-@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h
13 subdir = . 14 subdir = .
14 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 15 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
15@@ -272,8 +271,7 @@ am__fontcache_HEADERS_DIST = include/X11 16 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 17@@ -272,8 +270,7 @@ am__fontcache_HEADERS_DIST = include/X11
16 am__kb_HEADERS_DIST = include/X11/extensions/XKB.h \ 18 am__kb_HEADERS_DIST = include/X11/extensions/XKB.h \
17 include/X11/extensions/XKBproto.h \ 19 include/X11/extensions/XKBproto.h \
18 include/X11/extensions/XKBsrv.h \ 20 include/X11/extensions/XKBsrv.h \
19- include/X11/extensions/XKBstr.h \ 21- include/X11/extensions/XKBstr.h \
20- include/X11/extensions/XKBgeom.h 22- include/X11/extensions/XKBgeom.h
21+ include/X11/extensions/XKBstr.h 23+ include/X11/extensions/XKBstr.h
22 am__lg3d_HEADERS_DIST = include/X11/extensions/lgewire.h 24 am__lg3d_HEADERS_DIST = include/X11/extensions/lgewire.h
23 am__print_HEADERS_DIST = include/X11/extensions/Print.h \ 25 am__print_HEADERS_DIST = include/X11/extensions/Print.h \
24 include/X11/extensions/Printstr.h 26 include/X11/extensions/Printstr.h
 27@@ -287,8 +284,7 @@ am__trap_HEADERS_DIST = include/X11/exte
 28 am__video_HEADERS_DIST = include/X11/extensions/Xv.h \
 29 include/X11/extensions/XvMC.h \
 30 include/X11/extensions/XvMCproto.h \
 31- include/X11/extensions/Xvproto.h \
 32- include/X11/extensions/vldXvMC.h
 33+ include/X11/extensions/Xvproto.h
 34 am__windowswm_HEADERS_DIST = include/X11/extensions/windowswm.h \
 35 include/X11/extensions/windowswmstr.h
 36 am__xf86misc_HEADERS_DIST = include/X11/extensions/xf86misc.h \