From c1fa2496635d34b0339c4cfeb73488b6b10c712d Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Thu, 12 Feb 2004 08:28:58 +0000
Subject: [PATCH] Modify the "no-rpath" to not need a "/" to start the rpath. 
 Also modify the "r" command to allow paths ending in "/".  This should fix PR
 24352.

---
 mk/buildlink3/bsd.buildlink3.mk |  4 ++--
 mk/buildlink3/gen-transform.sh  | 36 ++++++++++++++++-----------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 192bdffcb82f..c8d238f1d2bd 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.81 2004/02/09 03:05:59 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.82 2004/02/12 08:28:58 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -856,7 +856,7 @@ _BLNK_TRANSFORM+=	${BUILDLINK_TRANSFORM}
 # Explicitly remove everything else that's an absolute path, since we've
 # already protected the ones we care about.
 #
-_BLNK_TRANSFORM+=       r:
+_BLNK_TRANSFORM+=       r:/
 #
 # Remove -Wl,-R* and *-rpath* if _USE_RPATH == "no".
 # Transform -Wl,-R* and *-rpath* if Sun compilers are used.
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh
index 9d5816efe6b4..6413711ef5e2 100644
--- a/mk/buildlink3/gen-transform.sh
+++ b/mk/buildlink3/gen-transform.sh
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.20 2004/02/01 00:41:25 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.21 2004/02/12 08:28:58 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -112,12 +112,12 @@ EOF
 		gen $action __r:-R\\.
 		;;
 	no-rpath)
-		gen $action _r:-Wl,--rpath-link,
-		gen $action _r:-Wl,--rpath,
-		gen $action _r:-Wl,-rpath-link,
-		gen $action _r:-Wl,-rpath,
-		gen $action _r:-Wl,-R
-		gen $action _r:-R
+		gen $action __r:-Wl,--rpath-link,
+		gen $action __r:-Wl,--rpath,
+		gen $action __r:-Wl,-rpath-link,
+		gen $action __r:-Wl,-rpath,
+		gen $action __r:-Wl,-R
+		gen $action __r:-R
 		;;
 	reorder)
 		case "$action" in
@@ -250,7 +250,7 @@ EOF
 		case "$action" in
 		transform|untransform)
 			@CAT@ >> $sedfile << EOF
-s|$2[^ 	\`"':;]*||g
+s|$2[^$_sep]*||g
 EOF
 			;;
 		esac
@@ -268,17 +268,17 @@ EOF
 		;;
 	r)
 		case "$2" in
-		"")	r=__r; pat="/"  ;;
-		*)	r=_r;  pat="$2" ;;
+		*/)	r=__r ;;
+		*)	r=_r ;;
 		esac
-		gen $action $r:-I$pat
-		gen $action $r:-L$pat
-		gen $action $r:-Wl,--rpath-link,$pat
-		gen $action $r:-Wl,--rpath,$pat
-		gen $action $r:-Wl,-rpath-link,$pat
-		gen $action $r:-Wl,-rpath,$pat
-		gen $action $r:-Wl,-R$pat
-		gen $action $r:-R$pat
+		gen $action $r:-I$2
+		gen $action $r:-L$2
+		gen $action $r:-Wl,--rpath-link,$2
+		gen $action $r:-Wl,--rpath,$2
+		gen $action $r:-Wl,-rpath-link,$2
+		gen $action $r:-Wl,-rpath,$2
+		gen $action $r:-Wl,-R$2
+		gen $action $r:-R$2
 		;;
 	S)
 		case "$action" in