5 files changed, 33 insertions, 32 deletions

diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index 7973c3b17f45..de8f8ecc2008 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -6,33 +6,20 @@
 #
 
 PORTNAME=	musicbrainz
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
 MAINTAINER=	roman@xpert.com
 
-USE_AUTOCONF=	yes
-USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_LIBTOOL=	yes
 USE_NEWGCC=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
-
-pre-extract:
-.if !defined(WITHOUT_VORBIS)
-	@${ECHO}
-	@${ECHO} "You can disable Vorbis support by defining WITHOUT_VORBIS"
-	@${ECHO}
-LIB_DEPENDS+=	vorbis.0:${PORTSDIR}/audio/libvorbis
-HAVE_VORBIS=	yes
-.endif
-
-post-extract:
-	@${RM} ${WRKSRC}/config.sub ${WRKSRC}/config.guess ;\
-	${LN} -s ${AUTOCONF_DIR}/config.* ${WRKSRC}/ ;\
-	${PERL} -pi -e 's/-ldl//g' ${WRKSRC}/examples/Makefile.*
+post-patch:
+	@${PERL} -pi -e 's|^CFLAGS=|#CFLAGS=|g ; \
+		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz/distinfo b/audio/libmusicbrainz/distinfo
index e5621adc9b59..eeb3bf643c8f 100644
--- a/audio/libmusicbrainz/distinfo
+++ b/audio/libmusicbrainz/distinfo
@@ -1 +1 @@
-MD5 (musicbrainz-1.0.0.tar.bz2) = 3c1739cb488de8677319c639e6c2081d
+MD5 (musicbrainz-1.0.1.tar.bz2) = dfe8253f6d1c73c89dc06c00e3c35e11
diff --git a/audio/libmusicbrainz/files/patch-configure.in b/audio/libmusicbrainz/files/patch-configure.in
deleted file mode 100644
index e1597916e509..000000000000
--- a/audio/libmusicbrainz/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sat May 19 14:53:45 2001
-+++ configure.in	Sat May 19 14:53:51 2001
-@@ -5,8 +5,6 @@
- AM_INIT_AUTOMAKE(musicbrainz, "$VERSION")
- dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
- 
--CFLAGS="-Wall -O2"
--CPPFLAGS="-Wall -O2"
- 
- dnl Canonicalize host.
- AC_CANONICAL_HOST
diff --git a/audio/libmusicbrainz/files/patch-ltmain.sh b/audio/libmusicbrainz/files/patch-ltmain.sh
new file mode 100644
index 000000000000..285ecfe5d590
--- /dev/null
+++ b/audio/libmusicbrainz/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- 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/pkg-plist b/audio/libmusicbrainz/pkg-plist
index ad2d75deff8a..e9361f246c19 100644
--- a/audio/libmusicbrainz/pkg-plist
+++ b/audio/libmusicbrainz/pkg-plist
@@ -1,4 +1,4 @@
-include/musicbrainz/bitprint.h
+include/musicbrainz/bitprintinfo.h
 include/musicbrainz/bitzi/bitcollider.h
 include/musicbrainz/bitzi/gui_win32.h
 include/musicbrainz/bitzi/list.h