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, 12 insertions, 12 deletions

diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index cc3295a6403..3a23a163703 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2004/08/05 00:23:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.16 2004/08/27 06:29:09 jlam Exp $
 
 SHA1 (pvm3.4.4.tgz) = 95bfabee61383fe2223ee2f539129bb54b5afb40
 Size (pvm3.4.4.tgz) = 967852 bytes
@@ -14,7 +14,7 @@ SHA1 (patch-ai) = d44e1b5f28dfa7d626895994fca79109239ee856
 SHA1 (patch-aj) = 4245e2a742022a0465015027361cae847cd6cbd6
 SHA1 (patch-ak) = 9c5115017a05e184221de465ac8d9dad636f9c45
 SHA1 (patch-al) = 7d5e0aa7e2c7177493fcfb7e799c7538143911a9
-SHA1 (patch-am) = b306f7d99d3b7f77d1da33671931e7ad5fa25441
+SHA1 (patch-am) = d006193cdd138fdae3cff9d0621b04839c38c676
 SHA1 (patch-an) = 7b0ba18a78a649a3ca20e17bc4a61e3b558b6ced
 SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d
 SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9
@@ -48,7 +48,7 @@ SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
 SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
 SHA1 (patch-bt) = d9331073d273a197f4a03499d69693b63f7fb473
-SHA1 (patch-bu) = 0ee41192bf7c350b22e3f4dd804f20792dbfee47
-SHA1 (patch-bv) = bf9a53cceb5d0c0cbe541a612e014c8421b470da
+SHA1 (patch-bu) = 952c6f9c7657447809698950f01ca88784792df6
+SHA1 (patch-bv) = 70e40116da06dcd3ef8cc939c2f885c16fe0c45c
 SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
 SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
diff --git a/parallel/pvm3/patches/patch-am b/parallel/pvm3/patches/patch-am
index d69f8337d7e..629ddd640c3 100644
--- a/parallel/pvm3/patches/patch-am
+++ b/parallel/pvm3/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2004/08/05 00:23:32 dmcmahill Exp $
+$NetBSD: patch-am,v 1.6 2004/08/27 06:29:10 jlam Exp $
 
 --- xep/Makefile.aimk.orig	Fri Aug 29 14:17:48 1997
 +++ xep/Makefile.aimk
@@ -20,7 +20,7 @@ $NetBSD: patch-am,v 1.5 2004/08/05 00:23:32 dmcmahill Exp $
 -XLIBS		=	-lXaw -lXmu -lXext -lXt -lX11
 -XCFLAGS		=	-I/usr/local/X11R5/include -I/usr/local/X11/include \
 -				-L/usr/local/X11R5/lib -L/usr/local/X11/lib
-+XLIBS		=	-L${X11BASE}/lib -Wl,${RPATH_FLAG}$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
++XLIBS		=	-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}$(X11BASE)/lib -lXaw -lXmu -lXext -lXt -lX11
 +XCFLAGS		=	-I${X11BASE}/include 
  
  HEADERS		=	$(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \
diff --git a/parallel/pvm3/patches/patch-bu b/parallel/pvm3/patches/patch-bu
index e1e27e9d4c6..250b72272a5 100644
--- a/parallel/pvm3/patches/patch-bu
+++ b/parallel/pvm3/patches/patch-bu
@@ -1,4 +1,4 @@
-$NetBSD: patch-bu,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bu,v 1.2 2004/08/27 06:29:10 jlam Exp $
 
 --- examples/Makefile.aimk.orig	Wed Feb 16 21:49:35 2000
 +++ examples/Makefile.aimk	Thu Mar 25 03:43:25 2004
@@ -13,9 +13,9 @@ $NetBSD: patch-bu,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
  	- mkdir $(XDIR)
  
 +LTCC=		${LIBTOOL} --mode=compile ${CC}
-+LTCC_LINK=	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTCC_LINK=	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
 +LTFORT=		${LIBTOOL} --mode=compile ${FC}
-+LTFORT_LINK=	${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTFORT_LINK=	${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
 +
  hello$(EXESFX):  $(SDIR)/hello.c $(XDIR)
 -	$(CC) $(CFLAGS) -o $@ $(SDIR)/hello.c $(LDFLAGS) $(LIBS)
diff --git a/parallel/pvm3/patches/patch-bv b/parallel/pvm3/patches/patch-bv
index da038bfbff8..a91fbf6cf12 100644
--- a/parallel/pvm3/patches/patch-bv
+++ b/parallel/pvm3/patches/patch-bv
@@ -1,4 +1,4 @@
-$NetBSD: patch-bv,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bv,v 1.2 2004/08/27 06:29:10 jlam Exp $
 
 --- gexamples/Makefile.aimk.orig	Wed Feb 16 21:48:37 2000
 +++ gexamples/Makefile.aimk	Thu Mar 25 02:04:18 2004
@@ -6,9 +6,9 @@ $NetBSD: patch-bv,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
  			tjf$(EXESFX) trsg$(EXESFX) frsg$(EXESFX) gs$(EXESFX)
  
 +LTCC=		${LIBTOOL} --mode=compile ${CC}
-+LTCC_LINK=	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTCC_LINK=	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
 +LTFORT=		${LIBTOOL} --mode=compile ${FC}
-+LTFORT_LINK=	${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} -Wl,${RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTFORT_LINK=	${LIBTOOL} --mode=link ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
 +
  all:  $(PROGS)