Split dri2proto from xf86driproto for xorg.

Fixes for the case USE_BUILTIN.xf86dirproto=NO and USE_BUILTIN.dri2proto=YES.

Bump version to 0.86.

4 files changed, 11 insertions, 8 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 5b8391930c6..711eb294799 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.153 2014/03/31 09:19:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.154 2014/04/17 02:03:12 obache Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.
 
-PKGNAME=	x11-links-0.85
+PKGNAME=	x11-links-0.86
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/pkgtools/x11-links/files/xorg.dri2proto b/pkgtools/x11-links/files/xorg.dri2proto
new file mode 100644
index 00000000000..7c0b73b3230
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.dri2proto
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.dri2proto,v 1.1 2014/04/17 02:03:12 obache Exp $
+#
+include/X11/extensions/dri2proto.h
+include/X11/extensions/dri2tokens.h
+lib/pkgconfig/dri2proto.pc
+share/pkgconfig/dri2proto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86driproto b/pkgtools/x11-links/files/xorg.xf86driproto
index 6e7a5147cf1..18d1fecff2c 100644
--- a/pkgtools/x11-links/files/xorg.xf86driproto
+++ b/pkgtools/x11-links/files/xorg.xf86driproto
@@ -1,11 +1,7 @@
-# $NetBSD: xorg.xf86driproto,v 1.4 2014/03/07 15:27:32 jperkin Exp $
+# $NetBSD: xorg.xf86driproto,v 1.5 2014/04/17 02:03:12 obache Exp $
 #
 include/X11/dri/xf86dri.h
 include/X11/dri/xf86driproto.h
 include/X11/dri/xf86dristr.h
-include/X11/extensions/dri2proto.h
-include/X11/extensions/dri2tokens.h
-lib/pkgconfig/dri2proto.pc
 lib/pkgconfig/xf86driproto.pc
-share/pkgconfig/dri2proto.pc
 share/pkgconfig/xf86driproto.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 6a68a387419..40c43151a11 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.24 2013/02/11 09:16:12 wiz Exp $
+# $NetBSD: xorg.mk,v 1.25 2014/04/17 02:03:12 obache Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -16,6 +16,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/dri2proto/buildlink3.mk"
 .include "../../x11/evieext/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/fontcacheproto/buildlink3.mk"