5 files changed, 35 insertions, 6 deletions

diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index 3c3772c97f74..6eaeb00d4557 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	musicbrainz
-PORTVERSION=	1.0.0.pre6
+PORTVERSION=	1.0.0
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
-DISTNAME=	${PORTNAME}-1.0.0pre6
 
 MAINTAINER=	roman@xpert.com
 
-USE_NEWGCC=	yes
-INSTALLS_SHLIB=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_NEWGCC=	yes
+INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
@@ -30,6 +30,8 @@ HAVE_VORBIS=	yes
 .endif
 
 post-extract:
-	${TOUCH} ${WRKSRC}/stamp-h.in
+	@${RM} ${WRKSRC}/config.sub ${WRKSRC}/config.guess ;\
+	${LN} -s ${LOCALBASE}/share/autoconf/config.* ${WRKSRC}/ ;\
+	${PERL} -pi -e 's/-ldl//g' ${WRKSRC}/examples/Makefile.*
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz3/distinfo b/audio/libmusicbrainz3/distinfo
index ebcf45614b64..08adc02403e9 100644
--- a/audio/libmusicbrainz3/distinfo
+++ b/audio/libmusicbrainz3/distinfo
@@ -1 +1 @@
-MD5 (musicbrainz-1.0.0pre6.tar.gz) = 2f7d292231decd05ffe71b8a619055ec
+MD5 (musicbrainz-1.0.0.tar.gz) = 77572ecfeb16261230b065af0d1f4b83
diff --git a/audio/libmusicbrainz3/files/patch-configure.in b/audio/libmusicbrainz3/files/patch-configure.in
new file mode 100644
index 000000000000..e1597916e509
--- /dev/null
+++ b/audio/libmusicbrainz3/files/patch-configure.in
@@ -0,0 +1,11 @@
+--- 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/libmusicbrainz3/files/patch-id3.c b/audio/libmusicbrainz3/files/patch-id3.c
new file mode 100644
index 000000000000..f9fdf56408f7
--- /dev/null
+++ b/audio/libmusicbrainz3/files/patch-id3.c
@@ -0,0 +1,10 @@
+--- lib/bitzi/id3.c.orig	Sat May 19 14:47:54 2001
++++ lib/bitzi/id3.c	Sat May 19 14:48:09 2001
+@@ -13,6 +13,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #ifdef WIN32
+ #include <winsock.h>
+ #else
diff --git a/audio/libmusicbrainz3/pkg-plist b/audio/libmusicbrainz3/pkg-plist
index 6e574e8db2c8..ad2d75deff8a 100644
--- a/audio/libmusicbrainz3/pkg-plist
+++ b/audio/libmusicbrainz3/pkg-plist
@@ -1,3 +1,8 @@
+include/musicbrainz/bitprint.h
+include/musicbrainz/bitzi/bitcollider.h
+include/musicbrainz/bitzi/gui_win32.h
+include/musicbrainz/bitzi/list.h
+include/musicbrainz/bitzi/plugin.h
 include/musicbrainz/errors.h
 include/musicbrainz/mb_c.h
 include/musicbrainz/musicbrainz.h
@@ -5,4 +10,5 @@ include/musicbrainz/queries.h
 lib/libmusicbrainz.a
 lib/libmusicbrainz.so
 lib/libmusicbrainz.so.1
+@dirrm include/musicbrainz/bitzi
 @dirrm include/musicbrainz