Update freeamp 2.1.1 to zinf 2.2.0.

Add zlib patches for working around zlib 1.1.4 problems (obtained from
src/lib/zlibz in current) + a file that was forgotten in the zlib 1.1.3 to
1.1.4 upgrade between freeamp 2.1.1 and zinf 2.2.0.

12 files changed, 214 insertions, 296 deletions

diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index 06640cd2589c..db98bc63252a 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -5,21 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	freeamp
-PORTVERSION=	2.1.1
-PORTREVISION=	4
+PORTNAME=	zinf
+PORTVERSION=	2.2.0
 CATEGORIES=	audio
-MASTER_SITES=	http://www.freeamp.org/download/src/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	musicbrainz.1:${PORTSDIR}/audio/musicbrainz \
+LIB_DEPENDS=	musicbrainz.2:${PORTSDIR}/audio/musicbrainz \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		ttf.4:${PORTSDIR}/print/freetype
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_BZIP2=	yes
 USE_GTK=	yes
 WANT_ESOUND=	yes
 USE_GMAKE=	yes
@@ -79,8 +77,8 @@ pre-extract:
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/sdr/plugins
-	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.freeamp \
+	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.zinf \
 		${PREFIX}/etc/sdr/plugins
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/freeamp
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/zinf
 
 .include <bsd.port.post.mk>
diff --git a/audio/zinf/distinfo b/audio/zinf/distinfo
index 0ac667c7a993..fd6b6abb3140 100644
--- a/audio/zinf/distinfo
+++ b/audio/zinf/distinfo
@@ -1 +1 @@
-MD5 (freeamp-2.1.1.tar.bz2) = 56720f823f84c3505aeab474c9a6a836
+MD5 (zinf-2.2.0.tar.gz) = 0484ae0c4a462a347054892b32fdcfe9
diff --git a/audio/zinf/files/patch-aa b/audio/zinf/files/patch-aa
index a28137bd431c..e9529418ee8e 100644
--- a/audio/zinf/files/patch-aa
+++ b/audio/zinf/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Mon Dec 10 16:42:31 2001
-+++ configure.in	Thu Mar 14 23:34:42 2002
-@@ -179,8 +179,8 @@
+--- configure.in.orig	Mon Jun 24 01:44:27 2002
++++ configure.in	Sat Aug  3 22:49:49 2002
+@@ -172,8 +172,8 @@
      ;;
    freebsd*)
      host_os="freebsd"
@@ -11,19 +11,18 @@
      ;;
    netbsd*)
      host_os="freebsd"
-@@ -331,9 +331,9 @@
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+@@ -325,8 +325,10 @@
       esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     ac_save_CFLAGS="$CFLAGS"
+      ac_save_CFLAGS="$CFLAGS"
 +     ac_save_CPPFLAGS="$CPPFLAGS"
       ac_save_LIBS="$LIBS"
--     CFLAGS="$CFLAGS $ESD_CFLAGS"
+      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)
-@@ -392,7 +392,7 @@
+@@ -385,7 +387,7 @@
  }
  
  ],, have_esound=false, have_esound=false)
@@ -32,7 +31,7 @@
       LIBS="$ac_save_LIBS"
       AC_LANG_RESTORE
       rm -f conf.esdtest
-@@ -419,7 +419,7 @@
+@@ -412,7 +414,7 @@
  
  dnl optional freetype support..
  save_CPPFLAGS="$CPPFLAGS"
@@ -41,7 +40,7 @@
  AC_LANG_SAVE
  AC_LANG_C
  AC_CHECK_HEADERS(freetype.h, have_freetype="true", have_freetype="false")
-@@ -465,9 +465,9 @@
+@@ -459,9 +461,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/'`
@@ -53,7 +52,7 @@
       LIBS="$GTK_LIBS $LIBS"
  
       AC_TRY_RUN([
-@@ -494,7 +494,7 @@
+@@ -488,7 +490,7 @@
           gtk_major_version, gtk_minor_version, gtk_micro_version);
    return 1;
  }], , have_gtk=false, have_gtk=false])
@@ -62,17 +61,17 @@
      LIBS="$ac_save_LIBS" 
      if test "$have_gtk" = "false"; then
         AC_MSG_RESULT(no)
