Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.

64 files changed, 64 insertions, 128 deletions

diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
index 5fcfa35e477..bf5fbabfd9d 100644
--- a/multimedia/RealPlayerGold/Makefile
+++ b/multimedia/RealPlayerGold/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/20 12:45:40 rh Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:40 tv Exp $
 #
 
 DISTNAME=		RealPlayer10GOLD
@@ -17,7 +17,6 @@ FETCH_CMD=		${PREFIX}/bin/wget
 RPMFILES=		${DISTNAME}${EXTRACT_SUFX}
 RPM2PKGARGS=		-d ${PREFIX} -f ${PLIST_SRC} -p ${REALPLAYER_SUBDIR} -s3
 EXTRACT_ONLY=		# empty
-NO_BUILDLINK=		yes
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 2bd290397cf..b962692b61b 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:40 tv Exp $
 #
 
 DISTNAME=	acidrip-0.14
@@ -15,7 +15,6 @@ DEPENDS+=	mencoder-[0-9]*:../../multimedia/mencoder
 DEPENDS+=	mplayer-[0-9]*:../../multimedia/mplayer
 DEPENDS+=	p5-gtk2>=1.040:../../x11/p5-gtk2
 
-USE_BUILDLINK3=	yes
 USE_PERL5=	yes
 
 PERL5_REQD=     5.8
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 498a6e5da90..5b4787409cf 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:40 tv Exp $
 #
 
 DISTNAME=	avidemux-2.0.18
@@ -13,7 +13,6 @@ COMMENT=	Graphical video editing program
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile
index 05795a620de..e78022e64f2 100644
--- a/multimedia/avifile/Makefile
+++ b/multimedia/avifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:40 tv Exp $
 
 DISTNAME=	avifile-0.53.5
 PKGREVISION=	4
@@ -15,7 +15,6 @@ DEPENDS=	win32-codecs>=010122:../../multimedia/win32-codecs
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index cd23649862e..c9459aa97fc 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/05/16 02:07:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:40 tv Exp $
 #
 
 DISTNAME=		Dirac-0.2.0
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://dirac.sourceforge.net/
 COMMENT=		Open-source video codec designed at the BBC
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index d9c94a8feba..e50b4b0f515 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:40 tv Exp $
 #
 
 DISTNAME=	dumpmpeg-0.6
@@ -10,7 +10,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/dumpmpeg
 COMMENT=	Splits an MPEG stream into single images
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 
 .include "../../multimedia/smpeg/buildlink3.mk"
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index cb126710fc8..f526ba4e84b 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/28 23:18:16 reed Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=		dvdauthor-0.6.10
 PKGREVISION=	2
@@ -9,7 +9,6 @@ MAINTAINER=		sekiya@NetBSD.org
 HOMEPAGE=		http://dvdauthor.sourceforge.net/
 COMMENT=		Tools to assist DVD authoring
 
-USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS=		make
 
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index b88b1fe0161..a501ebf106a 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:41 tv Exp $
 #
 
 VERS=		0.50.18
@@ -27,7 +27,6 @@ DEPENDS+=	vcdimager>=0.7.12:../../sysutils/vcdimager-devel
 
 BUILDLINK_DEPENDS.perl= perl>=5.6.0
 
-USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 
 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Video/DVDRip/.packlist
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 8ff77513b60..2fbbc30197a 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/03/05 13:32:10 grant Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=	ffmpeg-0.4.8
 PKGREVISION=	3
@@ -10,7 +10,6 @@ HOMEPAGE=	http://ffmpeg.sourceforge.net/
 COMMENT=	MPEG decoding, encoding and streaming software
 
 HAS_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 USE_PKGINSTALL=	YES
diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile
index 76097cc9a30..717a2a929bc 100644
--- a/multimedia/flashplayer/Makefile
+++ b/multimedia/flashplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/22 20:16:50 abs Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:41 tv Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -7,7 +7,6 @@ PKGNAME=	${DISTNAME:C/-/player-/}
 PKGREVISION=	3
 COMMENT=	Standalone open source Flash(tm) player
 
