From df836e9d104820191560caad6bbf1dc578ffc774 Mon Sep 17 00:00:00 2001
From: cjep <cjep>
Date: Sat, 4 Jan 2003 11:51:29 +0000
Subject: Instead of using -Wl,-R use -Wl,${_OPSYS_RPATH_NAME} (and pass this
 value to make).

---
 security/ssh/Makefile         | 3 ++-
 security/ssh/distinfo         | 4 ++--
 security/ssh/patches/patch-ac | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'security')

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 4f650548c24..4a815a993e2 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2002/10/20 00:49:55 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2003/01/04 11:51:29 cjep Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -34,6 +34,7 @@ GNU_CONFIGURE=		YES
 SSH_CONF_DIR=		${PKG_SYSCONFDIR}
 
 CONFIGURE_ARGS+=	--with-etcdir=${SSH_CONF_DIR}
+MAKE_FLAGS+=		_OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME}
 
 .if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=	--with-libwrap
diff --git a/security/ssh/distinfo b/security/ssh/distinfo
index ecb85d490d0..9bd5f49d366 100644
--- a/security/ssh/distinfo
+++ b/security/ssh/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2003/01/03 20:10:45 cjep Exp $
+$NetBSD: distinfo,v 1.7 2003/01/04 11:51:30 cjep Exp $
 
 SHA1 (ssh-1.2.27.tar.gz) = 0e7d59c6a62b094bd51818599ae24f7de3462d14
 Size (ssh-1.2.27.tar.gz) = 1022546 bytes
 SHA1 (patch-aa) = 6cf6e5043e1cd230064b73620ce7c86bf5673649
 SHA1 (patch-ab) = 24f370975088dd33551df39ebc1e5cc204c5d7cb
-SHA1 (patch-ac) = d2fb5f37b59e34b98d2c81f96cffbb29fa57bbe2
+SHA1 (patch-ac) = 8ec0adaae86c690166dd87b779b8af509664df0e
 SHA1 (patch-ad) = 0fac0e4586db5257ea10dfba2e14f7f35c6bed49
 SHA1 (patch-ae) = 559327d78036cd956443a739f3f0f52430dd9b2f
 SHA1 (patch-af) = 8a3246a9bd1520a4b8ad74584ee1c68b3ed671d3
diff --git a/security/ssh/patches/patch-ac b/security/ssh/patches/patch-ac
index d670f0be906..dd34c72efd8 100644
--- a/security/ssh/patches/patch-ac
+++ b/security/ssh/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.13 2003/01/03 20:10:46 cjep Exp $
+$NetBSD: patch-ac,v 1.14 2003/01/04 11:51:30 cjep Exp $
 
 --- Makefile.in.orig	Wed May 12 12:19:31 1999
 +++ Makefile.in
@@ -36,7 +36,7 @@ $NetBSD: patch-ac,v 1.13 2003/01/03 20:10:46 cjep Exp $
  X_LIBS		= @X_LIBS@
  X_PRE_LIBS	= @X_PRE_LIBS@
 -X_EXTRA_LIBS	= @X_EXTRA_LIBS@
-+X_EXTRA_LIBS	= @X_EXTRA_LIBS@ -Wl,-R$(X11BASE)/lib
++X_EXTRA_LIBS	= @X_EXTRA_LIBS@ -Wl,$(_OPSYS_RPATH_NAME)$(X11BASE)/lib
  
  XLIBS		= $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(LIBS)
  
-- 
cgit v1.2.3