[pkgsrc/trunk]: pkgsrc/math/scilab Use COMPILER_RPATH_FLAG instead of hard co...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/febf119d3153
branches:  trunk
changeset: 519872:febf119d3153
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Wed Oct 11 21:14:57 2006 +0000

description:
Use COMPILER_RPATH_FLAG instead of hard coding  -Wl,--rpath.
Also fix some obvious typos in the setting of the rpath.

Fixes compilation on solaris and probably others.

diffstat:

 math/scilab/distinfo         |  4 ++--
 math/scilab/patches/patch-ab |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r a4e18a3f42ab -r febf119d3153 math/scilab/distinfo
--- a/math/scilab/distinfo      Wed Oct 11 19:31:31 2006 +0000
+++ b/math/scilab/distinfo      Wed Oct 11 21:14:57 2006 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2006/05/22 19:20:04 wiz Exp $
+$NetBSD: distinfo,v 1.23 2006/10/11 21:14:57 dmcmahill Exp $
 
 SHA1 (scilab-3.1.1-src.tar.gz) = 63cae13441befb795d32cec5f825042b6b4e74b3
 RMD160 (scilab-3.1.1-src.tar.gz) = 363486c6c9d1e64a28edcd002651e3c9d3b1eb73
 Size (scilab-3.1.1-src.tar.gz) = 14261772 bytes
 SHA1 (patch-aa) = 6d9749330ba4471de03a2873daee5b9fdc0aac06
-SHA1 (patch-ab) = cd9b290e0d17b5aeacf0e87c709134815ef97338
+SHA1 (patch-ab) = 3eef2b1462a9d55f79b34ad103353c7176f6a8ae
 SHA1 (patch-ac) = 0c48500eb261d643bdd5c1d34d23968b312eae57
 SHA1 (patch-ad) = 186b5b1b71ccd983f49ae4c1bfb45152d4ebd662
 SHA1 (patch-ae) = 050ea8847196c2808a74c252db7c98d77677cd25
diff -r a4e18a3f42ab -r febf119d3153 math/scilab/patches/patch-ab
--- a/math/scilab/patches/patch-ab      Wed Oct 11 19:31:31 2006 +0000
+++ b/math/scilab/patches/patch-ab      Wed Oct 11 21:14:57 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.11 2006/05/12 12:39:32 joerg Exp $
+$NetBSD: patch-ab,v 1.12 2006/10/11 21:14:57 dmcmahill Exp $
 
 --- configure.orig     2005-05-25 15:00:45.000000000 +0000
 +++ configure
@@ -483,8 +483,8 @@
                                        if test "$USER_TK_LIB_PATH" = ""
 -                                      then TK_LIB=" -L$PATH_LIB_TK -l$NAME_LIB_TK"
 -                                      else TK_LIB=" -L$USER_TK_LIB_PATH  -l$NAME_LIB_TK"
-+                                      then TK_LIB=" -Wl,--rpath,$PATH_LIB_TL -L$PATH_LIB_TK -l$NAME_LIB_TK"
-+                                      else TK_LIB=" -Wl,--rpath,$PATH_LIB_TL -L$USER_TK_LIB_PATH  -l$NAME_LIB_TK"
++                                      then TK_LIB=" ${COMPILER_RPATH_FLAG}${PATH_LIB_TK} -L$PATH_LIB_TK -l$NAME_LIB_TK"
++                                      else TK_LIB=" ${COMPILER_RPATH_FLAG}${USER_TK_LIB_PATH} -L$USER_TK_LIB_PATH  -l$NAME_LIB_TK"
                                        fi
                                        break 3;
                                fi