Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

38 files changed, 325 insertions, 23 deletions

diff --git a/audio/arts/buildlink2.mk b/audio/arts/buildlink2.mk
new file mode 100644
index 00000000000..f9e6e28c8a1
--- /dev/null
+++ b/audio/arts/buildlink2.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:43 jlam Exp $
+
+.if !defined(ARTS_BUILDLINK2_MK)
+ARTS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		arts
+BUILDLINK_DEPENDS.arts?=	arts>=1.0.0
+BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.arts=arts
+BUILDLINK_PREFIX.arts_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.arts!=	${GREP} "^\(include\|lib\)" ${.CURDIR}/../../audio/arts/PLIST
+
+BUILDLINK_TARGETS+=		arts-buildlink
+
+arts-buildlink: _BUILDLINK_USE
+
+.endif	# ARTS_BUILDLINK2_MK
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index e5d47973cd7..edf07f55335 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/17 07:54:03 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 19:21:44 jlam Exp $
 
 SHA1 (arts-1.0.2.tar.bz2) = ad22ce03239de351f47e317b21050edace810fce
 Size (arts-1.0.2.tar.bz2) = 1017488 bytes
diff --git a/audio/arts/patches/patch-aa b/audio/arts/patches/patch-aa
index 7ab9936e95c..87280e83221 100644
--- a/audio/arts/patches/patch-aa
+++ b/audio/arts/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:21:44 jlam Exp $
 
 --- Makefile.in.orig	Wed May  8 19:59:26 2002
 +++ Makefile.in
diff --git a/audio/arts/patches/patch-ab b/audio/arts/patches/patch-ab
index b213df8a127..f017f2c83d6 100644
--- a/audio/arts/patches/patch-ab
+++ b/audio/arts/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/07/17 07:54:04 skrll Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 19:21:45 jlam Exp $
 
 --- artsc/artsdsp.c.orig	Mon Jun 24 17:55:50 2002
 +++ artsc/artsdsp.c
diff --git a/audio/arts/patches/patch-ac b/audio/arts/patches/patch-ac
index cb944ae37bf..9cadc3a3b94 100644
--- a/audio/arts/patches/patch-ac
+++ b/audio/arts/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/07/17 07:54:04 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 19:21:45 jlam Exp $
 
 --- flow/cpuinfo.cc.orig	Mon Mar 18 12:39:39 2002
 +++ flow/cpuinfo.cc
diff --git a/audio/arts/patches/patch-ad b/audio/arts/patches/patch-ad
index de6e0336b97..42f77c79f25 100644
--- a/audio/arts/patches/patch-ad
+++ b/audio/arts/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:21:45 jlam Exp $
 
 --- soundserver/Makefile.am.orig	Wed May  8 19:57:54 2002
 +++ soundserver/Makefile.am
diff --git a/audio/arts/patches/patch-ae b/audio/arts/patches/patch-ae
index 72bf0475a22..f2263c3a5dc 100644
--- a/audio/arts/patches/patch-ae
+++ b/audio/arts/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:21:45 jlam Exp $
 
 --- soundserver/Makefile.in.orig	Wed May  8 19:59:27 2002
 +++ soundserver/Makefile.in
diff --git a/audio/arts/patches/patch-af b/audio/arts/patches/patch-af
index 1a002600c4e..cba426b41f2 100644
--- a/audio/arts/patches/patch-af
+++ b/audio/arts/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/31 15:02:58 skrll Exp $
+$NetBSD: patch-af,v 1.2 2002/08/25 19:21:45 jlam Exp $
 
 --- flow/gsl/gslcommon.c.orig	Thu May 30 13:24:35 2002
 +++ flow/gsl/gslcommon.c
