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.

---
 games/xbomber/distinfo         | 4 ++--
 games/xbomber/patches/patch-aa | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'games/xbomber')

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
-- 
cgit v1.2.3