6 files changed, 10 insertions, 69 deletions

diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index 4bbcadc6603d..8dbaa0a72070 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	libmusicbrainz
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
+MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
+		ftp://ftp.au.musicbrainz.org/pub/musicbrainz/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	2nd generation incarnation of the CD Index - audio metadata
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
-CONFLICTS=	musicbrainz-*
+CONFLICTS=	musicbrainz-1.*
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
-		 s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz/distinfo b/audio/libmusicbrainz/distinfo
index 108d4bee0399..397cde705de9 100644
--- a/audio/libmusicbrainz/distinfo
+++ b/audio/libmusicbrainz/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmusicbrainz-2.1.1.tar.gz) = 4f753d93a85cf413e00f1394b8cbd269
-SHA256 (libmusicbrainz-2.1.1.tar.gz) = a40ae7bfe8d2a3ba54c3850282a181e953bfc31b2ec274f0db7cf81f96a8f56b
-SIZE (libmusicbrainz-2.1.1.tar.gz) = 528162
+MD5 (libmusicbrainz-2.1.2.tar.gz) = 88d35af903665fecbdee77eb6d5e6cdd
+SHA256 (libmusicbrainz-2.1.2.tar.gz) = f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
+SIZE (libmusicbrainz-2.1.2.tar.gz) = 504432
diff --git a/audio/libmusicbrainz/files/patch-examples_getalbum.c b/audio/libmusicbrainz/files/patch-examples_getalbum.c
deleted file mode 100644
index a5842dfd606a..000000000000
--- a/audio/libmusicbrainz/files/patch-examples_getalbum.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- examples/getalbum.c.orig	Wed Mar 17 00:05:57 2004
-+++ examples/getalbum.c	Wed Mar 17 00:06:35 2004
-@@ -30,7 +30,7 @@
- {
-     musicbrainz_t o;
-     char          error[256], data[256], temp[256], *args[2];
--    int           ret, numTracks, trackNum, i, isMultipleArtist = 0;
-+    int           ret, numTracks, numDates, trackNum, i, isMultipleArtist = 0;
- 
-     if (argc < 2)
-     {
-@@ -141,7 +141,7 @@
-     if (mb_GetResultData(o, MBE_AlbumGetAmazonCoverartURL, data, 256))
-        printf("CoverartURL: %s\n", data);
- 
--    int numDates = mb_GetResultInt(o, MBE_AlbumGetNumReleaseDates);
-+    numDates = mb_GetResultInt(o, MBE_AlbumGetNumReleaseDates);
-     for(i = 1; i <= numDates; i++)
-     {
-         // Select the first release date
diff --git a/audio/libmusicbrainz/files/patch-ltmain.sh b/audio/libmusicbrainz/files/patch-ltmain.sh
deleted file mode 100644
index 285ecfe5d590..000000000000
--- a/audio/libmusicbrainz/files/patch-ltmain.sh
+++ /dev/null
@@ -1,25 +0,0 @@
---- ltmain.sh.orig	Thu Aug 23 07:47:42 2001
-+++ ltmain.sh	Tue Dec 11 22:07:52 2001
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/audio/libmusicbrainz/files/patch-mb_freebsd.cpp b/audio/libmusicbrainz/files/patch-mb_freebsd.cpp
deleted file mode 100644
index cd0e810a8cc0..000000000000
--- a/audio/libmusicbrainz/files/patch-mb_freebsd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- osdep/mb_freebsd.cpp.orig	Tue Jul 10 00:22:07 2001
-+++ osdep/mb_freebsd.cpp	Wed Aug 14 01:48:18 2002
-@@ -34,6 +34,8 @@
- #include <fcntl.h>
- #include <assert.h>
- 
-+#include <netinet/in.h>
-+
- #include "mb.h"
- #include "diskid.h"
- #include "config.h"
diff --git a/audio/libmusicbrainz/pkg-descr b/audio/libmusicbrainz/pkg-descr
index dfcf673c8cd0..8786b0cb14e0 100644
--- a/audio/libmusicbrainz/pkg-descr
+++ b/audio/libmusicbrainz/pkg-descr
@@ -4,6 +4,4 @@ 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.
 
-WWW: http://www.musicbrainz.org/
-
-Roman Shterenzon <roman@xpert.com>
+WWW: http://musicbrainz.org/