diff --git a/audio/cdparanoia/buildlink2.mk b/audio/cdparanoia/buildlink2.mk
new file mode 100644
index 00000000000..2e897d3ac78
--- /dev/null
+++ b/audio/cdparanoia/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:46 jlam Exp $
+
+.if !defined(CDPARANOIA_BUILDLINK2_MK)
+CDPARANOIA_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			cdparanoia
+BUILDLINK_DEPENDS.cdparanoia?=		cdparanoia>=3.0
+BUILDLINK_PKGSRCDIR.cdparanoia?=	../../audio/cdparanoia
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.cdparanoia=cdparanoia
+BUILDLINK_PREFIX.cdparanoia_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.cdparanoia=	include/cdparanoia/*
+BUILDLINK_FILES.cdparanoia+=	lib/libcdda_paranoia.*
+BUILDLINK_FILES.cdparanoia+=	lib/libcdda_interface.*
+
+BUILDLINK_TARGETS+=	cdparanoia-buildlink
+
+cdparanoia-buildlink: _BUILDLINK_USE
+
+.endif	# CDPARANOIA_BUILDLINK2_MK
diff --git a/audio/flac/buildlink2.mk b/audio/flac/buildlink2.mk
new file mode 100644
index 00000000000..739bd289b78
--- /dev/null
+++ b/audio/flac/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:46 jlam Exp $
+
+.if !defined(FLAC_BUILDLINK2_MK)
+FLAC_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		flac
+BUILDLINK_DEPENDS.flac?=	flac>=1.0
+BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.flac=flac
+BUILDLINK_PREFIX.flac_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.flac=		include/FLAC/*
+BUILDLINK_FILES.flac+=		lib/libFLAC.*
+
+BUILDLINK_TARGETS+=	flac-buildlink
+
+flac-buildlink: _BUILDLINK_USE
+
+.endif	# FLAC_BUILDLINK2_MK
diff --git a/audio/gsm/buildlink2.mk b/audio/gsm/buildlink2.mk
new file mode 100644
index 00000000000..a2b17e2809f
--- /dev/null
+++ b/audio/gsm/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:47 jlam Exp $
+
+.if !defined(GSM_BUILDLINK2_MK)
+GSM_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gsm
+BUILDLINK_DEPENDS.gsm?=		gsm>=1.0.10
+BUILDLINK_PKGSRCDIR.gsm?=	../../audio/gsm
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gsm=gsm
+BUILDLINK_PREFIX.gsm_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gsm=	include/gsm.h
+BUILDLINK_FILES.gsm+=	include/gsm/*
+BUILDLINK_FILES.gsm+=	lib/libgsm.*
+
+BUILDLINK_TARGETS+=	gsm-buildlink
+
+gsm-buildlink: _BUILDLINK_USE
+
+.endif	# GSM_BUILDLINK2_MK
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index 5e5997e7d04..ef857775b20 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/05/12 10:16:45 abs Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:21:47 jlam Exp $
 #
 
 DISTNAME=	id3lib-3.8.0pre2
diff --git a/audio/id3lib/buildlink2.mk b/audio/id3lib/buildlink2.mk
new file mode 100644
index 00000000000..c500af05418
--- /dev/null
+++ b/audio/id3lib/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:48 jlam Exp $
+
+.if !defined(ID3LIB_BUILDLINK2_MK)
+ID3LIB_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		id3lib
+BUILDLINK_DEPENDS.id3lib?=	id3lib>=3.8.0
+BUILDLINK_PKGSRCDIR.id3lib?=	../../audio/id3lib
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.id3lib=id3lib
+BUILDLINK_PREFIX.id3lib_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.id3lib=		include/id3.h
+BUILDLINK_FILES.id3lib+=	include/id3/*
+BUILDLINK_FILES.id3lib+=	lib/libid3*.*
+
+BUILDLINK_TARGETS+=	id3lib-buildlink
+
+id3lib-buildlink: _BUILDLINK_USE
+
+.endif	# ID3LIB_BUILDLINK2_MK
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 117ef358284..7bcd5d5db5f 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/05/25 12:47:59 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 19:21:48 jlam Exp $
 #
 
 VERS=		3.92
diff --git a/audio/lame/buildlink2.mk b/audio/lame/buildlink2.mk
new file mode 100644
index 00000000000..35f8a29ee39
--- /dev/null
+++ b/audio/lame/buildlink2.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:49 jlam Exp $
+
+.if !defined(LAME_BUILDLINK2_MK)
+LAME_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		lame
+BUILDLINK_DEPENDS.lame?=	lame>=3.89
+BUILDLINK_PKGSRCDIR.lame?=	../../audio/lame
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.lame=lame
+BUILDLINK_PREFIX.lame=	${LOCALBASE}
+BUILDLINK_FILES.lame=	include/lame/lame.h
+
+BUILDLINK_TARGETS+=	lame-buildlink
+
+lame-buildlink: _BUILDLINK_USE
+
+.endif	# LAME_BUILDLINK2_MK
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 467aca42b36..94170817a22 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/25 12:47:59 hubertf Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 19:21:49 jlam Exp $
 
 SHA1 (lame-3.92.tar.gz) = 97be7804c7c89b088726124163de94b7432d5ea4
 Size (lame-3.92.tar.gz) = 970894 bytes
diff --git a/audio/lame/patches/patch-ac b/audio/lame/patches/patch-ac
index 644fa97cb7a..aa2e31b7a71 100644
--- a/audio/lame/patches/patch-ac
+++ b/audio/lame/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/25 12:47:59 hubertf Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:21:49 jlam Exp $
 
 --- frontend/Makefile.in.orig	Fri Apr 12 21:38:18 2002
 +++ frontend/Makefile.in
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 8995f6960e3..6902f24772f 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/16 02:50:02 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 19:21:50 jlam Exp $
 #
 
 DISTNAME=	libcdaudio-0.99.6
diff --git a/audio/libcdaudio/buildlink2.mk b/audio/libcdaudio/buildlink2.mk
new file mode 100644
index 00000000000..5ddec4ff5b9
--- /dev/null
+++ b/audio/libcdaudio/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:51 jlam Exp $
+
+.if !defined(LIBCDAUDIO_BUILDLINK2_MK)
+LIBCDAUDIO_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			libcdaudio
+BUILDLINK_DEPENDS.libcdaudio?=		libcdaudio>=0.99.4nb1
+BUILDLINK_PKGSRCDIR.libcdaudio?=	../../audio/libcdaudio
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libcdaudio=libcdaudio
+BUILDLINK_PREFIX.libcdaudio_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libcdaudio=		include/cdaudio.h
+BUILDLINK_FILES.libcdaudio+=		lib/libcdaudio.*
+
+BUILDLINK_TARGETS+=	libcdaudio-buildlink
+
+libcdaudio-buildlink: _BUILDLINK_USE
+
+.endif	# LIBCDAUDIO_BUILDLINK2_MK
diff --git a/audio/libcdaudio/distinfo b/audio/libcdaudio/distinfo
index ec72a541c86..d85a75ff1a5 100644
--- a/audio/libcdaudio/distinfo
+++ b/audio/libcdaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/06 03:19:22 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:21:51 jlam Exp $
 
 SHA1 (libcdaudio-0.99.6.tar.gz) = a75bd8c8204081d05f09e7c1139f26e9ca7cf801
 Size (libcdaudio-0.99.6.tar.gz) = 262260 bytes
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 9697c896b6f..ceace402b41 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/07/13 01:03:35 mycroft Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 19:21:51 jlam Exp $
 
 DISTNAME=		libmikmod-3.1.10
 CATEGORIES=		audio
diff --git a/audio/libmikmod/PLIST b/audio/libmikmod/PLIST
index 16604d22d4f..6ae063f0359 100644
--- a/audio/libmikmod/PLIST
+++ b/audio/libmikmod/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/13 01:03:35 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:21:51 jlam Exp $
 bin/libmikmod-config
 include/mikmod.h
 @unexec ${INSTALL_INFO} --delete %D/info/mikmod.info %D/info/dir
diff --git a/audio/libmikmod/buildlink2.mk b/audio/libmikmod/buildlink2.mk
new file mode 100644
index 00000000000..6724f4a5af1
--- /dev/null
+++ b/audio/libmikmod/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:52 jlam Exp $
+
+.if !defined(LIBMIKMOD_BUILDLINK2_MK)
+LIBMIKMOD_BUILDLINK2_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_PACKAGES+=		libmikmod
+BUILDLINK_DEPENDS.libmikmod?=	libmikmod>=3.1.9
+BUILDLINK_PKGSRCDIR.libmikmod?=	../../audio/libmikmod
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libmikmod=libmikmod
+BUILDLINK_PREFIX.libmikmod_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libmikmod=	include/mikmod.h
+BUILDLINK_FILES.libmikmod+=	lib/libmikmod.*
+
+BUILDLINK_TARGETS+=	libmikmod-buildlink
+
+libmikmod-buildlink: _BUILDLINK_USE
+
+.endif	# LIBMIKMOD_BUILDLINK2_MK
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 1abe16f843e..1061d245e6d 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/13 01:03:35 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 19:21:52 jlam Exp $
 
 SHA1 (libmikmod-3.1.10.tar.gz) = 8d4daec66b17e556e8977cb077c4186111808e0d
 Size (libmikmod-3.1.10.tar.gz) = 528929 bytes
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index b88db973800..a9285c4962c 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2002/07/13 01:03:35 mycroft Exp $
+$NetBSD: patch-ac,v 1.6 2002/08/25 19:21:52 jlam Exp $
 
 --- configure.orig	Tue Jan 22 01:21:19 2002
 +++ configure	Thu Jul 11 02:05:35 2002
diff --git a/audio/libmikmod/patches/patch-ad b/audio/libmikmod/patches/patch-ad
index a26023f7b11..8c72744d5cc 100644
--- a/audio/libmikmod/patches/patch-ad
+++ b/audio/libmikmod/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2002/07/13 01:03:35 mycroft Exp $
+$NetBSD: patch-ad,v 1.6 2002/08/25 19:21:52 jlam Exp $
 
 --- drivers/drv_sun.c.orig	Sun Jan 13 00:58:57 2002
 +++ drivers/drv_sun.c	Thu Jul 11 02:12:04 2002
diff --git a/audio/libsidplay/buildlink2.mk b/audio/libsidplay/buildlink2.mk
new file mode 100644
index 00000000000..74ad15a0937
--- /dev/null
+++ b/audio/libsidplay/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:53 jlam Exp $
+
+.if !defined(LIBSIDPLAY_BUILDLINK2_MK)
+LIBSIDPLAY_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			libsidplay
+BUILDLINK_DEPENDS.libsidplay?=		libsidplay>=1.36.38
+BUILDLINK_PKGSRCDIR.libsidplay?=	../../audio/libsidplay
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libsidplay=libsidplay
+BUILDLINK_PREFIX.libsidplay_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libsidplay=	include/sidplay/*
+BUILDLINK_FILES.libsidplay+=	lib/libsidplay.*
+
+BUILDLINK_TARGETS+=	libsidplay-buildlink
+
+libsidplay-buildlink: _BUILDLINK_USE
+
+.endif	# LIBSIDPLAY_BUILDLINK2_MK
diff --git a/audio/mad/PLIST b/audio/mad/PLIST
index 4e40350e490..978badedff0 100644
--- a/audio/mad/PLIST
+++ b/audio/mad/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/31 10:41:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:21:53 jlam Exp $
 bin/abxtest
 bin/madplay
 include/id3tag.h
diff --git a/audio/mad/buildlink.mk b/audio/mad/buildlink.mk
index 8423d9ad218..839a68c9d7b 100644
--- a/audio/mad/buildlink.mk
+++ b/audio/mad/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/28 00:05:08 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/08/25 19:21:53 jlam Exp $
 #
 # This Makefile fragment is included by packages that use mad.
 #
diff --git a/audio/mad/buildlink2.mk b/audio/mad/buildlink2.mk
new file mode 100644
index 00000000000..5a59ad34e5f
--- /dev/null
+++ b/audio/mad/buildlink2.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:54 jlam Exp $
+
+.if !defined(MAD_BUILDLINK2_MK)
+MAD_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		mad
+BUILDLINK_DEPENDS.mad?=		mad>=0.14.2b
+BUILDLINK_PKGSRCDIR.mad?=	../../audio/mad
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.mad=mad
+BUILDLINK_PREFIX.mad_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.mad=		include/id3tag.h
+BUILDLINK_FILES.mad+=		include/mad.h
+BUILDLINK_FILES.mad+=		lib/libid3tag.*
+BUILDLINK_FILES.mad+=		lib/libmad.*
+
+#.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		mad-buildlink
+
+mad-buildlink: _BUILDLINK_USE
+
+.endif	# MAD_BUILDLINK2_MK
diff --git a/audio/musicbrainz/buildlink2.mk b/audio/musicbrainz/buildlink2.mk
new file mode 100644
index 00000000000..1d851db80ba
--- /dev/null
+++ b/audio/musicbrainz/buildlink2.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:55 jlam Exp $
+
+.if !defined(MUSICBRAINZ_BUILDLINK2_MK)
+MUSICBRAINZ_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			musicbrainz
+BUILDLINK_DEPENDS.musicbrainz?=		musicbrainz>=1.1.0
+BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.musicbrainz=musicbrainz
+BUILDLINK_PREFIX.musicbrainz_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.musicbrainz=	include/musicbrainz/*
+BUILDLINK_FILES.musicbrainz+=	include/musicbrainz/*/*
+BUILDLINK_FILES.musicbrainz+=	lib/libmusicbrainz.*
+
+BUILDLINK_TARGETS+=	musicbrainz-buildlink
+
+musicbrainz-buildlink: _BUILDLINK_USE
+
+.endif	# MUSICBRAINZ_BUILDLINK2_MK
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index cc2366f2094..8de58b8c2dd 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/06/09 20:21:08 tron Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 19:21:55 jlam Exp $
 # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
 #
 
