(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.

6 files changed, 19 insertions, 15 deletions

diff --git a/net/bind9-current/Makefile b/net/bind9-current/Makefile
index b1f46bf3de0..44cdb11491d 100644
--- a/net/bind9-current/Makefile
+++ b/net/bind9-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2002/12/19 03:46:46 itojun Exp $
+# $NetBSD: Makefile,v 1.41 2003/03/14 19:37:51 jlam Exp $
 #
 
 DISTNAME=	bind-${BIND_VERSION}
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=--disable-threads	# Until we have real threads
 CONFIGURE_ARGS+=--with-libtool=yes \
 		--sysconfdir=/etc \
 		--localstatedir=/var
-#LDFLAGS+=	-Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
+#LDFLAGS+=	-Wl,${RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
 # use external OpenSSL.  comment out the following line and the buildlink
 # include at the bottom to use OpenSSL shipped with BIND9.
 CONFIGURE_ARGS+=--with-openssl=${SSLBASE}
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 30b5a772b5a..f95cbefd610 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2003/03/10 03:01:09 hubertf Exp $
+# $NetBSD: Makefile,v 1.48 2003/03/14 19:37:52 jlam Exp $
 #
 
 DISTNAME=	bind-${BIND_VERSION}
@@ -26,7 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-libtool=yes \
 		--sysconfdir=/etc \
 		--localstatedir=/var
-#LDFLAGS+=	-Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
+#LDFLAGS+=	-Wl,${RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
 # use external OpenSSL.  comment out the following line and the buildlink
 # include at the bottom to use OpenSSL shipped with BIND9.
 CONFIGURE_ARGS+=--with-openssl=${SSLBASE}
diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile
index 237d53c548b..0713f2e3134 100644
--- a/net/coda_client/Makefile
+++ b/net/coda_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/11/01 16:34:40 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/14 19:37:52 jlam Exp $
 #
 
 DISTNAME=		coda-4.6.6
@@ -27,10 +27,13 @@ USE_PERL5=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 
+FIX_RPATH+=		GDBM_LDADD
+GDBM_LDADD=		-Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib -lgdbm
+
 pre-configure:
-	cd ${WRKSRC} &&							\
+	cd ${WRKSRC} &&						\
 	for F in coda-src/advice/Makefile.in; do 		\
-		${SED} -e "s_-lgdbm_-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lgdbm_"\
+		${SED} -e "s_-lgdbm_${GDBM_LDADD}_"		\
 			< $$F > $$F.patched &&			\
 		${MV} $$F.patched $$F;				\
 	done
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index cd3b433aeb3..162bb27bda7 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2003/03/12 21:02:24 jschauma Exp $
+# $NetBSD: Makefile,v 1.62 2003/03/14 19:37:53 jlam Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
 #
 
@@ -27,7 +27,10 @@ CONFIGURE_ARGS=		"--datadir=${KDEBASEDIR}/share/kde" \
 			"--with-qt-dir=${QT1DIR}/qt1"
 CONFIGURE_ENV=  	KDEDIR=${KDEBASEDIR} \
 			CXXFLAGS="${CFLAGS}" \
-			all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib"
+			all_libraries="${KDE_LDFLAGS}"
+
+FIX_RPATH+=		KDE_LDFLAGS
+KDE_LDFLAGS=		-L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
 
 GCC_VERSION!=   	gcc --version
 .if (${GCC_VERSION:C/-.*$$//} == egcs)
diff --git a/net/pureftpd/Makefile b/net/pureftpd/Makefile
index cda880dd01b..4129a0af9f4 100644
--- a/net/pureftpd/Makefile
+++ b/net/pureftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/07 18:21:48 salo Exp $
+# $NetBSD: Makefile,v 1.10 2003/03/14 19:37:53 jlam Exp $
 #
 
 DISTNAME=	pure-ftpd-1.0.14
@@ -27,7 +27,7 @@ DEPENDS+=	mysql-client>=3.23:../../databases/mysql-client
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}	\
 		--with-quotas
 CCPFLAGS+=	-I${LOCALBASE}/include/mysql
-LDFLAGS+=	-L${LOCALBASE}/lib/mysql -Wl,-R${LOCALBASE}/lib/mysql
+LDFLAGS+=	-L${LOCALBASE}/lib/mysql -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
 BUILD_DEFS+=	PURE_FTPD_USE_MYSQL
 .endif
 
diff --git a/net/snort-mysql/Makefile b/net/snort-mysql/Makefile
index 9ed27b7e1d3..bee85ebd7a8 100644
--- a/net/snort-mysql/Makefile
+++ b/net/snort-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/10 12:23:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/14 19:37:54 jlam Exp $
 #
 
 .include "../../net/snort/Makefile.common"
@@ -20,9 +20,7 @@ DISTINFO_FILE=  ${PKGDIR}/distinfo
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_USE_RPATH} == "yes"
-LDFLAGS+=       -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql
-.endif
+LDFLAGS+=       ${BUILDLINK_LDFLAGS.mysql-client}
 
 .include "../../databases/mysql-client/buildlink2.mk"
 .include "../../net/libpcap/buildlink2.mk"