Tue Jan 24 14:25:00 2017 UTC ()
add missing xorg present and Mesa support.  bump revision.

allows tigervnc to build.

thanks to dmcmahill for testing.


(mrg)
diff -r1.172 -r1.173 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.67 -r1.68 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.27 -r1.28 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.MesaLib
diff -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.libXpresent
diff -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.presentproto
diff -r0 -r1.1 pkgsrc/x11/libXpresent/builtin.mk
cvs diff -r1.172 -r1.173 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2016/07/10 13:28:41 1.172
+++ pkgsrc/pkgtools/x11-links/Makefile 2017/01/24 14:25:00 1.173
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.172 2016/07/10 13:28:41 rillig Exp $ 1# $NetBSD: Makefile,v 1.173 2017/01/24 14:25:00 mrg Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7PKGNAME= x11-links-1.02 7PKGNAME= x11-links-1.03
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 11HOMEPAGE= http://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
12COMMENT= Shadow tree of links to native X11 headers and libraries 12COMMENT= Shadow tree of links to native X11 headers and libraries
13LICENSE= original-bsd 13LICENSE= original-bsd
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16.if ${OPSYS} == "OpenBSD" 16.if ${OPSYS} == "OpenBSD"
17CHECK_SHLIBS_SUPPORTED= no 17CHECK_SHLIBS_SUPPORTED= no
18.endif 18.endif
19 19
20NOT_FOR_PLATFORM= DragonFly-*-* 20NOT_FOR_PLATFORM= DragonFly-*-*
cvs diff -r1.67 -r1.68 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2016/07/10 13:28:41 1.67
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2017/01/24 14:25:00 1.68
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.67 2016/07/10 13:28:41 rillig Exp $ 1# $NetBSD: buildlink3.mk,v 1.68 2017/01/24 14:25:00 mrg Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5# 5#
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.02 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.03
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the helper programs, headers and libraries to be symlinked 19# Force all of the helper programs, headers and libraries to be symlinked
20# into ${BUILDLINK_X11_DIR}. 20# into ${BUILDLINK_X11_DIR}.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(bin/.*|include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
cvs diff -r1.27 -r1.28 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2016/07/10 13:28:41 1.27
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2017/01/24 14:25:00 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.27 2016/07/10 13:28:41 rillig Exp $ 1# $NetBSD: xorg.mk,v 1.28 2017/01/24 14:25:00 mrg Exp $
2# 2#
3# This is for X.org, but use "xfree" files also. 3# This is for X.org, but use "xfree" files also.
4 4
5FILES_LIST= ${FILESDIR}/xorg 5FILES_LIST= ${FILESDIR}/xorg
6 6
7# XXX: what about xaw? 7# XXX: what about xaw?
8 8
9.include "../../fonts/fontconfig/buildlink3.mk" 9.include "../../fonts/fontconfig/buildlink3.mk"
10.include "../../fonts/libfontenc/buildlink3.mk" 10.include "../../fonts/libfontenc/buildlink3.mk"
11.include "../../graphics/MesaLib/buildlink3.mk" 11.include "../../graphics/MesaLib/buildlink3.mk"
12.include "../../graphics/freetype2/buildlink3.mk" 12.include "../../graphics/freetype2/buildlink3.mk"
13.include "../../graphics/glu/buildlink3.mk" 13.include "../../graphics/glu/buildlink3.mk"
14.include "../../graphics/glut/buildlink3.mk" 14.include "../../graphics/glut/buildlink3.mk"
@@ -33,36 +33,38 @@ FILES_LIST= ${FILESDIR}/xorg @@ -33,36 +33,38 @@ FILES_LIST= ${FILESDIR}/xorg
33.include "../../x11/libXau/buildlink3.mk" 33.include "../../x11/libXau/buildlink3.mk"
34.include "../../x11/libXcomposite/buildlink3.mk" 34.include "../../x11/libXcomposite/buildlink3.mk"
35.include "../../x11/libXcursor/buildlink3.mk" 35.include "../../x11/libXcursor/buildlink3.mk"
36.include "../../x11/libXdamage/buildlink3.mk" 36.include "../../x11/libXdamage/buildlink3.mk"
37.include "../../x11/libXdmcp/buildlink3.mk" 37.include "../../x11/libXdmcp/buildlink3.mk"
38.include "../../x11/libXevie/buildlink3.mk" 38.include "../../x11/libXevie/buildlink3.mk"
39.include "../../x11/libXext/buildlink3.mk" 39.include "../../x11/libXext/buildlink3.mk"
40.include "../../x11/libXfixes/buildlink3.mk" 40.include "../../x11/libXfixes/buildlink3.mk"
41.include "../../x11/libXfont/buildlink3.mk" 41.include "../../x11/libXfont/buildlink3.mk"
42.include "../../x11/libXft/buildlink3.mk" 42.include "../../x11/libXft/buildlink3.mk"
43.include "../../x11/libXinerama/buildlink3.mk" 43.include "../../x11/libXinerama/buildlink3.mk"
44.include "../../x11/libXmu/buildlink3.mk" 44.include "../../x11/libXmu/buildlink3.mk"
45.include "../../x11/libXpm/buildlink3.mk" 45.include "../../x11/libXpm/buildlink3.mk"
 46.include "../../x11/libXpresent/buildlink3.mk"
