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.

5 files changed, 30 insertions, 30 deletions

diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common
index 51e41c76c88..5141e8ae3bb 100644
--- a/mail/exim/Makefile.common
+++ b/mail/exim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/07/07 08:46:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/08/27 06:29:08 jlam Exp $
 
 MASTER_SITES=	ftp://ftp.exim.org/pub/exim/exim4/ \
 		ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
@@ -41,19 +41,19 @@ CFLAGS+=		${_STRIPFLAG_CC}
 .if defined(EXIM_DB) && ${EXIM_DB} == "gdbm"
 .  include "../../databases/gdbm/buildlink3.mk"
 EXIM_USE_DB_CONFIG=	USE_GDBM=yes
-EXIM_DBMLIB=		DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm
 EXIM_INCLUDE=		-I${PREFIX}/include
 .else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED
 .  include "../../mk/bdb.buildlink3.mk"
 EXIM_USE_DB_CONFIG=	USE_DB=yes	# the default
 .  if ${BDB_TYPE} == "db4"
-EXIM_DBMLIB=		DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4
 EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db4}
 .  elif ${BDB_TYPE} == "db3"
-EXIM_DBMLIB=		DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3
 EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db3}
 .  elif ${BDB_TYPE} == "db2"
-EXIM_DBMLIB=		DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2
+EXIM_DBMLIB=		DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2
 EXIM_INCLUDE=		-I${PREFIX}/${BUILDLINK_INCDIRS.db2}
 .  else # using native
 EXIM_DBMLIB=		# empty so use defaults
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 97f848f12b0..cc60d6dd58d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.12 2004/08/27 06:29:08 jlam Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	2
@@ -53,7 +53,7 @@ BDB_ACCEPTED=	native db3 db2
 .if defined(EXIM_DB.mysql) && ${EXIM_DB.mysql} == "YES"
 LOOKUP_INCLUDE+=	-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 LOOKUP_LIBS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
-LOOKUP_LIBS+=		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+LOOKUP_LIBS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
 LOOKUP_LIBS+=		-lmysqlclient
 MAKE_ENV+=		LOOKUP_MYSQL=YES
 .  include "../../databases/mysql-client/buildlink3.mk"
@@ -61,7 +61,7 @@ MAKE_ENV+=		LOOKUP_MYSQL=YES
 .if defined(EXIM_DB.pgsql) && ${EXIM_DB.pgsql} == "YES"
 LOOKUP_INCLUDE+=	-I${PGSQL_PREFIX}/include/postgresql
 LOOKUP_LIBS+=		-L${PGSQL_PREFIX}/lib
