[pkgsrc/trunk]: pkgsrc/security Make ksba-config --libs emit the runtime link...

[kleink <kleink%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcd780b16262
branches:  trunk
changeset: 467049:bcd780b16262
user:      kleink <kleink%pkgsrc.org@localhost>
date:      Sun Jan 25 22:29:50 2004 +0000

description:
Make ksba-config --libs emit the runtime linker search path.
Welcome nb1.

diffstat:

 security/libksba/Makefile           |   3 ++-
 security/libksba/buildlink2.mk      |   4 ++--
 security/libksba/distinfo           |   3 ++-
 security/libksba/patches/patch-aa   |  13 +++++++++++++
 security/libksba04/Makefile         |   3 ++-
 security/libksba04/buildlink2.mk    |   4 ++--
 security/libksba04/distinfo         |   3 ++-
 security/libksba04/patches/patch-aa |  16 ++++++++++++++++
 8 files changed, 41 insertions(+), 8 deletions(-)

diffs (119 lines):

diff -r 8b141b6711d4 -r bcd780b16262 security/libksba/Makefile
--- a/security/libksba/Makefile Sun Jan 25 21:10:10 2004 +0000
+++ b/security/libksba/Makefile Sun Jan 25 22:29:50 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/25 00:14:56 kleink Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/25 22:29:50 kleink Exp $
 #
 
 DISTNAME=      libksba-0.9.1
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/alpha/libksba/
 
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba/buildlink2.mk
--- a/security/libksba/buildlink2.mk    Sun Jan 25 21:10:10 2004 +0000
+++ b/security/libksba/buildlink2.mk    Sun Jan 25 22:29:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/25 00:14:56 kleink Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/01/25 22:29:50 kleink Exp $
 #
 # This Makefile fragment is included by packages that use libksba.
 #
@@ -9,7 +9,7 @@
 LIBKSBA_BUILDLINK2_MK= # defined
 
 BUILDLINK_PACKAGES+=                   libksba
-BUILDLINK_DEPENDS.libksba?=            libksba>=0.9.1
+BUILDLINK_DEPENDS.libksba?=            libksba>=0.9.1nb1
 BUILDLINK_PKGSRCDIR.libksba?=          ../../security/libksba
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.libksba=libksba
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba/distinfo
--- a/security/libksba/distinfo Sun Jan 25 21:10:10 2004 +0000
+++ b/security/libksba/distinfo Sun Jan 25 22:29:50 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/25 00:14:56 kleink Exp $
+$NetBSD: distinfo,v 1.2 2004/01/25 22:29:50 kleink Exp $
 
 SHA1 (libksba-0.9.1.tar.gz) = 010418fa2e4b8b19fcfed6fba744952d4acf6de2
 Size (libksba-0.9.1.tar.gz) = 471263 bytes
+SHA1 (patch-aa) = d8af1927606aa254874776f589d80b439179b77b
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libksba/patches/patch-aa Sun Jan 25 22:29:50 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/01/25 22:29:50 kleink Exp $
+
+--- src/ksba-config.in.orig    2003-11-12 15:48:53.000000000 +0100
++++ src/ksba-config.in 2004-01-25 22:39:50.000000000 +0100
+@@ -106,7 +106,7 @@
+ if test "$echo_libs" = "yes"; then
+     libdirs=""
+     if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
++      libdirs="-L@libdir@ -Wl,-R@libdir@"
+     fi
+     tmp=""
+     for i in $libdirs $libs; do
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba04/Makefile
--- a/security/libksba04/Makefile       Sun Jan 25 21:10:10 2004 +0000
+++ b/security/libksba04/Makefile       Sun Jan 25 22:29:50 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/25 00:49:39 kleink Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/25 22:29:50 kleink Exp $
 #
 
 DISTNAME=      libksba-0.4.7
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/alpha/aegypten/
 
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba04/buildlink2.mk
--- a/security/libksba04/buildlink2.mk  Sun Jan 25 21:10:10 2004 +0000
+++ b/security/libksba04/buildlink2.mk  Sun Jan 25 22:29:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/01/25 01:08:28 kleink Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/01/25 22:29:50 kleink Exp $
 #
 # This Makefile fragment is included by packages that use libksba.
 #
@@ -9,7 +9,7 @@
 LIBKSBA_BUILDLINK2_MK= # defined
 
 BUILDLINK_PACKAGES+=                   libksba
-BUILDLINK_DEPENDS.libksba?=            libksba-0.4.7
+BUILDLINK_DEPENDS.libksba?=            libksba-0.4.7nb1
 BUILDLINK_PKGSRCDIR.libksba?=          ../../security/libksba04
 
 EVAL_PREFIX+=  BUILDLINK_PREFIX.libksba=libksba
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba04/distinfo
--- a/security/libksba04/distinfo       Sun Jan 25 21:10:10 2004 +0000
+++ b/security/libksba04/distinfo       Sun Jan 25 22:29:50 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/25 00:46:34 kleink Exp $
+$NetBSD: distinfo,v 1.2 2004/01/25 22:29:50 kleink Exp $
 
 SHA1 (libksba-0.4.7.tar.gz) = 0ed06ec79bd30eb9705f94d47a6cf8a03be2a237
 Size (libksba-0.4.7.tar.gz) = 445328 bytes
+SHA1 (patch-aa) = 7f5101c82aa52311adcfb66132c311da6a4919cc
diff -r 8b141b6711d4 -r bcd780b16262 security/libksba04/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libksba04/patches/patch-aa       Sun Jan 25 22:29:50 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2004/01/25 22:29:50 kleink Exp $
+
+--- src/ksba-config.in.orig    2002-08-23 15:10:11.000000000 +0200
++++ src/ksba-config.in 2004-01-25 22:33:19.000000000 +0100
+@@ -103,9 +103,9 @@
+ 
+ if test "$echo_libs" = "yes"; then
+     if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
++      libdirs="-L@libdir@ -Wl,-R@libdir@"
+       for i in $libs ; do
+-      if test "$i" = "-L@libdir@" ; then
++      if test "$i" = "-L@libdir@ -Wl,-R@libdir@" ; then
+         libdirs=""
+       fi
+       done