Tue Sep 14 17:30:13 2010 UTC ()
Update "x11-links" package to version 0.56:
- Add a nasty hack to deal with the "pixman" issue under NetBSD 5.1*
  (and 5.0?) which provides an old version of "libpixman" with a higher
  major number than the package in "pkgsrc".


(tron)
diff -r1.120 -r1.121 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.32 -r1.33 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.19 -r1.20 pkgsrc/pkgtools/x11-links/xorg.mk
cvs diff -r1.120 -r1.121 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2010/09/14 08:55:42 1.120
+++ pkgsrc/pkgtools/x11-links/Makefile 2010/09/14 17:30:12 1.121
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.120 2010/09/14 08:55:42 tron Exp $ 1# $NetBSD: Makefile,v 1.121 2010/09/14 17:30:12 tron 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
7DISTNAME= x11-links-0.55 7DISTNAME= x11-links-0.56
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
14COMMENT= Shadow tree of links to native X11 headers and libraries 14COMMENT= Shadow tree of links to native X11 headers and libraries
15LICENSE= original-bsd 15LICENSE= original-bsd
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
19 19
20WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}
cvs diff -r1.32 -r1.33 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/14 08:55:42 1.32
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/14 17:30:12 1.33
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.32 2010/09/14 08:55:42 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.33 2010/09/14 17:30:12 tron 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>=0.55 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.56
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 headers and libraries to be symlinked into 19# Force all of the headers and libraries to be symlinked into
20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(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.19 -r1.20 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2010/09/11 20:26:11 1.19
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2010/09/14 17:30:12 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.19 2010/09/11 20:26:11 wiz Exp $ 1# $NetBSD: xorg.mk,v 1.20 2010/09/14 17:30:12 tron 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"
@@ -41,27 +41,29 @@ FILES_LIST= ${FILESDIR}/xorg @@ -41,27 +41,29 @@ FILES_LIST= ${FILESDIR}/xorg
41.include "../../x11/libXinerama/buildlink3.mk" 41.include "../../x11/libXinerama/buildlink3.mk"
42.include "../../x11/libXmu/buildlink3.mk" 42.include "../../x11/libXmu/buildlink3.mk"
43.include "../../x11/libXpm/buildlink3.mk" 43.include "../../x11/libXpm/buildlink3.mk"
44.include "../../x11/libXprintUtil/buildlink3.mk" 44.include "../../x11/libXprintUtil/buildlink3.mk"
45.include "../../x11/libXrandr/buildlink3.mk" 45.include "../../x11/libXrandr/buildlink3.mk"
46.include "../../x11/libXrender/buildlink3.mk" 46.include "../../x11/libXrender/buildlink3.mk"
47.include "../../x11/libXres/buildlink3.mk" 47.include "../../x11/libXres/buildlink3.mk"
48.include "../../x11/libXt/buildlink3.mk" 48.include "../../x11/libXt/buildlink3.mk"
49.include "../../x11/libXtst/buildlink3.mk" 49.include "../../x11/libXtst/buildlink3.mk"
50.include "../../x11/libXv/buildlink3.mk" 50.include "../../x11/libXv/buildlink3.mk"
51.include "../../x11/libdrm/buildlink3.mk" 51.include "../../x11/libdrm/buildlink3.mk"
52.include "../../x11/liblbxutil/buildlink3.mk" 52.include "../../x11/liblbxutil/buildlink3.mk"
53.include "../../x11/libxcb/buildlink3.mk" 53.include "../../x11/libxcb/buildlink3.mk"
 54.if empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-*)
54.include "../../x11/pixman/buildlink3.mk" 55.include "../../x11/pixman/buildlink3.mk"
 56.endif
55.include "../../x11/printproto/buildlink3.mk" 57.include "../../x11/printproto/buildlink3.mk"
56.include "../../x11/randrproto/buildlink3.mk" 58.include "../../x11/randrproto/buildlink3.mk"
57.include "../../x11/recordproto/buildlink3.mk" 59.include "../../x11/recordproto/buildlink3.mk"
58.include "../../x11/renderproto/buildlink3.mk" 60.include "../../x11/renderproto/buildlink3.mk"
59.include "../../x11/resourceproto/buildlink3.mk" 61.include "../../x11/resourceproto/buildlink3.mk"
60.include "../../x11/scrnsaverproto/buildlink3.mk" 62.include "../../x11/scrnsaverproto/buildlink3.mk"
61.include "../../x11/trapproto/buildlink3.mk" 63.include "../../x11/trapproto/buildlink3.mk"
62.include "../../x11/videoproto/buildlink3.mk" 64.include "../../x11/videoproto/buildlink3.mk"
63.include "../../x11/xcmiscproto/buildlink3.mk" 65.include "../../x11/xcmiscproto/buildlink3.mk"
64.include "../../x11/xcb-proto/buildlink3.mk" 66.include "../../x11/xcb-proto/buildlink3.mk"
65.include "../../x11/xcb-util/buildlink3.mk" 67.include "../../x11/xcb-util/buildlink3.mk"
66.include "../../x11/xextproto/buildlink3.mk" 68.include "../../x11/xextproto/buildlink3.mk"
67.include "../../x11/xf86bigfontproto/buildlink3.mk" 69.include "../../x11/xf86bigfontproto/buildlink3.mk"