Index: head/audio/xmms-imms/Makefile =================================================================== --- head/audio/xmms-imms/Makefile (revision 116205) +++ head/audio/xmms-imms/Makefile (revision 116206) @@ -1,38 +1,38 @@ # New ports collection makefile for: xmms-imms # Date created: Wed Feb 11 17:11:37 EST 2004 # Whom: Brian Feldman # # $FreeBSD$ # PORTNAME= imms -PORTVERSION= 1.0.1 +PORTVERSION= 1.1 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} PKGNAMEPREFIX= xmms- MAINTAINER= green@FreeBSD.org COMMENT= Automatic, weight-based playlist ordering plugin for XMMS LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ sqlite.2:${PORTSDIR}/databases/sqlite \ pcre.0:${PORTSDIR}/devel/pcre \ id3:${PORTSDIR}/audio/id3lib \ vorbis.3:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gtk12 USE_GMAKE= yes USE_AUTOCONF_VER= 259 USE_AUTOHEADER_VER= 259 GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif INSTALLS_SHLIB= yes .include Property changes on: head/audio/xmms-imms/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/audio/xmms-imms/distinfo =================================================================== --- head/audio/xmms-imms/distinfo (revision 116205) +++ head/audio/xmms-imms/distinfo (revision 116206) @@ -1,2 +1,2 @@ -MD5 (imms-1.0.1.tar.bz2) = 1af7f78714ccc4fb2cbf50a02238aef2 -SIZE (imms-1.0.1.tar.bz2) = 45249 +MD5 (imms-1.1.tar.bz2) = b229b76f183ff2b3d4d1eccfd0569da2 +SIZE (imms-1.1.tar.bz2) = 48912 Property changes on: head/audio/xmms-imms/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/audio/xmms-imms/files/patch-imms.cc =================================================================== --- head/audio/xmms-imms/files/patch-imms.cc (revision 116205) +++ head/audio/xmms-imms/files/patch-imms.cc (nonexistent) @@ -1,34 +0,0 @@ ---- imms.cc.orig Wed Feb 11 17:47:21 2004 -+++ imms.cc Wed Feb 11 18:03:41 2004 -@@ -1,7 +1,6 @@ - #include - #include - #include --#include // for (s)random - - #include - #include -@@ -43,23 +42,6 @@ - ////////////////////////////////////////////// - - string last_song; -- --// Random --int imms_random(int max) --{ -- int rand_num; -- static struct random_data rand_data; -- static char rand_state[256]; -- static bool initialized = false; -- if (!initialized) -- { -- initstate_r(time(0), rand_state, sizeof(rand_state), &rand_data); -- initialized = true; -- } -- random_r(&rand_data, &rand_num); -- double cof = rand_num / (RAND_MAX + 1.0); -- return (int)(max * cof); --} - - // Imms - Imms::Imms() Property changes on: head/audio/xmms-imms/files/patch-imms.cc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/audio/xmms-imms/files/patch-configure.ac =================================================================== --- head/audio/xmms-imms/files/patch-configure.ac (revision 116205) +++ head/audio/xmms-imms/files/patch-configure.ac (revision 116206) @@ -1,13 +1,29 @@ ---- configure.ac.orig Fri Feb 27 09:49:26 2004 -+++ configure.ac Fri Feb 27 09:49:50 2004 -@@ -29,8 +29,8 @@ +--- configure.ac.orig Thu Apr 15 16:15:24 2004 ++++ configure.ac Sat Aug 14 12:42:19 2004 +@@ -31,8 +31,8 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Extra debug output]), -- [enable_debug='yes' DEBUG_CFLAGS="-ggdb -O0 -DDEBUG"], -- [enable_debug='no' DEBUG_CFLAGS="-O3"]) -+ [enable_debug='yes' DEBUG_CFLAGS="-g -DDEBUG"], -+ [enable_debug='no' DEBUG_CFLAGS=""]) +- [enable_debug='yes' XCPPFLAGS="-ggdb -O0 -DDEBUG"], +- [enable_debug='no' XCPPFLAGS="-O3"]) ++ [enable_debug='yes' XCPPFLAGS="-g -DDEBUG"], ++ [enable_debug='no' XCPPFLAGS=""]) AC_PROG_CXX AC_PROG_CC +@@ -96,6 +96,7 @@ + + saved_libs="$LIBS" + LIBS="$LIBS-ltag" ++ saved_cppflags="$CPPFLAGS" + CPPFLAGS=`taglib-config --cflags` + + AC_TRY_LINK([#include +@@ -104,6 +105,7 @@ + [XCPPFLAGS="$XCPPFLAGS `taglib-config --cflags`" + AC_MSG_RESULT(yes)], + [LIBS=$saved_libs AC_MSG_RESULT(no)]) ++ CPPFLAGS="$saved_cppflags" + fi + + if test "$with_taglib" = "yes"; then Property changes on: head/audio/xmms-imms/files/patch-configure.ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/xmms-imms/files/patch-correlate.cc =================================================================== --- head/audio/xmms-imms/files/patch-correlate.cc (nonexistent) +++ head/audio/xmms-imms/files/patch-correlate.cc (revision 116206) @@ -0,0 +1,9 @@ +--- correlate.cc.orig Thu Apr 15 16:15:24 2004 ++++ correlate.cc Sat Aug 14 11:15:59 2004 +@@ -1,5 +1,6 @@ + #include + #include ++#include + + #include "correlate.h" + #include "strmanip.h" Property changes on: head/audio/xmms-imms/files/patch-correlate.cc ___________________________________________________________________ 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/xmms-imms/files/patch-picker.cc =================================================================== --- head/audio/xmms-imms/files/patch-picker.cc (revision 116205) +++ head/audio/xmms-imms/files/patch-picker.cc (revision 116206) @@ -1,24 +1,38 @@ ---- picker.cc.orig Sun Jan 25 16:55:21 2004 -+++ picker.cc Wed Feb 11 18:47:20 2004 -@@ -1,4 +1,5 @@ - #include +--- picker.cc.orig Thu Apr 15 16:15:24 2004 ++++ picker.cc Sat Aug 14 11:19:33 2004 +@@ -2,6 +2,7 @@ + #include + + #include +#include #include "picker.h" #include "strmanip.h" -@@ -31,9 +32,12 @@ +@@ -53,9 +54,12 @@ SongData data(position, path); - if (find(candidates.begin(), candidates.end(), data) - != candidates.end()) - return true; + Candidates::iterator i = candidates.begin(); + while (i != candidates.end()) { + if (*i == data) + return true; + i++; + } - int cost = fetch_song_info(data); + if (fetch_song_info(data)) + { +@@ -83,8 +87,9 @@ + void SongPicker::do_events() + { +- bool more; +- for (int i = 0; i < 4 && (more = add_candidate()); ++i); ++ bool more = true; ++ for (int i = 0; i < 4 && more; ++i) ++ more = add_candidate(); + if (!more) + identify_more(); + } Property changes on: head/audio/xmms-imms/files/patch-picker.cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/xmms-imms/files/patch-plugin.h =================================================================== --- head/audio/xmms-imms/files/patch-plugin.h (revision 116205) +++ head/audio/xmms-imms/files/patch-plugin.h (revision 116206) @@ -1,14 +1,14 @@ ---- plugin.h.orig Wed Feb 11 17:44:30 2004 -+++ plugin.h Wed Feb 11 17:45:06 2004 +--- plugin.h.orig Thu Apr 15 16:15:24 2004 ++++ plugin.h Sat Aug 14 11:08:55 2004 @@ -1,7 +1,11 @@ #ifndef __PLUGIN_H #define __PLUGIN_H -+#if HAVE_STDINT_H ++#ifdef HAVE_STDIN #include +#else +#include +#endif + #include "immsconf.h" #ifdef __cplusplus - extern "C" { Property changes on: head/audio/xmms-imms/files/patch-plugin.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/audio/xmms-imms/files/patch-utils.cc =================================================================== --- head/audio/xmms-imms/files/patch-utils.cc (nonexistent) +++ head/audio/xmms-imms/files/patch-utils.cc (revision 116206) @@ -0,0 +1,26 @@ +--- utils.cc.orig Sat Aug 14 11:03:14 2004 ++++ utils.cc Sat Aug 14 11:05:54 2004 +@@ -3,23 +3,6 @@ + + #include "utils.h" + +-// Random +-int imms_random(int max) +-{ +- int rand_num; +- static struct random_data rand_data; +- static char rand_state[256]; +- static bool initialized = false; +- if (!initialized) +- { +- initstate_r(time(0), rand_state, sizeof(rand_state), &rand_data); +- initialized = true; +- } +- random_r(&rand_data, &rand_num); +- double cof = rand_num / (RAND_MAX + 1.0); +- return (int)(max * cof); +-} +- + time_t usec_diff(struct timeval &tv1, struct timeval &tv2) + { + return (tv2.tv_sec - tv1.tv_sec) * 1000000 Property changes on: head/audio/xmms-imms/files/patch-utils.cc ___________________________________________________________________ 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/xmms-imms/files/patch-vars.mk.in =================================================================== --- head/audio/xmms-imms/files/patch-vars.mk.in (revision 116205) +++ head/audio/xmms-imms/files/patch-vars.mk.in (revision 116206) @@ -1,19 +1,21 @@ ---- vars.mk.in.orig Sun Jan 25 16:55:21 2004 -+++ vars.mk.in Wed Feb 11 18:40:43 2004 -@@ -4,14 +4,13 @@ +--- vars.mk.in.orig Thu Apr 15 16:15:24 2004 ++++ vars.mk.in Sat Aug 14 12:51:25 2004 +@@ -4,15 +4,14 @@ INSTALL_PROGRAM = @INSTALL@ DESTDIR = @prefix@ -SHELL = bash - XMMS_OBJ = plugin.o interface.o libimmscore.a - CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \ - songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o + XMMS_OBJ = @PLUGIN_OBJ@ interface.o player.o libimmscore.a + CORE_OBJ = imms.o immsdb.o basicdb.o correlate.o playlist.o sqldb.o \ + fetcher.o picker.o spectrum.o songinfo.o comm.o server.o \ + regexx.o utils.o strmanip.o levenshtein.o xidle.o md5.o --CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT -+CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ @CFLAGS@ -Wall -fPIC -D_REENTRANT - CXXFLAGS = ${CFLAGS} -pedantic -fno-rtti +-CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ -Wall -fPIC -D_REENTRANT +-CXXFLAGS = ${CPPFLAGS} -fno-rtti -LDFLAGS = `xmms-config --libs` @LIBS@ -+LDFLAGS = `xmms-config --libs` -lc @LIBS@ ++CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall -fPIC -D_REENTRANT ++CXXFLAGS = ${CPPFLAGS} ++LDFLAGS = @LDFLAGS@ `xmms-config --libs` -lc -lm @LIBS@ ARFLAGS = rs default: all Property changes on: head/audio/xmms-imms/files/patch-vars.mk.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property