add missing xorg present and Mesa support. bump revision.

allows tigervnc to build.

thanks to dmcmahill for testing.

6 files changed, 84 insertions, 5 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 531a0a9539c..f3144345b31 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.172 2016/07/10 13:28:41 rillig Exp $
+# $NetBSD: Makefile,v 1.173 2017/01/24 14:25:00 mrg 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-1.02
+PKGNAME=	x11-links-1.03
 CATEGORIES=	pkgtools x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index c0db4e7c353..668d83bfccb 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.67 2016/07/10 13:28:41 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.68 2017/01/24 14:25:00 mrg Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+=	x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=1.02
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=1.03
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg.MesaLib b/pkgtools/x11-links/files/xorg.MesaLib
new file mode 100644
index 00000000000..ec2315ab6ea
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.MesaLib
@@ -0,0 +1,61 @@
+# $NetBSD: xorg.MesaLib,v 1.1 2017/01/24 14:25:00 mrg Exp $
+#
+include/GL/internal/dri_interface.h
+include/GL/internal/glcore.h
+include/GL/internal/sarea.h
+include/GL/GLwDrawA.h
+include/GL/GLwDrawAP.h
+include/GL/GLwMDrawA.h
+include/GL/GLwMDrawAP.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glext.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/glxext.h
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+include/GL/osmesa.h
+include/EGL/egl.h
+include/EGL/eglext.h
+include/EGL/eglmesaext.h
+include/EGL/eglplatform.h
+lib/libGL.a
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.0.2
+lib/libGL.so.1.2
+lib/libGL.so.2
+lib/libGL.so.2.0
+lib/libGL.so.9.0
+lib/libGL.so.9.1
+lib/libGL.so.10.0
+lib/libGL.so.12.0
+lib/libGL.so.13.0
+lib/libGL.so.14.0
+lib/libGL.so.15.0
+lib/libGL.so.16.0
+lib/libGL.dylib
+lib/libGL.1.dylib
+lib/libGL.1.2.dylib
+lib/libGLw.a
+lib/libGLw.so
+lib/libGLw.so.1
+lib/libGLw.so.1.0
+lib/libGLw.so.2
+lib/libGLw.so.2.0
+lib/libGLw.so.5.1
+lib/libGLw.so.6.0
+lib/libGLw.dylib
+lib/libGLw.1.dylib
+lib/libGLw.1.0.dylib
+lib/libEGL.a
+lib/libEGL.so
+lib/libEGL.so.0
+lib/libEGL.so.0.0
+lib/libEGL.so.1.0
+lib/pkgconfig/gl.pc
+lib/pkgconfig/glw.pc
+lib/pkgconfig/egl.pc
diff --git a/pkgtools/x11-links/files/xorg.libXpresent b/pkgtools/x11-links/files/xorg.libXpresent
new file mode 100644
index 00000000000..3c53a547ecc
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXpresent
@@ -0,0 +1,10 @@
+# $NetBSD: xorg.libXpresent,v 1.1 2017/01/24 14:25:00 mrg Exp $
+#
+include/X11/extensions/Xpresent.h
+lib/libXpresent.a
+lib/libXpresent.la
+lib/libXpresent.so
+lib/libXpresent.so.1
+lib/libXpresent.so.1.0
+lib/pkgconfig/xpresent.pc
+man/man3/Xpresent.3
diff --git a/pkgtools/x11-links/files/xorg.presentproto b/pkgtools/x11-links/files/xorg.presentproto
new file mode 100644
index 00000000000..226e4a079d0
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.presentproto
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.presentproto,v 1.1 2017/01/24 14:25:00 mrg Exp $
+#
+include/X11/extensions/presentproto.h
+include/X11/extensions/presenttokens.h
+lib/pkgconfig/presentproto.pc
+share/doc/presentproto/presentproto.txt
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 40b4bc1d9f3..342d1a4c6b0 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.27 2016/07/10 13:28:41 rillig Exp $
+# $NetBSD: xorg.mk,v 1.28 2017/01/24 14:25:00 mrg Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -43,6 +43,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXpresent/buildlink3.mk"
 .include "../../x11/libXprintUtil/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
@@ -53,6 +54,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/presentproto/buildlink3.mk"
 .include "../../x11/printproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/recordproto/buildlink3.mk"