diff options
| author | tron <tron@pkgsrc.org> | 2010-09-14 17:30:12 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2010-09-14 17:30:12 +0000 |
| commit | c8916517cf770df104a83a17f64af3f0c661a536 (patch) | |
| tree | 7ff9ccee7a15d025c1b0236dda2be8e1844d0409 /pkgtools | |
| parent | 29649315fcd27d9f791924e86a10629c4048c818 (diff) | |
| download | pkgsrc-c8916517cf770df104a83a17f64af3f0c661a536.tar.gz | |
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".
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 | ||||
| -rw-r--r-- | pkgtools/x11-links/xorg.mk | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 5b2bc28bc1b..dc39f70d4f3 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.120 2010/09/14 08:55:42 tron Exp $ +# $NetBSD: Makefile,v 1.121 2010/09/14 17:30:12 tron Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, # usually the most recent. -DISTNAME= x11-links-0.55 +DISTNAME= x11-links-0.56 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 0607b3d3ea6..8d08024965f 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2010/09/14 08:55:42 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2010/09/14 17:30:12 tron Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -12,7 +12,7 @@ BUILDLINK_TREE+= x11-links .if !defined(X11_LINKS_BUILDLINK3_MK) X11_LINKS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.55 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.56 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk index ae1d2250865..ebe4868a655 100644 --- a/pkgtools/x11-links/xorg.mk +++ b/pkgtools/x11-links/xorg.mk @@ -1,4 +1,4 @@ -# $NetBSD: xorg.mk,v 1.19 2010/09/11 20:26:11 wiz Exp $ +# $NetBSD: xorg.mk,v 1.20 2010/09/14 17:30:12 tron Exp $ # # This is for X.org, but use "xfree" files also. @@ -51,7 +51,9 @@ FILES_LIST= ${FILESDIR}/xorg .include "../../x11/libdrm/buildlink3.mk" .include "../../x11/liblbxutil/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" +.if empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-*) .include "../../x11/pixman/buildlink3.mk" +.endif .include "../../x11/printproto/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/recordproto/buildlink3.mk" |