* finally fixed CDDB contrib

extras/contrib/src/Makefile

@@ -55,7 +55,7 @@ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
 	.dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
-	.png .gpgerror .gcrypt .gnutls .daap .cdio .vcdimager
+	.png .gpgerror .gcrypt .gnutls .daap .cddb .cdio .vcdimager
 endif
 ifeq ($(SYS),BEOS)
 all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
@@ -880,7 +880,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.gz
 	patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
-	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
+	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="-liconv" && make && make install)
 	touch $@
 
 CLEAN_FILE += .cddb

extras/contrib/src/Patches/libcddb.patch

+diff -ruN libcddb.orig/include/cddb/cddb_regex.h libcddb/include/cddb/cddb_regex.h
+--- libcddb.orig/include/cddb/cddb_regex.h	Fri Oct 15 21:42:08 2004
++++ libcddb/include/cddb/cddb_regex.h	Tue Jan 18 01:57:50 2005
+@@ -30,9 +30,7 @@
+ #include <cddb/cddb_config.h>
+ #include <stdlib.h>
+ 
+-#ifdef CDDB_NEED_UNISTD_H
+ #include <unistd.h>
+-#endif
+ #include <regex.h>
+ 
+ /**

extras/contrib/src/packages.mak

@@ -101,7 +101,7 @@ MODPLUG_VERSION=0.7
 MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
 MASH_VERSION=5.2
 MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
-CDDB_VERSION=0.9.5
+CDDB_VERSION=0.9.6
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
 VCDIMAGER_VERSION=0.7.21
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz