Fri Jul 18 16:23:50 2008 UTC ()
pullup ticket #2453 requested by tron
x11-links: update for build breakage under xcode/macosx

revisions pulled up:
pkgsrc/pkgtools/x11-links/Makefile		1.92
pkgsrc/pkgtools/x11-links/buildlink3.mk		1.13
pkgsrc/pkgtools/x11-links/files/xorg		1.6
pkgsrc/pkgtools/x11-links/files/xorg.libXrand	1.2

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Jul 18 12:08:53 UTC 2008

   Modified Files:
   	pkgsrc/pkgtools/x11-links: Makefile buildlink3.mk
   	pkgsrc/pkgtools/x11-links/files: xorg xorg.libXrandr

   Log Message:
   Update to version 0.36:
   Add newer libraries included in Xcode 3.1 for Mac OS X Leopard.


(rtr)
diff -r1.91 -r1.91.4.1 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.12 -r1.12.6.1 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.5 -r1.5.8.1 pkgsrc/pkgtools/x11-links/files/xorg
diff -r1.1 -r1.1.8.1 pkgsrc/pkgtools/x11-links/files/xorg.libXrandr
cvs diff -r1.91 -r1.91.4.1 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2008/05/26 02:13:23 1.91
+++ pkgsrc/pkgtools/x11-links/Makefile 2008/07/18 16:23:50 1.91.4.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.91 2008/05/26 02:13:23 joerg Exp $ 1# $NetBSD: Makefile,v 1.91.4.1 2008/07/18 16:23:50 rtr 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.35 7DISTNAME= x11-links-0.36
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.12 -r1.12.6.1 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/01/05 16:22:15 1.12
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/07/18 16:23:50 1.12.6.1
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.12 2008/01/05 16:22:15 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.12.6.1 2008/07/18 16:23:50 rtr 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.35 21BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.36
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.5 -r1.5.8.1 pkgsrc/pkgtools/x11-links/files/xorg (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg 2007/12/17 18:20:19 1.5
+++ pkgsrc/pkgtools/x11-links/files/xorg 2008/07/18 16:23:50 1.5.8.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg,v 1.5 2007/12/17 18:20:19 tron Exp $ 1# $NetBSD: xorg,v 1.5.8.1 2008/07/18 16:23:50 rtr 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
@@ -336,26 +336,27 @@ lib/libXRes.so @@ -336,26 +336,27 @@ lib/libXRes.so
336lib/libXRes.so.1 336lib/libXRes.so.1
337lib/libXRes.so.1.0 337lib/libXRes.so.1.0
338lib/libXTrap.6.4.dylib 338lib/libXTrap.6.4.dylib
339lib/libXTrap.6.dylib 339lib/libXTrap.6.dylib
340lib/libXTrap.a 340lib/libXTrap.a
341lib/libXTrap.dylib 341lib/libXTrap.dylib
342lib/libXTrap.so 342lib/libXTrap.so
343lib/libXTrap.so.6 343lib/libXTrap.so.6
344lib/libXTrap.so.6.4 344lib/libXTrap.so.6.4
345lib/libXaw.6.1.dylib 345lib/libXaw.6.1.dylib
346lib/libXaw.6.dylib 346lib/libXaw.6.dylib
347lib/libXaw.7.0.dylib 347lib/libXaw.7.0.dylib
348lib/libXaw.7.dylib 348lib/libXaw.7.dylib
 349lib/libXaw.8.dylib
349lib/libXaw.a 350lib/libXaw.a
350lib/libXaw.dylib 351lib/libXaw.dylib
351lib/libXaw.so 352lib/libXaw.so
352lib/libXaw.so.6 353lib/libXaw.so.6
353lib/libXaw.so.6.1 354lib/libXaw.so.6.1
354lib/libXaw.so.7 355lib/libXaw.so.7
355lib/libXaw.so.7.0 356lib/libXaw.so.7.0
356lib/libXaw.so.8.0 357lib/libXaw.so.8.0
357lib/libXdamage.a 358lib/libXdamage.a
358lib/libXdamage.so.1.0 359lib/libXdamage.so.1.0
359lib/libXevie.a 360lib/libXevie.a
360lib/libXevie.so.1.0 361lib/libXevie.so.1.0
361lib/libXfont.1.3.dylib 362lib/libXfont.1.3.dylib
@@ -372,26 +373,27 @@ lib/libXfontcache.a @@ -372,26 +373,27 @@ lib/libXfontcache.a
372lib/libXfontcache.so 373lib/libXfontcache.so
373lib/libXfontcache.so.1 374lib/libXfontcache.so.1
374lib/libXfontcache.so.1.2 375lib/libXfontcache.so.1.2
375lib/libXft.1.0.dylib 376lib/libXft.1.0.dylib
376lib/libXft.1.1.dylib 377lib/libXft.1.1.dylib
377lib/libXft.1.dylib 378lib/libXft.1.dylib
378lib/libXft.2.1.2.dylib 379lib/libXft.2.1.2.dylib
379lib/libXft.2.dylib 380lib/libXft.2.dylib
380lib/libXft.dylib 381lib/libXft.dylib
381lib/libXft.so.1 382lib/libXft.so.1
382lib/libXft.so.1.0 383lib/libXft.so.1.0
383lib/libXft.so.1.1 384lib/libXft.so.1.1
384lib/libXi.6.0.dylib 385lib/libXi.6.0.dylib
 386lib/libXi.6.0.0.dylib
385lib/libXi.6.dylib 387lib/libXi.6.dylib
386lib/libXi.a 388lib/libXi.a
387lib/libXi.dylib 389lib/libXi.dylib
388lib/libXi.so 390lib/libXi.so
389lib/libXi.so.6 391lib/libXi.so.6
390lib/libXi.so.6.0 392lib/libXi.so.6.0
391lib/libXp.6.2.dylib 393lib/libXp.6.2.dylib
392lib/libXp.6.dylib 394lib/libXp.6.dylib
393lib/libXp.a 395lib/libXp.a
394lib/libXp.dylib 396lib/libXp.dylib
395lib/libXp.so 397lib/libXp.so
396lib/libXp.so.6 398lib/libXp.so.6
397lib/libXp.so.6.2 399lib/libXp.so.6.2
cvs diff -r1.1 -r1.1.8.1 pkgsrc/pkgtools/x11-links/files/xorg.libXrandr (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.libXrandr 2007/12/17 18:20:20 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.libXrandr 2008/07/18 16:23:50 1.1.8.1
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1# $NetBSD: xorg.libXrandr,v 1.1 2007/12/17 18:20:20 tron Exp $ 1# $NetBSD: xorg.libXrandr,v 1.1.8.1 2008/07/18 16:23:50 rtr Exp $
2# 2#
3include/X11/extensions/Xrandr.h 3include/X11/extensions/Xrandr.h
4lib/libXrandr.2.0.0.dylib 4lib/libXrandr.2.0.0.dylib
 5lib/libXrandr.2.1.0.dylib
5lib/libXrandr.2.dylib 6lib/libXrandr.2.dylib
6lib/libXrandr.dylib 7lib/libXrandr.dylib
7lib/libXrandr.la 8lib/libXrandr.la
8lib/pkgconfig/xrandr.pc 9lib/pkgconfig/xrandr.pc