-USE_BUILDLINK3=	yes
 BUILD_DIRS=	${WRKSRC}/Player
 CPPFLAGS+=	-DDEV_DSP="\"${DEVOSSSOUND}\""
 
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 85aec8d869b..600109a63a4 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/02/23 01:11:47 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	8
@@ -10,7 +10,6 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://people.freebsd.org/~rhh/fxtv/
 COMMENT=	TV display application for Brooktree 848 compatible TV cards
 
-USE_BUILDLINK3=	YES
 USE_X11BASE=	YES
 USE_GNU_TOOLS+=	make
 XAW_TYPE?=	3d
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 72441e41a15..6a1ec25fdfe 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/27 15:43:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
@@ -16,7 +16,6 @@ DEPENDS+=       	mencoder>=0.90:../../multimedia/mencoder
 DEPENDS+=       	mplayer>=0.90:../../multimedia/mplayer
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_DIRS+=       	gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 057221e2fea..a888aea8417 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/09 11:19:32 abs Exp $
+# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:41 tv Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -53,7 +53,6 @@ DISTFILES+=	${SKINS}
 DISTINFO_FILE=	${.CURDIR}/distinfo
 DIST_SUBDIR=	${PKGNAME_NOREV}-20050409
 
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--enable-gui --disable-mencoder \
 			--confdir=${PREFIX}/share/mplayer
 
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 1dc6cc4e709..9373a22be98 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=		gnome-media-1.2.3
 PKGREVISION=		12
@@ -12,7 +12,6 @@ COMMENT=		Set of audio/multimedia applications for GNOME
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_DIRS+=		gnome1-1.5
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 870169f46af..44803a89ffa 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/03/22 16:34:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=		gnome-media-2.10.0
 CATEGORIES=		multimedia gnome
@@ -15,7 +15,6 @@ DEPENDS+=		gst-plugins-esound>=0.8.8:../../audio/gst-plugins-esound
 DEPENDS+=		gst-plugins-oss>=0.8.8:../../audio/gst-plugins-oss
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 681354d3529..5b4d1583288 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/25 23:42:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=		gopchop-1.1.3
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://outflux.net/unix/software/GOPchop/
 COMMENT=		MPEG2 GOP-accurate editor
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 08e1c8d892f..7a2aa073ff9 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/03/22 16:16:33 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.8
@@ -18,7 +18,6 @@ PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins/patches
 BUILD_DEPENDS+=		nasm>=0.98.38:../../devel/nasm
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 2cb593dcb54..d1e1f08eed7 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/02/09 13:37:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=		gstreamer-0.8.9
@@ -13,7 +13,6 @@ COMMENT=		GNOME multimedia streamer library
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 21190388581..95e59dc0c30 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/06 17:22:52 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=		gxine-0.4.1
@@ -10,7 +10,6 @@ HOMEPAGE=		http://xinehq.de/
 COMMENT=		Gtk-based media player
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_X11=		YES
 
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index db5d595b8e3..f6f0337f8d4 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/03/25 12:25:21 markd Exp $
+# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
 CATEGORIES=	multimedia
@@ -8,7 +8,6 @@ COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
 DEPENDS+=	xine-arts>=1rc0a:../../audio/xine-arts
 
-USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGINSTALL=		YES
 
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 983c65a720a..80c6625a289 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/07 12:07:43 markd Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=	kmplayer-0.8.4b
@@ -16,7 +16,6 @@ DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index 84d53ee2b46..33ec72746ae 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/02/18 19:32:10 reed Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=		libassetml-1.2.1
@@ -11,7 +11,6 @@ COMMENT=		Library for sharing image and audio files between projects
 
 BUILD_DEPENDS+=	texi2html-[0-9]*:../../textproc/texi2html
 
-USE_BUILDLINK3=		yes
 USE_DIRS+=		gnome2-1.5	# share/gnome/help
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile
index 791962b67d2..4426a9942f9 100644
--- a/multimedia/libdv/Makefile
+++ b/multimedia/libdv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/02/24 01:42:46 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=	libdv-0.104
 CATEGORIES=	multimedia
@@ -8,7 +8,6 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://libdv.sourceforge.net/
 COMMENT=	DV video codec library
 
-USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index 44cb6c05849..a5661ba7c3f 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=	libdvbpsi-0.1.3
 PKGREVISION=	1
