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.

4 files changed, 8 insertions, 8 deletions

diff --git a/games/hugo/distinfo b/games/hugo/distinfo
index 7c7df7be8c4..c6f472dce95 100644
--- a/games/hugo/distinfo
+++ b/games/hugo/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2004/06/15 13:21:21 grant Exp $
+$NetBSD: distinfo,v 1.4 2004/08/27 06:29:07 jlam Exp $
 
 SHA1 (hugo-3.0.07/hugov30_unix_source.tar.gz) = 4b3afc3b4f03ff23643460321d76127980184ec0
 Size (hugo-3.0.07/hugov30_unix_source.tar.gz) = 213002 bytes
 SHA1 (hugo-3.0.07/hugolib.zip) = 76b5580461a6c6f15780f554d2e23574ef78e24d
 Size (hugo-3.0.07/hugolib.zip) = 67669 bytes
-SHA1 (patch-aa) = c291ff5787189bf6f0261e10ef1b5b46243719a3
+SHA1 (patch-aa) = cc0d06b3abec10feb882f6a87af8bd5def10a8b7
 SHA1 (patch-ab) = 4d2753b45b1e16c7213e1ee99860519bf889e11d
 SHA1 (patch-ac) = 43df8bc8b35cb5525f582a6d11eba89d063fbe76
 SHA1 (patch-ad) = 454c364a4fe45d1fc94b768db85443fcc8ef8204
diff --git a/games/hugo/patches/patch-aa b/games/hugo/patches/patch-aa
index e70bfcc22f7..a22c8d6c074 100644
--- a/games/hugo/patches/patch-aa
+++ b/games/hugo/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/06/15 13:21:21 grant Exp $
+$NetBSD: patch-aa,v 1.3 2004/08/27 06:29:07 jlam Exp $
 
 --- Makefile.orig	2001-11-26 19:54:04.000000000 +1100
 +++ Makefile
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/15 13:21:21 grant Exp $
  #HE_LIBS=-lcurses -ltermlib
  #HE_LIBS=-lcurses 
 -HE_LIBS=-lncurses 
-+HE_LIBS=-L$(PREFIX)/lib -Wl,${RPATH_FLAG}$(PREFIX)/lib -lncurses 
++HE_LIBS=-L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}$(PREFIX)/lib -lncurses 
  
  # Shouldn't need to change anything below here.
  HC_H=source/hcheader.h source/htokens.h
diff --git a/games/xbomber/distinfo b/games/xbomber/distinfo
index 0734ba6971d..7a2a2cfef26 100644
--- a/games/xbomber/distinfo
+++ b/games/xbomber/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/11/18 14:43:08 xtraeme Exp $
+$NetBSD: distinfo,v 1.6 2004/08/27 06:29:07 jlam Exp $
 
 SHA1 (xbomber.0.8.tar.gz) = 1146d1cc9d10f1115f650ad20bf4fd9e77cf2b8b
 Size (xbomber.0.8.tar.gz) = 241168 bytes
-SHA1 (patch-aa) = d4fccbda2d59db7a776b8505ea2ddc633b9d5a9c
+SHA1 (patch-aa) = 908ec814f6810b55f5a1b52d4fb0bfe87743d7de
 SHA1 (patch-ab) = 934cd3bba0f7f257c7e5dd9490c4114413f4a094
diff --git a/games/xbomber/patches/patch-aa b/games/xbomber/patches/patch-aa
index e3c405dbb6c..63996f54e34 100644
--- a/games/xbomber/patches/patch-aa
+++ b/games/xbomber/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2003/11/18 14:43:08 xtraeme Exp $
+$NetBSD: patch-aa,v 1.8 2004/08/27 06:29:07 jlam Exp $
 
 --- makefile.orig	1998-06-19 04:28:34.000000000 +0100
 +++ makefile	2003-11-05 12:36:20.000000000 +0000
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.7 2003/11/18 14:43:08 xtraeme Exp $
  
  # adjust according to target
 -XLIB=-L/usr/X11/lib -lX11
-+XLIB=-Wl,${RPATH_FLAG}${PREFIX}/lib -L$(PREFIX)/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
++XLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib -L$(PREFIX)/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11
  
  # uncomment for sunos/solaris
  #XLIB=-L/usr/openwin/lib -lX11