-@@ -515,7 +515,7 @@
+@@ -509,7 +511,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"
-@@ -541,17 +541,10 @@
- AC_SUBST(GTK_LIBS)
+ else
+   GTK_CFLAGS=""
+@@ -530,18 +532,10 @@
+ AC_SUBST(GTK_PREFIX)
  AC_SUBST(EXTRALIBS)
  
 -AC_SUBST(CFLAGS)
@@ -80,7 +79,8 @@
  
  dnl orbit crap
 -save_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+-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")
@@ -91,7 +91,7 @@
  ORBIT_LIBS=""
  ORBIT_IDL=""
  
-@@ -661,7 +654,7 @@
+@@ -651,7 +645,7 @@
    alsa_min_major_version=0
    alsa_min_minor_version=5
    alsa_min_micro_version=0
@@ -100,7 +100,7 @@
    ac_save_LIBS="$LIBS"
  
    LIBS="$LIBS -lasound"
-@@ -706,7 +699,7 @@
+@@ -696,7 +690,7 @@
  ], , have_alsa=false, have_alsa=false
  )
     AC_LANG_RESTORE
@@ -109,18 +109,17 @@
     LIBS="$ac_save_LIBS"
     if test "$have_alsa" = "false"; then
        AC_MSG_RESULT(no)
-@@ -726,6 +719,10 @@
+@@ -716,6 +710,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)
  
-@@ -736,6 +733,7 @@
+@@ -726,6 +723,7 @@
       OSDEPPLUGINS="$OSDEPPLUGINS plugins/vorbis.mdf";
       AC_MSG_RESULT([compiling vorbis codec plugin])
    fi 
@@ -128,25 +127,7 @@
  fi 
  
  ID3_LIBS=""
-@@ -749,6 +747,9 @@
- dnl Partly taken from SDL's configure.in
- dnl -------------------------------------------------------------
- 
-+AC_ARG_ENABLE(arts, [  --disable-arts          Don't compile the libArts output plugin], enable_arts=no, enable_arts=yes)
-+
-+if test "x$enable_arts" = "xyes"; then
- AC_PATH_PROG(ARTSCCONFIG, artsc-config)
- if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then
- : # arts isn't installed
-@@ -765,6 +766,7 @@
-      AC_MSG_RESULT([compiling arts pmo plugin])
-     ])
- fi
-+fi
- 
- AC_SUBST(ARTS_LIBS)
- AC_SUBST(EXTRALIBS)
-@@ -819,9 +821,9 @@
+@@ -813,9 +811,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
@@ -158,7 +139,7 @@
      LIBS="$LIBS $GDK_PIXBUF_LIBS"
  dnl
  dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
-@@ -883,7 +885,7 @@
+@@ -877,7 +875,7 @@
  }
  
  ],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
@@ -167,7 +148,7 @@
       LIBS="$ac_save_LIBS"
     fi
  fi
-@@ -902,7 +904,7 @@
+@@ -896,7 +894,7 @@
        :
       else
          echo "*** Could not run GDK_PIXBUF test program, checking why..."
