Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,

which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

8 files changed, 16 insertions, 16 deletions

diff --git a/www/ap-auth-mysql/Makefile b/www/ap-auth-mysql/Makefile
index 07b9087e432..f97014eff28 100644
--- a/www/ap-auth-mysql/Makefile
+++ b/www/ap-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/07/17 16:58:19 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2004/08/27 06:29:11 jlam Exp $
 #
 
 DISTNAME=		libapache-mod-auth-mysql_4.3.1
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 LDFLAGS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
 			-lmysqlclient					\
-			-Wl,${RPATH_FLAG}${PREFIX}/lib/mysql
+			${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 APACHE_MODULE=		YES
 APACHE_MODULE_NAME=	mod_auth_mysql.so
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index e0fdb7d5389..2bdb7837558 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2004/07/17 12:43:37 tron Exp $
+# $NetBSD: Makefile,v 1.82 2004/08/27 06:29:11 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.19-1.3.31
 PKGNAME=		ap-ssl-2.8.19
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
-SSL_RPATH_LDFLAGS=	${RPATH_FLAG}${SSLBASE}/lib
+SSL_RPATH_LDFLAGS=	${LINKER_RPATH_FLAG} ${SSLBASE}/lib
 FIX_RPATH+=		SSL_RPATH_LDFLAGS
 MAKE_ENV+=		SSL_RPATH_LDFLAGS="${SSL_RPATH_LDFLAGS}"
 
diff --git a/www/ap2-auth-mysql/Makefile b/www/ap2-auth-mysql/Makefile
index cb974a5a53d..e24c7f584f4 100644
--- a/www/ap2-auth-mysql/Makefile
+++ b/www/ap2-auth-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/05/04 23:59:15 snj Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/27 06:29:11 jlam Exp $
 #
 
 DISTNAME=		mod_auth_mysql.c
@@ -34,7 +34,7 @@ do-build:
 	${APXS} -c -n ${APACHE_MODULE_NAME}					\
 	    -I${BUILDLINK_PREFIX.mysql-client}/include				\
 	    -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql			\
-	    -Wl,${RPATH_FLAG} -Wl,${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
+	    ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
 	    -lmysqlclient ${DISTNAME}
 
 do-install:
diff --git a/www/ap2-auth-pgsql/Makefile b/www/ap2-auth-pgsql/Makefile
index a5f7222f313..87deb2e2ef7 100644
--- a/www/ap2-auth-pgsql/Makefile
+++ b/www/ap2-auth-pgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/07/24 22:45:16 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/27 06:29:11 jlam Exp $
 # FreeBSD Id: ports/www/mod_auth_pgsql2/Makefile,v 1.5 2004/02/06 11:21:00 clement Exp
 
 DISTNAME=		mod_auth_pgsql-2.0.2b1
@@ -21,7 +21,7 @@ do-build:
 		${APXS} -c -n ${APACHE_MODULE_NAME} \
 		-I${PGSQL_PREFIX}/include/postgresql \
 		-L${LOCALBASE}/lib \
-		-Wl,${RPATH_FLAG} -Wl,${LOCALBASE}/lib \
+		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib \
 		-lpq ${DISTNAME:C/-[^-]*$//}.c
 
 do-install:
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 6f09603da0b..3b3d48340ad 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2004/04/30 05:25:59 snj Exp $
+# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -134,7 +134,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,${RPATH_FLAG}/usr/ucblib -L/usr/ucblib
+LDFLAGS+=		${COMPILER_RPATH_FLAG}/usr/ucblib -L/usr/ucblib
 .  else
 CONFIGURE_ENV+=		LIBS="-ldb2"
 .  endif
diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile
index c0fd24d84a7..e02e587fdbe 100644
--- a/www/galeon12/Makefile
+++ b/www/galeon12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/08/18 12:56:08 taya Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/27 06:29:11 jlam Exp $
 
 DISTNAME=	galeon-1.2.14
 CATEGORIES=	www
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --with-mozilla-snapshot=1.7
 .include	"../../x11/gnome-libs/buildlink3.mk"
 
 MOZ_LIBDIR=     ${MOZILLA_PREFIX}/lib/mozilla
-LDFLAGS+=       -Wl,${RPATH_FLAG}${MOZ_LIBDIR}
+LDFLAGS+=       ${COMPILER_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 3dab04a93b6..cb8814185c7 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2004/06/19 00:25:04 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.43 2004/08/27 06:29:11 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-source-${MOZ_DIST_VER}
@@ -64,7 +64,7 @@ MAKE_ENV+=	MOZILLA_PKG_NAME=${MOZILLA}
 MOZ_LIBDIR=	${PREFIX}/lib/${MOZILLA}
 MAKE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
 CONFIGURE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
-LDFLAGS+=	-Wl,${RPATH_FLAG}${MOZ_LIBDIR}
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
 
 .ifdef BUILD_SVG
 MAKE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index 19835ff3995..a6369d0ab86 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/05/29 04:26:53 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/27 06:29:11 jlam Exp $
 
 DISTNAME=	libapreq-1.2
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Lots of Apache specific httpd handling modules
 USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libapreq/.packlist
 
-LDFLAGS+=	-Wl,${RPATH_FLAG}${PERL5_SITEARCH}/auto/libapreq
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${PERL5_SITEARCH}/auto/libapreq
 
 .include "../../lang/perl5/module.mk"
 .include "../../www/ap-perl/buildlink3.mk"