Update to IMMS 1.1 and fix for newer GCC.

8 files changed, 80 insertions, 47 deletions

diff --git a/audio/xmms-imms/Makefile b/audio/xmms-imms/Makefile
index f8f675007ac6..0446cce0c168 100644
--- a/audio/xmms-imms/Makefile
+++ b/audio/xmms-imms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imms
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -29,7 +29,7 @@ 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
diff --git a/audio/xmms-imms/distinfo b/audio/xmms-imms/distinfo
index d1b17ce48e76..66edaa8042ad 100644
--- a/audio/xmms-imms/distinfo
+++ b/audio/xmms-imms/distinfo
@@ -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
diff --git a/audio/xmms-imms/files/patch-configure.ac b/audio/xmms-imms/files/patch-configure.ac
index 7efde56e0a76..eb7af04f3b88 100644
--- a/audio/xmms-imms/files/patch-configure.ac
+++ b/audio/xmms-imms/files/patch-configure.ac
@@ -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 <tag.h>
+@@ -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
diff --git a/audio/xmms-imms/files/patch-correlate.cc b/audio/xmms-imms/files/patch-correlate.cc
new file mode 100644
index 000000000000..bde17fb6e601
--- /dev/null
+++ b/audio/xmms-imms/files/patch-correlate.cc
@@ -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 <assert.h>
+ #include <iostream>
++#include <math.h>
+ 
+ #include "correlate.h"
+ #include "strmanip.h"
diff --git a/audio/xmms-imms/files/patch-picker.cc b/audio/xmms-imms/files/patch-picker.cc
index 857e9a8dc4f5..fccc4e7d7436 100644
--- a/audio/xmms-imms/files/patch-picker.cc
+++ b/audio/xmms-imms/files/patch-picker.cc
@@ -1,12 +1,14 @@
---- picker.cc.orig	Sun Jan 25 16:55:21 2004
-+++ picker.cc	Wed Feb 11 18:47:20 2004
-@@ -1,4 +1,5 @@
- #include <iostream>
+--- picker.cc.orig	Thu Apr 15 16:15:24 2004
++++ picker.cc	Sat Aug 14 11:19:33 2004
+@@ -2,6 +2,7 @@
+ #include <algorithm>
+ 
+ #include <math.h>
 +#include <math.h>
  
  #include "picker.h"
  #include "strmanip.h"
-@@ -31,9 +32,12 @@
+@@ -53,9 +54,12 @@
  
      SongData data(position, path);
  
@@ -20,5 +22,17 @@
 +	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();
+ }
diff --git a/audio/xmms-imms/files/patch-plugin.h b/audio/xmms-imms/files/patch-plugin.h
index 543834c9d5d0..c3d440914912 100644
--- a/audio/xmms-imms/files/patch-plugin.h
+++ b/audio/xmms-imms/files/patch-plugin.h
@@ -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 <stdint.h>
 +#else
 +#include <sys/types.h>
 +#endif
+ #include "immsconf.h"
  
  #ifdef __cplusplus
- extern "C" {
diff --git a/audio/xmms-imms/files/patch-imms.cc b/audio/xmms-imms/files/patch-utils.cc
index 1c4779f1f948..bbf1df0aa6b0 100644
--- a/audio/xmms-imms/files/patch-imms.cc
+++ b/audio/xmms-imms/files/patch-utils.cc
@@ -1,18 +1,9 @@
---- imms.cc.orig	Wed Feb 11 17:47:21 2004
-+++ imms.cc	Wed Feb 11 18:03:41 2004
-@@ -1,7 +1,6 @@
- #include <time.h>
- #include <ctype.h>
- #include <math.h>
--#include <stdlib.h>     // for (s)random
+--- utils.cc.orig	Sat Aug 14 11:03:14 2004
++++ utils.cc	Sat Aug 14 11:05:54 2004
+@@ -3,23 +3,6 @@
  
- #include <iostream>
- #include <iomanip>
-@@ -43,23 +42,6 @@
- //////////////////////////////////////////////
+ #include "utils.h"
  
- string last_song;
--
 -// Random
 -int imms_random(int max)
 -{
@@ -29,6 +20,7 @@
 -    double cof = rand_num / (RAND_MAX + 1.0);
 -    return (int)(max * cof);
 -}
- 
- // Imms
- Imms::Imms() 
+-
+ time_t usec_diff(struct timeval &tv1, struct timeval &tv2)
+ {
+     return (tv2.tv_sec - tv1.tv_sec) * 1000000
diff --git a/audio/xmms-imms/files/patch-vars.mk.in b/audio/xmms-imms/files/patch-vars.mk.in
index 6a62c8b8cc8b..2b2de9519fc5 100644
--- a/audio/xmms-imms/files/patch-vars.mk.in
+++ b/audio/xmms-imms/files/patch-vars.mk.in
@@ -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