@@ -176,7 +157,7 @@
          LIBS="$LIBS $GDK_PIXBUF_LIBS"
          AC_TRY_LINK([
  #include <stdio.h>
-@@ -921,7 +923,7 @@
+@@ -915,7 +913,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" ])
@@ -185,7 +166,7 @@
          LIBS="$ac_save_LIBS"
       fi
     fi
-@@ -933,8 +935,8 @@
+@@ -927,8 +925,8 @@
  AC_SUBST(GDK_PIXBUF_LIBS)
  rm -f conf.gdk_pixbuftest
  
@@ -196,7 +177,7 @@
  
  AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
-@@ -944,7 +946,7 @@
+@@ -938,7 +936,7 @@
      echo "*** Download the library from "
      echo "***     http://www.musicbrainz.org/download.html"
      echo "***"
diff --git a/audio/zinf/files/patch-ac b/audio/zinf/files/patch-ac
index 9ac6033089d5..3ccdbc6010ff 100644
--- a/audio/zinf/files/patch-ac
+++ b/audio/zinf/files/patch-ac
@@ -1,15 +1,15 @@
---- 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 @@
+--- Makefile.header.in.orig	Sat Aug  3 22:50:21 2002
++++ Makefile.header.in	Sat Aug  3 22:51:50 2002
+@@ -72,7 +72,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)
+ 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 -I$(srcdir)/lmc/wav/include $(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 @@
+@@ -88,8 +88,8 @@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
  X_PRE_LIBS = @X_PRE_LIBS@
  
diff --git a/audio/zinf/files/patch-ad b/audio/zinf/files/patch-ad
index 9e5f9a6a6c07..6657f35b715e 100644
--- a/audio/zinf/files/patch-ad
+++ b/audio/zinf/files/patch-ad
@@ -1,11 +1,11 @@
---- Makefile-plugins.in.orig	Tue Oct 16 13:31:05 2001
-+++ Makefile-plugins.in	Wed Dec 12 03:25:45 2001
-@@ -232,7 +232,7 @@
- UNIXFREEAMPUIOBJ += ui/freeamp/unix/src/GTKPreferenceWindow.o 
- UNIXFREEAMPUIOBJ += ui/freeamp/unix/src/GTKFileSelector.o  
- UNIXFREEAMPUIOBJ += ui/musicbrowser/unix/src/gtkmessagedialog.o
--UNIXFREEAMPUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS)
-+UNIXFREEAMPUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS)
+--- Makefile-plugins.in.orig	Sat Aug  3 22:53:07 2002
++++ Makefile-plugins.in	Sat Aug  3 22:54:02 2002
+@@ -200,7 +200,7 @@
+ UNIXZINFUIOBJ += ui/zinf/unix/src/GTKPreferenceWindow.o 
+ UNIXZINFUIOBJ += ui/zinf/unix/src/GTKFileSelector.o  
+ UNIXZINFUIOBJ += ui/musicbrowser/unix/src/gtkmessagedialog.o
+-UNIXZINFUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS)
++UNIXZINFUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS)
  
