25 files changed, 34 insertions, 281 deletions

diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 0851115e8987..1a7e896f2a1b 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	libtunepimp
-DISTVERSION=	0.4.0-pre5
+PORTVERSION=	0.3.0
+PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
+MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
 MAINTAINER=	lauri@kde.org
 COMMENT=	Client library for musicbrainz
@@ -23,11 +24,10 @@ LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
 CONFLICTS=	trm-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 
diff --git a/audio/libtunepimp-old/distinfo b/audio/libtunepimp-old/distinfo
index d6c03c70dd56..d4bd94ea614d 100644
--- a/audio/libtunepimp-old/distinfo
+++ b/audio/libtunepimp-old/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtunepimp-0.4.0-pre5.tar.gz) = 22e3fa2614cc0262ee3f932a0781f6b6
-SIZE (libtunepimp-0.4.0-pre5.tar.gz) = 926332
+MD5 (libtunepimp-0.3.0.tar.gz) = f1f506914150c4917ec730f847ad4709
+SIZE (libtunepimp-0.3.0.tar.gz) = 524889
diff --git a/audio/libtunepimp-old/files/patch-lib-metadata.cpp b/audio/libtunepimp-old/files/patch-lib-metadata.cpp
deleted file mode 100644
index 018363898587..000000000000
--- a/audio/libtunepimp-old/files/patch-lib-metadata.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/metadata.cpp.orig	Wed Nov 10 17:37:26 2004
-+++ lib/metadata.cpp	Wed Sep 14 17:25:59 2005
-@@ -34,6 +34,14 @@
-    #include "astrcmp.h"
- }
- 
-+#ifndef min
-+#define min(a,b) ((a) < (b) ? (a) : (b))
-+#endif
-+
-+#ifndef max
-+#define max(a,b) ((a) > (b) ? (a) : (b))
-+#endif
-+
- const int numAlbumTypeStrings = 11;
- const char *albumTypeStrings[] =
- {
diff --git a/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp b/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp
deleted file mode 100644
index a3a5cabb78e8..000000000000
--- a/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/utf8/utf8util.cpp.orig	Mon Jul 11 05:01:23 2005
-+++ lib/utf8/utf8util.cpp	Wed Sep 14 17:19:42 2005
-@@ -38,7 +38,7 @@
-     char *dest;
-     string to;
- 
--    to.clear();
-+    to = "";
-     ret = utf8_encode(from.c_str(), &dest);
-     if (ret >= 0)
-     {
-@@ -54,7 +54,7 @@
-     char *dest;
-     string to;
- 
--    to.clear();
-+    to = "";
-     ret = utf8_decode(from.c_str(), &dest);
-     if (ret >= 0)
-     {
diff --git a/audio/libtunepimp-old/files/patch-lib_mp3_trm.cpp b/audio/libtunepimp-old/files/patch-lib_mp3_trm.cpp
new file mode 100644
index 000000000000..411d7bcefaf9
--- /dev/null
+++ b/audio/libtunepimp-old/files/patch-lib_mp3_trm.cpp
@@ -0,0 +1,10 @@
+--- 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/files/patch-plugins-flac-flac.cpp b/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp
deleted file mode 100644
index 5d590d59034b..000000000000
--- a/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/flac/flac.cpp.orig	Tue Jun 28 13:03:06 2005
-+++ plugins/flac/flac.cpp	Wed Sep 14 17:35:23 2005
-@@ -33,7 +33,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
diff --git a/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp b/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp
deleted file mode 100644
index 8b8e8fd87acd..000000000000
--- a/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/mp3/mp3.cpp.orig	Tue Jul 12 06:44:06 2005
-+++ plugins/mp3/mp3.cpp	Wed Sep 14 17:32:42 2005
-@@ -33,7 +33,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
diff --git a/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp b/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp
deleted file mode 100644
index 2ab8c472b45e..000000000000
--- a/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/vorbis/vorbis.cpp.orig	Tue Jun 28 13:03:06 2005
-+++ plugins/vorbis/vorbis.cpp	Wed Sep 14 17:34:12 2005
-@@ -33,7 +33,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
diff --git a/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp b/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp
deleted file mode 100644
index 34bf7b46d4c3..000000000000
--- a/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/wav/wav.cpp.orig	Wed Jun 15 06:15:18 2005
-+++ plugins/wav/wav.cpp	Wed Sep 14 17:30:30 2005
-@@ -34,7 +34,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
\ No newline at end of file
diff --git a/audio/libtunepimp-old/pkg-plist b/audio/libtunepimp-old/pkg-plist
index c0f9286eaa79..950bc6aa8465 100644
--- a/audio/libtunepimp-old/pkg-plist
+++ b/audio/libtunepimp-old/pkg-plist
@@ -1,20 +1,11 @@
 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.so
-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 lib/tunepimp/plugins
-@dirrm lib/tunepimp
+lib/libtunepimp.so.2
 @dirrm include/tunepimp
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 0851115e8987..1a7e896f2a1b 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	libtunepimp
-DISTVERSION=	0.4.0-pre5
+PORTVERSION=	0.3.0
+PORTEPOCH=	1
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
+MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
 MAINTAINER=	lauri@kde.org
 COMMENT=	Client library for musicbrainz
@@ -23,11 +24,10 @@ LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \
 CONFLICTS=	trm-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
-USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
 
diff --git a/audio/libtunepimp/distinfo b/audio/libtunepimp/distinfo
index d6c03c70dd56..d4bd94ea614d 100644
--- a/audio/libtunepimp/distinfo
+++ b/audio/libtunepimp/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtunepimp-0.4.0-pre5.tar.gz) = 22e3fa2614cc0262ee3f932a0781f6b6
-SIZE (libtunepimp-0.4.0-pre5.tar.gz) = 926332
+MD5 (libtunepimp-0.3.0.tar.gz) = f1f506914150c4917ec730f847ad4709
+SIZE (libtunepimp-0.3.0.tar.gz) = 524889
diff --git a/audio/libtunepimp/files/patch-lib-metadata.cpp b/audio/libtunepimp/files/patch-lib-metadata.cpp
deleted file mode 100644
index 018363898587..000000000000
--- a/audio/libtunepimp/files/patch-lib-metadata.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/metadata.cpp.orig	Wed Nov 10 17:37:26 2004
-+++ lib/metadata.cpp	Wed Sep 14 17:25:59 2005
-@@ -34,6 +34,14 @@
-    #include "astrcmp.h"
- }
- 
-+#ifndef min
-+#define min(a,b) ((a) < (b) ? (a) : (b))
-+#endif
-+
-+#ifndef max
-+#define max(a,b) ((a) > (b) ? (a) : (b))
-+#endif
-+
- const int numAlbumTypeStrings = 11;
- const char *albumTypeStrings[] =
- {
diff --git a/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp b/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp
deleted file mode 100644
index a3a5cabb78e8..000000000000
--- a/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/utf8/utf8util.cpp.orig	Mon Jul 11 05:01:23 2005
-+++ lib/utf8/utf8util.cpp	Wed Sep 14 17:19:42 2005
-@@ -38,7 +38,7 @@
-     char *dest;
-     string to;
- 
--    to.clear();
-+    to = "";
-     ret = utf8_encode(from.c_str(), &dest);
-     if (ret >= 0)
-     {
-@@ -54,7 +54,7 @@
-     char *dest;
-     string to;
- 
--    to.clear();
-+    to = "";
-     ret = utf8_decode(from.c_str(), &dest);
-     if (ret >= 0)
-     {
diff --git a/audio/libtunepimp/files/patch-lib_mp3_trm.cpp b/audio/libtunepimp/files/patch-lib_mp3_trm.cpp
new file mode 100644
index 000000000000..411d7bcefaf9
--- /dev/null
+++ b/audio/libtunepimp/files/patch-lib_mp3_trm.cpp
@@ -0,0 +1,10 @@
+--- 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/files/patch-plugins-flac-flac.cpp b/audio/libtunepimp/files/patch-plugins-flac-flac.cpp
deleted file mode 100644
index 5d590d59034b..000000000000
--- a/audio/libtunepimp/files/patch-plugins-flac-flac.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/flac/flac.cpp.orig	Tue Jun 28 13:03:06 2005
-+++ plugins/flac/flac.cpp	Wed Sep 14 17:35:23 2005
-@@ -33,7 +33,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
diff --git a/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp b/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp
deleted file mode 100644
index 8b8e8fd87acd..000000000000
--- a/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/mp3/mp3.cpp.orig	Tue Jul 12 06:44:06 2005
-+++ plugins/mp3/mp3.cpp	Wed Sep 14 17:32:42 2005
-@@ -33,7 +33,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
diff --git a/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp b/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp
deleted file mode 100644
index 2ab8c472b45e..000000000000
--- a/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/vorbis/vorbis.cpp.orig	Tue Jun 28 13:03:06 2005
-+++ plugins/vorbis/vorbis.cpp	Wed Sep 14 17:34:12 2005
-@@ -33,7 +33,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
diff --git a/audio/libtunepimp/files/patch-plugins-wav-wav.cpp b/audio/libtunepimp/files/patch-plugins-wav-wav.cpp
deleted file mode 100644
index 34bf7b46d4c3..000000000000
--- a/audio/libtunepimp/files/patch-plugins-wav-wav.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/wav/wav.cpp.orig	Wed Jun 15 06:15:18 2005
-+++ plugins/wav/wav.cpp	Wed Sep 14 17:30:30 2005
-@@ -34,7 +34,10 @@
- #ifdef WIN32
- #include <winsock.h>
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <sys/param.h>
- #endif
- 
\ No newline at end of file
diff --git a/audio/libtunepimp/pkg-plist b/audio/libtunepimp/pkg-plist
index c0f9286eaa79..950bc6aa8465 100644
--- a/audio/libtunepimp/pkg-plist
+++ b/audio/libtunepimp/pkg-plist
@@ -1,20 +1,11 @@
 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.so
-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 lib/tunepimp/plugins
-@dirrm lib/tunepimp
+lib/libtunepimp.so.2
 @dirrm include/tunepimp
diff --git a/audio/py-libtunepimp/Makefile b/audio/py-libtunepimp/Makefile
deleted file mode 100644
index 16f656358042..000000000000
--- a/audio/py-libtunepimp/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:	tunepimp python bindings
-# Date created:		Sat Aug 20 15:26:15 UTC 2005
-# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME=	libtunepimp
-DISTVERSION=	0.4.0-pre5
-CATEGORIES=	audio python
-MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	lauri@kde.org
-COMMENT=	tunepimp python bindings
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libtunepimp.so:${PORTSDIR}/audio/libtunepimp
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-
-BUILD_WRKSRC=	${WRKSRC}/python
-INSTALL_WRKSRC=	${WRKSRC}/python
-
-.include <bsd.port.mk>
diff --git a/audio/py-libtunepimp/distinfo b/audio/py-libtunepimp/distinfo
deleted file mode 100644
index d6c03c70dd56..000000000000
--- a/audio/py-libtunepimp/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (libtunepimp-0.4.0-pre5.tar.gz) = 22e3fa2614cc0262ee3f932a0781f6b6
-SIZE (libtunepimp-0.4.0-pre5.tar.gz) = 926332
diff --git a/audio/py-libtunepimp/files/patch-python::tunepimp::tunepimp.py b/audio/py-libtunepimp/files/patch-python::tunepimp::tunepimp.py
deleted file mode 100644
index 5bf71dc94d8e..000000000000
--- a/audio/py-libtunepimp/files/patch-python::tunepimp::tunepimp.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- python/tunepimp/tunepimp.py.orig	Sat Jul  2 22:13:08 2005
-+++ python/tunepimp/tunepimp.py	Fri Sep 16 22:44:39 2005
-@@ -137,7 +137,16 @@
-         if sys.platform == "linux2":
-            lib = "libtunepimp.so.3"
-         else:
--           raise TunePimpError, "Unknown platform: " + sys.platform 
-+            if sys.platform == "freebsd5":
-+               lib = "libtunepimp.so.3"
-+            else:
-+                if sys.platform == "freebsd6":
-+                   lib = "libtunepimp.so.3"
-+                else:
-+                    if sys.platform == "freebsd4":
-+                       lib = "libtunepimp.so.3"
-+                    else:
-+                        raise TunePimpError, "Unknown platform: " + sys.platform 
- 
-     pathList = [ ]
-     ldLibPath = os.environ.get('LD_LIBRARY_PATH')
diff --git a/audio/py-libtunepimp/pkg-descr b/audio/py-libtunepimp/pkg-descr
deleted file mode 100644
index 2fd58ef72edc..000000000000
--- a/audio/py-libtunepimp/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Tunepimp is a client library for MusicBrainz
-
-MusicBrainz is the second generation incarnation of the CD Index.
-This server is designed to enable Audio CD and MP3/Vorbis players
-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/
-
--- lioux@FreeBSD.org
diff --git a/audio/py-libtunepimp/pkg-plist b/audio/py-libtunepimp/pkg-plist
deleted file mode 100644
index a513ccc7965c..000000000000
--- a/audio/py-libtunepimp/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-%%PYTHON_SITELIBDIR%%/tunepimp/__init__.py
-%%PYTHON_SITELIBDIR%%/tunepimp/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tunepimp/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tunepimp/metadata.py
-%%PYTHON_SITELIBDIR%%/tunepimp/metadata.pyc
-%%PYTHON_SITELIBDIR%%/tunepimp/metadata.pyo
-%%PYTHON_SITELIBDIR%%/tunepimp/track.py
-%%PYTHON_SITELIBDIR%%/tunepimp/track.pyc
-%%PYTHON_SITELIBDIR%%/tunepimp/track.pyo
-%%PYTHON_SITELIBDIR%%/tunepimp/tunepimp.py
-%%PYTHON_SITELIBDIR%%/tunepimp/tunepimp.pyc
-%%PYTHON_SITELIBDIR%%/tunepimp/tunepimp.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/tunepimp