diff options
| author | jperkin <jperkin@pkgsrc.org> | 2014-06-14 21:06:52 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2014-06-14 21:06:52 +0000 |
| commit | 9e411fe37a8895d718d184bf47de177fb1886950 (patch) | |
| tree | c49ac11ecf8ad7d81a5be364ec848eb3310ca9fd /pkgtools | |
| parent | 4e303b5bb8d4e748645a7bf2d7b35fa26b97143a (diff) | |
| download | pkgsrc-9e411fe37a8895d718d184bf47de177fb1886950.tar.gz | |
Update x11-links to 0.91.
On Linux with LIBABISUFFIX, only include lib$LIBABISUFFIX directories rather
than both, as it can cause issues with ld finding suitable libraries. Fixes
a bunch of packages.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/x11-links/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 4435e24e402..dc7a2f602b0 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.158 2014/06/13 22:42:18 gdt Exp $ +# $NetBSD: Makefile,v 1.159 2014/06/14 21:06:52 jperkin 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. -PKGNAME= x11-links-0.90 +PKGNAME= x11-links-0.91 CATEGORIES= pkgtools x11 MAINTAINER= pkgsrc-users@NetBSD.org @@ -71,7 +71,7 @@ X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" .if ${OPSYS} == "Linux" && !empty(LIBABISUFFIX) -FILES_LIST_CMD+= | awk '{print;} /^lib\// { sub(/^lib\//, "lib${LIBABISUFFIX}/"); print; }' +FILES_LIST_CMD+= | awk '/^lib\// { sub(/^lib\//, "lib${LIBABISUFFIX}/") } { print }' .endif CREATE_X11LINK?= ${LN} -fs $$src $$dest diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index e9bb504d4ea..cda1f5839f6 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.57 2014/06/13 22:42:18 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.58 2014/06/14 21:06:52 jperkin 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.90 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.91 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build |