- BEOSFREEAMPUIOBJ  = ui/freeamp/beos/src/BeOSWindow.o
- BEOSFREEAMPUIOBJ += ui/freeamp/beos/src/BeOSBitmap.o
+ plugins/zinf.ui: $(ZINFUIOBJ)
+ 	$(LINKMOD) -o $@ $(ZINFUIOBJ) $(ZINFUILIBS)
diff --git a/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp b/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp
deleted file mode 100644
index c16ea2f477e1..000000000000
--- a/audio/zinf/files/patch-io-signature-src-signaturepmo.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./io/signature/src/signaturepmo.cpp.orig	Thu Oct 26 18:51:32 2000
-+++ ./io/signature/src/signaturepmo.cpp	Sun Apr  7 01:40:32 2002
-@@ -27,7 +27,6 @@
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- 
- /* project headers */
- #include "config.h"
diff --git a/audio/zinf/files/patch-zlib-infcodes.c b/audio/zinf/files/patch-zlib-infcodes.c
new file mode 100644
index 000000000000..635646f8bddb
--- /dev/null
+++ b/audio/zinf/files/patch-zlib-infcodes.c
@@ -0,0 +1,21 @@
+--- lib/zlib/src/infcodes.c.orig	Thu Jun 20 08:40:24 2002
++++ lib/zlib/src/infcodes.c	Sun Aug  4 16:45:11 2002
+@@ -197,8 +197,18 @@
+       c->mode = COPY;
+     case COPY:          /* o: copying bytes in window, waiting for space */
+       f = q - c->sub.copy.dist;
++#ifdef __FreeBSD__
++      {
++      /* Work-around for a FreeBSD gcc bug. */
++      volatile inflate_blocks_statef *s1 = s;
++
++      while (f < s1->window)            /* modulo window size-"while" instead */
++        f += s1->end - s1->window;      /* of "if" handles invalid distances */
++      }
++#else
+       while (f < s->window)             /* modulo window size-"while" instead */
+         f += s->end - s->window;        /* of "if" handles invalid distances */
++#endif
+       while (c->len)
+       {
+         NEEDOUT
diff --git a/audio/zinf/files/patch-zlib-inffast.c b/audio/zinf/files/patch-zlib-inffast.c
new file mode 100644
index 000000000000..59c283dd0e5b
--- /dev/null
+++ b/audio/zinf/files/patch-zlib-inffast.c
@@ -0,0 +1,67 @@
+--- lib/zlib/src/inffast.c.orig	Thu Jun 20 08:40:24 2002
++++ lib/zlib/src/inffast.c	Sun Aug  4 17:16:50 2002
+@@ -1,5 +1,5 @@
+ /* inffast.c -- process literals and length/distance pairs fast
+- * Copyright (C) 1995-1998 Mark Adler
++ * Copyright (C) 1995-2002 Mark Adler
+  * For conditions of distribution and use, see copyright notice in zlib.h 
+  */
+ 
+@@ -93,28 +93,41 @@
+ 
+             /* do the copy */
+             m -= c;
+-            if ((uInt)(q - s->window) >= d)     /* offset before dest */
+-            {                                   /*  just copy */
+-              r = q - d;
+-              *q++ = *r++;  c--;        /* minimum count is three, */
+-              *q++ = *r++;  c--;        /*  so unroll loop a little */
+-            }
+-            else                        /* else offset after destination */
++            r = q - d;
++            if (r < s->window)                  /* wrap if needed */
+             {
+-              e = d - (uInt)(q - s->window); /* bytes from offset to end */
+-              r = s->end - e;           /* pointer to offset */
+-              if (c > e)                /* if source crosses, */
++              do {
++                r += s->end - s->window;        /* force pointer in window */
++              } while (r < s->window);          /* covers invalid distances */
++              e = s->end - r;
++              if (c > e)
+               {
+-                c -= e;                 /* copy to end of window */
++                c -= e;                         /* wrapped copy */
+                 do {
+-                  *q++ = *r++;
++                    *q++ = *r++;
+                 } while (--e);
+-                r = s->window;          /* copy rest from start of window */
++                r = s->window;
++                do {
++                    *q++ = *r++;
++                } while (--c);
+               }
++              else                              /* normal copy */
++              {
++                *q++ = *r++;  c--;
++                *q++ = *r++;  c--;
++                do {
++                    *q++ = *r++;
++                } while (--c);
++              }
++            }
++            else                                /* normal copy */
++            {
++              *q++ = *r++;  c--;
++              *q++ = *r++;  c--;
++              do {
++                *q++ = *r++;
++              } while (--c);
+             }
+-            do {                        /* copy all or what's left */
+-              *q++ = *r++;
+-            } while (--c);
+             break;
+           }
+           else if ((e & 64) == 0)
diff --git a/audio/zinf/files/patch-zlib-zconf.h b/audio/zinf/files/patch-zlib-zconf.h
new file mode 100644
index 000000000000..9f4ca4b60d38
--- /dev/null
+++ b/audio/zinf/files/patch-zlib-zconf.h
@@ -0,0 +1,28 @@
+--- lib/zlib/include/zconf.h.orig	Sun Aug  4 20:51:32 2002
++++ lib/zlib/include/zconf.h	Sun Aug  4 20:53:27 2002
+@@ -238,15 +238,25 @@
+ #ifdef HAVE_UNISTD_H
+ #  include <sys/types.h> /* for off_t */
+ #  include <unistd.h>    /* for SEEK_* and off_t */
++#ifndef __FreeBSD__
+ #  define z_off_t  off_t
+ #endif
++#endif
+ #ifndef SEEK_SET
+ #  define SEEK_SET        0       /* Seek from beginning of file.  */
+ #  define SEEK_CUR        1       /* Seek from current position.  */
+ #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+ #endif
++#ifndef __FreeBSD__
+ #ifndef z_off_t
+ #  define  z_off_t long
++#endif
++#else
++/*
++ * This is hard-configured for FreeBSD, since zlib doesn't actually support
++ * using the system off_t for offsets unless off_t is no longer than long.
++ */
++#define z_off_t long
+ #endif
+ 
+ /* MVS linker does not support external names larger than 8 bytes */
diff --git a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp b/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.zinf
index 202e4cceee0e..53b178861605 100644
--- a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.freeamp
+++ b/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.zinf
@@ -1,5 +1,5 @@
 media:audio
-tool:freeamp
+tool:zinf
 proto:RTP/AVP
 protoname:RTP
 
diff --git a/audio/zinf/pkg-descr b/audio/zinf/pkg-descr
index aeb51f3df4e0..ee7473a92cad 100644
--- a/audio/zinf/pkg-descr
+++ b/audio/zinf/pkg-descr
@@ -1,10 +1,9 @@
-FreeAmp is an Open Source effort to build the best digital audio 
-player available.  In the interest of supporting the free software 
-community, while at the same time fostering the growth of the online 
-delivery of music, EMusic.com, THE Source for Downloadable Music, is 
-funding both the FreeAmp.org domain and the efforts of the FreeAmp 
-team.
+The Zinf audio player is a simple, but powerful audio player for Linux and
+Win32. It supports MP3, Ogg/Vorbis, WAV and Audio CD playback, with a powerful
+music browser, theme support and a download manager. 
 
