[pkgsrc/trunk]: pkgsrc/devel/pcre Fix pcre-config to always output the rpath ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5319c4c8a11d
branches:  trunk
changeset: 530166:5319c4c8a11d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 17 17:05:08 2007 +0000

description:
Fix pcre-config to always output the rpath for ${prefix}/lib based
on COMPILER_RPATH_FLAG. Before it hard-wired Solaris and *BSD, now
it works everywhere. Bump revision.

diffstat:

 devel/pcre/Makefile         |   9 ++++++++-
 devel/pcre/distinfo         |   3 ++-
 devel/pcre/patches/patch-aa |  21 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diffs (62 lines):

diff -r 20bdcdd38198 -r 5319c4c8a11d devel/pcre/Makefile
--- a/devel/pcre/Makefile       Sun Jun 17 15:38:54 2007 +0000
+++ b/devel/pcre/Makefile       Sun Jun 17 17:05:08 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/06/08 18:39:24 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/06/17 17:05:08 joerg Exp $
 
 DISTNAME=      pcre-7.1
 CATEGORIES=    devel
+PKGREVISION=   1
 MASTER_SITES=  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
 EXTRACT_SUFX=  .tar.bz2
 
@@ -17,6 +18,12 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --enable-utf8
 
+SUBST_CLASSES+=                rpath
+SUBST_STAGE.rpath=     pre-configure
+SUBST_MESSAGE.rpath=   Fixing rpath output in pcre-config
+SUBST_FILES.rpath=     pcre-config.in
+SUBST_VARS.rpath=      COMPILER_RPATH_FLAG
+
 PKGCONFIG_OVERRIDE=    libpcre.pc.in libpcrecpp.pc.in
 
 # needs a stacksize of 4mb, default is 2mb
diff -r 20bdcdd38198 -r 5319c4c8a11d devel/pcre/distinfo
--- a/devel/pcre/distinfo       Sun Jun 17 15:38:54 2007 +0000
+++ b/devel/pcre/distinfo       Sun Jun 17 17:05:08 2007 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.24 2007/05/03 12:27:55 wiz Exp $
+$NetBSD: distinfo,v 1.25 2007/06/17 17:05:08 joerg Exp $
 
 SHA1 (pcre-7.1.tar.bz2) = 1bc54556368165e7ce5f59ac2a60aba7dec6365c
 RMD160 (pcre-7.1.tar.bz2) = 1df0f1e86435a7f77c694472bb23bc71433a60be
 Size (pcre-7.1.tar.bz2) = 729915 bytes
+SHA1 (patch-aa) = 2bca13cdd4a398ae3dbf26f75fd94557cb076dbe
diff -r 20bdcdd38198 -r 5319c4c8a11d devel/pcre/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/pcre/patches/patch-aa       Sun Jun 17 17:05:08 2007 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.12 2007/06/17 17:05:08 joerg Exp $
+
+--- pcre-config.in.orig        2007-06-17 16:31:18.000000000 +0000
++++ pcre-config.in
+@@ -12,15 +12,7 @@ if test $# -eq 0; then
+       exit 1
+ fi
+ 
+-libR=
+-case `uname -s` in
+-  *SunOS*)
+-  libR=" -R@libdir@"
+-  ;;
+-  *BSD*)
+-  libR=" -Wl,-R@libdir@"
+-  ;;
+-esac
++libR=" @COMPILER_RPATH_FLAG@@libdir@"
+ 
+ while test $# -gt 0; do
+   case "$1" in