From bcdbfdcf2f6935b7a6ee9e2ec2e15f6f1cc5f73c Mon Sep 17 00:00:00 2001
From: jmc <jmc@pkgsrc.org>
Date: Mon, 10 Mar 2003 04:08:21 +0000
Subject: Instead of a base -R in the link line use _OPSYS_RPATH_NAME instead

---
 devel/sdcc/Makefile         | 3 ++-
 devel/sdcc/distinfo         | 4 ++--
 devel/sdcc/patches/patch-av | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'devel/sdcc')

diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 5da28b4456c..f037331a661 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/09 18:59:23 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/03/10 04:08:21 jmc Exp $
 # FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
 
 DISTNAME=	sdcc-2.2.1-src
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/sdcc
 # by default on some, not on others
 CPPFLAGS+=		-fdollars-in-identifiers
 CONFIGURE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/devel/sdcc/distinfo b/devel/sdcc/distinfo
index 3d9c5ebf917..051b38a31bf 100644
--- a/devel/sdcc/distinfo
+++ b/devel/sdcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/03/06 23:03:22 jmc Exp $
+$NetBSD: distinfo,v 1.8 2003/03/10 04:08:21 jmc Exp $
 
 SHA1 (sdcc-2.2.1-src.tar.gz) = c0d448bbdc86620d87b781f62635c51ab44b2235
 Size (sdcc-2.2.1-src.tar.gz) = 2015592 bytes
@@ -23,7 +23,7 @@ SHA1 (patch-ar) = 71dd271f7ad7a506a54b116d083eb77f34a23f2c
 SHA1 (patch-as) = 79a1234f35a8e072ba42e89e86989a7efe54d836
 SHA1 (patch-at) = 3a41e9e1fc8d26baa6cbef1b666481d9977a2f98
 SHA1 (patch-au) = 36e6e5470112ba8c813b98f6e2283accb9d4f115
-SHA1 (patch-av) = e66ac84551bdcea100ff598fdbae051c7b28931a
+SHA1 (patch-av) = 20748a666dd8c4eb13bec11c3e62ffbc7965950f
 SHA1 (patch-aw) = 8429c7adf50e82629c6638a0f722ffc08eccfd3c
 SHA1 (patch-ax) = 9729ccb4b42412ea189d55a916d0b6093fe6cba6
 SHA1 (patch-ay) = e48cff86a76fe9225e5461b29288f94e7a44f308
diff --git a/devel/sdcc/patches/patch-av b/devel/sdcc/patches/patch-av
index aa5755730c7..f3c4a244720 100644
--- a/devel/sdcc/patches/patch-av
+++ b/devel/sdcc/patches/patch-av
@@ -1,4 +1,4 @@
-$NetBSD: patch-av,v 1.3 2003/03/06 23:03:22 jmc Exp $
+$NetBSD: patch-av,v 1.4 2003/03/10 04:08:22 jmc Exp $
 
 --- src/Makefile.in.orig	Sat Sep 30 19:39:35 2000
 +++ src/Makefile.in	Thu Mar  6 22:56:31 2003
@@ -6,7 +6,7 @@ $NetBSD: patch-av,v 1.3 2003/03/06 23:03:22 jmc Exp $
  
  LIBS		= -lgc -lm @LIBS@
  ifeq ($(HAVE_LIBGC), 1)
-+LIBDIRS		= -L$(BUILDLINK_DIR)/lib -Wl,-R${PREFIX}/lib
++LIBDIRS		= -L$(BUILDLINK_DIR)/lib -Wl,${_OPSYS_RPATH_NAME}${PREFIX}/lib
  else
  LIBDIRS		= -L$(PRJDIR)/support/gc
  LIBGC		= $(PRJDIR)/support/gc/libgc.a
-- 
cgit v1.2.3