- Fix dependency stuff

- Support CXXFLAGS/PREFIX properly
- Supoprt PTHREAD_CFLAGS/PTHREAD_LIBS

PR: 28645
Submitted by: Ports Fury

3 files changed, 197 insertions, 38 deletions

diff --git a/audio/zinf/files/patch-aa b/audio/zinf/files/patch-aa
index 93832dff5bbf..d8f7aedd8bd4 100644
--- a/audio/zinf/files/patch-aa
+++ b/audio/zinf/files/patch-aa
@@ -1,19 +1,175 @@
-*** configure.in.orig	Sun Jul  1 15:31:13 2001
---- configure.in	Sun Jul  1 15:32:03 2001
-***************
-*** 928,934 ****
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_CHECK_LIB(musicbrainz, mb_New, ,
-!   AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]),-ldl)
-  AC_LANG_RESTORE
-  
-  AC_CONFIG_HEADER(config/config.h)
---- 928,934 ----
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_CHECK_LIB(musicbrainz, mb_New, ,
-!   AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]))
-  AC_LANG_RESTORE
-  
-  AC_CONFIG_HEADER(config/config.h)
+--- configure.in.orig	Sat Apr 14 02:44:47 2001
++++ configure.in	Mon Jul  2 21:43:50 2001
+@@ -174,8 +174,8 @@
+     ;;
+   freebsd*)
+     host_os="freebsd"
+-    CFLAGS="$CFLAGS -D_THREAD_SAFE -pthread -I/usr/local/include"
+-    LDFLAGS="$LDFLAGS -Wl,-export-dynamic -L/usr/local/lib"
++    CFLAGS="$CFLAGS"
++    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+     ;;
+   netbsd*)
+     host_os="freebsd"
+@@ -326,9 +326,9 @@
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+      esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-     ac_save_CFLAGS="$CFLAGS"
++     ac_save_CPPFLAGS="$CPPFLAGS"
+      ac_save_LIBS="$LIBS"
+-     CFLAGS="$CFLAGS $ESD_CFLAGS"
++     CPPFLAGS="$CPPFLAGS $ESD_CFLAGS"
+      LIBS="$LIBS $ESD_LIBS"
+      rm -f conf.esdtest
+      AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
+@@ -387,7 +387,7 @@
+ }
+ 
+ ],, have_esound=false, have_esound=false)
+-     CFLAGS="$ac_save_CFLAGS"
++     CPPFLAGS="$ac_save_CPPFLAGS"
+      LIBS="$ac_save_LIBS"
+      AC_LANG_RESTORE
+      rm -f conf.esdtest
+@@ -460,9 +460,9 @@
+      gtk_config_major=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+      gtk_config_minor=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+      gtk_config_micro=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-     ac_save_CFLAGS="$CFLAGS"
++     ac_save_CPPFLAGS="$CPPFLAGS"
+      ac_save_LIBS="$LIBS"
+-     CFLAGS="$CFLAGS $GTK_CFLAGS"
++     CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+ 
+      AC_TRY_RUN([
+@@ -489,7 +489,7 @@
+          gtk_major_version, gtk_minor_version, gtk_micro_version);
+   return 1;
+ }], , have_gtk=false, have_gtk=false])
+-    CFLAGS="$ac_save_CFLAGS"
++    CPPFLAGS="$ac_save_CPPFLAGS"
+     LIBS="$ac_save_LIBS" 
+     if test "$have_gtk" = "false"; then
+        AC_MSG_RESULT(no)
+@@ -510,7 +510,7 @@
+   OSINC="$OSINC -I$srcdir/ui/download/unix/include"
+   OSINC="$OSINC -I$srcdir/ui/musicbrowser/include"
+   OSINC="$OSINC -I$srcdir/ftc/kjofol"
+-  CFLAGS="$CFLAGS $GTK_CFLAGS"
++  CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+   AC_DEFINE(HAVE_GTK)
+ elif test "$host_os" = "beos"; then
+   OSDEPPLUGINS="$OSDEPPLUGINS plugins/musicbrowser.ui"
+@@ -536,7 +536,7 @@
+ AC_SUBST(GTK_LIBS)
+ AC_SUBST(EXTRALIBS)
+ 
+-AC_SUBST(CFLAGS)
++AC_SUBST(CPPFLAGS)
+ 
+ dnl orbit crap
+ save_CPPFLAGS="$CPPFLAGS"
+@@ -656,7 +656,7 @@
+   alsa_min_major_version=0
+   alsa_min_minor_version=5
+   alsa_min_micro_version=0
+-  ac_save_CFLAGS="$CFLAGS"
++  ac_save_CPPFLAGS="$CPPFLAGS"
+   ac_save_LIBS="$LIBS"
+ 
+   LIBS="$LIBS -lasound"
+@@ -701,7 +701,7 @@
+ ], , have_alsa=false, have_alsa=false
+ )
+    AC_LANG_RESTORE
+-   CFLAGS="$ac_save_CFLAGS"
++   CPPFLAGS="$ac_save_CPPFLAGS"
+    LIBS="$ac_save_LIBS"
+    if test "$have_alsa" = "false"; then
+       AC_MSG_RESULT(no)
+@@ -748,13 +748,21 @@
+                     have_arts="false")
+ fi
+ 
++AC_ARG_ENABLE(arts, [  --disable-arts          Don't compile the libArts output plugin], enable_arts=no, enable_arts=yes)
++
++if test "x$enable_arts" = "xno"; then
++  have_arts="false";
++fi
++
+ ARTS_LIBS=""
+-AC_CHECK_LIB(artsc, arts_init, 
+-  OSDEPPLUGINS="$OSDEPPLUGINS plugins/arts.pmo";
+-  OSINC="$OSINC -I$srcdir/io/arts/include"
+-  ARTS_LIBS="-lartsc -laudiofile"
+-  AC_MSG_RESULT([compiling arts pmo plugin])
+-)
++if test "$have_arts" = "true"; then
++  AC_CHECK_LIB(artsc, arts_init, 
++    OSDEPPLUGINS="$OSDEPPLUGINS plugins/arts.pmo";
++    OSINC="$OSINC -I$srcdir/io/arts/include"
++    ARTS_LIBS="-lartsc -laudiofile"
++    AC_MSG_RESULT([compiling arts pmo plugin])
++  )
++fi
+ 
+ AC_SUBST(ARTS_LIBS)
+ AC_SUBST(EXTRALIBS)
+@@ -808,9 +816,9 @@
+   gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
+          sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+   if test "x$enable_gdk_pixbuftest" = "xyes" ; then
+-    ac_save_CFLAGS="$CFLAGS"
++    ac_save_CPPFLAGS="$CPPFLAGS"
+     ac_save_LIBS="$LIBS"
+-    CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
++    CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
+     LIBS="$LIBS $GDK_PIXBUF_LIBS"
+ dnl
+ dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
+@@ -872,7 +880,7 @@
+ }
+ 
+ ],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-     CFLAGS="$ac_save_CFLAGS"
++     CPPFLAGS="$ac_save_CPPFLAGS"
+      LIBS="$ac_save_LIBS"
+    fi
+ fi
+@@ -891,7 +899,7 @@
+       :
+      else
+         echo "*** Could not run GDK_PIXBUF test program, checking why..."
+-        CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
++        CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
+         LIBS="$LIBS $GDK_PIXBUF_LIBS"
+         AC_TRY_LINK([
+ #include <stdio.h>
+@@ -910,7 +918,7 @@
+         echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
+         echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
+         echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
+-        CFLAGS="$ac_save_CFLAGS"
++        CPPFLAGS="$ac_save_CPPFLAGS"
+         LIBS="$ac_save_LIBS"
+      fi
+    fi
+@@ -922,13 +930,13 @@
+ AC_SUBST(GDK_PIXBUF_LIBS)
+ rm -f conf.gdk_pixbuftest
+ 
+-CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
+-AC_SUBST(CFLAGS)
++CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
++AC_SUBST(CPPFLAGS)
+ 
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_CHECK_LIB(musicbrainz, mb_New, ,
+-  AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]),-ldl)
++  AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]))
+ AC_LANG_RESTORE
+ 
+ AC_CONFIG_HEADER(config/config.h)
diff --git a/audio/zinf/files/patch-ab b/audio/zinf/files/patch-ab
deleted file mode 100644
index 74c70f279b31..000000000000
--- a/audio/zinf/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** config/config.h.in.orig	Sun Jul  1 18:51:35 2001
---- config/config.h.in	Sun Jul  1 18:51:49 2001
-***************
-*** 46,52 ****
-  #define BRANDING_UPDATE_SERVER "fatman.freeamp.org"
-  #define BRANDING_UPDATE_PATH "/update/freeamp/"
-  #define BRANDING_DEFAULT_THEME "FreeAmp.fat"
-! #define BRANDING_SHARE_PATH "/../share/freeamp"
-  #define BRANDING_APP_NAME "freeamp"
-  
-  #define FREEAMP_PATH_ENV "FREEAMP_PATH"
---- 46,52 ----
-  #define BRANDING_UPDATE_SERVER "fatman.freeamp.org"
-  #define BRANDING_UPDATE_PATH "/update/freeamp/"
-  #define BRANDING_DEFAULT_THEME "FreeAmp.fat"
-! #define BRANDING_SHARE_PATH "/../share/gnome/freeamp"
-  #define BRANDING_APP_NAME "freeamp"
-  
-  #define FREEAMP_PATH_ENV "FREEAMP_PATH"
diff --git a/audio/zinf/files/patch-ac b/audio/zinf/files/patch-ac
new file mode 100644
index 000000000000..9ac6033089d5
--- /dev/null
+++ b/audio/zinf/files/patch-ac
@@ -0,0 +1,22 @@
+--- Makefile.header.in.orig	Sun Jan 28 15:43:24 2001
++++ Makefile.header.in	Sat Jun 30 07:33:57 2001
+@@ -71,7 +71,7 @@
+ 
+ INCLUDES = -I. -I$(srcdir)/lib/gdbm -I$(srcdir)/base/include -I$(srcdir)/config -I$(srcdir)/io/include -I$(srcdir)/ui/include -I$(srcdir)/lmc/include -I$(srcdir)/io/soundcard/unix/$(UNIX_AUDIO_API)/include -I$(srcdir)/lmc/xingmp3/include -I$(srcdir)/lmc/cd/include -I$(srcdir)/plm/portable/pmp300/sba -I$(srcdir)/lib/xml/include -I$(srcdir)/lib/zlib/include -I$(srcdir)/lib/unzip/include -I$(srcdir)/io/cd/unix/include -I$(srcdir)/base/aps -I$(srcdir)/io/wavout/include -I$(srcdir)/ui/lcd/include -I$(srcdir)/ui/irman/include -I$(srcdir)/lib/http/include -I$(srcdir)/io/signature/include -I$(srcdir)/plm/metadata/id3v2 $(OSINC)
+ 
+-CXXFLAGS = $(EXTRA_CXXFLAGS)
++CXXFLAGS = @CXXFLAGS@ -D_REENTRANT
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ./config/config.h
+@@ -87,8 +87,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ 
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(RELOC)
+-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(RELOC)
++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS)
+ CXXCOMPILE += $(RELOC)
+ 
+ CXXLINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) $(RELOC) -o $@