-LOOKUP_LIBS+=		-Wl,${RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq
+LOOKUP_LIBS+=		${COMPILER_RPATH_FLAG}${PGSQL_PREFIX}/lib -lpq
 MAKE_ENV+=		LOOKUP_PGSQL=YES
 .  include "../../mk/pgsql.buildlink3.mk"
 .endif
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index b75d656f186..0227d25fa5b 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2004/08/27 06:29:08 jlam Exp $
 
 # Global and legacy options
 #
@@ -67,7 +67,7 @@ PKG_SUPPORTED_OPTIONS=	ldap mysql mysql4 pcre pgsql sasl
 # .  endif
 # CCARGS+=	-DHAS_SSL
 # AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
-# 		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
+# 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
 # 		-lssl -lcrypto
 # PLIST_SRC+=	${PKGDIR}/PLIST.tls
 # MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
@@ -80,7 +80,7 @@ PKG_SUPPORTED_OPTIONS=	ldap mysql mysql4 pcre pgsql sasl
 .  include "../../devel/pcre/buildlink3.mk"
 CCARGS+=	-DHAS_PCRE
 AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib				\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib		\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib	\
 		-lpcre
 .else
 CCARGS+=	-DNO_PCRE
@@ -93,13 +93,13 @@ CCARGS+=	-DNO_PCRE
 .  include "../../databases/openldap/buildlink3.mk"
 CCARGS+=	-DHAS_LDAP
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
 		-lldap -llber
 .  if ${OPSYS} != "Linux"
 .    include "../../databases/db4/buildlink3.mk"
 CCARGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
 AUXLIBS+=	-L${BUILDLINK_PREFIX.db4}/lib				\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib		\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib	\
 		-ldb4
 .  endif
 .endif
@@ -116,7 +116,7 @@ AUXLIBS+=	`${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs`
 .  include "../../databases/mysql-client/buildlink3.mk"
 CCARGS+=	-DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
 		-lmysqlclient -lz -lm
 .endif
 
@@ -143,7 +143,7 @@ SASLLIBDIR=	${PREFIX}/lib/sasl2
 PWCHECK_METHOD=	auxprop
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl2
 .  elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
 .    include "../../security/cyrus-sasl2/buildlink3.mk"
@@ -152,7 +152,7 @@ SASLLIBDIR=	${PREFIX}/lib/sasl2
 PWCHECK_METHOD=	auxprop
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl2
 .  elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
 .    include "../../security/cyrus-sasl/buildlink3.mk"
@@ -160,7 +160,7 @@ SASLLIBDIR=	${PREFIX}/lib/sasl
 PWCHECK_METHOD=	sasldb
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl
 .  endif
 PLIST_SRC+=	${PKGDIR}/PLIST.sasl
@@ -173,6 +173,6 @@ MESSAGE_SUBST+=	SASLLIBDIR=${SASLLIBDIR}
 .  include "../../databases/db/buildlink3.mk"
 CCARGS+=	-I${BUILDLINK_PREFIX.db2}/include/db2
 AUXLIBS+=	-L${BUILDLINK_PREFIX.db2}/lib				\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib		\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib	\
 		-ldb2
 .endif
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index ba5b2e0f8b3..fff8102035b 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $
+# $NetBSD: options.mk,v 1.8 2004/08/27 06:29:08 jlam Exp $
 
 # Global and legacy options
 #
@@ -71,7 +71,7 @@ PATCH_DIST_STRIP.${TLS_PATCH}=	-p1
 .  endif
 CCARGS+=	-DHAS_SSL
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
 		-lssl -lcrypto
 PLIST_SRC+=	${PKGDIR}/PLIST.tls
 MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
@@ -84,7 +84,7 @@ MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
 .  include "../../devel/pcre/buildlink3.mk"
 CCARGS+=	-DHAS_PCRE
 AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib				\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib		\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib	\
 		-lpcre
 .else
 CCARGS+=	-DNO_PCRE
@@ -97,13 +97,13 @@ CCARGS+=	-DNO_PCRE
 .  include "../../databases/openldap/buildlink3.mk"
 CCARGS+=	-DHAS_LDAP
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
 		-lldap -llber
 .  if ${OPSYS} != "Linux"
 .    include "../../databases/db4/buildlink3.mk"
 CCARGS+=	-I${BUILDLINK_PREFIX.db4}/include/db4
 AUXLIBS+=	-L${BUILDLINK_PREFIX.db4}/lib				\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib		\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db4}/lib	\
 		-ldb4
 .  endif
 .endif
@@ -120,7 +120,7 @@ AUXLIBS+=	`${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config --libs`
 .  include "../../databases/mysql-client/buildlink3.mk"
 CCARGS+=	-DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
 		-lmysqlclient -lz -lm
 .endif
 
@@ -147,7 +147,7 @@ SASLLIBDIR=	${PREFIX}/lib/sasl2
 PWCHECK_METHOD=	auxprop
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl2
 .  elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
 .    include "../../security/cyrus-sasl2/buildlink3.mk"
@@ -156,7 +156,7 @@ SASLLIBDIR=	${PREFIX}/lib/sasl2
 PWCHECK_METHOD=	auxprop
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl2
 .  elif defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
 .    include "../../security/cyrus-sasl/buildlink3.mk"
@@ -164,7 +164,7 @@ SASLLIBDIR=	${PREFIX}/lib/sasl
 PWCHECK_METHOD=	sasldb
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl
 .  endif
 PLIST_SRC+=	${PKGDIR}/PLIST.sasl
@@ -177,6 +177,6 @@ MESSAGE_SUBST+=	SASLLIBDIR=${SASLLIBDIR}
 .  include "../../databases/db/buildlink3.mk"
 CCARGS+=	-I${BUILDLINK_PREFIX.db2}/include/db2
 AUXLIBS+=	-L${BUILDLINK_PREFIX.db2}/lib				\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib		\
+		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib	\
 		-ldb2
 .endif
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 373dbf4e4d8..42eda8e297b 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/08/23 23:22:29 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2004/08/27 06:29:08 jlam Exp $
 
 .if ${OPSYS} == "Darwin"
 PKG_DEFAULT_OPTIONS+=	darwin
@@ -130,7 +130,7 @@ PLIST_SRC+=             ${PKGDIR}/PLIST.tls
 SUBST_CLASSES+=		load
 SUBST_STAGE.load=	do-configure
 SUBST_FILES.load=	make-load.sh
-SUBST_SED.load=		-e '$$s|$$| -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
+SUBST_SED.load=		-e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
 .  if ${OPSYS} == "Darwin"
 SUBST_SED.load+=	-e '$$s|$$| -bind_at_load|'
 .  endif