diff --git a/audio/nas/buildlink2.mk b/audio/nas/buildlink2.mk
new file mode 100644
index 00000000000..cd825f17dc8
--- /dev/null
+++ b/audio/nas/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:55 jlam Exp $
+
+.if !defined(NAS_BUILDLINK2_MK)
+NAS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		nas
+BUILDLINK_DEPENDS.nas?=		nas>=1.4.2
+BUILDLINK_PKGSRCDIR.nas?=	../../audio/nas
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.nas=nas
+BUILDLINK_PREFIX.nas_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.nas=	include/audio/*
+BUILDLINK_FILES.nas+=	lib/libaudio.*
+
+BUILDLINK_TARGETS+=	nas-buildlink
+
+nas-buildlink: _BUILDLINK_USE
+
+.endif	# NAS_BUILDLINK2_MK
diff --git a/audio/rplay/buildlink2.mk b/audio/rplay/buildlink2.mk
new file mode 100644
index 00000000000..b8937de9bff
--- /dev/null
+++ b/audio/rplay/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:56 jlam Exp $
+
+.if !defined(RPLAY_BUILDLINK2_MK)
+RPLAY_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		rplay
+BUILDLINK_DEPENDS.rplay?=	rplay>=3.3.2
+BUILDLINK_PKGSRCDIR.rplay?=	../../audio/rplay
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.rplay=rplay
+BUILDLINK_PREFIX.rplay_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.rplay=	include/rplay.h
+BUILDLINK_FILES.rplay+=	lib/librplay.*
+
+BUILDLINK_TARGETS+=	rplay-buildlink
+
+rplay-buildlink: _BUILDLINK_USE
+
+.endif	# RPLAY_BUILDLINK2_MK
diff --git a/audio/wsoundserver/buildlink2.mk b/audio/wsoundserver/buildlink2.mk
new file mode 100644
index 00000000000..85c0fb0d175
--- /dev/null
+++ b/audio/wsoundserver/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:57 jlam Exp $
+
+.if !defined(WSOUND_BUILDLINK2_MK)
+WSOUND_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		wsound
+BUILDLINK_DEPENDS.wsound?=	wsoundserver>=0.4.0
+BUILDLINK_PKGSRCDIR.wsound?=	wsoundserver
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.wsound=wsoundserver
+BUILDLINK_FILES.wsound=		include/wsound.h
+BUILDLINK_FILES.wsound+=	lib/libwsound.*
+
+.include "../../audio/libaudiofile/buildlink2.mk"
+.include "../../devel/libproplist/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	wsound-buildlink
+
+wsound-buildlink: _BUILDLINK_USE
+
+.endif	# WSOUND_BUILDLINK2_MK
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index c2ff8ee6250..b51a7d05795 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/08/08 16:17:06 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2002/08/25 19:21:57 jlam Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
 
 DISTNAME=	xmms-1.2.7
diff --git a/audio/xmms/buildlink.mk b/audio/xmms/buildlink.mk
index 1f77225f627..9712c2d9a0d 100644
--- a/audio/xmms/buildlink.mk
+++ b/audio/xmms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/08/08 16:17:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:21:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xmms.
 #
diff --git a/audio/xmms/buildlink2.mk b/audio/xmms/buildlink2.mk
new file mode 100644
index 00000000000..ffd4b872851
--- /dev/null
+++ b/audio/xmms/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:58 jlam Exp $
+
+.if !defined(XMMS_BUILDLINK2_MK)
+XMMS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		xmms
+BUILDLINK_DEPENDS.xmms?=	xmms>=1.2.7nb1
+BUILDLINK_PKGSRCDIR.xmms?=	../../audio/xmms
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.xmms=xmms
+BUILDLINK_PREFIX.xmms_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.xmms=	include/xmms/*
+BUILDLINK_FILES.xmms+=	lib/libxmms.*
+
+PTHREAD_OPTS+=		require
+
+.include "../../x11/gtk/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
+BUILDLINK_TARGETS+=	xmms-buildlink
+
+xmms-buildlink: _BUILDLINK_USE
+
+.endif	# XMMS_BUILDLINK2_MK