4 files changed, 77 insertions, 47 deletions

diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 8ca7497369da..680c018421cd 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -5,20 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libmusicbrainz3
-PORTVERSION=	3.0.3
-PORTREVISION=	1
+PORTNAME=	libmusicbrainz4
+PORTVERSION=	4.0.0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		http://uk.musicbrainz.org/pub/musicbrainz/ \
 		http://ftp.osuosl.org/pub/musicbrainz/
-DISTNAME=	${PORTNAME:S/3//}-${PORTVERSION}
+DISTNAME=	${PORTNAME:S/4//}-${PORTVERSION}
 
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	MusicBrainz client library for audio metadata lookup
 
-LIB_DEPENDS=	discid:${PORTSDIR}/audio/libdiscid \
-		neon.27:${PORTSDIR}/www/neon29
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
+
+LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29
 
 USE_CMAKE=	yes
 USE_GNOME=	pkgconfig
@@ -26,11 +27,8 @@ USE_LDCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING.txt
-
 post-patch:
 	${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
-		-e '/CppUnit/d' ${WRKSRC}/CMakeLists.txt
+		 ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz5/distinfo b/audio/libmusicbrainz5/distinfo
index 31b01f9cadba..62f738190e1d 100644
--- a/audio/libmusicbrainz5/distinfo
+++ b/audio/libmusicbrainz5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmusicbrainz-3.0.3.tar.gz) = 7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5
-SIZE (libmusicbrainz-3.0.3.tar.gz) = 105837
+SHA256 (libmusicbrainz-4.0.0.tar.gz) = 30b139f51ee8c5bbe8803bdd6b24747276825f3cff7648ac72fba3c9d8f2e94a
+SIZE (libmusicbrainz-4.0.0.tar.gz) = 126597
diff --git a/audio/libmusicbrainz5/pkg-descr b/audio/libmusicbrainz5/pkg-descr
index a3bbafcbbc29..bbfbc0cd2f2d 100644
--- a/audio/libmusicbrainz5/pkg-descr
+++ b/audio/libmusicbrainz5/pkg-descr
@@ -1,5 +1,5 @@
 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.
+allowing metadata lookup for audio files. This is version 4.x which supports
+version 2 of the XML Web Service.
 
 WWW: http://musicbrainz.org/
diff --git a/audio/libmusicbrainz5/pkg-plist b/audio/libmusicbrainz5/pkg-plist
index ef554288f4b0..25d3f053bc31 100644
--- a/audio/libmusicbrainz5/pkg-plist
+++ b/audio/libmusicbrainz5/pkg-plist
@@ -1,33 +1,65 @@
-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/label.h
-include/musicbrainz3/labelalias.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/releasegroup.h
-include/musicbrainz3/results.h
-include/musicbrainz3/tag.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.3.0
-libdata/pkgconfig/libmusicbrainz3.pc
-@dirrm include/musicbrainz3
+include/musicbrainz4/Alias.h
+include/musicbrainz4/AliasList.h
+include/musicbrainz4/Annotation.h
+include/musicbrainz4/AnnotationList.h
+include/musicbrainz4/Artist.h
+include/musicbrainz4/ArtistCredit.h
+include/musicbrainz4/ArtistList.h
+include/musicbrainz4/Attribute.h
+include/musicbrainz4/AttributeList.h
+include/musicbrainz4/CDStub.h
+include/musicbrainz4/CDStubList.h
+include/musicbrainz4/Collection.h
+include/musicbrainz4/CollectionList.h
+include/musicbrainz4/Disc.h
+include/musicbrainz4/DiscList.h
+include/musicbrainz4/Entity.h
+include/musicbrainz4/FreeDBDisc.h
+include/musicbrainz4/FreeDBDiscList.h
+include/musicbrainz4/HTTPFetch.h
+include/musicbrainz4/ISRC.h
+include/musicbrainz4/ISRCList.h
+include/musicbrainz4/Label.h
+include/musicbrainz4/LabelInfo.h
+include/musicbrainz4/LabelInfoList.h
+include/musicbrainz4/LabelList.h
+include/musicbrainz4/Lifespan.h
+include/musicbrainz4/List.h
+include/musicbrainz4/ListImpl.h
+include/musicbrainz4/Medium.h
+include/musicbrainz4/MediumList.h
+include/musicbrainz4/Message.h
+include/musicbrainz4/Metadata.h
+include/musicbrainz4/NameCredit.h
+include/musicbrainz4/NameCreditList.h
+include/musicbrainz4/NonMBTrack.h
+include/musicbrainz4/NonMBTrackList.h
+include/musicbrainz4/PUID.h
+include/musicbrainz4/PUIDList.h
+include/musicbrainz4/Query.h
+include/musicbrainz4/Rating.h
+include/musicbrainz4/Recording.h
+include/musicbrainz4/RecordingList.h
+include/musicbrainz4/Relation.h
+include/musicbrainz4/RelationList.h
+include/musicbrainz4/Release.h
+include/musicbrainz4/ReleaseGroup.h
+include/musicbrainz4/ReleaseGroupList.h
+include/musicbrainz4/ReleaseList.h
+include/musicbrainz4/Tag.h
+include/musicbrainz4/TagList.h
+include/musicbrainz4/TextRepresentation.h
+include/musicbrainz4/Track.h
+include/musicbrainz4/TrackList.h
+include/musicbrainz4/UserRating.h
+include/musicbrainz4/UserTag.h
+include/musicbrainz4/UserTagList.h
+include/musicbrainz4/Work.h
+include/musicbrainz4/WorkList.h
+include/musicbrainz4/mb4_c.h
+include/musicbrainz4/xmlParser.h
+lib/libmusicbrainz4.so
+lib/libmusicbrainz4.so.3
+lib/libmusicbrainz4.so.3.0.0
+libdata/pkgconfig/libmusicbrainz4.pc
+@dirrm include/musicbrainz4