Attachment #35276 for bug #57001

View | Details | Raw Unified | Return to bug 57001
Collapse All | Expand All




#

PORTNAME=	zinf
PORTVERSION=	2.2.4
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	GTK-based MP3 player

BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
LIB_DEPENDS=	id3-3.8.2:${PORTSDIR}/audio/id3lib \
		musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
		gdbm.3:${PORTSDIR}/databases/gdbm
RUN_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport

USE_X_PREFIX=	yes
USE_GNOME=	gdkpixbuf gnomehack gnometarget
WANT_GNOME=	yes
USE_PERL5=	yes
USE_FREETYPE=	yes
USE_GMAKE=	yes
USE_LIBTOOL=	yes
LIBTOOLFLAGS=	# none
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--enable-ipv6

CPPFLAGS=	-I${LOCALBASE}/include/stlport \
		-I${LOCALBASE}/include/freetype1/freetype \
		-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}

CFLAGS+=	-O0

.include <bsd.port.pre.mk>

.if ${ARCH} == "i386"
BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
CPPFLAGS+=	"-D_M_IX86"
.else
CONFIGURE_ARGS+=	--disable-x86opts
.endif

.if ${ARCH} == "alpha"
CPPFLAGS+=	"-D_M_ALPHA"
.endif


Line 1 Link Here

(-)audio/zinf/distinfo (-1 / +1 lines)
1	MD5 (zinf-2.2.3.tar.gz) = 2eda6103c0287c7d4d591841e4898199	1	MD5 (zinf-2.2.4.tar.gz) = 7520bbbffa466b86753c461f3c3a075f




--- Makefile.in.orig	Mon Jun 24 08:44:27 2002
+++ Makefile.in	Thu Oct 17 09:19:30 2002
@@ -142,10 +142,10 @@
 install-zinf: zinf
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) zinf $(DESTDIR)$(bindir)
-	$(mkinstalldirs) /usr/share/pixmaps
-	$(INSTALL_DATA) installer/unix/linux/zinf.png $(GTK_PREFIX)/share/pixmaps
-	$(mkinstalldirs) /usr/share/gnome/apps/Audio
-	$(INSTALL_DATA) installer/unix/linux/Zinf.desktop $(GTK_PREFIX)/share/gnome/apps/Audio
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/pixmaps
+	$(INSTALL_DATA) installer/unix/linux/zinf.png $(DESTDIR)$(datadir)/gnome/pixmaps
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Audio
+	$(INSTALL_DATA) installer/unix/linux/Zinf.desktop $(DESTDIR)$(datadir)/gnome/apps/Audio
 	if test -f "MakeTheme"; then \
 		$(INSTALL_PROGRAM) MakeTheme $(DESTDIR)$(bindir);\
 	fi;




--- configure.in.orig	Mon Jan 20 02:04:10 2003
+++ configure.in	Fri May  2 01:35:27 2003
@@ -182,8 +182,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"
@@ -334,9 +334,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)
@@ -395,7 +395,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
@@ -502,9 +502,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([
@@ -531,7 +531,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)
@@ -552,7 +552,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)
 else
   GTK_CFLAGS=""
@@ -573,18 +573,10 @@
 AC_SUBST(GTK_PREFIX)
 AC_SUBST(EXTRALIBS)
 
-AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
 
 dnl orbit crap
-save_CPPFLAGS="$CPPFLAGS"
-ORBIT_CPP_CFLAGS=`orbit-config --cflags server`
-CPPFLAGS="$CPPFLAGS $GTK_CFLAGS $ORBIT_CPP_CFLAGS" 
-AC_LANG_SAVE
-AC_LANG_C
-AC_CHECK_HEADERS(orb/orbit.h, have_orbit="true", have_orbit="false")
-CPPFLAGS="$save_CPPFLAGS"
-AC_LANG_RESTORE
-
+have_orbit="false"
 ORBIT_LIBS=""
 ORBIT_IDL=""
 
@@ -708,7 +700,7 @@
   alsa_min_major_version=0
   alsa_min_minor_version=9
   alsa_min_micro_version=0
-  ac_save_CFLAGS="$CFLAGS"
+  ac_save_CPPFLAGS="$CPPFLAGS"
   ac_save_LIBS="$LIBS"
 
   LIBS="$LIBS -lasound"
@@ -753,7 +745,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)
@@ -773,6 +765,9 @@
   AC_MSG_RESULT([compiling alsa pmo plugin])
 fi
 
