Contribs: separate win32 from other platform for CDDB

The changes needed are not the same.

extras/contrib/src/Makefile

@@ -1426,7 +1426,11 @@ libcddb-$(CDDB_VERSION).tar.bz2:
 
 libcddb: libcddb-$(CDDB_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	(cd $@; patch -p0 < ../Patches/libcddb-cross.patch && autoreconf -fisv)
+	(cd $@; patch -p0 < ../Patches/libcddb-cross.patch )
+ifdef HAVE_WIN32
+	(cd $@; patch -p0 < ../Patches/libcddb-win32.patch )
+endif
+	(cd $@; autoreconf -fisv)
 
 ifdef HAVE_WIN32
 .cddb: libcddb .regex

extras/contrib/src/Patches/libcddb-cross.patch

@@ -18,15 +18,6 @@
  AC_FUNC_STAT
  AC_FUNC_VPRINTF
  AC_FUNC_SELECT_ARGTYPES
---- libcddb.pc.in.orig	2009-10-25 21:36:57.000000000 +0100
-+++ libcddb.pc.in	2009-10-25 21:36:11.000000000 +0100
-@@ -6,5 +6,5 @@
- Name: libcddb
- Description: CDDB server access library
- Version: @VERSION@
--Libs: -L${libdir} -lcddb @LIBICONV@
-+Libs: -L${libdir} -lcddb ${libdir}/libregex.a @LIBICONV@
- Cflags: -I${includedir}
 --- include/cddb/cddb_ni.h.orig	2009-10-25 21:58:20.000000000 +0100
 +++ include/cddb/cddb_ni.h	2009-10-25 21:58:46.000000000 +0100
 @@ -35,6 +35,7 @@

extras/contrib/src/Patches/libcddb-win32.patch

+--- libcddb.pc.in.orig	2009-10-25 21:36:57.000000000 +0100
++++ libcddb.pc.in	2009-10-25 21:36:11.000000000 +0100
+@@ -6,5 +6,5 @@
+ Name: libcddb
+ Description: CDDB server access library
+ Version: @VERSION@
+-Libs: -L${libdir} -lcddb @LIBICONV@
++Libs: -L${libdir} -lcddb -lregex ${libdir}/libregex.a @LIBICONV@ -lws2_32
+ Cflags: -I${includedir}