Index: head/audio/libtunepimp/Makefile =================================================================== --- head/audio/libtunepimp/Makefile (revision 159254) +++ head/audio/libtunepimp/Makefile (revision 159255) @@ -1,39 +1,46 @@ # New ports collection makefile for: tunepimp # Date Created: 11 Aug 2004 # Whom: Lauri Watts # # $FreeBSD$ # PORTNAME= libtunepimp PORTVERSION= 0.4.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/ \ ftp://ftp.au.musicbrainz.org/pub/musicbrainz/ MAINTAINER= lauri@kde.org COMMENT= Client library for musicbrainz -LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - FLAC:${PORTSDIR}/audio/flac \ +LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ + expat:${PORTSDIR}/textproc/expat2 \ mad:${PORTSDIR}/audio/libmad \ + mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ + musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ ogg:${PORTSDIR}/audio/libogg \ - expat:${PORTSDIR}/textproc/expat2 \ - musicbrainz:${PORTSDIR}/audio/libmusicbrainz + tag:${PORTSDIR}/audio/taglib \ + vorbis:${PORTSDIR}/audio/libvorbis CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes post-patch: @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \ - s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure + s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|g' \ ${WRKSRC}/lib/threads/posix/Makefile.in + +post-configure: + @${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \ + ${WRKSRC}/examples/Makefile .include Property changes on: head/audio/libtunepimp/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/audio/libtunepimp/files/patch-configure =================================================================== --- head/audio/libtunepimp/files/patch-configure (nonexistent) +++ head/audio/libtunepimp/files/patch-configure (revision 159255) @@ -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 Property changes on: head/audio/libtunepimp/files/patch-configure ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/files/patch-lib-metadata.cpp =================================================================== --- head/audio/libtunepimp/files/patch-lib-metadata.cpp (nonexistent) +++ head/audio/libtunepimp/files/patch-lib-metadata.cpp (revision 159255) @@ -0,0 +1,17 @@ +--- 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[] = + { Property changes on: head/audio/libtunepimp/files/patch-lib-metadata.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp =================================================================== --- head/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp (nonexistent) +++ head/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp (revision 159255) @@ -0,0 +1,20 @@ +--- 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) + { Property changes on: head/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/files/patch-plugins-flac-flac.cpp =================================================================== --- head/audio/libtunepimp/files/patch-plugins-flac-flac.cpp (nonexistent) +++ head/audio/libtunepimp/files/patch-plugins-flac-flac.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + Property changes on: head/audio/libtunepimp/files/patch-plugins-flac-flac.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp =================================================================== --- head/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp (nonexistent) +++ head/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + Property changes on: head/audio/libtunepimp/files/patch-plugins-mp3-mp3.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp =================================================================== --- head/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp (nonexistent) +++ head/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + Property changes on: head/audio/libtunepimp/files/patch-plugins-vorbis-vorbis.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/files/patch-plugins-wav-wav.cpp =================================================================== --- head/audio/libtunepimp/files/patch-plugins-wav-wav.cpp (nonexistent) +++ head/audio/libtunepimp/files/patch-plugins-wav-wav.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + \ No newline at end of file Property changes on: head/audio/libtunepimp/files/patch-plugins-wav-wav.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp/pkg-plist =================================================================== --- head/audio/libtunepimp/pkg-plist (revision 159254) +++ head/audio/libtunepimp/pkg-plist (revision 159255) @@ -1,21 +1,24 @@ 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 -@dirrm include/tunepimp +lib/tunepimp/plugins/wma.tpp @dirrm lib/tunepimp/plugins @dirrm lib/tunepimp +@dirrm include/tunepimp Property changes on: head/audio/libtunepimp/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/audio/libtunepimp-old/Makefile =================================================================== --- head/audio/libtunepimp-old/Makefile (revision 159254) +++ head/audio/libtunepimp-old/Makefile (revision 159255) @@ -1,39 +1,46 @@ # New ports collection makefile for: tunepimp # Date Created: 11 Aug 2004 # Whom: Lauri Watts # # $FreeBSD$ # PORTNAME= libtunepimp PORTVERSION= 0.4.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/ \ ftp://ftp.au.musicbrainz.org/pub/musicbrainz/ MAINTAINER= lauri@kde.org COMMENT= Client library for musicbrainz -LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - FLAC:${PORTSDIR}/audio/flac \ +LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ + expat:${PORTSDIR}/textproc/expat2 \ mad:${PORTSDIR}/audio/libmad \ + mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ + musicbrainz:${PORTSDIR}/audio/libmusicbrainz \ ogg:${PORTSDIR}/audio/libogg \ - expat:${PORTSDIR}/textproc/expat2 \ - musicbrainz:${PORTSDIR}/audio/libmusicbrainz + tag:${PORTSDIR}/audio/taglib \ + vorbis:${PORTSDIR}/audio/libvorbis CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -liconv" + LDFLAGS="-L${LOCALBASE}/lib" INSTALLS_SHLIB= yes post-patch: @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \ - s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure + s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-lthr|${PTHREAD_LIBS}|g' \ ${WRKSRC}/lib/threads/posix/Makefile.in + +post-configure: + @${REINPLACE_CMD} -e 's|\(^LDFLAGS =.*\)|\1 ${PTHREAD_LIBS} -liconv|g' \ + ${WRKSRC}/examples/Makefile .include Property changes on: head/audio/libtunepimp-old/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-configure =================================================================== --- head/audio/libtunepimp-old/files/patch-configure (nonexistent) +++ head/audio/libtunepimp-old/files/patch-configure (revision 159255) @@ -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 Property changes on: head/audio/libtunepimp-old/files/patch-configure ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-lib-metadata.cpp =================================================================== --- head/audio/libtunepimp-old/files/patch-lib-metadata.cpp (nonexistent) +++ head/audio/libtunepimp-old/files/patch-lib-metadata.cpp (revision 159255) @@ -0,0 +1,17 @@ +--- 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[] = + { Property changes on: head/audio/libtunepimp-old/files/patch-lib-metadata.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp =================================================================== --- head/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp (nonexistent) +++ head/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp (revision 159255) @@ -0,0 +1,20 @@ +--- 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) + { Property changes on: head/audio/libtunepimp-old/files/patch-lib-utf8-utf8util.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp =================================================================== --- head/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp (nonexistent) +++ head/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + Property changes on: head/audio/libtunepimp-old/files/patch-plugins-flac-flac.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp =================================================================== --- head/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp (nonexistent) +++ head/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + Property changes on: head/audio/libtunepimp-old/files/patch-plugins-mp3-mp3.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp =================================================================== --- head/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp (nonexistent) +++ head/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + Property changes on: head/audio/libtunepimp-old/files/patch-plugins-vorbis-vorbis.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp =================================================================== --- head/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp (nonexistent) +++ head/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp (revision 159255) @@ -0,0 +1,13 @@ +--- 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 + #else ++#include ++#include + #include ++#include + #include + #endif + \ No newline at end of file Property changes on: head/audio/libtunepimp-old/files/patch-plugins-wav-wav.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/libtunepimp-old/pkg-plist =================================================================== --- head/audio/libtunepimp-old/pkg-plist (revision 159254) +++ head/audio/libtunepimp-old/pkg-plist (revision 159255) @@ -1,21 +1,24 @@ 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 -@dirrm include/tunepimp +lib/tunepimp/plugins/wma.tpp @dirrm lib/tunepimp/plugins @dirrm lib/tunepimp +@dirrm include/tunepimp Property changes on: head/audio/libtunepimp-old/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property