diff options
| author | joerg <joerg@pkgsrc.org> | 2013-03-02 18:07:14 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-03-02 18:07:14 +0000 |
| commit | ee344c0c7ebacd049a7d20fe5f2eb8b378a44bf2 (patch) | |
| tree | c557b9bc163bad34055163f75e9042285403e72e /graphics | |
| parent | fd6547205dd4430ec00773861997e01f21e90ad7 (diff) | |
| download | pkgsrc-ee344c0c7ebacd049a7d20fe5f2eb8b378a44bf2.tar.gz | |
Provide rpath in imlib2-config --libs output.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/imlib2/Makefile | 11 | ||||
| -rw-r--r-- | graphics/imlib2/distinfo | 3 | ||||
| -rw-r--r-- | graphics/imlib2/patches/patch-imlib2-config.in | 14 |
3 files changed, 24 insertions, 4 deletions
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index abdbff144aa..83838b9358b 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2013/02/16 11:18:04 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2013/03/02 18:07:14 joerg Exp $ DISTNAME= imlib2-1.4.5 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/} EXTRACT_SUFX= .tar.bz2 @@ -26,12 +26,17 @@ SHLIB_SUFFIX= sl SHLIB_SUFFIX= so .endif -SUBST_CLASSES+= shlib +SUBST_CLASSES+= shlib rpath SUBST_STAGE.shlib= post-patch SUBST_MESSAGE.shlib= Replacing shared library suffix SUBST_FILES.shlib+= src/lib/image.c SUBST_SED.shlib+= -e 's,"\.so",".${SHLIB_SUFFIX}",' +SUBST_STAGE.rpath= pre-configure +SUBST_MESSAGE.rpath= Replacing COMPILER_RPATH_FLAG +SUBST_FILES.rpath= imlib2-config.in +SUBST_VARS.rpath= COMPILER_RPATH_FLAG + .include "options.mk" .include "../../archivers/bzip2/buildlink3.mk" diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index 9c1a063f397..86d9e21a993 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2012/06/15 18:52:26 joerg Exp $ +$NetBSD: distinfo,v 1.30 2013/03/02 18:07:14 joerg Exp $ SHA1 (imlib2-1.4.5.tar.bz2) = af86a2c38f4bc3806db57e64e74dc9814ad474a0 RMD160 (imlib2-1.4.5.tar.bz2) = 3b8fd51a854f628f8e8b38612da6c99a0609c6aa @@ -7,5 +7,6 @@ SHA1 (patch-ab) = 9ec9287a8003760e3c330b6a751c0d28bef19afc SHA1 (patch-ac) = 4f5e05fd921499c2ef679135e42bd8dc6f71d2de SHA1 (patch-ad) = 3dc74b7804fde49f6fa0f0b8fe8c1bd87b37535a SHA1 (patch-ae) = 9a2838ebfebe2db8bcd1f5fbe13a680122f0f8c0 +SHA1 (patch-imlib2-config.in) = 621831f2fe661db1d78632b4c1c0b36ab2e8916d SHA1 (patch-src_lib_amd64__blend.S) = 226de814e6c890ec1fea105641e036416e670a9f SHA1 (patch-src_lib_amd64__blend__cmod.S) = a02c7b101cc16889002101cfc689e8e39cb04016 diff --git a/graphics/imlib2/patches/patch-imlib2-config.in b/graphics/imlib2/patches/patch-imlib2-config.in new file mode 100644 index 00000000000..dd7a696d332 --- /dev/null +++ b/graphics/imlib2/patches/patch-imlib2-config.in @@ -0,0 +1,14 @@ +$NetBSD: patch-imlib2-config.in,v 1.1 2013/03/02 18:07:14 joerg Exp $ + +--- imlib2-config.in.orig 2013-03-01 19:12:59.000000000 +0000 ++++ imlib2-config.in +@@ -45,8 +45,7 @@ while test $# -gt 0; do + echo $includes + ;; + --libs) +- libdirs=-L@libdir@ +- echo $libdirs -lImlib2 @my_libs@ ++ echo -L@libdir@ @COMPILER_RPATH_FLAG@@libdir@ -lImlib2 @my_libs@ + ;; + *) + echo "${usage}" 1>&2 |