Sun Oct 5 21:37:39 2008 UTC ()
Bump x11-links to 0.39 and force dependency after cube-native-xorg merge.


(cube)
diff -r1.94 -r1.95 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.15 -r1.16 pkgsrc/pkgtools/x11-links/buildlink3.mk
cvs diff -r1.94 -r1.95 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2008/09/16 12:38:38 1.94
+++ pkgsrc/pkgtools/x11-links/Makefile 2008/10/05 21:37:39 1.95
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.94 2008/09/16 12:38:38 tron Exp $ 1# $NetBSD: Makefile,v 1.95 2008/10/05 21:37:39 cube 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.38 7DISTNAME= x11-links-0.39
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.15 -r1.16 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/09/16 12:38:38 1.15
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2008/10/05 21:37:39 1.16
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.15 2008/09/16 12:38:38 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2008/10/05 21:37:39 cube 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.38 21BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.39
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/|/|"