From ca7093842870728d22dde1258798b1704c53ca18 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 27 Aug 2004 06:29:06 +0000
Subject: Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
 which are the full option names used to set rpath directives for the linker
 and the compiler, respectively.  In places were we are invoking the linker,
 use "${LINKER_RPATH_FLAG} <path>", where the space is inserted in case the
 flag is a word, e.g. -rpath.  The default values of *_RPATH_FLAG are set by
 the compiler/*.mk files, depending on the compiler that you use.  They may be
 overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG
 and _OPSYS_COMPILER_RPATH_FLAG, respectively.  Garbage-collect
 _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

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

(limited to 'sysutils')

diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index c8e1b5e483f..1a4f7b82b72 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2003/12/11 17:14:22 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/08/27 06:29:10 jlam Exp $
 
 SHA1 (mtools-3.9.9.tar.bz2) = 91198d52fa405eff1ac9eec57cadcc86d06b6ef1
 Size (mtools-3.9.9.tar.bz2) = 262148 bytes
 SHA1 (patch-aa) = 4c04697a01eefcceef176a7816f367f95b06878c
-SHA1 (patch-ab) = 29ccd93cc6f2a2cf0020e91cbeaeac9d5e1a0fe4
+SHA1 (patch-ab) = 5193ddef1bce4b4116a39c3565e5729245a04557
 SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e
 SHA1 (patch-ad) = 891ed493888708d9fb835d9249852555938a84a0
 SHA1 (patch-ae) = 5281829c8c79f95ff4672fabb53acd22685c17bb
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
index f5bf03278ce..b47c0786fab 100644
--- a/sysutils/mtools/patches/patch-ab
+++ b/sysutils/mtools/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
+$NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
 
 --- configure.orig	2003-02-16 11:06:45.000000000 +0000
 +++ configure
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
    # It would also be nice to do this for all -L options, not just this one.
    if test -n "$x_libraries"; then
 -    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
++    X_LIBS="$X_LIBS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
      case `(uname -sr) 2>/dev/null` in
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.6 2003/12/11 16:05:40 adam Exp $
    # Check for libraries that X11R6 Xt/Xaw programs need.
    ac_save_LDFLAGS=$LDFLAGS
 -  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS ${COMPILER_RPATH_FLAG}$x_libraries -L$x_libraries"
    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
    # check for ICE first), but we must link in the order -lSM -lICE or
    # we get undefined symbols.  So assume we have SM if we have ICE.
-- 
cgit v1.2.3