Prevent libtunepimp and libtunepimp-old from clobbering each other's

libraries and includes and bump PORTREVISION for both. Hack the two remaining
users of libtunepimp-old into compiling.

9 files changed, 107 insertions, 30 deletions

diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index a09a539be2a..3c5c9d9ee84 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	juk
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -21,7 +20,7 @@ COMMENT=	KDE audio player
 LIB_DEPENDS=	akode:${PORTSDIR}/audio/akode \
 		musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
 		tag:${PORTSDIR}/audio/taglib \
-		tunepimp.3:${PORTSDIR}/audio/libtunepimp-old
+		tunepimp-0.4.3:${PORTSDIR}/audio/libtunepimp-old
 
 CONFLICTS=	kdemultimedia-3.3*
 
@@ -35,6 +34,8 @@ USE_AUTOTOOLS=  libtool:15
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS+=CFLAGS=-I${LOCALBASE}/include/tunepimp-0.4 \
+		LDFLAGS=-L${LOCALBASE}/lib/tunepimp-0.4
 
 .include <bsd.port.pre.mk>
 
@@ -63,6 +64,9 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|LIBS="-ltunepimp  $$LIBS"|LIBS="-ltunepimp -liconv $$LIBS"|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ltunepimp|-ltunepimp-0.4|g' \
+			-e 's|<tunepimp/tp_c.h>|<tunepimp-0.4/tunepimp/tp_c.h>|g' \
+		${WRKSRC}/configure ${WRKSRC}/juk/ktrm.cpp ${WRKSRC}/juk/Makefile.in
 
 do-build:
 	cd ${WRKSRC}/arts/runtime && ${SETENV} ${MAKE_ENV} ${GMAKE}
diff --git a/audio/juk/distinfo b/audio/juk/distinfo
index 51232e3eeb3..a3c9dfa3cb9 100644
--- a/audio/juk/distinfo
+++ b/audio/juk/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.3.tar.bz2) = 61bd938c564e3280034944338955712b
-SHA256 (KDE/kdemultimedia-3.5.3.tar.bz2) = 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f
-SIZE (KDE/kdemultimedia-3.5.3.tar.bz2) = 6276838
+MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33
+SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b
+SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789
diff --git a/audio/kid3-kde4/Makefile b/audio/kid3-kde4/Makefile
index db00fb96062..04c9e9d69e2 100644
--- a/audio/kid3-kde4/Makefile
+++ b/audio/kid3-kde4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		FLAC.7:${PORTSDIR}/audio/flac \
 		ogg.5:${PORTSDIR}/audio/libogg \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		tunepimp.3:${PORTSDIR}/audio/libtunepimp-old
+		tunepimp-0.4.3:${PORTSDIR}/audio/libtunepimp-old
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
@@ -26,6 +26,14 @@ USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+CONFIGURE_ARGS+=CFLAGS=-I${LOCALBASE}/include/tunepimp-0.4 \
+		LDFLAGS=-L${LOCALBASE}/lib/tunepimp-0.4
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-ltunepimp|-ltunepimp-0.4|g' \
+		-e 's|<tunepimp/tp_c.h>|<tunepimp-0.4/tunepimp/tp_c.h>|g' \
+	${WRKSRC}/configure ${WRKSRC}/kid3/musicbrainzclient.h \
+		${WRKSRC}/admin/Makefile
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index db00fb96062..04c9e9d69e2 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		FLAC.7:${PORTSDIR}/audio/flac \
 		ogg.5:${PORTSDIR}/audio/libogg \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
