Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

26 files changed, 137 insertions, 31 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index d3dd3c4ad2e..1761633b406 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/18 02:19:27 rh Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 18:38:05 jlam Exp $
 
 DISTNAME=		esound-0.2.26
 PKGREVISION=		1
@@ -9,7 +9,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.tux.org/~ricdude/EsounD.html
 COMMENT=		the Enlightened sound daemon
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
@@ -19,6 +19,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 EGDIR=			${PREFIX}/share/examples/esound
 CONF_FILES=		${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
 
-.include "../../audio/libaudiofile/buildlink.mk"
+.include "../../audio/libaudiofile/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/buildlink2.mk b/audio/esound/buildlink2.mk
new file mode 100644
index 00000000000..ec37357b4e5
--- /dev/null
+++ b/audio/esound/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:05 jlam Exp $
+
+.if !defined(ESOUND_BUILDLINK2_MK)
+ESOUND_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		esound
+BUILDLINK_DEPENDS.esound?=	esound>=0.2.18
+BUILDLINK_PKGSRCDIR.esound?=	../../audio/esound
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.esound=esound
+BUILDLINK_PREFIX.esound_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.esound=		include/esd.h
+BUILDLINK_FILES.esound+=	lib/libesd.*
+
+.include "../../audio/libaudiofile/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		esound-buildlink
+
+esound-buildlink: _BUILDLINK_USE
+
+.endif	# ESOUND_BUILDLINK2_MK
diff --git a/audio/esound/distinfo b/audio/esound/distinfo
index 46049d9d213..3d6acb8a756 100644
--- a/audio/esound/distinfo
+++ b/audio/esound/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/18 02:19:27 rh Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:38:06 jlam Exp $
 
 SHA1 (esound-0.2.26.tar.gz) = dffa3424120b896b879a2ea95f2c495a49dadc45
 Size (esound-0.2.26.tar.gz) = 349513 bytes
diff --git a/audio/esound/patches/patch-ad b/audio/esound/patches/patch-ad
index 0452ce3481c..9b82d999cb7 100644
--- a/audio/esound/patches/patch-ad
+++ b/audio/esound/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:28 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 18:38:07 jlam Exp $
 
 --- esound.pc.in.orig	Tue Apr 23 18:28:28 2002
 +++ esound.pc.in
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 73a5e4efe94..989fcf856f9 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/08/05 13:08:38 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2002/08/25 18:38:09 jlam Exp $
 
 DISTNAME=	libao-0.8.3
 CATEGORIES=	devel
@@ -9,7 +9,7 @@ COMMENT=	cross-platform audio library
 
 PLIST_SUBST+=	VERSION="${DISTNAME}"
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--disable-arts
@@ -19,5 +19,5 @@ USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/PLIST b/audio/libao/PLIST
index b576ec42880..e818657f04f 100644
--- a/audio/libao/PLIST
+++ b/audio/libao/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:08:39 lukem Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:10 jlam Exp $
 include/ao/ao.h
 include/ao/os_types.h
 include/ao/plugin.h
diff --git a/audio/libao/buildlink.mk b/audio/libao/buildlink.mk
index 6d3c276b805..13960596ecd 100644
--- a/audio/libao/buildlink.mk
+++ b/audio/libao/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2002/08/05 13:08:39 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.6 2002/08/25 18:38:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libao.
 #
diff --git a/audio/libao/buildlink2.mk b/audio/libao/buildlink2.mk
new file mode 100644
index 00000000000..3de907e7a76
--- /dev/null
+++ b/audio/libao/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:10 jlam Exp $
+
+.if !defined(LIBAO_BUILDLINK2_MK)
+LIBAO_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libao
+BUILDLINK_DEPENDS.libao?=	libao>=0.8.3
+BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.libao=libao
+BUILDLINK_PREFIX.libao=	${LOCALBASE}
+BUILDLINK_FILES.libao=	include/ao/ao.h
+BUILDLINK_FILES.libao+=	include/ao/os_types.h
+BUILDLINK_FILES.libao+=	lib/libao.*
+BUILDLINK_FILES.libao+=	lib/ao/*
+
+BUILDLINK_TARGETS+=	libao-buildlink
+
+libao-buildlink: _BUILDLINK_USE
+
+.endif	# LIBAO_BUILDLINK2_MK
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index 649f01d4e26..4d40c7c2cbb 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/08/05 13:08:39 lukem Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 18:38:10 jlam Exp $
 
 SHA1 (libao-0.8.3.tar.gz) = bf918997df2d99e60927cb5bc43b5d1e547811c0
 Size (libao-0.8.3.tar.gz) = 210690 bytes
diff --git a/audio/libao/patches/patch-ac b/audio/libao/patches/patch-ac
index 4b05bfe0118..7cec0fa9fc8 100644
--- a/audio/libao/patches/patch-ac
+++ b/audio/libao/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/08/05 13:08:39 lukem Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 18:38:11 jlam Exp $
 
 --- src/Makefile.in.orig	Sat Jul 20 00:17:44 2002
 +++ src/Makefile.in
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index d1d65fda1a3..d012c442a77 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/07/18 02:19:27 rh Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 18:38:11 jlam Exp $
 
 DISTNAME=		audiofile-0.2.3
 PKGNAME=		lib${DISTNAME}
@@ -11,8 +11,8 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://andromeda.68k.org/~michael/audiofile/
 COMMENT=		Sound library for SGI audio file
 
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/audio/libaudiofile/buildlink2.mk b/audio/libaudiofile/buildlink2.mk
new file mode 100644
index 00000000000..266840237fa
--- /dev/null
+++ b/audio/libaudiofile/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:12 jlam Exp $
+
+.if !defined(AUDIOFILE_BUILDLINK2_MK)
+AUDIOFILE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		audiofile
+BUILDLINK_DEPENDS.audiofile?=	libaudiofile>=0.2.1
+BUILDLINK_PKGSRCDIR.audiofile?=	../../audio/libaudiofile
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.audiofile=audiofile
+BUILDLINK_PREFIX.audiofile_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.audiofile=	include/af_vfs.h
+BUILDLINK_FILES.audiofile+=	include/audiofile.h
+BUILDLINK_FILES.audiofile+=	include/aupvlist.h
+BUILDLINK_FILES.audiofile+=	lib/libaudiofile.*
+
+BUILDLINK_TARGETS+=		audiofile-buildlink
+
+audiofile-buildlink: _BUILDLINK_USE
+
+.endif	# AUDIOFILE_BUILDLINK2_MK
diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo
index 5f88f1ec69e..75e9f4689cb 100644
--- a/audio/libaudiofile/distinfo
+++ b/audio/libaudiofile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/18 02:19:27 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 18:38:13 jlam Exp $
 
 SHA1 (audiofile-0.2.3.tar.gz) = 12bb67ba45985e258e5c077c33e5613f340e3e34
 Size (audiofile-0.2.3.tar.gz) = 332223 bytes
diff --git a/audio/libaudiofile/patches/patch-aa b/audio/libaudiofile/patches/patch-aa
index ce6ea251c07..5fe3122f854 100644
--- a/audio/libaudiofile/patches/patch-aa
+++ b/audio/libaudiofile/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2002/07/18 02:19:27 rh Exp $
+$NetBSD: patch-aa,v 1.8 2002/08/25 18:38:13 jlam Exp $
 
 --- audiofile.pc.in.orig	Fri Oct 26 14:11:38 2001
 +++ audiofile.pc.in
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index b200956f25a..b772feefe6c 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/05 13:10:14 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 18:38:13 jlam Exp $
 
 DISTNAME=	libogg-1.0
 PKGNAME=	libogg-1.0.0.8
@@ -9,7 +9,7 @@ MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.xiph.org/ogg/
 COMMENT=	Ogg project codecs library
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/audio/libogg/PLIST b/audio/libogg/PLIST
index a9a625efcbe..72948a44997 100644
--- a/audio/libogg/PLIST
+++ b/audio/libogg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:10:14 lukem Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:14 jlam Exp $
 include/ogg/config_types.h
 include/ogg/ogg.h
 include/ogg/os_types.h
diff --git a/audio/libogg/buildlink.mk b/audio/libogg/buildlink.mk
index 9745b92c56c..af2e1b48c5f 100644
--- a/audio/libogg/buildlink.mk
+++ b/audio/libogg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:10:14 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libogg.
 #
diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk
new file mode 100644
index 00000000000..1fcecd4af72
--- /dev/null
+++ b/audio/libogg/buildlink2.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:14 jlam Exp $
+
+.if !defined(LIBOGG_BUILDLINK2_MK)
+LIBOGG_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libogg
+BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.8
+BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libogg=libogg
+BUILDLINK_PREFIX.libogg_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libogg=		include/ogg/config_types.h
+BUILDLINK_FILES.libogg+=	include/ogg/ogg.h
+BUILDLINK_FILES.libogg+=	include/ogg/os_types.h
+BUILDLINK_FILES.libogg+=	lib/libogg.*
+
+BUILDLINK_TARGETS+=		libogg-buildlink
+
+libogg-buildlink: _BUILDLINK_USE
+
+.endif	# LIBOGG_BUILDLINK2_MK
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index 897a76970c7..8c8b9f12a0c 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/05 13:10:14 lukem Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:38:15 jlam Exp $
 
 SHA1 (libogg-1.0.tar.gz) = 2929e8867e566e9f7029cfacf0b4ccbe2f1f6cec
 Size (libogg-1.0.tar.gz) = 222625 bytes
diff --git a/audio/libogg/patches/patch-ab b/audio/libogg/patches/patch-ab
index c24db1dff14..89482e71c96 100644
--- a/audio/libogg/patches/patch-ab
+++ b/audio/libogg/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/08/05 13:10:14 lukem Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 18:38:15 jlam Exp $
 
 --- doc/ogg/Makefile.in.orig	Sat Jul 20 00:13:22 2002
 +++ doc/ogg/Makefile.in
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index b90d51aec9e..43c73a97090 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/05 13:11:22 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:16 jlam Exp $
 
 DISTNAME=	libvorbis-1.0
 PKGNAME=	libvorbis-1.0.0.8
@@ -11,10 +11,8 @@ COMMENT=	Library for the Ogg Vorbis audio encoding format
 
 #BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_DIR}
-
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
@@ -26,5 +24,5 @@ GCC_VERSION!=gcc --version
 .include "../../lang/gcc/Makefile.gcc"
 .endif
 
-.include "../../audio/libogg/buildlink.mk"
+.include "../../audio/libogg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 59722451714..69fa3f4342e 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:11:22 lukem Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:16 jlam Exp $
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index abca44beb6c..ced6444feb9 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:11:22 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.10 2002/08/25 18:38:16 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libvorbis.
 #
diff --git a/audio/libvorbis/buildlink2.mk b/audio/libvorbis/buildlink2.mk
new file mode 100644
index 00000000000..66da4cfcfa7
--- /dev/null
+++ b/audio/libvorbis/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:17 jlam Exp $
+
+.if !defined(LIBVORBIS_BUILDLINK2_MK)
+LIBVORBIS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		libvorbis
+BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.8
+BUILDLINK_PKGSRCDIR.libvorbis?=	../../audio/libvorbis
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libvorbis=libvorbis
+BUILDLINK_PREFIX.libvorbis_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libvorbis=	include/vorbis/*
+BUILDLINK_FILES.libvorbis+=	lib/libvorbis.*
+BUILDLINK_FILES.libvorbis+=	lib/libvorbisenc.*
+BUILDLINK_FILES.libvorbis+=	lib/libvorbisfile.*
+
+.include "../../audio/libogg/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	libvorbis-buildlink
+
+libvorbis-buildlink: _BUILDLINK_USE
+
+.endif	# LIBVORBIS_BUILDLINK2_MK
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index be8d2d3d752..73fe88e99af 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/05 13:11:22 lukem Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 18:38:17 jlam Exp $
 
 SHA1 (libvorbis-1.0.tar.gz) = 2b414cb4cf7d022d39b7be7049f2c84a287a4fc7
 Size (libvorbis-1.0.tar.gz) = 749064 bytes
diff --git a/audio/libvorbis/patches/patch-ae b/audio/libvorbis/patches/patch-ae
index 33298f82349..7942707baa5 100644
--- a/audio/libvorbis/patches/patch-ae
+++ b/audio/libvorbis/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/08/05 13:11:23 lukem Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 18:38:17 jlam Exp $
 
 --- doc/Makefile.in.orig	Sat Jul 20 00:12:33 2002
 +++ doc/Makefile.in