(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, 15 insertions, 15 deletions

diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 267a6b4b985..71d6bc1cee5 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2003/01/28 22:04:26 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2003/03/14 19:37:59 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.12-1.3.27
 PKGNAME=		ap-ssl-2.8.12
@@ -25,9 +25,9 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_USE_RPATH} == "yes"
-MAKE_ENV+=		SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib"
-.endif
+SSL_RPATH_LDFLAGS=	${RPATH_FLAG}${SSLBASE}/lib
+FIX_RPATH+=		SSL_RPATH_LDFLAGS
+MAKE_ENV+=		SSL_RPATH_LDFLAGS="${SSL_RPATH_LDFLAGS}"
 
 PKG_SYSCONFVAR=		apache
 PKG_SYSCONFSUBDIR?=	httpd
diff --git a/www/apache/Makefile b/www/apache/Makefile
index eb1074aa6ae..72ffd3a9f0f 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2003/02/23 15:55:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.122 2003/03/14 19:38:00 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -128,7 +128,7 @@ CONFIGURE_ENV+=		INCLUDES="${BUILDLINK_CPPFLAGS.db}"
 # on Solaris, we also need libdbm
 .  if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
-LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib
+LDFLAGS+=		-Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib
 .  else
 CONFIGURE_ENV+=		LIBS="-ldb2"
 .  endif
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 17086d83bdb..37ccbd8feb2 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2003/02/23 15:55:58 jmmv Exp $
+# $NetBSD: Makefile,v 1.69 2003/03/14 19:38:00 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -123,7 +123,7 @@ CONFIGURE_ENV+=		INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
 # on Solaris, we also need libdbm
 .  if ${OPSYS} == "SunOS"
 CONFIGURE_ENV+=		LIBS="-ldbm -ldb2"
-LDFLAGS+=		-Wl,-R/usr/ucblib -L/usr/ucblib
+LDFLAGS+=		-Wl,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib
 .  else
 CONFIGURE_ENV+=		LIBS="-ldb2"
 .  endif
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index f9979cf9e3f..fee16101f60 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2003/02/18 14:56:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.45 2003/03/14 19:38:01 jlam Exp $
 
 DISTNAME=	galeon-1.2.8
 PKGREVISION=	2
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --with-mozilla-snapshot=1.2
 .include	"../../x11/gnome-libs/buildlink2.mk"
 
 MOZ_LIBDIR=     ${PREFIX}/lib/mozilla
-LDFLAGS+=       -Wl,-R${MOZ_LIBDIR}
+LDFLAGS+=       -Wl,${RPATH_FLAG}${MOZ_LIBDIR}
 
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 9e8963cccbd..ffb87868cf1 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2003/02/02 08:08:04 taya Exp $
+# $NetBSD: Makefile.common,v 1.11 2003/03/14 19:38:02 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -46,7 +46,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.4.*-* NetBSD-*-m68k
 MOZ_LIBDIR=	${PREFIX}/lib/${MOZILLA}
 MAKE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
 CONFIGURE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
-LDFLAGS+=	-Wl,-R${MOZ_LIBDIR}
+LDFLAGS+=	-Wl,${RPATH_FLAG}${MOZ_LIBDIR}
 
 .ifdef BUILD_SVG
 MAKE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index e369804ab99..6548b67e4c1 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/10 19:14:14 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/14 19:38:03 jlam Exp $
 
 DISTNAME=	skipstone-0.8.3
 CATEGORIES=	www
@@ -17,13 +17,13 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
 		--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla
-LDFLAGS+=	-Wl,-R${BUILDLINK_PREFIX.mozilla}/lib/mozilla
+LDFLAGS+=	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mozilla}/lib/mozilla
 
 # for mozilla-stable (1.0 series)
 #CONFIGURE_ARGS=	--prefix=${PREFIX} \
 #		--with-mozilla-includes=${BUILDLINK_PREFIX.mozilla-stable}/include/mozilla-stable \
 #		--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla-stable}/lib/mozilla-stable
-#LDFLAGS+=	-Wl,-R${BUILDLINK_PREFIX.mozilla-stable}/lib/mozilla-stable
+#LDFLAGS+=	-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mozilla-stable}/lib/mozilla-stable
 
 #.include "../../www/mozilla-stable/buildlink2.mk"
 .include "../../www/mozilla/buildlink2.mk"