- contribs: more cygwin/general fixes

extras/contrib/bootstrap

@@ -177,7 +177,7 @@ echo "LD = ${LD}" >> config.mak
 echo "RANLIB = ${RANLIB}" >> config.mak
 echo "AR = ${AR}" >> config.mak
 echo "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}" >> config.mak
-echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -I${PREFIX}/include" >> config.mak
+echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 

extras/contrib/src/Makefile

@@ -427,7 +427,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
 
 .freetype: freetype2
 ifdef HAVE_CYGWIN
-	(cd $<; CPPFLAGS="$(EXTRA_CPPFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(EXTRA_LDFLAGS)" ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 endif

extras/contrib/src/Patches/dvdnav.patch

@@ -479,7 +479,7 @@ diff -ur libdvdnav/src/vm/vm.c libdvdnav.new/src/vm/vm.c
  #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
  #define pthread_mutex_destroy(a)
  
-+#ifndef HAVE_GETIMEOFDAY 
++#ifndef HAVE_GETTIMEOFDAY
  /* replacement gettimeofday implementation */
  #include <sys/timeb.h>
  static inline int _private_gettimeofday( struct timeval *tv, void *tz )