diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-11-14 09:44:30 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-11-14 09:44:30 +0000 |
| commit | e351a63d16fa678bdf18d8d8d22679f7f37b036f (patch) | |
| tree | 1579f61a1b26c4257d7c97d254b57aa9f127652f /x11/xorgproto | |
| parent | 58860b64591b28aaee79c642f919265fbbbe7841 (diff) | |
| download | pkgsrc-e351a63d16fa678bdf18d8d8d22679f7f37b036f.tar.gz | |
Remove conflicted header file. Bump PKGREVISION
* XKBgeom.h is provided by libX11-1.6.9 now. Remove it from xorgproto.
Diffstat (limited to 'x11/xorgproto')
| -rw-r--r-- | x11/xorgproto/Makefile | 3 | ||||
| -rw-r--r-- | x11/xorgproto/PLIST | 3 | ||||
| -rw-r--r-- | x11/xorgproto/distinfo | 3 | ||||
| -rw-r--r-- | x11/xorgproto/patches/patch-Makefile.in | 24 |
4 files changed, 29 insertions, 4 deletions
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile index 867bd85f23f..fbd4f833529 100644 --- a/x11/xorgproto/Makefile +++ b/x11/xorgproto/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2019/11/13 22:13:29 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/11/14 09:44:30 ryoon Exp $ DISTNAME= xorgproto-2019.2 +PKGREVISION= 1 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=proto/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xorgproto/PLIST b/x11/xorgproto/PLIST index 6c98d77bf0f..e65d0d280de 100644 --- a/x11/xorgproto/PLIST +++ b/x11/xorgproto/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2019/11/13 22:13:29 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2019/11/14 09:44:30 ryoon Exp $ include/GL/glxint.h include/GL/glxmd.h include/GL/glxproto.h @@ -42,7 +42,6 @@ include/X11/extensions/XI2.h include/X11/extensions/XI2proto.h include/X11/extensions/XIproto.h include/X11/extensions/XKB.h -include/X11/extensions/XKBgeom.h include/X11/extensions/XKBproto.h include/X11/extensions/XKBsrv.h include/X11/extensions/XKBstr.h diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo index 08ea714e7f8..92a54b9b853 100644 --- a/x11/xorgproto/distinfo +++ b/x11/xorgproto/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2019/11/13 22:13:29 wiz Exp $ +$NetBSD: distinfo,v 1.8 2019/11/14 09:44:30 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 diff --git a/x11/xorgproto/patches/patch-Makefile.in b/x11/xorgproto/patches/patch-Makefile.in new file mode 100644 index 00000000000..f13d67ea725 --- /dev/null +++ b/x11/xorgproto/patches/patch-Makefile.in @@ -0,0 +1,24 @@ +$NetBSD: patch-Makefile.in,v 1.1 2019/11/14 09:44:30 ryoon Exp $ + +* XKBgeom.h is provided by libX11 1.6.9 + +--- Makefile.in.orig 2019-10-17 16:02:37.000000000 +0000 ++++ Makefile.in +@@ -89,7 +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 +@@ -272,8 +271,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 |