8 files changed, 34 insertions, 38 deletions

diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index a65220e9c28e..61b92303c187 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	libtunepimp
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.4.2
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
+MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \
+		ftp://ftp.au.musicbrainz.org/pub/musicbrainz/
 
 MAINTAINER=	lauri@kde.org
 COMMENT=	Client library for musicbrainz
@@ -25,10 +25,9 @@ LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
 CONFLICTS=	trm-0*
 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"
+		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/audio/libtunepimp-old/distinfo b/audio/libtunepimp-old/distinfo
index 854803a50be3..b7ad326d8ec2 100644
--- a/audio/libtunepimp-old/distinfo
+++ b/audio/libtunepimp-old/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtunepimp-0.3.0.tar.gz) = f1f506914150c4917ec730f847ad4709
-SHA256 (libtunepimp-0.3.0.tar.gz) = 5fbfc6441f2bf34d5eed81ec77bf19469b53eb30f33575cab218aa8d587566d2
-SIZE (libtunepimp-0.3.0.tar.gz) = 524889
+MD5 (libtunepimp-0.4.2.tar.gz) = 10b9e4a2f1930aed78ef7ddaebbe0fde
+SHA256 (libtunepimp-0.4.2.tar.gz) = d3e0f66a92b9c54a388b9a55bcdcc98601e3f918e966f3362c3bd3b45f3936e4
+SIZE (libtunepimp-0.4.2.tar.gz) = 1019995
diff --git a/audio/libtunepimp-old/files/patch-lib_mp3_trm.cpp b/audio/libtunepimp-old/files/patch-lib_mp3_trm.cpp
deleted file mode 100644
index 411d7bcefaf9..000000000000
--- a/audio/libtunepimp-old/files/patch-lib_mp3_trm.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/mp3_trm.cpp.orig	Sat Aug 14 23:35:41 2004
-+++ lib/mp3_trm.cpp	Sat Aug 14 23:35:55 2004
-@@ -82,6 +82,7 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
- #include <netinet/in.h>
- #endif
- 
diff --git a/audio/libtunepimp-old/pkg-plist b/audio/libtunepimp-old/pkg-plist
index d3888b75c7a1..db2a99a68150 100644
--- a/audio/libtunepimp-old/pkg-plist
+++ b/audio/libtunepimp-old/pkg-plist
@@ -1,12 +1,21 @@
 bin/tp_tagger
 bin/trm
 include/tunepimp/context.h
+include/tunepimp/decode_plugin.h
 include/tunepimp/defs.h
+include/tunepimp/fileio.h
+include/tunepimp/metadata_plugin.h
 include/tunepimp/tp_c.h
 include/tunepimp/track.h
 include/tunepimp/tunepimp.h
 lib/libtunepimp.a
 lib/libtunepimp.la
 lib/libtunepimp.so
-lib/libtunepimp.so.2
+lib/libtunepimp.so.3
+lib/tunepimp/plugins/flac.tpp
+lib/tunepimp/plugins/mp3.tpp
+lib/tunepimp/plugins/vorbis.tpp
+lib/tunepimp/plugins/wav.tpp
 @dirrm include/tunepimp
+@dirrm lib/tunepimp/plugins
+@dirrm lib/tunepimp
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index a65220e9c28e..61b92303c187 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	libtunepimp
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.4.2
 PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
+MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \
+		ftp://ftp.au.musicbrainz.org/pub/musicbrainz/
 
 MAINTAINER=	lauri@kde.org
 COMMENT=	Client library for musicbrainz
@@ -25,10 +25,9 @@ LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
 CONFLICTS=	trm-0*
 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"
+		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/audio/libtunepimp/distinfo b/audio/libtunepimp/distinfo
index 854803a50be3..b7ad326d8ec2 100644
--- a/audio/libtunepimp/distinfo
+++ b/audio/libtunepimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtunepimp-0.3.0.tar.gz) = f1f506914150c4917ec730f847ad4709
-SHA256 (libtunepimp-0.3.0.tar.gz) = 5fbfc6441f2bf34d5eed81ec77bf19469b53eb30f33575cab218aa8d587566d2
-SIZE (libtunepimp-0.3.0.tar.gz) = 524889
+MD5 (libtunepimp-0.4.2.tar.gz) = 10b9e4a2f1930aed78ef7ddaebbe0fde
+SHA256 (libtunepimp-0.4.2.tar.gz) = d3e0f66a92b9c54a388b9a55bcdcc98601e3f918e966f3362c3bd3b45f3936e4
+SIZE (libtunepimp-0.4.2.tar.gz) = 1019995
diff --git a/audio/libtunepimp/files/patch-lib_mp3_trm.cpp b/audio/libtunepimp/files/patch-lib_mp3_trm.cpp
deleted file mode 100644
index 411d7bcefaf9..000000000000
--- a/audio/libtunepimp/files/patch-lib_mp3_trm.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/mp3_trm.cpp.orig	Sat Aug 14 23:35:41 2004
-+++ lib/mp3_trm.cpp	Sat Aug 14 23:35:55 2004
-@@ -82,6 +82,7 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
- #include <netinet/in.h>
- #endif
- 
diff --git a/audio/libtunepimp/pkg-plist b/audio/libtunepimp/pkg-plist
index d3888b75c7a1..db2a99a68150 100644
--- a/audio/libtunepimp/pkg-plist
+++ b/audio/libtunepimp/pkg-plist
@@ -1,12 +1,21 @@
 bin/tp_tagger
 bin/trm
 include/tunepimp/context.h
+include/tunepimp/decode_plugin.h
 include/tunepimp/defs.h
+include/tunepimp/fileio.h
+include/tunepimp/metadata_plugin.h
 include/tunepimp/tp_c.h
 include/tunepimp/track.h
 include/tunepimp/tunepimp.h
 lib/libtunepimp.a
 lib/libtunepimp.la
 lib/libtunepimp.so
-lib/libtunepimp.so.2
+lib/libtunepimp.so.3
+lib/tunepimp/plugins/flac.tpp
+lib/tunepimp/plugins/mp3.tpp
+lib/tunepimp/plugins/vorbis.tpp
+lib/tunepimp/plugins/wav.tpp
 @dirrm include/tunepimp
+@dirrm lib/tunepimp/plugins
+@dirrm lib/tunepimp