-WWW: http://www.freeamp.org/
+It is based on the FreeA*p audio player which was developed by EMusic. The
+FreeA*p project was discontinued due to a trademark conflict and EMusic being
+acquired by Vivendi.
 
-Roman Shterenzon <roman@xpert.com>
+WWW: http://www.zinf.org/
diff --git a/audio/zinf/pkg-plist b/audio/zinf/pkg-plist
index 4fa3140c6248..bff6cc47cb58 100644
--- a/audio/zinf/pkg-plist
+++ b/audio/zinf/pkg-plist
@@ -1,208 +1,42 @@
-bin/freeamp
-etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.freeamp
-%%LIBARTS%%lib/freeamp/plugins/arts.pmo
-lib/freeamp/plugins/cd.lmc
-lib/freeamp/plugins/cd.pmo
-lib/freeamp/plugins/download.ui
-%%ESOUND%%lib/freeamp/plugins/esound.pmo
-lib/freeamp/plugins/freeamp.ui
-lib/freeamp/plugins/freeampcmd.ui
-lib/freeamp/plugins/httpinput.pmi
-lib/freeamp/plugins/id3v1.mdf
-lib/freeamp/plugins/id3v2.mdf
-lib/freeamp/plugins/irman.ui
-lib/freeamp/plugins/kjofol.ftf
-lib/freeamp/plugins/lcd.ui
-lib/freeamp/plugins/localfileinput.pmi
-lib/freeamp/plugins/m3u.plf
-lib/freeamp/plugins/mbcd.mdf
-lib/freeamp/plugins/misc.mdf
-lib/freeamp/plugins/mpg123.ui
-lib/freeamp/plugins/musicbrowser.ui
-lib/freeamp/plugins/ncurses.ui
-lib/freeamp/plugins/obsinput.pmi
-lib/freeamp/plugins/pls.plf
-lib/freeamp/plugins/rmp.dlf
-lib/freeamp/plugins/signature.pmo
-lib/freeamp/plugins/soundcard.pmo
-%%VORBIS%%lib/freeamp/plugins/vorbis.lmc
-%%VORBIS%%lib/freeamp/plugins/vorbis.mdf
-lib/freeamp/plugins/wav.lmc
-lib/freeamp/plugins/wavout.pmo
-lib/freeamp/plugins/winamp.ftf
-lib/freeamp/plugins/winamp_theme.xml
-lib/freeamp/plugins/xingmp3.lmc
-share/freeamp/help/Copy of configuring_settings_topics.html
-share/freeamp/help/Shortcut to preferences_advanced.html.lnk
-share/freeamp/help/adding_a_custom_theme.html
-share/freeamp/help/adding_items_to_the_bottom_of_the_playlist_queue.html
-share/freeamp/help/adding_items_to_the_playlist_for_immediate_playback.html
-share/freeamp/help/adding_music_to_your_music_collection.html
-share/freeamp/help/adding_tracks_to_a_playlist.html
-share/freeamp/help/adjusting_the_playback_volume.html
-share/freeamp/help/appearance_topics.html
-share/freeamp/help/bitzilogo.gif
-share/freeamp/help/bw_logo.gif
-share/freeamp/help/changing_information_about_a_track.html
-share/freeamp/help/changing_the_order_of_tracks_in_a_playlist.html
-share/freeamp/help/changing_the_player_theme.html
-share/freeamp/help/changing_the_tool_view_in_my_music.html
-share/freeamp/help/clearing_a_playlist.html
-share/freeamp/help/configuring_player_settings.html
-share/freeamp/help/configuring_settings_topics.html
-share/freeamp/help/contents.html
-share/freeamp/help/creating_a_new_playlist.html
-share/freeamp/help/creating_and_managing_topics.html
-share/freeamp/help/creating_and_modifying_topics.html
-share/freeamp/help/creating_custom_themes.html
-share/freeamp/help/creating_relatable_playlists.html
-share/freeamp/help/currentlylisten.gif
-share/freeamp/help/deleting_an_mp3_file_from_your_computer.html
-share/freeamp/help/download.gif
-share/freeamp/help/download_manager.html
-share/freeamp/help/download_manager_entry.html
-share/freeamp/help/downloading_mp3_files_from_a_web_site.html
-share/freeamp/help/drive_selection_entry.html
-share/freeamp/help/edit_info_entry.html
-share/freeamp/help/edit_track_info.html
-share/freeamp/help/editing_the_currently_playing_playlist.html
-share/freeamp/help/ejecting_audio_cds.html
-share/freeamp/help/equal.gif
-share/freeamp/help/files.gif
-share/freeamp/help/freeampmain_eq.gif
-share/freeamp/help/freeampmain_eq.jpg
-share/freeamp/help/freeampmain_eqclosed.gif
-share/freeamp/help/freeampmain_eqopen.gif
-share/freeamp/help/getting_help.html
-share/freeamp/help/glossary.html
-share/freeamp/help/help.gif
-share/freeamp/help/help.html
-share/freeamp/help/helpstyle.css
-share/freeamp/help/keyboard_shortcuts.html
-share/freeamp/help/main_window.html
-share/freeamp/help/menu_topics.html
-share/freeamp/help/min.gif
-share/freeamp/help/moving_to_the_next_track.html
-share/freeamp/help/moving_to_the_previous_track.html
-share/freeamp/help/music_browser_entry.html
-share/freeamp/help/musicbro.gif
-share/freeamp/help/my_music.html
-share/freeamp/help/mymusic.gif
-share/freeamp/help/mymusicfolders.gif
-share/freeamp/help/nextrack.gif
-share/freeamp/help/opening_a_playlist.html
-share/freeamp/help/options.gif
-share/freeamp/help/overview_topics.html
-share/freeamp/help/pause.gif
-share/freeamp/help/pause2.gif
-share/freeamp/help/pausing_downloading.html
-share/freeamp/help/pausing_playback.html
-share/freeamp/help/play.gif
-share/freeamp/help/playing_audio_cds.html
-share/freeamp/help/playing_mp3_files.html
-share/freeamp/help/playing_streams.html
-share/freeamp/help/playing_topics.html
-share/freeamp/help/playing_tracks_in_random_order.html
-share/freeamp/help/postit.gif
-share/freeamp/help/preferences_about.html
-share/freeamp/help/preferences_about_entry.html
-share/freeamp/help/preferences_advanced.html
-share/freeamp/help/preferences_advanced_entry.html
-share/freeamp/help/preferences_directory_entry.html
-share/freeamp/help/preferences_folders.html
-share/freeamp/help/preferences_general.html
-share/freeamp/help/preferences_general_entry.html
-share/freeamp/help/preferences_musicbrainz.html
-share/freeamp/help/preferences_musicbrowser.html
-share/freeamp/help/preferences_musicbrowser_entry.html
-share/freeamp/help/preferences_plugins.html
-share/freeamp/help/preferences_plugins_entry.html
-share/freeamp/help/preferences_relatable.html
-share/freeamp/help/preferences_relatable_entry.html
-share/freeamp/help/preferences_streaming.html
-share/freeamp/help/preferences_streaming_entry.html
-share/freeamp/help/preferences_themes.html
-share/freeamp/help/preferences_themes_entry.html
-share/freeamp/help/prev_track.gif
-share/freeamp/help/prevtrack.gif
-share/freeamp/help/quit.gif
-share/freeamp/help/random1.gif
-share/freeamp/help/random2.gif
-share/freeamp/help/relatable_button.gif
-share/freeamp/help/relatable_entry.html
-share/freeamp/help/relatable_eqclosed.gif
-share/freeamp/help/relatable_equopen.gif
-share/freeamp/help/relatable_profile.html
-share/freeamp/help/relatable_streams.html
-share/freeamp/help/relatable_suggest.gif
-share/freeamp/help/relatablelogo.gif
-share/freeamp/help/relatablesig.gif
-share/freeamp/help/removing_a_playlist_from_your_music_collection.html
-share/freeamp/help/removing_a_track_from_the_playlist.html
-share/freeamp/help/removing_a_track_from_your_music_collection.html
-share/freeamp/help/repeat1.gif
-share/freeamp/help/repeatall.gif
-share/freeamp/help/repeating_playback.html
-share/freeamp/help/repeatno.gif
-share/freeamp/help/resuming_downloading.html
-share/freeamp/help/resuming_playback.html
-share/freeamp/help/saving_a_playlist.html
-share/freeamp/help/saving_a_stream_on_your_computer.html
-share/freeamp/help/scroll.gif
-share/freeamp/help/search_computer_for_music.html
-share/freeamp/help/searching_for_music_on_your_computer.html
-share/freeamp/help/seeking_in_the_current_track.html
-share/freeamp/help/setting_file_associations_or_mime_types.html
-share/freeamp/help/setting_the_default_playlist_queue_option.html
-share/freeamp/help/setting_the_folder_location_to_save_your_music.html
-share/freeamp/help/setting_the_playlist_display_information.html
-share/freeamp/help/sorting_tracks_in_the_playlist.html
-share/freeamp/help/spacetravel.gif
-share/freeamp/help/spacetravel_ret.gif
-share/freeamp/help/spacetraveleq.gif
-share/freeamp/help/spacetraveleq_ret.gif
-share/freeamp/help/spacetravelmed.gif
-share/freeamp/help/spacetravelsm.gif
-share/freeamp/help/stop.gif
-share/freeamp/help/stopping_playback.html
-share/freeamp/help/streaming_topics.html
-share/freeamp/help/taddfiles.gif
-share/freeamp/help/tadditems.gif
-share/freeamp/help/technical_support.html
-share/freeamp/help/teditinfo.gif
-share/freeamp/help/the_page_could_not_be_found.html
-share/freeamp/help/timportitems.gif
-share/freeamp/help/tnewplaylist.gif
-share/freeamp/help/tremoveitems.gif
-share/freeamp/help/tsaveplaylist.gif
-share/freeamp/help/update_topics.html
-share/freeamp/help/updating_the_player.html
-share/freeamp/help/view.gif
-share/freeamp/help/viewing_id3_topics.html
-share/freeamp/help/viewing_the_track_duration.html
-share/freeamp/help/viewing_the_track_name.html
-share/freeamp/help/volume.gif
-share/freeamp/help/what_are_bitzi_features.html
-share/freeamp/help/what_are_id3_tags.html
-share/freeamp/help/what_are_relatable_features.html
-share/freeamp/help/what_are_relatable_features_entry.html
-share/freeamp/help/what_are_themes.html
-share/freeamp/help/what_is_a_playlist.html
-share/freeamp/help/what_is_my_music.html
-share/freeamp/help/what_is_streaming.html
-share/freeamp/help/what_is_the_player.html
-share/freeamp/help/what_kind_of_mp3_files_can_i_play.html
-share/freeamp/help/working_with_the_my_music_collection_folders.html
-share/freeamp/themes/Aquatica.fat
-share/freeamp/themes/EMusic.fat
-share/freeamp/themes/FreeAmp.fat
-share/freeamp/themes/FreeAmpClassic.fat
-share/freeamp/themes/Relatable.fat
-share/freeamp/themes/Tommy.fat
-@dirrm share/freeamp/themes
-@dirrm share/freeamp/help
-@dirrm share/freeamp
-@dirrm lib/freeamp/plugins
-@dirrm lib/freeamp
+bin/zinf
+etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.zinf
+%%LIBARTS%%lib/zinf/plugins/arts.pmo
+lib/zinf/plugins/cd.lmc
+lib/zinf/plugins/cd.pmo
+lib/zinf/plugins/download.ui
+%%ESOUND%%lib/zinf/plugins/esound.pmo
+lib/zinf/plugins/zinf.ui
+lib/zinf/plugins/zinfcmd.ui
+lib/zinf/plugins/httpinput.pmi
+lib/zinf/plugins/id3v1.mdf
+lib/zinf/plugins/id3v2.mdf
+lib/zinf/plugins/irman.ui
+lib/zinf/plugins/kjofol.ftf
+lib/zinf/plugins/lcd.ui
+lib/zinf/plugins/localfileinput.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/obsinput.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
+share/zinf/themes/Aquatica.fat
+share/zinf/themes/Zinf.fat
+share/zinf/themes/ZinfClassic.fat
+@dirrm share/zinf/themes
+@dirrm share/zinf
+@dirrm lib/zinf/plugins
+@dirrm lib/zinf
 @unexec rmdir %D/etc/sdr/plugins 2>/dev/null || true
 @unexec rmdir %D/etc/sdr 2>/dev/null || true