-		tunepimp.3:${PORTSDIR}/audio/libtunepimp-old
+		tunepimp-0.4.3:${PORTSDIR}/audio/libtunepimp-old
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
@@ -26,6 +26,14 @@ USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
+CONFIGURE_ARGS+=CFLAGS=-I${LOCALBASE}/include/tunepimp-0.4 \
+		LDFLAGS=-L${LOCALBASE}/lib/tunepimp-0.4
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-ltunepimp|-ltunepimp-0.4|g' \
+		-e 's|<tunepimp/tp_c.h>|<tunepimp-0.4/tunepimp/tp_c.h>|g' \
+	${WRKSRC}/configure ${WRKSRC}/kid3/musicbrainzclient.h \
+		${WRKSRC}/admin/Makefile
 
 .include <bsd.port.pre.mk>
 
diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile
index 3e817f6e8ea..14ad91b7af8 100644
--- a/audio/libtunepimp-old/Makefile
+++ b/audio/libtunepimp-old/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtunepimp-old
 PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \
@@ -30,9 +30,12 @@ CONFLICTS=	trm-0* libtunepimp-0*
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv"
 INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/tunepimp-0.4
+USE_LDCONFIG=	${PREFIX}/lib/tunepimp-0.4
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
@@ -43,5 +46,9 @@ post-patch:
 post-configure:
 	@${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \
 		${WRKSRC}/examples/Makefile
+	@${REINPLACE_CMD} -e \
+	's|PREFIX"/lib/tunepimp/plugins"|PREFIX"/lib/tunepimp-0.4/tunepimp/plugins"|g' \
+		${WRKSRC}/lib/tunepimp.cpp
+
 
 .include <bsd.port.mk>
diff --git a/audio/libtunepimp-old/files/patch-examples-Makefile.in b/audio/libtunepimp-old/files/patch-examples-Makefile.in
new file mode 100644
index 00000000000..f563be1a363
--- /dev/null
+++ b/audio/libtunepimp-old/files/patch-examples-Makefile.in
@@ -0,0 +1,27 @@
+--- examples/Makefile.in.orig	Tue Sep 12 19:17:31 2006
++++ examples/Makefile.in	Tue Sep 12 19:17:56 2006
+@@ -53,10 +53,10 @@
+ PROGRAMS = $(bin_PROGRAMS)
+ am_tp_tagger_OBJECTS = tagger.$(OBJEXT)
+ tp_tagger_OBJECTS = $(am_tp_tagger_OBJECTS)
+-tp_tagger_DEPENDENCIES = $(top_builddir)/lib/libtunepimp.la
++tp_tagger_DEPENDENCIES = $(top_builddir)/lib/libtunepimp-0.4.la
+ am_trm_OBJECTS = trm.$(OBJEXT)
+ trm_OBJECTS = $(am_trm_OBJECTS)
+-trm_DEPENDENCIES = $(top_builddir)/lib/libtunepimp.la
++trm_DEPENDENCIES = $(top_builddir)/lib/libtunepimp-0.4.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -207,9 +207,9 @@
+ #
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/threads/posix
+ tp_tagger_SOURCES = tagger.c
+-tp_tagger_LDADD = $(top_builddir)/lib/libtunepimp.la @READLINE_LIBS@
++tp_tagger_LDADD = $(top_builddir)/lib/libtunepimp-0.4.la @READLINE_LIBS@
+ trm_SOURCES = trm.c
+-trm_LDADD = $(top_builddir)/lib/libtunepimp.la 
++trm_LDADD = $(top_builddir)/lib/libtunepimp-0.4.la 
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/audio/libtunepimp-old/files/patch-lib-Makefile.in b/audio/libtunepimp-old/files/patch-lib-Makefile.in
new file mode 100644
index 00000000000..b1f5a60705a
--- /dev/null
+++ b/audio/libtunepimp-old/files/patch-lib-Makefile.in
@@ -0,0 +1,20 @@
+--- lib/Makefile.in.bak	Sat Jan 28 21:54:05 2006
++++ lib/Makefile.in	Tue Sep 12 19:11:17 2006
+@@ -240,7 +240,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = utf8 threads
+ INCLUDES = -I$(top_srcdir)/include/tunepimp -Ithreads/posix
+-lib_LTLIBRARIES = libtunepimp.la
++lib_LTLIBRARIES = libtunepimp-0.4.la
+ libtunepimp_la_SOURCES = tunepimp.cpp filecache.cpp filelookup.cpp analyzer.cpp dirsearch.cpp metadata.cpp submit.cpp astrcmp.c track.cpp lookup.cpp lookuptools.cpp write.cpp c_wrapper.cpp watchdog.cpp plugins.cpp readmeta.cpp fileio.cpp
+ 
+ # Here are a set of rules to help you update your library version information:
+@@ -338,7 +338,7 @@
+ 	done
+ libpluginsupport.la: $(libpluginsupport_la_OBJECTS) $(libpluginsupport_la_DEPENDENCIES) 
+ 	$(CXXLINK)  $(libpluginsupport_la_LDFLAGS) $(libpluginsupport_la_OBJECTS) $(libpluginsupport_la_LIBADD) $(LIBS)
+-libtunepimp.la: $(libtunepimp_la_OBJECTS) $(libtunepimp_la_DEPENDENCIES) 
++libtunepimp-0.4.la: $(libtunepimp_la_OBJECTS) $(libtunepimp_la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(libdir) $(libtunepimp_la_LDFLAGS) $(libtunepimp_la_OBJECTS) $(libtunepimp_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
diff --git a/audio/libtunepimp-old/pkg-plist b/audio/libtunepimp-old/pkg-plist
index dca0bb75b43..fb92097d5b3 100644
--- a/audio/libtunepimp-old/pkg-plist
+++ b/audio/libtunepimp-old/pkg-plist
@@ -1,24 +1,26 @@
 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.3
-lib/tunepimp/plugins/flac.tpp
-lib/tunepimp/plugins/mp3.tpp
-lib/tunepimp/plugins/mp4.tpp
-lib/tunepimp/plugins/mpc.tpp
-lib/tunepimp/plugins/vorbis.tpp
-lib/tunepimp/plugins/wav.tpp
-lib/tunepimp/plugins/wma.tpp
-@dirrm lib/tunepimp/plugins
-@dirrm lib/tunepimp
-@dirrm include/tunepimp
+include/tunepimp-0.4/tunepimp/context.h
+include/tunepimp-0.4/tunepimp/decode_plugin.h
+include/tunepimp-0.4/tunepimp/defs.h
+include/tunepimp-0.4/tunepimp/fileio.h
+include/tunepimp-0.4/tunepimp/metadata_plugin.h
+include/tunepimp-0.4/tunepimp/tp_c.h
+include/tunepimp-0.4/tunepimp/track.h
+include/tunepimp-0.4/tunepimp/tunepimp.h
+lib/tunepimp-0.4/libtunepimp-0.4.a
+lib/tunepimp-0.4/libtunepimp-0.4.la
+lib/tunepimp-0.4/libtunepimp-0.4.so
+lib/tunepimp-0.4/libtunepimp-0.4.so.3
+lib/tunepimp-0.4/tunepimp/plugins/flac.tpp
+lib/tunepimp-0.4/tunepimp/plugins/mp3.tpp
+lib/tunepimp-0.4/tunepimp/plugins/mp4.tpp
+lib/tunepimp-0.4/tunepimp/plugins/mpc.tpp
+lib/tunepimp-0.4/tunepimp/plugins/vorbis.tpp
+lib/tunepimp-0.4/tunepimp/plugins/wav.tpp
+lib/tunepimp-0.4/tunepimp/plugins/wma.tpp
+@dirrm lib/tunepimp-0.4/tunepimp/plugins
+@dirrm lib/tunepimp-0.4/tunepimp
+@dirrm lib/tunepimp-0.4
+@dirrm include/tunepimp-0.4/tunepimp
+@dirrm include/tunepimp-0.4
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index f0599847e96..8131f02142c 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libtunepimp
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/ \