[pkgsrc/trunk]: pkgsrc/x11/xorgproto Fix conflict with vlcXvMC.h provided by ...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55b9096f10cb
branches:  trunk
changeset: 404635:55b9096f10cb
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Nov 15 10:01:35 2019 +0000

description:
Fix conflict with vlcXvMC.h provided by libXvMC 1.0.12, bump PKGREVISION

diffstat:

 x11/xorgproto/Makefile                  |   4 ++--
 x11/xorgproto/PLIST                     |   3 +--
 x11/xorgproto/distinfo                  |   4 ++--
 x11/xorgproto/patches/patch-Makefile.in |  20 ++++++++++++++++----
 4 files changed, 21 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r 79280a1e8448 -r 55b9096f10cb x11/xorgproto/Makefile
--- a/x11/xorgproto/Makefile    Fri Nov 15 09:57:52 2019 +0000
+++ b/x11/xorgproto/Makefile    Fri Nov 15 10:01:35 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2019/11/14 09:44:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/15 10:01:35 ryoon Exp $
 
 DISTNAME=              xorgproto-2019.2
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 79280a1e8448 -r 55b9096f10cb x11/xorgproto/PLIST
--- a/x11/xorgproto/PLIST       Fri Nov 15 09:57:52 2019 +0000
+++ b/x11/xorgproto/PLIST       Fri Nov 15 10:01:35 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/11/14 09:44:30 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/11/15 10:01:35 ryoon Exp $
 include/GL/glxint.h
 include/GL/glxmd.h
 include/GL/glxproto.h
@@ -108,7 +108,6 @@
 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/xcalibrateproto.h
diff -r 79280a1e8448 -r 55b9096f10cb x11/xorgproto/distinfo
--- a/x11/xorgproto/distinfo    Fri Nov 15 09:57:52 2019 +0000
+++ b/x11/xorgproto/distinfo    Fri Nov 15 10:01:35 2019 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2019/11/14 09:44:30 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2019/11/15 10:01:35 ryoon 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) = d0e0ff3a54547b0415f687ab77a5645906a8debe
+SHA1 (patch-Makefile.in) = 4ef6cd0b2f0c02cd9d59f4f8a3f8997746e6f76c
diff -r 79280a1e8448 -r 55b9096f10cb x11/xorgproto/patches/patch-Makefile.in
--- a/x11/xorgproto/patches/patch-Makefile.in   Fri Nov 15 09:57:52 2019 +0000
+++ b/x11/xorgproto/patches/patch-Makefile.in   Fri Nov 15 10:01:35 2019 +0000
@@ -1,18 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.1 2019/11/14 09:44:30 ryoon Exp $
+$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,7 +89,6 @@ PRE_UNINSTALL = :
+@@ -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
+-@LEGACY_TRUE@am__append_2 = include/X11/extensions/vldXvMC.h
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -272,8 +271,7 @@ am__fontcache_HEADERS_DIST = include/X11
+ 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 \
@@ -22,3 +24,13 @@
  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 \