+AC_ARG_ENABLE(vorbis, [  --disable-vorbis        Don't compile the Vorbis output plugin], enable_vorbis=no, enable_vorbis=yes)
+
+if test "x$enable_vorbis" = "xyes"; then
 AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
 AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
 
@@ -784,6 +779,7 @@
      AC_MSG_RESULT([compiling vorbis codec plugin])
   fi 
 fi 
+fi
 
 ID3_LIBS=""
 AC_CHECK_LIB(z, uncompress,
@@ -803,7 +799,7 @@
     if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
     : # arts isn't installed
     else
-        CFLAGS="$CFLAGS `$ARTSCCONFIG --cflags`"
+        CPPFLAGS="$CPPFLAGS `$ARTSCCONFIG --cflags`"
         AC_TRY_COMPILE([
          #include <artsc.h>
         ],[
@@ -870,9 +866,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
@@ -934,7 +930,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
@@ -953,7 +949,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>
@@ -972,7 +968,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
@@ -984,8 +980,8 @@
 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
@@ -995,7 +991,7 @@
     echo "*** Download the library from "
     echo "***     http://www.musicbrainz.org/download.html"
     echo "***"
-    AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++)
+    AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++)
 AC_LANG_RESTORE
 
 AC_CONFIG_HEADER(config/config.h)




--- Makefile.header.in.orig	Thu Jan 16 18:32:00 2003
+++ Makefile.header.in	Fri May  2 01:38:08 2003
@@ -73,9 +73,9 @@
 
 OSDEPOBJ = @OSDEPOBJ@
 
-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/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 -I$(srcdir)/lmc/wav/include -I$(srcdir)/lib/utf8 $(OSINC)
+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/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)/lmc/wav/include -I$(srcdir)/lib/utf8 $(OSINC)
 
-CXXFLAGS = -Werror $(EXTRA_CXXFLAGS)
+CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(srcdir)/config/mkinstalldirs
 CONFIG_HEADER = ./config/config.h
@@ -91,8 +91,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 $@

Lines 1-11 Link Here

(-)audio/zinf/files/patch-ad (-11 lines)
1	--- Makefile-plugins.in.orig Mon Jun 24 19:03:03 2002
2	+++ Makefile-plugins.in Thu Oct 17 10:02:34 2002
3	@@ -200,7 +200,7 @@
4	UNIXZINFUIOBJ += ui/zinf/unix/src/GTKPreferenceWindow.o
5	UNIXZINFUIOBJ += ui/zinf/unix/src/GTKFileSelector.o
6	UNIXZINFUIOBJ += ui/musicbrowser/unix/src/gtkmessagedialog.o
7	-UNIXZINFUILIBS = $(GDK_PIXBUF_LIBS) -static $(TTF_LIBS)
8	+UNIXZINFUILIBS = $(GDK_PIXBUF_LIBS) $(TTF_LIBS)
9
10	plugins/zinf.ui: $(ZINFUIOBJ)
11	$(LINKMOD) -o $@ $(ZINFUIOBJ) $(ZINFUILIBS)

Line 0 Link Here

(-)audio/zinf/files/patch-base-Makefile.in (+11 lines)
	1	--- base/Makefile.in.orig Mon Aug 4 01:31:49 2003
	2	+++ base/Makefile.in Mon Aug 18 19:02:03 2003
	3	@@ -230,7 +230,7 @@
	4	src/undomanager.cpp src/timer.cpp src/missingfile.cpp
	5
	6	zinf_LDADD = $(top_builddir)/io/libio.la unix/libunix.la $(GDBM_LIBS) \
	7	- $(THREAD_LIBS) -ldl
	8	+ $(THREAD_LIBS) $(INTLLIBS)
	9
	10	zinf_LDFLAGS = -export-dynamic
	11

Line 0 Link Here

(-)audio/zinf/files/patch-base-include-eventdata.h (+11 lines)
	1	--- base/include/eventdata.h.orig Thu Feb 6 02:52:52 2003
	2	+++ base/include/eventdata.h Sat Sep 13 02:36:12 2003
	3	@@ -241,7 +241,7 @@
	4
	5	m_childEvents = new std::vector <Event *>(other.m_childEvents->size());
	6
	7	- copy(other.m_childEvents->begin(), other.m_childEvents->end(),
	8	+ std::copy(other.m_childEvents->begin(), other.m_childEvents->end(),
	9	m_childEvents->begin());
	10	}
	11




--- base/include/facontext.h.orig	Thu Feb  6 02:52:52 2003
+++ base/include/facontext.h	Mon Aug 18 17:34:13 2003
@@ -25,7 +25,10 @@
 #ifndef INCLUDED_FACONTEXT_H_
 #define INCLUDED_FACONTEXT_H_
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 #include "config.h"
 #include "preferences.h"




--- base/include/preferences.h.orig	Sat Mar 15 10:01:45 2003
+++ base/include/preferences.h	Mon Aug 18 17:32:11 2003
@@ -26,7 +26,10 @@
 
 #include <string>
 #include <vector>
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 #include "config.h"
 #include "errors.h"




--- base/include/swab.h.orig	Tue Mar 18 03:53:31 2003
+++ base/include/swab.h	Mon Aug 18 17:33:34 2003
@@ -1,7 +1,10 @@
 #if !defined(_ZINF_SWAB_H)
 #define _ZINF_SWAB_H
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 #define SWAB16(a) ( (((uint16_t)(a) << 8) & 0xFF00) | (((uint16_t)(a) >> 8) & 0x00FF) )
 #define SWAB32(a) ( (SWAB16(((a) >> 16) & 0xFFFF) << 0) | (SWAB16((a) & 0xFFFF) << 16) )




--- base/include/thread.h.orig	Thu Feb  6 02:52:49 2003
+++ base/include/thread.h	Mon Aug 18 17:33:09 2003
@@ -26,7 +26,10 @@
 
 #include "config.h"
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 
 typedef void (*thread_function)(void * arg);
 




--- base/src/player.cpp.orig	Sun Aug  3 04:17:48 2003
+++ base/src/player.cpp	Thu Aug 21 21:50:28 2003
@@ -708,7 +708,7 @@
 #ifndef HAVE_GTK
       if (name == "zinf.ui") {
           pref = kTextUIPref;
-          context->prefs->GetPrefString(pref, name);
+          m_context->prefs->GetPrefString(pref, name);
       }
 #endif
 #endif
@@ -869,7 +869,7 @@
 //         cerr << boost::format("%1% will quit") % The_BRANDING << endl;
 
 
-         cerr << "No UI plugin in '" << thePath << "' matched 'plugins/" << name << "' or 'plugins/" << name << ".ui.'" << endl;
+         cerr << "If this was the first time you started zinf just try again." << endl;
          cerr << The_BRANDING << " will quit." << endl;
 #endif
          Event    *e = new Event(CMD_QuitPlayer);




--- base/src/propimpl.cpp.orig	Thu Feb  6 02:52:47 2003
+++ base/src/propimpl.cpp	Mon Aug 18 17:35:16 2003
@@ -21,7 +21,10 @@
 	$Id: propimpl.cpp,v 1.4 2003/02/05 17:52:47 rottmann Exp $
 ____________________________________________________________________________*/
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <map>
 #include <vector>
 #include <string>




--- base/src/registrar.cpp.orig	Sat Mar 15 10:01:46 2003
+++ base/src/registrar.cpp	Mon Aug 18 18:54:16 2003
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <set>
-#include <wordexp.h>
+#include <glob.h>
 #endif // WIN32
 
 #include <stdio.h>
@@ -79,13 +79,13 @@
         dir = *di++;
 
 #ifndef WIN32
-        wordexp_t result;
-        if (wordexp(dir.c_str(), &result, 0) ==0){
+        glob_t result;
+        if (glob(dir.c_str(), 0, NULL, &result) ==0){
              //cerr << "Expanded " << dir << " in ";
-             dir = result.we_wordv[0];
+             dir = result.gl_pathv[0];
              //cerr << dir << endl;
         }
-        wordfree(&result);
+        globfree(&result);
 
 #if 0
         if (dir[0] == '~') {




--- base/src/utility.cpp.orig	Sun May 11 15:45:31 2003
+++ base/src/utility.cpp	Mon Aug 18 18:57:01 2003
@@ -52,7 +52,7 @@
 #include "win32impl.h"
 #include "browser.h"
 #include <unistd.h>
-#include <wordexp.h>
+#include <glob.h>
 #define MKDIR(z) mkdir(z, 0755)
 #define _stat stat
 #ifndef _S_IFDIR
@@ -764,13 +764,13 @@
 
         if (subpath.size()) {
 #ifndef WIN32
-            wordexp_t result;
-            if (wordexp(subpath.c_str(), &result, 0) ==0){
+            glob_t result;
+            if (glob(subpath.c_str(), 0, NULL, &result) ==0){
                 //cerr << "Expanded " << dir << " in ";
-                subpath = result.we_wordv[0];
+                subpath = result.gl_pathv[0];
                 //cerr << dir << endl;
             }
-            wordfree(&result);
+            globfree(&result);
 #endif
 
             dirs.push_back(subpath);

Lines 1-11 Link Here

(-)audio/zinf/files/patch-base-unix-include-browser.h (-11 lines)
1	--- base/unix/include/browser.h.orig Sun Dec 15 10:34:14 2002
2	+++ base/unix/include/browser.h Sat Jan 18 04:33:14 2003
3	@@ -8,6 +8,8 @@
4	#define BROWSER_H
5	#include <string>
6
7	+using namespace std;
8	+
9	typedef enum
10	{
11	eBrowserNetscape = 0,




--- base/unix/include/win32impl.h.orig	Thu Feb  6 02:52:42 2003
+++ base/unix/include/win32impl.h	Mon Aug 18 17:36:37 2003
@@ -24,7 +24,10 @@
 #ifndef INCLUDED_WIN32IMPL_H_
 #define INCLUDED_WIN32IMPL_H_
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <limits.h>
 
 #include "config.h"




--- config/ltmain.sh.orig	Wed Jul 23 11:20:18 2003
+++ config/ltmain.sh	Mon Aug 18 22:41:00 2003
@@ -1075,12 +1075,17 @@
 	  esac
 	 elif test "X$arg" = "X-lc_r"; then
 	  case $host in
-	 *-*-openbsd* | *-*-freebsd*)
+	 *-*-openbsd*)
 	    # Do not include libc_r directly, use -pthread flag.
 	    continue
 	    ;;
 	  esac
 	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      -?thread)
 	deplibs="$deplibs $arg"
 	continue
 	;;




--- configure.orig	Mon Aug  4 01:28:11 2003
+++ configure	Thu Aug 21 21:13:45 2003
@@ -8480,6 +8480,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -13429,6 +13430,7 @@
       ;;
     freebsd*)
       ZINF_OS="freebsd";
+      UNIX_AUDIO_API="linux"
 
 cat >>confdefs.h <<\_ACEOF
 #define ZINF_OS_BSD 1




--- installer/unix/linux/Zinf.desktop.orig	Mon Jun 24 08:44:27 2002
+++ installer/unix/linux/Zinf.desktop	Sat Jan 18 04:49:09 2003
@@ -1,8 +1,8 @@
 
 [Desktop Entry]
-Name[en_US.ISO8859-1]=Zinf
+Name=Zinf
 Exec=zinf 
-Icon=/usr/share/pixmaps/zinf.png
+Icon=zinf.png
 Terminal=false
 MultipleArgs=false
 Type=Application

Line 0 Link Here

(-)audio/zinf/files/patch-io-soundcard-unix-linux-soundcardpmo.cpp (+11 lines)
	1	--- io/soundcard/unix/linux/soundcardpmo.cpp.orig Fri May 30 20:01:42 2003
	2	+++ io/soundcard/unix/linux/soundcardpmo.cpp Thu Aug 21 21:48:48 2003
	3	@@ -210,7 +210,7 @@
	4	int junkvar = 0;
	5
	6	#if !SMALL_ENDIAN
	7	- mask = AFMT_S16_BE
	8	+ mask = AFMT_S16_BE;
	9	if(ioctl(audio_fd,SNDCTL_DSP_SETFMT,&mask) == -1){
	10	ReportError(_("Cannot set card to Big Endian."));
	11	return(Error) pmoError_IOCTL_SNDCTL_DSP_SETFMT;




--- io/src/pullbuffer.cpp.orig	Sat Mar 15 10:01:51 2003
+++ io/src/pullbuffer.cpp	Thu Aug 21 21:53:22 2003
@@ -26,6 +26,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <inttypes.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -168,7 +172,7 @@
 
    pPtr = (char *)pBuffer;
 
-   if (pPtr >= (char *)((unsigned int)m_pPullBuffer + m_iBufferSize))
+   if (pPtr >= (char *)((uintptr_t)m_pPullBuffer + m_iBufferSize))
 	   pPtr -= m_iBufferSize;
 
    pBuffer = (void *)pPtr;




--- io/wavout/src/wav.cpp.orig	Tue Mar 18 03:53:30 2003
+++ io/wavout/src/wav.cpp	Thu Aug 21 19:47:59 2003
@@ -101,7 +101,7 @@
 	if (m_FP == NULL) return;
 
 #if !SMALL_ENDIAN
-	m_WH.Length = SWAB32(DataWritten + sizeof(WaveHeader) - 4);
+	m_WH.Length = SWAB32(SWAB32(m_WH.DataLength) + sizeof(WaveHeader) - 4);
 #else
 	m_WH.Length = m_WH.DataLength + sizeof(WaveHeader) - 4;
 #endif
@@ -118,7 +118,7 @@
 {
 #if !SMALL_ENDIAN
 	DataWritten+=data_size;
-	m_WH.DataLength=SWAB32(DataWritten);
+	m_WH.DataLength=SWAB32(SWAB32(m_WH.DataLength) + data_size);
 #else
 	m_WH.DataLength+=data_size;
 #endif

Lines 1-10 Link Here

(-)audio/zinf/files/patch-io-wavout-src-waveoutpmo.cpp (-10 lines)
1	--- ./io/wavout/src/wavoutpmo.cpp.orig Tue Oct 16 01:23:08 2001
2	+++ ./io/wavout/src/wavoutpmo.cpp Sun Apr 7 01:40:28 2002
3	@@ -28,7 +28,6 @@
4	#endif
5	#include <stdio.h>
6	#include <stdlib.h>
7	-#include <malloc.h>
8
9	/* project headers */
10	#include "config.h"

Line 0 Link Here

(-)audio/zinf/files/patch-io-wavout-src-wavoutpmo.cpp (+10 lines)
	1	--- io/wavout/src/wavoutpmo.cpp.orig Sat Mar 15 10:01:51 2003
	2	+++ io/wavout/src/wavoutpmo.cpp Mon Aug 18 17:25:07 2003
	3	@@ -28,7 +28,6 @@
	4	#endif
	5	#include <stdio.h>
	6	#include <stdlib.h>
	7	-#include <malloc.h>
	8	#include <string>
	9
	10	/* project headers */




--- lib/xml/include/Parse.h.orig	Thu Feb 13 20:47:58 2003
+++ lib/xml/include/Parse.h	Mon Aug 18 17:37:07 2003
@@ -31,7 +31,10 @@
 #pragma warning(disable:4786)
 #endif
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <string>
 #include <map>
 

Line 0 Link Here

(-)audio/zinf/files/patch-lmc-wav-src-wavlmc.cpp (+10 lines)
	1	--- lmc/wav/src/wavlmc.cpp.orig Sat Mar 15 10:01:52 2003
	2	+++ lmc/wav/src/wavlmc.cpp Thu Aug 21 19:49:36 2003
	3	@@ -49,6 +49,7 @@
	4	#include "facontext.h"
	5	#include "log.h"
	6	#include "debug.h"
	7	+#include "swab.h"
	8
	9	#define DB Debug_v("%s:%d\n", __FILE__, __LINE__);
	10

Lines 1-10 Link Here

(-)audio/zinf/files/patch-plm-metadata-id3lib-id3lib.cpp (-10 lines)
1	--- plm/metadata/id3lib/id3lib.cpp.orig Mon Dec 16 17:34:16 2002
2	+++ plm/metadata/id3lib/id3lib.cpp Sat Jan 18 10:26:46 2003
3	@@ -31,7 +31,6 @@
4	#include <strings.h>
5	#endif
6
7	-#include "id3config.h"
8	#include "errors.h"
9	#include "utility.h"
10	#include "debug.h"




--- ui/zinf/include/PixFontControl.h.orig	Thu Feb 13 21:21:37 2003
+++ ui/zinf/include/PixFontControl.h	Mon Aug 18 17:37:47 2003
@@ -32,7 +32,10 @@
 #pragma warning(disable:4786)
 #endif
 
+#include <inttypes.h>
+#if HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <string>
 #include <vector>
 




--- ui/zinf/src/ThemeZip.cpp.orig	Sun Feb 23 09:35:06 2003
+++ ui/zinf/src/ThemeZip.cpp	Thu Aug 21 21:56:19 2003
@@ -24,6 +24,10 @@
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <inttypes.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #ifdef WIN32
 #include <windows.h>
@@ -145,7 +149,7 @@
        oFile = *(*i);
        pPtr = strrchr(oFile.c_str(), DIR_MARKER);
        if (pPtr)
-           oFile.erase(0, ((int)pPtr - (int)oFile.c_str()) + 1);
+           oFile.erase(0, ((uintptr_t)pPtr - (uintptr_t)oFile.c_str()) + 1);
 
        pIn = fopen((*i)->c_str(), "rb");
        if (pIn == NULL)
@@ -424,7 +428,7 @@
 
        oUnpackFile = string(TarRecord.header.name);
        // in case we have sub-directory in tar, take only filename
-       unsigned int uPos;
+       uintptr_t uPos;
        uPos=oUnpackFile.rfind('/');
        if(uPos!=oUnpackFile.npos) oUnpackFile.erase(0,uPos+1);
 
@@ -553,7 +557,7 @@
         // see if it is directory record we are looking for
         if(TarRecord.header.typeflag == DIRTYPE)
         {
-            unsigned int uPos;
+            uintptr_t uPos;
             oDescriptiveName = string (TarRecord.header.name);
 
             // erase trailing slash

Line 0 Link Here

(-)audio/zinf/files/patch-ui-zinf-tools-Makefile.in (+11 lines)
	1	--- ui/zinf/tools/Makefile.in.orig Mon Aug 4 03:57:33 2003
	2	+++ ui/zinf/tools/Makefile.in Mon Aug 18 19:02:48 2003
	3	@@ -213,7 +213,7 @@
	4
	5	maketheme_SOURCES = MakeTheme.cpp $(top_srcdir)/ui/zinf/src/ThemeZip.cpp
	6	maketheme_LDADD = $(top_builddir)/lib/unzip/libunzip.la \
	7	- $(top_builddir)/base/unix/libunix.la $(ZLIB_LIBS) -ldl
	8	+ $(top_builddir)/base/unix/libunix.la $(ZLIB_LIBS)
	9
	10
	11	AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) \

Line 0 Link Here

(-)audio/zinf/files/patch-ui-zinf-unix-src-GTKFileSelector.cpp (+11 lines)
	1	--- ui/zinf/unix/src/GTKFileSelector.cpp.orig Wed Feb 19 16:39:23 2003
	2	+++ ui/zinf/unix/src/GTKFileSelector.cpp Sat Sep 13 03:02:14 2003
	3	@@ -25,7 +25,7 @@
	4	#include <unistd.h>
	5	#include <dirent.h>
	6
	7	-#if defined(solaris)
	8	+#if defined(solaris) \|\| defined(__FreeBSD__)
	9	#include <sys/types.h>
	10	#include <sys/param.h> /* for MAXPATHLEN */
	11	#include <sys/stat.h>




%%LIBARTS%%lib/zinf/plugins/arts.pmo
lib/zinf/plugins/cd.lmc
lib/zinf/plugins/cd.pmo
lib/zinf/plugins/cmdline.ui
lib/zinf/plugins/download.ui
%%ESOUND%%lib/zinf/plugins/esound.pmo
lib/zinf/plugins/http.pmi
lib/zinf/plugins/id3lib.mdf
lib/zinf/plugins/irman.ui
lib/zinf/plugins/kjofol.ftf
lib/zinf/plugins/id3lib.mdf
lib/zinf/plugins/lcd.ui
lib/zinf/plugins/local.pmi
lib/zinf/plugins/m3u.plf
lib/zinf/plugins/mbcd.mdf
lib/zinf/plugins/misc.mdf
lib/zinf/plugins/mpg123.ui
lib/zinf/plugins/musicbrowser.ui
lib/zinf/plugins/ncurses.ui
lib/zinf/plugins/obs.pmi
lib/zinf/plugins/pls.plf
lib/zinf/plugins/rmp.dlf
lib/zinf/plugins/soundcard.pmo
%%VORBIS%%lib/zinf/plugins/vorbis.lmc
%%VORBIS%%lib/zinf/plugins/vorbis.mdf
lib/zinf/plugins/wav.lmc
lib/zinf/plugins/wavout.pmo
lib/zinf/plugins/winamp.ftf
lib/zinf/plugins/winamp_theme.xml
lib/zinf/plugins/xingmp3.lmc
lib/zinf/plugins/zinf.ui
lib/zinf/plugins/zinfcmd.ui
share/gnome/apps/Audio/Zinf.desktop
share/gnome/pixmaps/zinf.png
share/zinf/themes/Aquatica.fat
share/zinf/themes/Zinf.fat
share/zinf/themes/ZinfClassic.fat

Return to bug 57001

Lines 6-12 Link Here

(-)audio/zinf/Makefile (-8 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= zinf	8	PORTNAME= zinf
9	PORTVERSION= 2.2.3	9	PORTVERSION= 2.2.4
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 14-41 Link Here
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= GTK-based MP3 player	15	COMMENT= GTK-based MP3 player
16		16
		17	BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
17	LIB_DEPENDS= id3-3.8.2:${PORTSDIR}/audio/id3lib \	18	LIB_DEPENDS= id3-3.8.2:${PORTSDIR}/audio/id3lib \
18	musicbrainz.2:${PORTSDIR}/audio/musicbrainz	19	musicbrainz.3:${PORTSDIR}/audio/libmusicbrainz \
		20	gdbm.3:${PORTSDIR}/databases/gdbm
		21	RUN_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
19		22
20	USE_X_PREFIX= yes	23	USE_X_PREFIX= yes
21	USE_GNOME= gnomehier gdkpixbuf	24	USE_GNOME= gdkpixbuf gnomehack gnometarget
22	WANT_GNOME= yes	25	WANT_GNOME= yes
23	USE_PERL5= yes	26	USE_PERL5= yes
24	USE_FREETYPE= yes	27	USE_FREETYPE= yes
25	USE_GMAKE= yes	28	USE_GMAKE= yes
26	USE_AUTOCONF_VER= 213	29	USE_LIBTOOL= yes
		30	LIBTOOLFLAGS= # none
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	31	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
		32	CONFIGURE_ARGS= --enable-ipv6
28		33
29	CPPFLAGS= -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include \	34	CPPFLAGS= -I${LOCALBASE}/include/stlport \
30	${PTHREAD_CFLAGS}	35	-I${LOCALBASE}/include/freetype1/freetype \
31	LDFLAGS= -L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}	36	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		37	LDFLAGS= -L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}
		38
		39	CFLAGS+= -O0
32		40
33	.include <bsd.port.pre.mk>	41	.include <bsd.port.pre.mk>
34		42
35	.if ${ARCH} == "i386"	43	.if ${ARCH} == "i386"
36	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm	44	BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm
37	CPPFLAGS+= "-D_M_IX86"	45	CPPFLAGS+= "-D_M_IX86"
38	.elif ${ARCH} == "alpha"	46	.else
		47	CONFIGURE_ARGS+= --disable-x86opts
		48	.endif
		49
		50	.if ${ARCH} == "alpha"
39	CPPFLAGS+= "-D_M_ALPHA"	51	CPPFLAGS+= "-D_M_ALPHA"
40	.endif	52	.endif
41		53

Lines 1-17 Link Here

(-)audio/zinf/files/patch-Makefile.in (-17 lines)
1	--- Makefile.in.orig Mon Jun 24 08:44:27 2002
2	+++ Makefile.in Thu Oct 17 09:19:30 2002
3	@@ -142,10 +142,10 @@
4	install-zinf: zinf
5	$(mkinstalldirs) $(DESTDIR)$(bindir)
6	$(INSTALL_PROGRAM) zinf $(DESTDIR)$(bindir)
7	- $(mkinstalldirs) /usr/share/pixmaps
8	- $(INSTALL_DATA) installer/unix/linux/zinf.png $(GTK_PREFIX)/share/pixmaps
9	- $(mkinstalldirs) /usr/share/gnome/apps/Audio
10	- $(INSTALL_DATA) installer/unix/linux/Zinf.desktop $(GTK_PREFIX)/share/gnome/apps/Audio
11	+ $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/pixmaps
12	+ $(INSTALL_DATA) installer/unix/linux/zinf.png $(DESTDIR)$(datadir)/gnome/pixmaps
13	+ $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Audio
14	+ $(INSTALL_DATA) installer/unix/linux/Zinf.desktop $(DESTDIR)$(datadir)/gnome/apps/Audio
15	if test -f "MakeTheme"; then \
16	$(INSTALL_PROGRAM) MakeTheme $(DESTDIR)$(bindir);\
17	fi;

Lines 1-189 Link Here

(-)audio/zinf/files/patch-aa (-189 lines)
1	--- configure.in.orig Mon Jan 20 02:04:10 2003
2	+++ configure.in Fri May 2 01:35:27 2003
3	@@ -182,8 +182,8 @@
4	;;
5	freebsd*)
6	host_os="freebsd"
7	- CFLAGS="$CFLAGS -D_THREAD_SAFE -pthread -I/usr/local/include"
8	- LDFLAGS="$LDFLAGS -Wl,-export-dynamic -L/usr/local/lib"
9	+ CFLAGS="$CFLAGS"
10	+ LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
11	;;
12	netbsd*)
13	host_os="freebsd"
14	@@ -334,9 +334,9 @@
15	sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\2/'`
16	esd_micro_version=`$ESD_CONFIG $esd_config_args --version \| \
17	sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\3/'`
18	- ac_save_CFLAGS="$CFLAGS"
19	+ ac_save_CPPFLAGS="$CPPFLAGS"
20	ac_save_LIBS="$LIBS"
21	- CFLAGS="$CFLAGS $ESD_CFLAGS"
22	+ CPPFLAGS="$CPPFLAGS $ESD_CFLAGS"
23	LIBS="$LIBS $ESD_LIBS"
24	rm -f conf.esdtest
25	AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
26	@@ -395,7 +395,7 @@
27	}
28
29	],, have_esound=false, have_esound=false)
30	- CFLAGS="$ac_save_CFLAGS"
31	+ CPPFLAGS="$ac_save_CPPFLAGS"
32	LIBS="$ac_save_LIBS"
33	AC_LANG_RESTORE
34	rm -f conf.esdtest
35	@@ -502,9 +502,9 @@
36	gtk_config_major=`$GTK_CONFIG --version \| sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\1/'`
37	gtk_config_minor=`$GTK_CONFIG --version \| sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\2/'`
38	gtk_config_micro=`$GTK_CONFIG --version \| sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\3/'`
39	- ac_save_CFLAGS="$CFLAGS"
40	+ ac_save_CPPFLAGS="$CPPFLAGS"
41	ac_save_LIBS="$LIBS"
42	- CFLAGS="$CFLAGS $GTK_CFLAGS"
43	+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
44	LIBS="$GTK_LIBS $LIBS"
45
46	AC_TRY_RUN([
47	@@ -531,7 +531,7 @@
48	gtk_major_version, gtk_minor_version, gtk_micro_version);
49	return 1;
50	}], , have_gtk=false, have_gtk=false])
51	- CFLAGS="$ac_save_CFLAGS"
52	+ CPPFLAGS="$ac_save_CPPFLAGS"
53	LIBS="$ac_save_LIBS"
54	if test "$have_gtk" = "false"; then
55	AC_MSG_RESULT(no)
56	@@ -552,7 +552,7 @@
57	OSINC="$OSINC -I$srcdir/ui/download/unix/include"
58	OSINC="$OSINC -I$srcdir/ui/musicbrowser/include"
59	OSINC="$OSINC -I$srcdir/ftc/kjofol"
60	- CFLAGS="$CFLAGS $GTK_CFLAGS"
61	+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
62	AC_DEFINE(HAVE_GTK)
63	else
64	GTK_CFLAGS=""
65	@@ -573,18 +573,10 @@
66	AC_SUBST(GTK_PREFIX)
67	AC_SUBST(EXTRALIBS)
68
69	-AC_SUBST(CFLAGS)
70	+AC_SUBST(CPPFLAGS)
71
72	dnl orbit crap
73	-save_CPPFLAGS="$CPPFLAGS"
74	-ORBIT_CPP_CFLAGS=`orbit-config --cflags server`
75	-CPPFLAGS="$CPPFLAGS $GTK_CFLAGS $ORBIT_CPP_CFLAGS"
76	-AC_LANG_SAVE
77	-AC_LANG_C
78	-AC_CHECK_HEADERS(orb/orbit.h, have_orbit="true", have_orbit="false")
79	-CPPFLAGS="$save_CPPFLAGS"
80	-AC_LANG_RESTORE
81	-
82	+have_orbit="false"
83	ORBIT_LIBS=""
84	ORBIT_IDL=""
85
86	@@ -708,7 +700,7 @@
87	alsa_min_major_version=0
88	alsa_min_minor_version=9
89	alsa_min_micro_version=0
90	- ac_save_CFLAGS="$CFLAGS"
91	+ ac_save_CPPFLAGS="$CPPFLAGS"
92	ac_save_LIBS="$LIBS"
93
94	LIBS="$LIBS -lasound"
95	@@ -753,7 +745,7 @@
96	], , have_alsa=false, have_alsa=false
97	)
98	AC_LANG_RESTORE
99	- CFLAGS="$ac_save_CFLAGS"
100	+ CPPFLAGS="$ac_save_CPPFLAGS"
101	LIBS="$ac_save_LIBS"
102	if test "$have_alsa" = "false"; then
103	AC_MSG_RESULT(no)
104	@@ -773,6 +765,9 @@
105	AC_MSG_RESULT([compiling alsa pmo plugin])
106	fi
107
108	+AC_ARG_ENABLE(vorbis, [ --disable-vorbis Don't compile the Vorbis output plugin], enable_vorbis=no, enable_vorbis=yes)
109	+
110	+if test "x$enable_vorbis" = "xyes"; then
111	AC_CHECK_LIB(ogg, ogg_sync_init, have_ogg="yes",)
112	AC_CHECK_LIB(vorbisfile, ov_info, have_vorbis="yes",, -lvorbis -logg)
113
114	@@ -784,6 +779,7 @@
115	AC_MSG_RESULT([compiling vorbis codec plugin])
116	fi
117	fi
118	+fi
119
120	ID3_LIBS=""
121	AC_CHECK_LIB(z, uncompress,
122	@@ -803,7 +799,7 @@
123	if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
124	: # arts isn't installed
125	else
126	- CFLAGS="$CFLAGS `$ARTSCCONFIG --cflags`"
127	+ CPPFLAGS="$CPPFLAGS `$ARTSCCONFIG --cflags`"
128	AC_TRY_COMPILE([
129	#include <artsc.h>
130	],[
131	@@ -870,9 +866,9 @@
132	gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version \| \
133	sed 's/\([[0-9]]\).\([[0-9]]\).\([[0-9]]*\)/\3/'`
134	if test "x$enable_gdk_pixbuftest" = "xyes" ; then
135	- ac_save_CFLAGS="$CFLAGS"
136	+ ac_save_CPPFLAGS="$CPPFLAGS"
137	ac_save_LIBS="$LIBS"
138	- CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
139	+ CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
140	LIBS="$LIBS $GDK_PIXBUF_LIBS"
141	dnl
142	dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
143	@@ -934,7 +930,7 @@
144	}
145
146	],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
147	- CFLAGS="$ac_save_CFLAGS"
148	+ CPPFLAGS="$ac_save_CPPFLAGS"
149	LIBS="$ac_save_LIBS"
150	fi
151	fi
152	@@ -953,7 +949,7 @@
153	:
154	else
155	echo "*** Could not run GDK_PIXBUF test program, checking why..."
156	- CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
157	+ CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
158	LIBS="$LIBS $GDK_PIXBUF_LIBS"
159	AC_TRY_LINK([
160	#include <stdio.h>
161	@@ -972,7 +968,7 @@
162	echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
163	echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
164	echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
165	- CFLAGS="$ac_save_CFLAGS"
166	+ CPPFLAGS="$ac_save_CPPFLAGS"
167	LIBS="$ac_save_LIBS"
168	fi
169	fi
170	@@ -984,8 +980,8 @@
171	AC_SUBST(GDK_PIXBUF_LIBS)
172	rm -f conf.gdk_pixbuftest
173
174	-CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
175	-AC_SUBST(CFLAGS)
176	+CPPFLAGS="$CPPFLAGS $GDK_PIXBUF_CFLAGS"
177	+AC_SUBST(CPPFLAGS)
178
179	AC_LANG_SAVE
180	AC_LANG_CPLUSPLUS
181	@@ -995,7 +991,7 @@
182	echo "*** Download the library from "
183	echo "*** http://www.musicbrainz.org/download.html"
184	echo "***"
185	- AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++)
186	+ AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++)
187	AC_LANG_RESTORE
188
189	AC_CONFIG_HEADER(config/config.h)

Lines 1-25 Link Here

(-)audio/zinf/files/patch-ac (-25 lines)
1	--- Makefile.header.in.orig Thu Jan 16 18:32:00 2003
2	+++ Makefile.header.in Fri May 2 01:38:08 2003
3	@@ -73,9 +73,9 @@
4
5	OSDEPOBJ = @OSDEPOBJ@
6
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/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 -I$(srcdir)/lmc/wav/include -I$(srcdir)/lib/utf8 $(OSINC)
8	+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/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)/lmc/wav/include -I$(srcdir)/lib/utf8 $(OSINC)
9
10	-CXXFLAGS = -Werror $(EXTRA_CXXFLAGS)
11	+CXXFLAGS = @CXXFLAGS@ $(EXTRA_CXXFLAGS)
12	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
13	mkinstalldirs = $(SHELL) $(srcdir)/config/mkinstalldirs
14	CONFIG_HEADER = ./config/config.h
15	@@ -91,8 +91,8 @@
16	X_EXTRA_LIBS = @X_EXTRA_LIBS@
17	X_PRE_LIBS = @X_PRE_LIBS@
18
19	-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(RELOC)
20	-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
21	+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(RELOC)
22	+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CXXFLAGS) $(CPPFLAGS)
23	CXXCOMPILE += $(RELOC)
24
25	CXXLINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) $(RELOC) -o $@

Line 0 Link Here

(-)audio/zinf/files/patch-base-include-facontext.h (+13 lines)
	1	--- base/include/facontext.h.orig Thu Feb 6 02:52:52 2003
	2	+++ base/include/facontext.h Mon Aug 18 17:34:13 2003
	3	@@ -25,7 +25,10 @@
	4	#ifndef INCLUDED_FACONTEXT_H_
	5	#define INCLUDED_FACONTEXT_H_
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11
	12	#include "config.h"
	13	#include "preferences.h"

Line 0 Link Here

(-)audio/zinf/files/patch-base-include-preferences.h (+13 lines)
	1	--- base/include/preferences.h.orig Sat Mar 15 10:01:45 2003
	2	+++ base/include/preferences.h Mon Aug 18 17:32:11 2003
	3	@@ -26,7 +26,10 @@
	4
	5	#include <string>
	6	#include <vector>
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11
	12	#include "config.h"
	13	#include "errors.h"

Line 0 Link Here

(-)audio/zinf/files/patch-base-include-swab.h (+13 lines)
	1	--- base/include/swab.h.orig Tue Mar 18 03:53:31 2003
	2	+++ base/include/swab.h Mon Aug 18 17:33:34 2003
	3	@@ -1,7 +1,10 @@
	4	#if !defined(_ZINF_SWAB_H)
	5	#define _ZINF_SWAB_H
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11
	12	#define SWAB16(a) ( (((uint16_t)(a) << 8) & 0xFF00) \| (((uint16_t)(a) >> 8) & 0x00FF) )
	13	#define SWAB32(a) ( (SWAB16(((a) >> 16) & 0xFFFF) << 0) \| (SWAB16((a) & 0xFFFF) << 16) )

Line 0 Link Here

(-)audio/zinf/files/patch-base-include-thread.h (+13 lines)
	1	--- base/include/thread.h.orig Thu Feb 6 02:52:49 2003
	2	+++ base/include/thread.h Mon Aug 18 17:33:09 2003
	3	@@ -26,7 +26,10 @@
	4
	5	#include "config.h"
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11
	12	typedef void (thread_function)(void arg);
	13

Line 0 Link Here

(-)audio/zinf/files/patch-base-src-player.cpp (+20 lines)
	1	--- base/src/player.cpp.orig Sun Aug 3 04:17:48 2003
	2	+++ base/src/player.cpp Thu Aug 21 21:50:28 2003
	3	@@ -708,7 +708,7 @@
	4	#ifndef HAVE_GTK
	5	if (name == "zinf.ui") {
	6	pref = kTextUIPref;
	7	- context->prefs->GetPrefString(pref, name);
	8	+ m_context->prefs->GetPrefString(pref, name);
	9	}
	10	#endif
	11	#endif
	12	@@ -869,7 +869,7 @@
	13	// cerr << boost::format("%1% will quit") % The_BRANDING << endl;
	14
	15
	16	- cerr << "No UI plugin in '" << thePath << "' matched 'plugins/" << name << "' or 'plugins/" << name << ".ui.'" << endl;
	17	+ cerr << "If this was the first time you started zinf just try again." << endl;
	18	cerr << The_BRANDING << " will quit." << endl;
	19	#endif
	20	Event *e = new Event(CMD_QuitPlayer);

Line 0 Link Here

(-)audio/zinf/files/patch-base-src-propimpl.cpp (+13 lines)
	1	--- base/src/propimpl.cpp.orig Thu Feb 6 02:52:47 2003
	2	+++ base/src/propimpl.cpp Mon Aug 18 17:35:16 2003
	3	@@ -21,7 +21,10 @@
	4	$Id: propimpl.cpp,v 1.4 2003/02/05 17:52:47 rottmann Exp $
	5	____________________________________________________________________________*/
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11	#include <map>
	12	#include <vector>
	13	#include <string>

Line 0 Link Here

(-)audio/zinf/files/patch-base-src-registrar.cpp (+29 lines)
	1	--- base/src/registrar.cpp.orig Sat Mar 15 10:01:46 2003
	2	+++ base/src/registrar.cpp Mon Aug 18 18:54:16 2003
	3	@@ -28,7 +28,7 @@
	4	#include <stdlib.h>
	5	#include <unistd.h>
	6	#include <set>
	7	-#include <wordexp.h>
	8	+#include <glob.h>
	9	#endif // WIN32
	10
	11	#include <stdio.h>
	12	@@ -79,13 +79,13 @@
	13	dir = *di++;
	14
	15	#ifndef WIN32
	16	- wordexp_t result;
	17	- if (wordexp(dir.c_str(), &result, 0) ==0){
	18	+ glob_t result;
	19	+ if (glob(dir.c_str(), 0, NULL, &result) ==0){
	20	//cerr << "Expanded " << dir << " in ";
	21	- dir = result.we_wordv[0];
	22	+ dir = result.gl_pathv[0];
	23	//cerr << dir << endl;
	24	}
	25	- wordfree(&result);
	26	+ globfree(&result);
	27
	28	#if 0
	29	if (dir[0] == '~') {

Line 0 Link Here

(-)audio/zinf/files/patch-base-src-utility.cpp (+29 lines)
	1	--- base/src/utility.cpp.orig Sun May 11 15:45:31 2003
	2	+++ base/src/utility.cpp Mon Aug 18 18:57:01 2003
	3	@@ -52,7 +52,7 @@
	4	#include "win32impl.h"
	5	#include "browser.h"
	6	#include <unistd.h>
	7	-#include <wordexp.h>
	8	+#include <glob.h>
	9	#define MKDIR(z) mkdir(z, 0755)
	10	#define _stat stat
	11	#ifndef _S_IFDIR
	12	@@ -764,13 +764,13 @@
	13
	14	if (subpath.size()) {
	15	#ifndef WIN32
	16	- wordexp_t result;
	17	- if (wordexp(subpath.c_str(), &result, 0) ==0){
	18	+ glob_t result;
	19	+ if (glob(subpath.c_str(), 0, NULL, &result) ==0){
	20	//cerr << "Expanded " << dir << " in ";
	21	- subpath = result.we_wordv[0];
	22	+ subpath = result.gl_pathv[0];
	23	//cerr << dir << endl;
	24	}
	25	- wordfree(&result);
	26	+ globfree(&result);
	27	#endif
	28
	29	dirs.push_back(subpath);

Line 0 Link Here

(-)audio/zinf/files/patch-base-unix-include-win32impl.h (+13 lines)
	1	--- base/unix/include/win32impl.h.orig Thu Feb 6 02:52:42 2003
	2	+++ base/unix/include/win32impl.h Mon Aug 18 17:36:37 2003
	3	@@ -24,7 +24,10 @@
	4	#ifndef INCLUDED_WIN32IMPL_H_
	5	#define INCLUDED_WIN32IMPL_H_
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11	#include <limits.h>
	12
	13	#include "config.h"

Line 0 Link Here

(-)audio/zinf/files/patch-config-ltmain.sh (+21 lines)
	1	--- config/ltmain.sh.orig Wed Jul 23 11:20:18 2003
	2	+++ config/ltmain.sh Mon Aug 18 22:41:00 2003
	3	@@ -1075,12 +1075,17 @@
	4	esac
	5	elif test "X$arg" = "X-lc_r"; then
	6	case $host in
	7	- --openbsd* \| --freebsd*)
	8	+ --openbsd*)
	9	# Do not include libc_r directly, use -pthread flag.
	10	continue
	11	;;
	12	esac
	13	fi
	14	+ deplibs="$deplibs $arg"
	15	+ continue
	16	+ ;;
	17	+
	18	+ -?thread)
	19	deplibs="$deplibs $arg"
	20	continue
	21	;;

Line 0 Link Here

(-)audio/zinf/files/patch-configure (+18 lines)
	1	--- configure.orig Mon Aug 4 01:28:11 2003
	2	+++ configure Thu Aug 21 21:13:45 2003
	3	@@ -8480,6 +8480,7 @@
	4
	5	# This can be used to rebuild libtool when needed
	6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
	7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
	8
	9	# Always use our own libtool.
	10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'
	11	@@ -13429,6 +13430,7 @@
	12	;;
	13	freebsd*)
	14	ZINF_OS="freebsd";
	15	+ UNIX_AUDIO_API="linux"
	16
	17	cat >>confdefs.h <<\_ACEOF
	18	#define ZINF_OS_BSD 1

Lines 1-13 Link Here

(-)audio/zinf/files/patch-installer-unix-linux-Zinf.desktop (-13 lines)
1	--- installer/unix/linux/Zinf.desktop.orig Mon Jun 24 08:44:27 2002
2	+++ installer/unix/linux/Zinf.desktop Sat Jan 18 04:49:09 2003
3	@@ -1,8 +1,8 @@
4
5	[Desktop Entry]
6	-Name[en_US.ISO8859-1]=Zinf
7	+Name=Zinf
8	Exec=zinf
9	-Icon=/usr/share/pixmaps/zinf.png
10	+Icon=zinf.png
11	Terminal=false
12	MultipleArgs=false
13	Type=Application

Line 0 Link Here

(-)audio/zinf/files/patch-io-src-pullbuffer.cpp (+22 lines)
	1	--- io/src/pullbuffer.cpp.orig Sat Mar 15 10:01:51 2003
	2	+++ io/src/pullbuffer.cpp Thu Aug 21 21:53:22 2003
	3	@@ -26,6 +26,10 @@
	4	#include <stdlib.h>
	5	#include <string.h>
	6	#include <assert.h>
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	+#include <stdint.h>
	10	+#endif
	11	#ifndef WIN32
	12	#include <unistd.h>
	13	#endif
	14	@@ -168,7 +172,7 @@
	15
	16	pPtr = (char *)pBuffer;
	17
	18	- if (pPtr >= (char *)((unsigned int)m_pPullBuffer + m_iBufferSize))
	19	+ if (pPtr >= (char *)((uintptr_t)m_pPullBuffer + m_iBufferSize))
	20	pPtr -= m_iBufferSize;
	21
	22	pBuffer = (void *)pPtr;

Line 0 Link Here

(-)audio/zinf/files/patch-io-wavout-src-wav.cpp (+20 lines)
	1	--- io/wavout/src/wav.cpp.orig Tue Mar 18 03:53:30 2003
	2	+++ io/wavout/src/wav.cpp Thu Aug 21 19:47:59 2003
	3	@@ -101,7 +101,7 @@
	4	if (m_FP == NULL) return;
	5
	6	#if !SMALL_ENDIAN
	7	- m_WH.Length = SWAB32(DataWritten + sizeof(WaveHeader) - 4);
	8	+ m_WH.Length = SWAB32(SWAB32(m_WH.DataLength) + sizeof(WaveHeader) - 4);
	9	#else
	10	m_WH.Length = m_WH.DataLength + sizeof(WaveHeader) - 4;
	11	#endif
	12	@@ -118,7 +118,7 @@
	13	{
	14	#if !SMALL_ENDIAN
	15	DataWritten+=data_size;
	16	- m_WH.DataLength=SWAB32(DataWritten);
	17	+ m_WH.DataLength=SWAB32(SWAB32(m_WH.DataLength) + data_size);
	18	#else
	19	m_WH.DataLength+=data_size;
	20	#endif

Line 0 Link Here

(-)audio/zinf/files/patch-lib-xml-include-Parse.h (+13 lines)
	1	--- lib/xml/include/Parse.h.orig Thu Feb 13 20:47:58 2003
	2	+++ lib/xml/include/Parse.h Mon Aug 18 17:37:07 2003
	3	@@ -31,7 +31,10 @@
	4	#pragma warning(disable:4786)
	5	#endif
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11	#include <string>
	12	#include <map>
	13

Line 0 Link Here

(-)audio/zinf/files/patch-ui-zinf-include-PixFontControl.h (+13 lines)
	1	--- ui/zinf/include/PixFontControl.h.orig Thu Feb 13 21:21:37 2003
	2	+++ ui/zinf/include/PixFontControl.h Mon Aug 18 17:37:47 2003
	3	@@ -32,7 +32,10 @@
	4	#pragma warning(disable:4786)
	5	#endif
	6
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	#include <stdint.h>
	10	+#endif
	11	#include <string>
	12	#include <vector>
	13

Line 0 Link Here

(-)audio/zinf/files/patch-ui-zinf-src-ThemeZip.cpp (+40 lines)
	1	--- ui/zinf/src/ThemeZip.cpp.orig Sun Feb 23 09:35:06 2003
	2	+++ ui/zinf/src/ThemeZip.cpp Thu Aug 21 21:56:19 2003
	3	@@ -24,6 +24,10 @@
	4	#include <time.h>
	5	#include <stdio.h>
	6	#include <ctype.h>
	7	+#include <inttypes.h>
	8	+#if HAVE_STDINT_H
	9	+#include <stdint.h>
	10	+#endif
	11
	12	#ifdef WIN32
	13	#include <windows.h>
	14	@@ -145,7 +149,7 @@
	15	oFile = (i);
	16	pPtr = strrchr(oFile.c_str(), DIR_MARKER);
	17	if (pPtr)
	18	- oFile.erase(0, ((int)pPtr - (int)oFile.c_str()) + 1);
	19	+ oFile.erase(0, ((uintptr_t)pPtr - (uintptr_t)oFile.c_str()) + 1);
	20
	21	pIn = fopen((*i)->c_str(), "rb");
	22	if (pIn == NULL)
	23	@@ -424,7 +428,7 @@
	24
	25	oUnpackFile = string(TarRecord.header.name);
	26	// in case we have sub-directory in tar, take only filename
	27	- unsigned int uPos;
	28	+ uintptr_t uPos;
	29	uPos=oUnpackFile.rfind('/');
	30	if(uPos!=oUnpackFile.npos) oUnpackFile.erase(0,uPos+1);
	31
	32	@@ -553,7 +557,7 @@
	33	// see if it is directory record we are looking for
	34	if(TarRecord.header.typeflag == DIRTYPE)
	35	{
	36	- unsigned int uPos;
	37	+ uintptr_t uPos;
	38	oDescriptiveName = string (TarRecord.header.name);
	39
	40	// erase trailing slash

Lines 3-37 Link Here

(-)audio/zinf/pkg-plist (-9 / +5 lines)
3	%%LIBARTS%%lib/zinf/plugins/arts.pmo	3	%%LIBARTS%%lib/zinf/plugins/arts.pmo
4	lib/zinf/plugins/cd.lmc	4	lib/zinf/plugins/cd.lmc
5	lib/zinf/plugins/cd.pmo	5	lib/zinf/plugins/cd.pmo
		6	lib/zinf/plugins/cmdline.ui
6	lib/zinf/plugins/download.ui	7	lib/zinf/plugins/download.ui
7	%%ESOUND%%lib/zinf/plugins/esound.pmo	8	%%ESOUND%%lib/zinf/plugins/esound.pmo
8	lib/zinf/plugins/httpinput.pmi	9	lib/zinf/plugins/http.pmi
9	lib/zinf/plugins/id3lib.mdf
10	lib/zinf/plugins/irman.ui	10	lib/zinf/plugins/irman.ui
11	lib/zinf/plugins/kjofol.ftf	11	lib/zinf/plugins/kjofol.ftf
		12	lib/zinf/plugins/id3lib.mdf
12	lib/zinf/plugins/lcd.ui	13	lib/zinf/plugins/lcd.ui
13	lib/zinf/plugins/localfileinput.pmi	14	lib/zinf/plugins/local.pmi
14	lib/zinf/plugins/m3u.plf	15	lib/zinf/plugins/m3u.plf
15	lib/zinf/plugins/mbcd.mdf	16	lib/zinf/plugins/mbcd.mdf
16	lib/zinf/plugins/misc.mdf	17	lib/zinf/plugins/misc.mdf
17	lib/zinf/plugins/mpg123.ui	18	lib/zinf/plugins/mpg123.ui
18	lib/zinf/plugins/musicbrowser.ui	19	lib/zinf/plugins/musicbrowser.ui
19	lib/zinf/plugins/ncurses.ui	20	lib/zinf/plugins/ncurses.ui
20	lib/zinf/plugins/obsinput.pmi	21	lib/zinf/plugins/obs.pmi
21	lib/zinf/plugins/pls.plf	22	lib/zinf/plugins/pls.plf
22	lib/zinf/plugins/rmp.dlf
23	lib/zinf/plugins/soundcard.pmo	23	lib/zinf/plugins/soundcard.pmo
24	%%VORBIS%%lib/zinf/plugins/vorbis.lmc	24	%%VORBIS%%lib/zinf/plugins/vorbis.lmc
25	%%VORBIS%%lib/zinf/plugins/vorbis.mdf	25	%%VORBIS%%lib/zinf/plugins/vorbis.mdf
26	lib/zinf/plugins/wav.lmc	26	lib/zinf/plugins/wav.lmc
27	lib/zinf/plugins/wavout.pmo	27	lib/zinf/plugins/wavout.pmo
28	lib/zinf/plugins/winamp.ftf	28	lib/zinf/plugins/winamp.ftf
29	lib/zinf/plugins/winamp_theme.xml
30	lib/zinf/plugins/xingmp3.lmc	29	lib/zinf/plugins/xingmp3.lmc
31	lib/zinf/plugins/zinf.ui	30	lib/zinf/plugins/zinf.ui
32	lib/zinf/plugins/zinfcmd.ui
33	share/gnome/apps/Audio/Zinf.desktop
34	share/gnome/pixmaps/zinf.png
35	share/zinf/themes/Aquatica.fat	31	share/zinf/themes/Aquatica.fat
36	share/zinf/themes/Zinf.fat	32	share/zinf/themes/Zinf.fat
37	share/zinf/themes/ZinfClassic.fat	33	share/zinf/themes/ZinfClassic.fat