4 files changed, 61 insertions, 34 deletions

diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index 161f98eddd5b..f768615e9d3b 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -1,31 +1,42 @@
-# New ports collection makefile for:	musicbrainz
-# Date Created:				26 Oct 2000
-# Whom:					Roman Shterenzon <roman@xpert.com>
+# New ports collection makefile for:	libmusicbrainz3
+# Date Created:				2007-05-17
+# Whom:					Jason E. Hale <bsdkaffee@gmail.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libmusicbrainz
-PORTVERSION=	2.1.5
+PORTNAME=	libmusicbrainz3
+PORTVERSION=	3.0.0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
     		http://uk.musicbrainz.org/pub/musicbrainz/
+DISTNAME=	${PORTNAME:S/3//}-${PORTVERSION}
 
 MAINTAINER=	bsdkaffee@gmail.com
-COMMENT=	2nd generation incarnation of the CD Index - audio metadata
+COMMENT=	MusicBrainz client library for audio metadata lookup
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+LIB_DEPENDS=	neon.26:${PORTSDIR}/www/neon
 
-CONFLICTS=	musicbrainz-1.*
+CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
+		-DCMAKE_C_COMPILER:STRING='${CC}' \
+		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
+		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
+		-DCMAKE_INSTALL_PREFIX=${PREFIX}
 
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnometarget pkgconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+pre-configure:
+	${MKDIR} ${WRKSRC}
+	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}\/pkgconfig|libdata\/pkgconfig|' \
+		${WRKSRC}/CMakeLists.txt
+
+do-configure:
+	@(cd ${WRKSRC}; \
+	${LOCALBASE}/bin/cmake ${CMAKE_ARGS})
+
+.include <bsd.port.post.mk>
diff --git a/audio/libmusicbrainz3/distinfo b/audio/libmusicbrainz3/distinfo
index b8ffd766f95a..b29cc231e5f0 100644
--- a/audio/libmusicbrainz3/distinfo
+++ b/audio/libmusicbrainz3/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmusicbrainz-2.1.5.tar.gz) = d5e19bb77edd6ea798ce206bd05ccc5f
-SHA256 (libmusicbrainz-2.1.5.tar.gz) = c6629c4bed428f9df3f89efc065b2d96f05eba36286532ebe8b8e404022371a0
-SIZE (libmusicbrainz-2.1.5.tar.gz) = 524243
+MD5 (libmusicbrainz-3.0.0.tar.gz) = 2665ae6bf003452b9a12e26a667292be
+SHA256 (libmusicbrainz-3.0.0.tar.gz) = fe717a7ef76601c41e9803bf336c8651806e493eb96de2d217a7531c29d671da
+SIZE (libmusicbrainz-3.0.0.tar.gz) = 94579
diff --git a/audio/libmusicbrainz3/pkg-descr b/audio/libmusicbrainz3/pkg-descr
index 8786b0cb14e0..a3bbafcbbc29 100644
--- a/audio/libmusicbrainz3/pkg-descr
+++ b/audio/libmusicbrainz3/pkg-descr
@@ -1,7 +1,5 @@
-MusicBrainz is the second generation incarnation of the CD Index.
-This server is designed to enable Audio CD and MP3/Vorbis players
-to download metadata about the music they are playing. All of the
-data collected on the Musicbrainz server is made available to the
-public under the OpenContent license.
+libmusicbrainz is a client library for accessing the MusicBrainz database
+allowing metadata lookup for audio files. This is version 3.x which uses the
+new XMLWebService.
 
 WWW: http://musicbrainz.org/
diff --git a/audio/libmusicbrainz3/pkg-plist b/audio/libmusicbrainz3/pkg-plist
index 707eadfae7a7..6beb1bae6289 100644
--- a/audio/libmusicbrainz3/pkg-plist
+++ b/audio/libmusicbrainz3/pkg-plist
@@ -1,11 +1,29 @@
-include/musicbrainz/browser.h
-include/musicbrainz/errors.h
-include/musicbrainz/mb_c.h
-include/musicbrainz/musicbrainz.h
-include/musicbrainz/queries.h
-lib/libmusicbrainz.a
-lib/libmusicbrainz.la
-lib/libmusicbrainz.so
-lib/libmusicbrainz.so.4
-libdata/pkgconfig/libmusicbrainz.pc
-@dirrm include/musicbrainz
+include/musicbrainz3/artist.h
+include/musicbrainz3/artistalias.h
+include/musicbrainz3/defines.h
+include/musicbrainz3/disc.h
+include/musicbrainz3/entity.h
+include/musicbrainz3/factory.h
+include/musicbrainz3/filters.h
+include/musicbrainz3/includes.h
+include/musicbrainz3/iwebservice.h
+include/musicbrainz3/lists.h
+include/musicbrainz3/mb_c.h
+include/musicbrainz3/mbxmlparser.h
+include/musicbrainz3/metadata.h
+include/musicbrainz3/model.h
+include/musicbrainz3/musicbrainz.h
+include/musicbrainz3/query.h
+include/musicbrainz3/relation.h
+include/musicbrainz3/release.h
+include/musicbrainz3/releaseevent.h
+include/musicbrainz3/results.h
+include/musicbrainz3/track.h
+include/musicbrainz3/user.h
+include/musicbrainz3/utils.h
+include/musicbrainz3/webservice.h
+lib/libmusicbrainz3.so
+lib/libmusicbrainz3.so.6
+lib/libmusicbrainz3.so.6.1.0
+libdata/pkgconfig/libmusicbrainz3.pc
+@dirrm include/musicbrainz3