USE_BUILDLINK3 so that -Wl,-R/usr/X11R6/lib gets stripped/translated

properly on various OSes

14 files changed, 26 insertions, 27 deletions

diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 060086ca96f..2dc9facaa49 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:45:55 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/23 20:58:41 danw Exp $
 
 DISTNAME=	gnuboy-1.0.3
 PKGREVISION=	1
@@ -10,6 +10,8 @@ HOMEPAGE=	http://gnuboy.unix-fu.org/
 COMMENT=	Gameboy emulator
 
 GNU_CONFIGURE=	yes
+USE_X11=	yes
+USE_BUILDLINK3=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnuboy
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index f64effd4610..3bf1a0927f1 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/28 15:45:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/23 20:58:41 danw Exp $
 
 DISTNAME=	minivmac-0.1.7.src
 PKGNAME=	minivmac-0.1.7
@@ -13,6 +13,7 @@ COMMENT=	Miniature Macintosh emulator
 
 WRKSRC=		${WRKDIR}/minivmac
 USE_X11=	YES
+USE_BUILDLINK3=	YES
 
 SCRIPTS_ENV+=	CC="${CC}"
 
diff --git a/games/galaxa/Makefile b/games/galaxa/Makefile
index da8e8b462cf..6e5cb59d3a3 100644
--- a/games/galaxa/Makefile
+++ b/games/galaxa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:15:40 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/23 20:58:41 danw Exp $
 #
 
 DISTNAME=	galaxa.0.1
@@ -14,6 +14,7 @@ COMMENT=	Space game based loosely on "Galaga"
 WRKSRC=		${WRKDIR}/galaxa
 MAKEFILE=	makefile
 USE_X11=	yes
+USE_BUILDLINK3=	yes
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/galaxa
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index 712738a77a4..4400d491af5 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:59 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/23 20:58:41 danw Exp $
 #
 
 DISTNAME=		spellcast
@@ -12,5 +12,6 @@ HOMEPAGE=		http://www.eblong.com/zarf/spellcast.html
 COMMENT=		Game of dueling wizards for two players
 
 USE_X11BASE=		yes
+USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 674ab82d6b4..84ddcdd9d0f 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:15:41 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/23 20:58:42 danw Exp $
 
 DISTNAME=		xevil1.5.1e
 PKGNAME=		xevil-1.5.1e
@@ -16,5 +16,6 @@ MAKE_ENV=		HOSTTYPE="netbsd" \
 
 WRKSRC=			${WRKDIR}
 USE_X11BASE=		yes
+USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index 6c97768e996..b954091720d 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:42 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/23 20:58:42 danw Exp $
 
 DISTNAME=		xzip180
 PKGNAME=		xzip-1.8
@@ -12,6 +12,7 @@ COMMENT=		Z-code interpreter for X11 (Infocom game format)
 
 WRKSRC=			${WRKDIR}/xzip
 USE_X11BASE=		yes
+USE_BUILDLINK3=		yes
 ALL_TARGET=		xzip
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pgraf/Makefile b/graphics/pgraf/Makefile
index d11102b412c..cf3451525b3 100644
--- a/graphics/pgraf/Makefile
+++ b/graphics/pgraf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:42:09 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/23 20:58:42 danw Exp $
 
 DISTNAME=		pgraf-20010131
 CATEGORIES=		graphics
@@ -9,6 +9,7 @@ COMMENT=		Portable graphics system
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 USE_X11=		YES
+USE_BUILDLINK3=		YES
 
 CONFLICTS=		pgp5-[0-9]*		# Both have a `pgps' executable
 
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 8fb5eadc03a..ed98f85dfab 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/11/07 14:59:42 gavan Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/23 20:58:42 danw Exp $
 #
 
 DISTNAME=	bbmail-0.8.3
@@ -11,6 +11,7 @@ COMMENT=	Mailbox monitor (not only) for the blackbox windowmanager
 
 GNU_CONFIGURE=	YES
 USE_X11=	YES
+USE_BUILDLINK3=	YES
 USE_GCC_SHLIB=	YES
 
 do-install:
diff --git a/mail/bbmail/distinfo b/mail/bbmail/distinfo
index 021239c2598..3a157d8e449 100644
--- a/mail/bbmail/distinfo
+++ b/mail/bbmail/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/07/18 15:26:27 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2004/05/23 20:58:42 danw Exp $
 
 SHA1 (bbmail-0.8.3.tar.gz) = 1707500785614805b88b77d4e86c3fbb059744e2
 Size (bbmail-0.8.3.tar.gz) = 123318 bytes
-SHA1 (patch-aa) = 70539174530e034ced8840ccc2120146fc4f5b4c
diff --git a/mail/bbmail/patches/patch-aa b/mail/bbmail/patches/patch-aa
deleted file mode 100644
index 8efaab126cc..00000000000
--- a/mail/bbmail/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/08/12 16:02:45 agc Exp $
-
---- Makefile.in	2002/08/12 15:32:50	1.1
-+++ Makefile.in	2002/08/12 15:34:06
-@@ -117,7 +117,7 @@
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir)
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -Wl,-R${X11BASE}/lib
- LIBS = @LIBS@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/BaseDisplay.Po $(DEPDIR)/Basemenu.Po \
diff --git a/mbone/mdp/Makefile b/mbone/mdp/Makefile
index 80110c1e85a..fe574922f2f 100644
--- a/mbone/mdp/Makefile
+++ b/mbone/mdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 14:00:13 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/23 20:58:42 danw Exp $
 #
 
 DISTNAME=	src-mdp-1.9a5
@@ -14,6 +14,7 @@ COMMENT=	Multicast file transfer
 WRKSRC=		${WRKDIR}/mdp/unix
 USE_GNU_TOOLS+=	make
 ALL_TARGET=	mdp
+USE_BUILDLINK3=	yes
 
 pre-build:
 		${LN} -sf ${WRKSRC}/Makefile.netbsd ${WRKSRC}/Makefile
diff --git a/time/dclock/Makefile b/time/dclock/Makefile
index 61736fdd57d..5212a4cc3a3 100644
--- a/time/dclock/Makefile
+++ b/time/dclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:27:16 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/23 20:58:42 danw Exp $
 #
 
 DISTNAME=	dclock
@@ -14,6 +14,7 @@ CONFLICTS+=	ivtools-*
 
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
+USE_BUILDLINK3=	yes
 
 MAKE_ENV+=	CC="${CC}"
 
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 9d8e7933e50..ad52fe53def 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:58 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/23 20:58:42 danw Exp $
 #
 
 DISTNAME=	xkbset-0.3
@@ -12,6 +12,7 @@ COMMENT=	Manages XKB features of the X window system
 
 USE_PERL5=	build
 USE_X11BASE=	yes
+USE_BUILDLINK3=	yes
 REPLACE_PERL=	mskacc-gui
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpns/Makefile b/x11/xpns/Makefile
index 2c1e91d613b..5a3b5cefb13 100644
--- a/x11/xpns/Makefile
+++ b/x11/xpns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:29 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/23 20:58:42 danw Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/06/29 09:38:20 obrien Exp
 #
 
@@ -14,6 +14,7 @@ COMMENT=	Petri-Net Simulator for Xwindows
 
 WRKSRC=		${WRKDIR}
 USE_X11BASE=	yes
+USE_BUILDLINK3=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	pns