Tue Sep 16 12:38:38 2008 UTC ()
Update "x11-links" package to version 0.38:
- Add support for builtin "pixman".
- Add some extra entries for Mac OS X.


(tron)
diff -r1.93 -r1.94 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.14 -r1.15 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.9 -r1.10 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r1.7 -r1.8 pkgsrc/pkgtools/x11-links/files/xorg
diff -r0 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.pixman
cvs diff -r1.93 -r1.94 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2008/08/22 13:34:39 1.93
+++ pkgsrc/pkgtools/x11-links/Makefile 2008/09/16 12:38:38 1.94
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.93 2008/08/22 13:34:39 tron Exp $ 1# $NetBSD: Makefile,v 1.94 2008/09/16 12:38:38 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.37 7DISTNAME= x11-links-0.38
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= jlam@pkgsrc.org 12MAINTAINER= jlam@pkgsrc.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
15#LICENSE= original-bsd 15#LICENSE= 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.14 -r1.15 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/08/22 13:34:39 1.14
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/09/16 12:38:38 1.15
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.14 2008/08/22 13:34:39 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.15 2008/09/16 12:38:38 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
6BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 6BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
7X11_LINKS_BUILDLINK3_MK:= ${X11_LINKS_BUILDLINK3_MK}+ 7X11_LINKS_BUILDLINK3_MK:= ${X11_LINKS_BUILDLINK3_MK}+
8 8
9.if !empty(BUILDLINK_DEPTH:M+) 9.if !empty(BUILDLINK_DEPTH:M+)
10BUILDLINK_DEPENDS+= x11-links 10BUILDLINK_DEPENDS+= x11-links
11.endif 11.endif
12 12
13# x11-links must come first so that packages listed later can overwrite 13# x11-links must come first so that packages listed later can overwrite
14# any symlinks created by buildlinking x11-links. 14# any symlinks created by buildlinking x11-links.
15# 15#
16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx11-links} 16BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nx11-links}
17BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES} 17BUILDLINK_PACKAGES:= x11-links ${BUILDLINK_PACKAGES}
18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links 18BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}x11-links
19 19
20.if !empty(X11_LINKS_BUILDLINK3_MK:M+) 20.if !empty(X11_LINKS_BUILDLINK3_MK:M+)
21BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.37 21BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.38
22BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 22BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
23BUILDLINK_DEPMETHOD.x11-links?= build 23BUILDLINK_DEPMETHOD.x11-links?= build
24 24
25# Force all of the headers and libraries to be symlinked into 25# Force all of the headers and libraries to be symlinked into
26# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 26# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
27# 27#
28BUILDLINK_CONTENTS_FILTER.x11-links= \ 28BUILDLINK_CONTENTS_FILTER.x11-links= \
29 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 29 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
30 30
31# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 31# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
32# and ${BUILDLINK_X11_DIR}/lib. 32# and ${BUILDLINK_X11_DIR}/lib.
33# 33#
34BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 34BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
cvs diff -r1.9 -r1.10 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2008/01/05 16:08:52 1.9
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2008/09/16 12:38:38 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.9 2008/01/05 16:08:52 tron Exp $ 1# $NetBSD: xorg.mk,v 1.10 2008/09/16 12:38:38 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# libXdamage and damageext only in pkgsrc-wip so not used here 7# libXdamage and damageext only in pkgsrc-wip so not used here
8# XXX: what about xaw? 8# XXX: what about xaw?
9 9
10.include "../../fonts/fontconfig/buildlink3.mk" 10.include "../../fonts/fontconfig/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 "../../textproc/expat/buildlink3.mk" 14.include "../../textproc/expat/buildlink3.mk"
@@ -19,26 +19,27 @@ FILES_LIST= ${FILESDIR}/xorg @@ -19,26 +19,27 @@ FILES_LIST= ${FILESDIR}/xorg
19.include "../../x11/libSM/buildlink3.mk" 19.include "../../x11/libSM/buildlink3.mk"
20.include "../../x11/libX11/buildlink3.mk" 20.include "../../x11/libX11/buildlink3.mk"
21.include "../../x11/libXcomposite/buildlink3.mk" 21.include "../../x11/libXcomposite/buildlink3.mk"
22.include "../../x11/libXcursor/buildlink3.mk" 22.include "../../x11/libXcursor/buildlink3.mk"
23.include "../../x11/libXext/buildlink3.mk" 23.include "../../x11/libXext/buildlink3.mk"
24.include "../../x11/libXfixes/buildlink3.mk" 24.include "../../x11/libXfixes/buildlink3.mk"
25.include "../../x11/libXft/buildlink3.mk" 25.include "../../x11/libXft/buildlink3.mk"
26.include "../../x11/libXinerama/buildlink3.mk" 26.include "../../x11/libXinerama/buildlink3.mk"
27.include "../../x11/libXmu/buildlink3.mk" 27.include "../../x11/libXmu/buildlink3.mk"
28.include "../../x11/libXpm/buildlink3.mk" 28.include "../../x11/libXpm/buildlink3.mk"
29.include "../../x11/libXrandr/buildlink3.mk" 29.include "../../x11/libXrandr/buildlink3.mk"
30.include "../../x11/libXrender/buildlink3.mk" 30.include "../../x11/libXrender/buildlink3.mk"
31.include "../../x11/libXt/buildlink3.mk" 31.include "../../x11/libXt/buildlink3.mk"
 32.include "../../x11/pixman/buildlink3.mk"
32.include "../../x11/renderproto/buildlink3.mk" 33.include "../../x11/renderproto/buildlink3.mk"
33.include "../../x11/randrproto/buildlink3.mk" 34.include "../../x11/randrproto/buildlink3.mk"
34.include "../../x11/xextproto/buildlink3.mk" 35.include "../../x11/xextproto/buildlink3.mk"
35.include "../../x11/xproto/buildlink3.mk" 36.include "../../x11/xproto/buildlink3.mk"
36 37
37# XXX what is ${X11_MODULES} ? 38# XXX what is ${X11_MODULES} ?
38 39
39# Check if any headers and libraries for ${X11_MODULES} found in 40# Check if any headers and libraries for ${X11_MODULES} found in
40# ${X11BASE} actually belong to the base Xorg or not. 41# ${X11BASE} actually belong to the base Xorg or not.
41# 42#
42# XXX: maybe skip iconv and zlib too? 43# XXX: maybe skip iconv and zlib too?
43.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links} 44.for _pkg_ in ${BUILDLINK_PACKAGES:Nx11-links}
44CHECK_BUILTIN.${_pkg_}:= yes 45CHECK_BUILTIN.${_pkg_}:= yes
cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/x11-links/files/xorg (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg 2008/08/22 13:34:39 1.7
+++ pkgsrc/pkgtools/x11-links/files/xorg 2008/09/16 12:38:38 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg,v 1.7 2008/08/22 13:34:39 tron Exp $ 1# $NetBSD: xorg,v 1.8 2008/09/16 12:38:38 tron Exp $
2# 2#
3# The files listed below are the union of the sets of files installed by 3# The files listed below are the union of the sets of files installed by
4# the supported Xorg (and some XFree) distributions, minus the set of files 4# the supported Xorg (and some XFree) distributions, minus the set of files
5# representing bits that may be added via pkgsrc, e.g. Xfixes, MesaLib, Xpm, 5# representing bits that may be added via pkgsrc, e.g. Xfixes, MesaLib, Xpm,
6# freetype2, etc. 6# freetype2, etc.
7# 7#
8include/DPS/ColorSB.h 8include/DPS/ColorSB.h
9include/DPS/ColorSBP.h 9include/DPS/ColorSBP.h
10include/DPS/DPSScrollW.h 10include/DPS/DPSScrollW.h
11include/DPS/DPSScrollWP.h 11include/DPS/DPSScrollWP.h
12include/DPS/FontCreatP.h 12include/DPS/FontCreatP.h
13include/DPS/FontCreato.h 13include/DPS/FontCreato.h
14include/DPS/FontSB.h 14include/DPS/FontSB.h
@@ -344,26 +344,29 @@ lib/libXRes.so.1.0 @@ -344,26 +344,29 @@ lib/libXRes.so.1.0
344lib/libXTrap.6.4.0.dylib 344lib/libXTrap.6.4.0.dylib
345lib/libXTrap.6.4.dylib 345lib/libXTrap.6.4.dylib
346lib/libXTrap.6.dylib 346lib/libXTrap.6.dylib
347lib/libXTrap.a 347lib/libXTrap.a
348lib/libXTrap.dylib 348lib/libXTrap.dylib
349lib/libXTrap.so 349lib/libXTrap.so
350lib/libXTrap.so.6 350lib/libXTrap.so.6
351lib/libXTrap.so.6.4 351lib/libXTrap.so.6.4
352lib/libXaw.6.1.dylib 352lib/libXaw.6.1.dylib
353lib/libXaw.6.dylib 353lib/libXaw.6.dylib
354lib/libXaw.7.0.dylib 354lib/libXaw.7.0.dylib
355lib/libXaw.7.dylib 355lib/libXaw.7.dylib
356lib/libXaw.8.dylib 356lib/libXaw.8.dylib
 357lib/libXaw6.6.dylib
 358lib/libXaw7.7.dylib
 359lib/libXaw8.8.dylib
357lib/libXaw.a 360lib/libXaw.a
358lib/libXaw.dylib 361lib/libXaw.dylib
359lib/libXaw.so 362lib/libXaw.so
360lib/libXaw.so.6 363lib/libXaw.so.6
361lib/libXaw.so.6.1 364lib/libXaw.so.6.1
362lib/libXaw.so.7 365lib/libXaw.so.7
363lib/libXaw.so.7.0 366lib/libXaw.so.7.0
364lib/libXaw.so.8.0 367lib/libXaw.so.8.0
365lib/libXdamage.1.0.0.dylib 368lib/libXdamage.1.0.0.dylib
366lib/libXdamage.1.dylib 369lib/libXdamage.1.dylib
367lib/libXdamage.dylib 370lib/libXdamage.dylib
368lib/libXdamage.a 371lib/libXdamage.a
369lib/libXdamage.so.1.0 372lib/libXdamage.so.1.0
File Added: pkgsrc/pkgtools/x11-links/files/xorg.pixman
# $NetBSD: xorg.pixman,v 1.2 2008/09/16 12:38:38 tron Exp $
#
include/pixman-1/pixman.h
include/pixman-1/pixman-version.h
lib/libpixman-1.0.11.8.dylib
lib/libpixman-1.0.dylib
lib/libpixman-1.dylib
lib/libpixman-1.la
lib/pkgconfig/pixman-1.pc