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

3 files changed, 13 insertions, 11 deletions

diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 10acb6b2587..5ea5bf3b94c 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/07/13 15:35:17 jschauma Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/14 19:37:46 jlam Exp $
 #
 
 DISTNAME=	bbmail-0.8.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://bbtools.windsofstorm.net/
 COMMENT=	mailbox monitor (not only) for the blackbox windowmanager
 
 GNU_CONFIGURE=	YES
-LDFLAGS+=	-Wl,-R${X11PREFIX}/lib
+USE_X11=	YES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bbmail ${PREFIX}/bin/
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 05f4b5e3586..79bcc532df0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2003/03/07 03:08:33 taca Exp $
+# $NetBSD: Makefile,v 1.86 2003/03/14 19:37:47 jlam Exp $
 
 DISTNAME=	postfix-2.0.6
 CATEGORIES=	mail
@@ -26,6 +26,8 @@ CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
 
 .include "../../mk/bsd.prefs.mk"
 
+FIX_RPATH+=	AUXLIBS
+
 #.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
 #PATCHFILES+=		tls+ipv6-1.13-pf-2.0.6.patch.gz
 #PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.13/
@@ -34,7 +36,7 @@ CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
 #
 #CCARGS+=		-DHAS_SSL
 #AUXLIBS+=		-L${BUILDLINK_PREFIX.openssl}/lib	\
-#			-Wl,-R${BUILDLINK_PREFIX.openssl}/lib	\
+#			-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
 #			-lssl -lcrypto
 #BUILD_DEFS+=		POSTFIX_USE_TLS
 #
@@ -46,7 +48,7 @@ CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
 .include "../../devel/pcre/buildlink2.mk"
 CCARGS+=	-DHAS_PCRE
 AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib		\
-		-Wl,-R${BUILDLINK_PREFIX.pcre}/lib	\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib	\
 		-lpcre
 BUILD_DEFS+=	POSTFIX_USE_PCRE
 .else
@@ -57,7 +59,7 @@ CCARGS+=	-DNO_PCRE
 .include "../../databases/openldap/buildlink2.mk"
 CCARGS+=	-DHAS_LDAP
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib	\
-		-Wl,-R${BUILDLINK_PREFIX.openldap}/lib	\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
 		-lldap -llber
 BUILD_DEFS+=	POSTFIX_USE_LDAP
 .endif
@@ -66,7 +68,7 @@ BUILD_DEFS+=	POSTFIX_USE_LDAP
 .include "../../databases/mysql-client/buildlink2.mk"
 CCARGS+=	-DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
 AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
-		-Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
 		-lmysqlclient -lz -lm
 BUILD_DEFS+=	POSTFIX_USE_MYSQL
 .endif
@@ -79,7 +81,7 @@ BUILD_DEFS+=	POSTFIX_USE_MYSQL
 #
 #CCARGS+=	-DHAS_SSL
 #AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib	\
-#		-Wl,-R${BUILDLINK_PREFIX.openssl}/lib	\
+#		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
 #		-lssl -lcrypto
 #BUILD_DEFS+=	POSTFIX_USE_TLS
 #
@@ -91,7 +93,7 @@ BUILD_DEFS+=	POSTFIX_USE_MYSQL
 .include "../../security/cyrus-sasl/buildlink2.mk"
 CCARGS+=	-DUSE_SASL_AUTH
 AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib		\
-		-Wl,-R${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
 		-lsasl
 BUILD_DEFS+=	USE_SASL
 
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index fe65cdb11d4..2b61766dee0 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:42 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/14 19:37:47 jlam Exp $
 
 DISTNAME=	teapop-0.3.5
 CATEGORIES=	mail
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--disable-vpop
 .if defined(TEAPOP_WITH_MYSQL)
 .include "../../databases/mysql-client/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
-LDFLAGS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+LDFLAGS+=	${BUILDLINK_LDFLAGS.mysql-client}
 .endif
 
 post-install: