From 3ef633718c6eecbd852195de9329d45632a10352 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 14 Mar 2003 19:37:30 +0000
Subject: (1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;    
 Makefiles simply need to use this value often, for better or for     worse.

(2) Create a new variable FIX_RPATH that lists variables that should
    be cleansed of -R or -rpath values if ${_USE_RPATH} is "no".  By
    default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
    additional variables may be appended from package Makefiles.
---
 security/pgp2/Makefile | 6 ++++--
 security/ssh/Makefile  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 34802750e8f..c288e4ac319 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/08/14 02:39:30 grant Exp $
+# $NetBSD: Makefile,v 1.32 2003/03/14 19:37:55 jlam Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
@@ -24,7 +24,7 @@ LICENCE=	fee-based-commercial-use
 PKGNAME=	pgp-2.6.3a
 DEPENDS+=	rsaref-2.0p3:../../security/rsaref
 RSAINC=		-I${PREFIX}/include
-RSALIBS=	-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lrsaref
+RSALIBS=	-Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib -lrsaref
 RSAOBJS=	rsaglue2.o
 CFLAGS=		-DUSA
 .else
@@ -35,6 +35,8 @@ RSAOBJS=	rsaglue1.o
 CFLAGS=
 .endif
 
+FIX_RPATH+=	RSALIBS
+
 PGPLIB=		${PREFIX}/share/pgp
 CFLAGS+=	-DPGP_SYSTEM_DIR=\\\"${PGPLIB}/\\\"
 
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 4a815a993e2..86ec7287e3c 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2003/01/04 11:51:29 cjep Exp $
+# $NetBSD: Makefile,v 1.104 2003/03/14 19:37:55 jlam Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -57,8 +57,10 @@ CONFIGURE_ENV+=		X_CFLAGS="-I${LOCALBASE}/include"
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
 DEPENDS+=		rsaref-2.0p3:../../security/rsaref
 CONFIGURE_ARGS+=	--with-rsaref="${LOCALBASE}/lib"
-CONFIGURE_ENV+=		LDFLAGS="-Wl,-R${LOCALBASE}/lib"
+CONFIGURE_ENV+=		LDFLAGS="${SSH_LDFLAGS}"
 CFLAGS+=		-I${LOCALBASE}/include
+SSH_LDFLAGS=		-Wl,${RPATH_FLAG}${LOCALBASE}/lib
+FIX_RPATH+=		SSH_LDFLAGS
 .endif
 
 # Include support for the SecureID card
-- 
cgit v1.2.3