4 files changed, 32 insertions, 27 deletions

diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index f0599847e962..3e817f6e8ea0 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -5,14 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libtunepimp
-PORTVERSION=	0.5.0
-PORTEPOCH=	1
+PORTNAME=	libtunepimp-old
+PORTVERSION=	0.4.2
+PORTREVISION=	2
+PORTEPOCH=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \
 		ftp://ftp.au.musicbrainz.org/pub/musicbrainz/
+DISTNAME=	libtunepimp-${PORTVERSION}
 
-MAINTAINER=	lauri@kde.org
+MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Client library for musicbrainz
 
 LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
@@ -22,10 +24,9 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
 		ogg:${PORTSDIR}/audio/libogg \
 		tag:${PORTSDIR}/audio/taglib \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		ofa:${PORTSDIR}/audio/libofa
+		vorbis:${PORTSDIR}/audio/libvorbis
 
-CONFLICTS=	trm-0*
+CONFLICTS=	trm-0* libtunepimp-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_AUTOTOOLS=	libtool:15
@@ -42,7 +43,5 @@ post-patch:
 post-configure:
 	@${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \
 		${WRKSRC}/examples/Makefile
-	@${REINPLACE_CMD} -e 's|plugins/wv|plugins/tta|' \
-		${WRKSRC}/plugins/tta/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/libtunepimp-old/distinfo b/audio/libtunepimp-old/distinfo
index 1721a5169e64..b7ad326d8ec2 100644
--- a/audio/libtunepimp-old/distinfo
+++ b/audio/libtunepimp-old/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtunepimp-0.5.0.tar.gz) = 2f303ff4fadcf51840e0f5e0e083d146
-SHA256 (libtunepimp-0.5.0.tar.gz) = 480fd5b4b3dd1aa31d52f3525e01da0c57d8ba4e413d88c0759c95e21ac723b2
-SIZE (libtunepimp-0.5.0.tar.gz) = 1075791
+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-configure b/audio/libtunepimp-old/files/patch-configure
new file mode 100644
index 000000000000..f960466def89
--- /dev/null
+++ b/audio/libtunepimp-old/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig  Mon Apr 10 10:52:03 2006
++++ configure	Mon Apr 10 10:54:14 2006
+@@ -20506,7 +20506,7 @@
+     TAGLIB_VERSION=`$TAGLIB_CONFIG --version`
+     echo "$as_me:$LINENO: checking for taglib >= 1.4.0" >&5
+ echo $ECHO_N "checking for taglib >= 1.4.0... $ECHO_C" >&6
+-        VERSION_CHECK=`expr $TAGLIB_VERSION \>\= 1.4.0`
++        VERSION_CHECK=`expr $TAGLIB_VERSION \>\= 1.4`
+         if test "$VERSION_CHECK" = "1" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
diff --git a/audio/libtunepimp-old/pkg-plist b/audio/libtunepimp-old/pkg-plist
index 39534ef9a718..dca0bb75b436 100644
--- a/audio/libtunepimp-old/pkg-plist
+++ b/audio/libtunepimp-old/pkg-plist
@@ -1,29 +1,24 @@
-bin/puid
-include/tunepimp/tp_c.h
+bin/tp_tagger
+bin/trm
+include/tunepimp/context.h
+include/tunepimp/decode_plugin.h
 include/tunepimp/defs.h
-include/tunepimp-0.5/context.h
-include/tunepimp-0.5/decode_plugin.h
-include/tunepimp-0.5/defs.h
-include/tunepimp-0.5/fileio.h
-include/tunepimp-0.5/metadata_plugin.h
-include/tunepimp-0.5/tp_c.h
-include/tunepimp-0.5/track.h
-include/tunepimp-0.5/tunepimp.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.5
+lib/libtunepimp.so.3
 lib/tunepimp/plugins/flac.tpp
 lib/tunepimp/plugins/mp3.tpp
 lib/tunepimp/plugins/mp4.tpp
 lib/tunepimp/plugins/mpc.tpp
-lib/tunepimp/plugins/speex.tpp
-lib/tunepimp/plugins/tta.tpp
 lib/tunepimp/plugins/vorbis.tpp
 lib/tunepimp/plugins/wav.tpp
 lib/tunepimp/plugins/wma.tpp
-lib/tunepimp/plugins/wv.tpp
 @dirrm lib/tunepimp/plugins
 @dirrm lib/tunepimp
 @dirrm include/tunepimp
-@dirrm include/tunepimp-0.5