@@ -12,6 +12,5 @@ COMMENT=	PSI decoder and generator library for MPEG2 and DVB streams
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
-USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 9104e1de53d..dff4dfaf8e7 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:41 tv Exp $
 #
 # Unfortunately, some reading of the United States law (DMCA) means
 # that we are not able to provide pointers to the source or homepage
@@ -25,7 +25,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index a1094e5a774..b05f42636cd 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:41 tv Exp $
 #
 
 DISTNAME=	libdvdnav-0.1.9
@@ -11,7 +11,6 @@ HOMEPAGE=	http://dvd.sourceforge.net/
 COMMENT=	Library to navigate DVDs
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 10931e6be24..092f4b27866 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:41 tv Exp $
 
 DISTNAME=	libdvdplay-1.0.1
 PKGREVISION=	2
@@ -12,7 +12,6 @@ COMMENT=	Simple API library designed for DVD navigation
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
-USE_BUILDLINK3=	yes
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index bcaf3d5eaa9..d6f3425f254 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	libdvdread-0.9.4
 PKGREVISION=	1
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
-USE_BUILDLINK3=	yes
 
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
 
diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
index 0a70a38771d..8ba41cffc7d 100644
--- a/multimedia/libflash/Makefile
+++ b/multimedia/libflash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
 #
 
 .include "Makefile.common"
@@ -7,7 +7,6 @@ PKGNAME=	lib${DISTNAME}
 PKGREVISION=	5
 COMMENT=	Open source Flash(tm) library
 
-USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 BUILD_DIRS=	${WRKSRC}/Lib
 MAKE_ENV+=	LIBOSSAUDIO="${LIBOSSAUDIO}"
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index 074d7359fa3..351f3bdf7de 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/02/17 10:52:46 salo Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	libmatroska-0.7.5
@@ -12,7 +12,6 @@ COMMENT=	Extensible open standard Audio/Video container format
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c++
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index f5137d5c166..3ec655edae4 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	mpeg2dec-0.4.0b
 PKGNAME=	libmpeg2-0.4.0b
@@ -18,7 +18,6 @@ WRKSRC=		${WRKDIR}/mpeg2dec-0.4.0
 GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
-USE_BUILDLINK3=	yes
 
 PKGCONFIG_OVERRIDE+=    libmpeg2/convert/libmpeg2convert.pc.in
 PKGCONFIG_OVERRIDE+=    libmpeg2/libmpeg2.pc.in
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index b5cc6eb3bdb..5fb5da39607 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/06/26 18:00:21 grant Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	libmpeg3-1.3
@@ -16,7 +16,6 @@ BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 CONFIGURE_ARGS+= --no-mmx --no-css
 .endif
 
-USE_BUILDLINK3= yes
 HAS_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 
diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
index e3fcd157537..05ba8c6cef6 100644
--- a/multimedia/libogg/Makefile
+++ b/multimedia/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	libogg-1.1.2
@@ -12,7 +12,6 @@ COMMENT=	Ogg project codecs library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 07a039050d0..770659ecb04 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/09 13:53:36 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	libtheora-1.0alpha4
@@ -12,7 +12,6 @@ COMMENT=	Video codec for Ogg multimedia streaming
 
 GNU_CONFIGURE=	YES
 PKGCONFIG_OVERRIDE=	theora.pc.in
-USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 
 .include "../../audio/libvorbis/buildlink3.mk"
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 7fba40e0179..4fe4e710cdf 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	lsdvd-0.10
 PKGREVISION=	1
@@ -12,7 +12,6 @@ COMMENT=	Application displaying the contents of DVDs
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index f217b8dde9e..0ee04b1888e 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/12/17 22:33:13 tron Exp $
+# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:42 tv Exp $
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
 
@@ -6,7 +6,6 @@ COMMENT=	Simple movie encoder for MPlayer-playable movies
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
 BUILD_TARGET=	mencoder
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 85cc8951e9f..4e84c582faf 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	mjpegtools-1.6.2
 PKGREVISION=	3
@@ -12,7 +12,6 @@ COMMENT=	Programs for compressing video streams
 DEPENDS+=		toolame>=02l:../../audio/toolame
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		yes
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index b6d20c45fed..e1da3a975e8 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/14 17:13:27 salo Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:42 tv Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -8,7 +8,6 @@ HOMEPAGE=	http://www.bunkus.org/videotools/mkvtoolnix/
 COMMENT=	Set of tools to create, alter and inspect Matroska files
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c c++
 
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 37e1ec13b94..39797a41adc 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/03/30 20:15:12 reed Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:42 tv Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -11,7 +11,6 @@ COMMENT=        MKVtoolnix mkvmerge GUI
 DEPENDS+=	${DISTNAME}:../../multimedia/mkvtoolnix
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c++
 USE_X11=	yes
diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile
index 58ab3b9bb4a..6fc75263bf2 100644
--- a/multimedia/moz-flash/Makefile
+++ b/multimedia/moz-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/21 03:14:36 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -12,7 +12,6 @@ COMMENT=	Mozilla open source Flash(tm) plugin
 
 DEPENDS+=	mozilla>=0.9.9:../../www/mozilla
 
-USE_BUILDLINK3=	YES
 USE_X11=	YES
 USE_LIBTOOL=	YES
 
diff --git a/multimedia/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile
index eebb387f461..7c651aade3f 100644
--- a/multimedia/mpeg-lib/Makefile
+++ b/multimedia/mpeg-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/03 15:15:05 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	mpeg_lib-1.3.1
@@ -13,7 +13,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://starship.python.net/~gward/mpeglib/
 COMMENT=	Library for decoding MPEG movies
 
-USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index 2f7349844c9..ba5b3300c62 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/02/21 20:26:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
@@ -12,7 +12,6 @@ HOMEPAGE=	http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html
 COMMENT=	The Parallel Berkeley MPEG Encoder
 
 WRKSRC=			${WRKDIR}/mpeg_encode
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
 post-build:
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index bf68a01ac0c..cfb9a024a3c 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/11/28 19:19:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -14,7 +14,6 @@ DEPENDS+=		mplayer>=0.92:../../multimedia/mplayer
 
 WRKSRC=			${WRKDIR}/mplayerplug-in
 GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LANGUAGES+=		c++
 USE_PKGINSTALL=		yes
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index feb63e8df04..6002e09d20d 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/01/05 15:39:15 drochner Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/04/11 21:46:42 tv Exp $
 
 MPLAYER_DIST_VERSION=	1.0pre6a
 
@@ -32,7 +32,6 @@ NO_BIN_ON_CD=		"a dependency is restricted"
 NO_BIN_ON_FTP=		"a dependency is restricted"
 NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
 
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
 
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index f38c3425a67..42d455c7dd1 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:42 tv Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
 PKGREVISION=	1
@@ -7,7 +7,6 @@ COMMENT=	Software-only MPEG-1/2/4 video decoder
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-USE_BUILDLINK3=		YES
 CONFIGURE_ARGS+=	--disable-mencoder
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 7018c6e68d8..7661c007cf0 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	mjpegtools-1.6.2
 PKGNAME=	mplex-1.6.2
@@ -13,7 +13,6 @@ COMMENT=	Multiplexes MPEG component streams into system layers
 BUILD_DEPENDS+=	nasm>=0.98:../../devel/nasm
 
 GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
diff --git a/multimedia/ns-flash/Makefile b/multimedia/ns-flash/Makefile
index 03a7ae425ca..7d681694096 100644
--- a/multimedia/ns-flash/Makefile
+++ b/multimedia/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/07 11:48:45 tron Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
 
 CATEGORIES=		multimedia www
 MASTER_SITES=		http://fpdownload.macromedia.com/get/shockwave/flash/english/${DISTUNAME}/${FLASH_VERS}/
@@ -43,7 +43,6 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-NO_BUILDLINK=		yes
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 CHECK_SHLIBS=		no
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 0fec4eb12ab..d26992bdc70 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	2
@@ -19,7 +19,6 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-x86_64
 ONLY_FOR_PLATFORM+=	Linux-*-*
 ONLY_FOR_PLATFORM+=	SunOS-*-*
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 4121afe66f8..c58545fa898 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
 
 DISTNAME=	ogle_gui-0.9.2
 PKGREVISION=	4
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	GUI for the Ogle DVD player
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 1592fc72617..95b035c3410 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/09 14:46:33 salo Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=	ogmtools-1.5
@@ -10,7 +10,6 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://www.bunkus.org/videotools/ogmtools/
 COMMENT=	Ogg Media files manipulation tools
 
