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.

5 files changed, 11 insertions, 11 deletions

diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo
index f66cb273fa8..17253b63289 100644
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/03/11 06:37:50 minskim Exp $
+$NetBSD: distinfo,v 1.7 2004/08/27 06:29:06 jlam Exp $
 
 SHA1 (eggdrop1.6.15.tar.bz2) = 8740800b066b35c745c7e753e7f58daac9929f3a
 Size (eggdrop1.6.15.tar.bz2) = 760615 bytes
@@ -8,7 +8,7 @@ SHA1 (patch-ac) = a1c5648e2748f5efbcb890b5ed8a3e8faac5f0a5
 SHA1 (patch-ad) = 8b9f740e82d44df7daeede770fce7f5add751407
 SHA1 (patch-ae) = 370fe00ada6b9432483ab3e0ef9c349f7c7dd00f
 SHA1 (patch-af) = 1915d3f9ac55e49d829613c6f003b2800f62a734
-SHA1 (patch-ag) = ab193737668ff9c0bdfbfa1b21678356a505bb41
+SHA1 (patch-ag) = 9cb1acc1be5ad4186dc7c9fac9f20955a9f51292
 SHA1 (patch-ah) = b9f6e10f0a1a8f73f014ceae5015dc157f8fe124
 SHA1 (patch-ai) = 0bbf9e3be1368897e2a9399c9ea58f28c8f84e0c
 SHA1 (patch-aj) = 7701eefed77228fe46360bea717403314386de03
diff --git a/chat/eggdrop/patches/patch-ag b/chat/eggdrop/patches/patch-ag
index 7368af9184b..1297714f426 100644
--- a/chat/eggdrop/patches/patch-ag
+++ b/chat/eggdrop/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $
+$NetBSD: patch-ag,v 1.5 2004/08/27 06:29:06 jlam Exp $
 
 --- Makefile.in.orig	Tue Feb 27 20:06:27 2001
 +++ Makefile.in	Fri Nov  2 11:40:10 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $
  # make modules
  SHLIB_CC = @SHLIB_CC@
 -SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = @SHLIB_LD@ $(RPATH_FLAG)@TCLLIB@
++SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@
  SHLIB_STRIP = @SHLIB_STRIP@
  MOD_EXT = @MOD_EXT@
  
@@ -15,7 +15,7 @@ $NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $
  # stuff for Tcl
  XREQS = @TCL_REQS@
  XLIBS = @TCL_LIBS@ @LIBS@
-+XLDFLAGS = -Wl,$(RPATH_FLAG)@TCLLIB@
++XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@
  TCLLIB = @TCLLIB@
  TCLLIBFN = @TCLLIBFN@
  
diff --git a/chat/fugu/Makefile b/chat/fugu/Makefile
index 5b2b344339c..dd60a066ee8 100644
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/05/30 02:19:16 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/08/27 06:29:06 jlam Exp $
 #
 
 DISTNAME=	fugu-1.0
@@ -16,7 +16,7 @@ USE_BUILDLINK3=	YES
 GNU_CONFIGURE= 	YES
 CONFIGURE_ENV+=	vi_cv_path_python=${PYTHONBIN}
 LDFLAGS+=	-L${BUILDLINK_PREFIX.py-Pmw}/lib \
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.py-Pmw}/include \
 		-I${BUILDLINK_PREFIX.rsaref}/include/rsaref \
 		-I${BUILDLINK_PREFIX.rsaref}/include
diff --git a/chat/ser/distinfo b/chat/ser/distinfo
index 4634f7ba0ec..2e3eaa02bb6 100644
--- a/chat/ser/distinfo
+++ b/chat/ser/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2004/05/09 23:58:19 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/08/27 06:29:07 jlam Exp $
 
 SHA1 (ser-0.8.10_src.tar.gz) = d3e88ff5eccf1c77b5b21637dd7c1ad3068ae89d
 Size (ser-0.8.10_src.tar.gz) = 931150 bytes
-SHA1 (patch-aa) = ebee20df3766908a6dc6b031f703f3ce60b45071
+SHA1 (patch-aa) = 40c28c6855a99468b5081eb21007d6b0e6744527
 SHA1 (patch-ab) = 5ec50d206955619e3f73c3f6da5e40c1e86426ec
 SHA1 (patch-ac) = 98bd0bc672c6183f8ee6a8dba3ea01500fcdb80d
diff --git a/chat/ser/patches/patch-aa b/chat/ser/patches/patch-aa
index e7c522f949f..e7ce8ecec5a 100644
--- a/chat/ser/patches/patch-aa
+++ b/chat/ser/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $
+$NetBSD: patch-aa,v 1.4 2004/08/27 06:29:07 jlam Exp $
 
 --- Makefile.defs.orig	2002-11-12 17:21:28.000000000 +0000
 +++ Makefile.defs	2003-09-16 15:42:29.000000000 +0100
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2003/09/16 14:51:18 agc Exp $
  endif
  
  endif #mode=release
-+LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
++LDFLAGS+= -L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib
  
  
  #*FLAGS used for compiling the modules