Update musicbrainz to 2.0.2. Also add buildlink3.mk glue.

Changes are:
Changes for libmusicbrainz 2.0.2
-------------------------------------

   - Added support for Mac OS X
   - Improved build system
   - Added build files for Visual Studio .NET (VC7)

Changes for libmusicbrainz 2.0.1
-------------------------------------
   - Added patch for pkgconfig
   - Threading handled correctly in python wrapper
   - New perl bindings
   - Had client use HTTP 1.0 rather than HTTP 1.1

5 files changed, 43 insertions, 11 deletions

diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index d218aef7f91..ef2648edf86 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/01/22 07:15:00 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/09 00:07:36 chris Exp $
 
-DISTNAME=	libmusicbrainz-2.0.0
+DISTNAME=	libmusicbrainz-2.0.2
 PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
@@ -9,9 +9,17 @@ MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://www.musicbrainz.org/
 COMMENT=	Second generation incarnation of the CD Index
 
+PKG_INSTALLATION_TYPES= overwrite pkgviews
+
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	libmusicbrainz.pc.in
+
+CONFIGURE_ARGS+=	--enable-cpp-headers
 
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/musicbrainz/PLIST b/audio/musicbrainz/PLIST
index ce89ac8383d..09b95e1ce11 100644
--- a/audio/musicbrainz/PLIST
+++ b/audio/musicbrainz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/20 16:02:34 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/09 00:07:36 chris Exp $
 include/musicbrainz/bitprintinfo.h
 include/musicbrainz/bitzi/bitcollider.h
 include/musicbrainz/bitzi/gui_win32.h
@@ -13,6 +13,7 @@ lib/libmusicbrainz.a
 lib/libmusicbrainz.la
 lib/libmusicbrainz.so
 lib/libmusicbrainz.so.2
-lib/libmusicbrainz.so.2.0
+lib/libmusicbrainz.so.2.1
+lib/pkgconfig/libmusicbrainz.pc
 @dirrm include/musicbrainz/bitzi
 @dirrm include/musicbrainz
diff --git a/audio/musicbrainz/buildlink2.mk b/audio/musicbrainz/buildlink2.mk
index 71a248a37af..70f93333790 100644
--- a/audio/musicbrainz/buildlink2.mk
+++ b/audio/musicbrainz/buildlink2.mk
@@ -1,18 +1,21 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/02/20 16:02:35 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/09 00:07:36 chris Exp $
 
 .if !defined(MUSICBRAINZ_BUILDLINK2_MK)
 MUSICBRAINZ_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			musicbrainz
-BUILDLINK_DEPENDS.musicbrainz?=		musicbrainz>=2.0.0
+BUILDLINK_DEPENDS.musicbrainz?=		musicbrainz>=2.0.2
 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=	include/musicbrainz/*.h
+BUILDLINK_FILES.musicbrainz+=	include/musicbrainz/*/*.h
 BUILDLINK_FILES.musicbrainz+=	lib/libmusicbrainz.*
 
+.include "../../textproc/expat/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
 BUILDLINK_TARGETS+=	musicbrainz-buildlink
 
 musicbrainz-buildlink: _BUILDLINK_USE
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
new file mode 100644
index 00000000000..077a6b9c65f
--- /dev/null
+++ b/audio/musicbrainz/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/09 00:07:36 chris Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBMUSICBRAINZ_BUILDLINK3_MK:=	${LIBMUSICBRAINZ_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libmusicbrainz
+.endif
+
+.if !empty(LIBMUSICBRAINZ_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libmusicbrainz
+BUILDLINK_DEPENDS.libmusicbrainz?=		libmusicbrainz>=2.0.2
+BUILDLINK_PKGSRCDIR.libmusicbrainz?=		../../audio/libmusicbrainz
+
+.include "../../textproc/expat/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+
+.endif # LIBMUSICBRAINZ_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/musicbrainz/distinfo b/audio/musicbrainz/distinfo
index c45f9f0f5c5..35ef4c56bb7 100644
--- a/audio/musicbrainz/distinfo
+++ b/audio/musicbrainz/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/02/20 16:02:35 salo Exp $
+$NetBSD: distinfo,v 1.4 2004/02/09 00:07:36 chris Exp $
 
-SHA1 (libmusicbrainz-2.0.0.tar.gz) = ce5bc56be6678d68dd1c68ae1a922a0f69d03c72
-Size (libmusicbrainz-2.0.0.tar.gz) = 543169 bytes
+SHA1 (libmusicbrainz-2.0.2.tar.gz) = 7aaef31e4a5f6a7d2e8aa14c4b6b7167ee533301
+Size (libmusicbrainz-2.0.2.tar.gz) = 583123 bytes