-USE_BUILDLINK3=	YES
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index e0f1b73871d..75c4cdcfd5b 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -12,7 +12,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.openquicktime.org/
 COMMENT=		Portable library for handling QuickTime(TM) media files
 
-USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
diff --git a/multimedia/p5-xmltv/Makefile b/multimedia/p5-xmltv/Makefile
index 8198287bfdb..00f6ae5683c 100644
--- a/multimedia/p5-xmltv/Makefile
+++ b/multimedia/p5-xmltv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/23 15:57:20 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:43 tv Exp $
 
 DISTNAME=	xmltv-0.5.39
 PKGNAME=	p5-${DISTNAME}
@@ -44,7 +44,6 @@ PERL5_REQD?=	5.6.0
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XMLTV/.packlist
 
 MAKE_PARAMS+=	PREFIX=${PREFIX:Q}
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 547a325e646..20962848ead 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=	smpeg-xmms-0.3.5
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.xmms.org/
 COMMENT=	MPEG video plugin using SDL/smpeg as the backend
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index f7565afd7aa..021eab5b87c 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=	smpeg-0.4.4
@@ -13,7 +13,6 @@ COMMENT=	SDL MPEG Player Library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index da2557c6ad3..9e3ed4615c9 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2005/03/22 16:37:32 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=	totem-1.0
@@ -14,7 +14,6 @@ PATCHDIR=	${.CURDIR}/../../multimedia/totem/patches
 PLIST_SRC=	${.CURDIR}/../../multimedia/totem/PLIST
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_DIRS+=		gnome2-1.5
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 11b28a64c35..a8f21eae153 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:43 tv Exp $
 
 DISTNAME=	transcode-0.6.12
 PKGREVISION=	6
@@ -12,7 +12,6 @@ COMMENT=	Command line video-stream processing tool
 
 BUILD_DEPENDS+=		nasm>=0.98.36:../../devel/nasm
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index dec5fb35577..952516421c3 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
@@ -11,7 +11,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
 COMMENT=		VideoLAN Client
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/multimedia/vls/Makefile b/multimedia/vls/Makefile
index c84226a8476..ddf25579419 100644
--- a/multimedia/vls/Makefile
+++ b/multimedia/vls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=		vls-0.5.6
@@ -10,7 +10,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.videolan.org/
 COMMENT=		VideoLAN Server
 
-USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index b0bb2d08d5c..785d82dde53 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/21 21:16:10 salo Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
 
 DISTNAME=	xanim2801
 PKGNAME=	xanim-2.80.1
@@ -22,7 +22,6 @@ EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
 .include "Makefile.codecs"
 
-USE_BUILDLINK3=	YES
 USE_IMAKE=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 7a4ee8d998c..e92f8789760 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=	xawtv_3.90
@@ -13,7 +13,6 @@ COMMENT=	TV application for Brooktree 848 compatible cards
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
-USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_PERL5=		build
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 379ae040b64..c1872c7e994 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/01/06 17:04:42 drochner Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=		xine-lib-1.0
@@ -19,7 +19,6 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		YES
 AUTOCONF_REQD=		2.58
 USE_PKGLOCALEDIR=	YES
-USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	misc/libxine.pc.in
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 49b44bfb516..6252eb8328c 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/03/27 15:42:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=		xine-ui-0.99.2
@@ -15,7 +15,6 @@ BUILD_USES_MSGFMT=	YES
 BUILDLINK_DEPENDS.curl=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
-USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_X11=		YES
 USE_LIBTOOL=		YES
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 2b0fa96ec7f..31666abfded 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/14 20:34:42 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
 
 DISTNAME=	xvid4conf-1.12
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://zebra.fh-weingarten.de/~transcode/
 COMMENT=	XviD Configuration Panel
                                                                                 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK3=	YES
 USE_X11=	YES
 
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 051bbab3502..e8f237dde2b 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/01/18 13:04:13 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:43 tv Exp $
 #
 
 DISTNAME=	xvidcore-1.0.3
@@ -17,7 +17,6 @@ BUILD_DEPENDS+=	nasm>=0.98.34:../../devel/nasm
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
-USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 MAKE_ENV+=	MKDIR="${MKDIR}"