46.include "../../x11/libXprintUtil/buildlink3.mk" 47.include "../../x11/libXprintUtil/buildlink3.mk"
47.include "../../x11/libXrandr/buildlink3.mk" 48.include "../../x11/libXrandr/buildlink3.mk"
48.include "../../x11/libXrender/buildlink3.mk" 49.include "../../x11/libXrender/buildlink3.mk"
49.include "../../x11/libXres/buildlink3.mk" 50.include "../../x11/libXres/buildlink3.mk"
50.include "../../x11/libXt/buildlink3.mk" 51.include "../../x11/libXt/buildlink3.mk"
51.include "../../x11/libXtst/buildlink3.mk" 52.include "../../x11/libXtst/buildlink3.mk"
52.include "../../x11/libXv/buildlink3.mk" 53.include "../../x11/libXv/buildlink3.mk"
53.include "../../x11/libdrm/buildlink3.mk" 54.include "../../x11/libdrm/buildlink3.mk"
54.include "../../x11/libxcb/buildlink3.mk" 55.include "../../x11/libxcb/buildlink3.mk"
55.include "../../x11/pixman/buildlink3.mk" 56.include "../../x11/pixman/buildlink3.mk"
 57.include "../../x11/presentproto/buildlink3.mk"
56.include "../../x11/printproto/buildlink3.mk" 58.include "../../x11/printproto/buildlink3.mk"
57.include "../../x11/randrproto/buildlink3.mk" 59.include "../../x11/randrproto/buildlink3.mk"
58.include "../../x11/recordproto/buildlink3.mk" 60.include "../../x11/recordproto/buildlink3.mk"
59.include "../../x11/renderproto/buildlink3.mk" 61.include "../../x11/renderproto/buildlink3.mk"
60.include "../../x11/resourceproto/buildlink3.mk" 62.include "../../x11/resourceproto/buildlink3.mk"
61.include "../../x11/scrnsaverproto/buildlink3.mk" 63.include "../../x11/scrnsaverproto/buildlink3.mk"
62.include "../../x11/trapproto/buildlink3.mk" 64.include "../../x11/trapproto/buildlink3.mk"
63.include "../../x11/videoproto/buildlink3.mk" 65.include "../../x11/videoproto/buildlink3.mk"
64.include "../../x11/xbitmaps/buildlink3.mk" 66.include "../../x11/xbitmaps/buildlink3.mk"
65.include "../../x11/xcmiscproto/buildlink3.mk" 67.include "../../x11/xcmiscproto/buildlink3.mk"
66.include "../../x11/xcb-proto/buildlink3.mk" 68.include "../../x11/xcb-proto/buildlink3.mk"
67.include "../../x11/xcb-util/buildlink3.mk" 69.include "../../x11/xcb-util/buildlink3.mk"
68.include "../../x11/xf86bigfontproto/buildlink3.mk" 70.include "../../x11/xf86bigfontproto/buildlink3.mk"
File Added: pkgsrc/pkgtools/x11-links/files/xorg.MesaLib
# $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
File Added: pkgsrc/pkgtools/x11-links/files/xorg.libXpresent
# $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
File Added: pkgsrc/pkgtools/x11-links/files/xorg.presentproto
# $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
File Added: pkgsrc/x11/libXpresent/builtin.mk
# $NetBSD: builtin.mk,v 1.1 2017/01/24 14:25:00 mrg Exp $

BUILTIN_PKG:=	libXpresent
PKGCONFIG_FILE.libXpresent=	${X11BASE}/lib/pkgconfig/xpresent.pc
PKGCONFIG_FILE.libXpresent+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xpresent.pc

.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"

CHECK_BUILTIN.libXpresent?=	no
.if !empty(CHECK_BUILTIN.libXpresent:M[nN][oO])

.  if !empty(USE_BUILTIN.libXpresent:M[nN][oO])
BUILDLINK_API_DEPENDS.presentproto+=	presentproto>=1.0
.  endif

.endif  # CHECK_BUILTIN.libXpresent