Remove expired ports:

2020-09-30 audio/zinf: Does not build, no upstream
2020-10-01 emulators/qemu-sbruno: Port will be removed in favor of emulators/qemu

50 files changed, 0 insertions, 1129 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 522b16505bc9..c5068b9bc80e 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -870,7 +870,6 @@
     SUBDIR += ympd
     SUBDIR += yoshimi
     SUBDIR += zam-plugins-lv2
-    SUBDIR += zinf
     SUBDIR += zita-convolver
     SUBDIR += zita-resampler
     SUBDIR += zrythm
diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
deleted file mode 100644
index 0c8fc344af95..000000000000
--- a/audio/zinf/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Created by: Roman Shterenzon <roman@xpert.com>
-# $FreeBSD$
-
-PORTNAME=	zinf
-PORTVERSION=	2.2.5
-PORTREVISION=	24
-CATEGORIES=	audio
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	GTK-based MP3 player
-
-LIB_DEPENDS=	libid3.so:audio/id3lib \
-		libgdbm.so:databases/gdbm
-
-USES=		alias gettext gmake gnome libtool ncurses pathfix perl5 \
-		pkgconfig
-USE_CXXSTD=	gnu++98
-USE_GNOME=	gtk20
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-ipv6 \
-		--disable-arts \
-		--disable-esd
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-D_WANT_SEMUN
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-LDFLAGS_i386=	-Wl,-znotext
-
-OPTIONS_DEFINE=	VORBIS
-OPTIONS_DEFAULT=VORBIS
-OPTIONS_SUB=	yes
-
-INSTALL_TARGET=	install-strip
-
-VORBIS_CONFIGURE_OFF=	--disable-vorbis
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
-
-BROKEN=		Does not build with llvm 11
-DEPRECATED=	Does not build, no upstream
-EXPIRATION_DATE=2020-09-30
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:devel/nasm
-CPPFLAGS+=	"-D_M_IX86"
-.else
-CONFIGURE_ARGS+=	--disable-x86opts
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|Player::||' ${WRKSRC}/base/include/player.h
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/sdr/plugins
-	${INSTALL_DATA} ${FILESDIR}/sdr2.plugin.S100.audio.rtp.mpa.zinf \
-		${STAGEDIR}${PREFIX}/etc/sdr/plugins
-
-.include <bsd.port.post.mk>
diff --git a/audio/zinf/distinfo b/audio/zinf/distinfo
deleted file mode 100644
index e94c70d347b4..000000000000
--- a/audio/zinf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (zinf-2.2.5.tar.gz) = f301439ca56c52bf9af0e2693d8ba622532895ecc45fd82f668897bde390cf73
-SIZE (zinf-2.2.5.tar.gz) = 2044561
diff --git a/audio/zinf/files/patch-base_Makefile.in b/audio/zinf/files/patch-base_Makefile.in
deleted file mode 100644
index 1dde106549d9..000000000000
--- a/audio/zinf/files/patch-base_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/Makefile.in.orig	2004-02-17 22:11:09 UTC
-+++ base/Makefile.in
-@@ -245,7 +245,7 @@ zinf_SOURCES = src/log.cpp src/player.cp
- 
- 
- zinf_LDADD = $(top_builddir)/io/libio.la unix/libunix.la \
--			 $(ZINF_LIBS) $(GDBM_LIBS) $(THREAD_LIBS) $(GLIB_LIBS)   -ldl
-+			 $(ZINF_LIBS) $(GDBM_LIBS) $(THREAD_LIBS) $(GLIB_LIBS)
- 
- zinf_LDFLAGS = -export-dynamic -L$(top_builddir)/mdb
- 
diff --git a/audio/zinf/files/patch-base_include_event.h b/audio/zinf/files/patch-base_include_event.h
deleted file mode 100644
index 6dc2c249992d..000000000000
--- a/audio/zinf/files/patch-base_include_event.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/include/event.h.orig	2003-09-16 17:34:53 UTC
-+++ base/include/event.h
-@@ -24,7 +24,10 @@ ________________________________________
- #ifndef INCLUDED_EVENT_H_
- #define INCLUDED_EVENT_H_
- 
-+#include <inttypes.h>
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include "config.h"
- #include "errors.h"
- 
diff --git a/audio/zinf/files/patch-base_include_facontext.h b/audio/zinf/files/patch-base_include_facontext.h
deleted file mode 100644
index a7f34aa103fe..000000000000
--- a/audio/zinf/files/patch-base_include_facontext.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/include/facontext.h.orig	2003-09-16 17:58:13 UTC
-+++ base/include/facontext.h
-@@ -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"
diff --git a/audio/zinf/files/patch-base_include_metadata.h b/audio/zinf/files/patch-base_include_metadata.h
deleted file mode 100644
index f44c09dac912..000000000000
--- a/audio/zinf/files/patch-base_include_metadata.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/include/metadata.h.orig	2003-09-16 20:34:53.000000000 +0300
-+++ base/include/metadata.h
-@@ -25,6 +25,7 @@ ________________________________________
- #define INCLUDED_METADATA_H_
- 
- #include <string>
-+#include <cstring>
- #include <map>
- 
- 
diff --git a/audio/zinf/files/patch-base_include_preferences.h b/audio/zinf/files/patch-base_include_preferences.h
deleted file mode 100644
index 048538709245..000000000000
--- a/audio/zinf/files/patch-base_include_preferences.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/include/preferences.h.orig	2003-09-16 17:34:53 UTC
-+++ base/include/preferences.h
-@@ -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"
diff --git a/audio/zinf/files/patch-base_include_queue.h b/audio/zinf/files/patch-base_include_queue.h
deleted file mode 100644
index 551fe16cc093..000000000000
--- a/audio/zinf/files/patch-base_include_queue.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/include/queue.h.orig	2003-09-16 17:34:53 UTC
-+++ base/include/queue.h
-@@ -24,6 +24,7 @@ ________________________________________
- #ifndef INCLUDED_QUEUE_H_
- #define INCLUDED_QUEUE_H_
- 
-+#include <assert.h>
- #include "config.h"
- #include "mutex.h"
- 
diff --git a/audio/zinf/files/patch-base_include_swab.h b/audio/zinf/files/patch-base_include_swab.h
deleted file mode 100644
index 1654a3cc6def..000000000000
--- a/audio/zinf/files/patch-base_include_swab.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/include/swab.h.orig	2003-09-16 17:34:53 UTC
-+++ base/include/swab.h
-@@ -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) )
diff --git a/audio/zinf/files/patch-base_include_thread.h b/audio/zinf/files/patch-base_include_thread.h
deleted file mode 100644
index 66a015ac7695..000000000000
--- a/audio/zinf/files/patch-base_include_thread.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/include/thread.h.orig	2003-09-16 17:34:53 UTC
-+++ base/include/thread.h
-@@ -26,7 +26,10 @@ ________________________________________
- 
- #include "config.h"
- 
-+#include <inttypes.h>
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- 
- typedef void (*thread_function)(void * arg);
- 
diff --git a/audio/zinf/files/patch-base_src_downloadmanager.cpp b/audio/zinf/files/patch-base_src_downloadmanager.cpp
deleted file mode 100644
index eaebd03877b8..000000000000
--- a/audio/zinf/files/patch-base_src_downloadmanager.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- base/src/downloadmanager.cpp.orig	2003-09-16 17:34:53 UTC
-+++ base/src/downloadmanager.cpp
-@@ -398,7 +398,7 @@ Error DownloadManager::ReadDownloadFile(
-     {
-         // find a suitable plugin
-         result = kError_FormatNotSupported;
--        char* extension = strrchr(url, '.');
-+        const char* extension = strrchr(url, '.');
- 
-         if(extension)
-         {
-@@ -558,7 +558,7 @@ static int32_t GetContentLengthFromHeade
- {
-     int32_t result = -1;
- 
--    char* cp = strstr(buffer, "Content-Length:");
-+    const char* cp = strstr(buffer, "Content-Length:");
- 
-     if(cp)
-     {
-@@ -572,7 +572,7 @@ static int32_t GetContentLengthFromHeade
- 
- static void GetContentTimeFromHeader(const char* buffer, string &mTime)
- {
--    char* cp = strstr(buffer, "Last-Modified:");
-+    const char* cp = strstr(buffer, "Last-Modified:");
-     if(cp)
-     {
-         string::size_type pos;
-@@ -748,7 +748,7 @@ Error DownloadManager::Download(Download
-         struct sockaddr_in  addr;
-         struct hostent      host;
-         SOCKET s = -1;
--        char* file = NULL;
-+        const char* file = NULL;
-         bool useProxy;
-         struct stat st;
- 	string destPath;
diff --git a/audio/zinf/files/patch-base_src_player.cpp b/audio/zinf/files/patch-base_src_player.cpp
deleted file mode 100644
index 6a341c47da0b..000000000000
--- a/audio/zinf/files/patch-base_src_player.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
---- base/src/player.cpp.orig	2004-02-02 17:39:35 UTC
-+++ base/src/player.cpp
-@@ -547,7 +547,7 @@ void Player::HandleSingleArg(char *arg)
-         // who needs to get this, plm or dlm?
-         bool giveToDLM = false;
-         bool giveToTheme = false;
--        char* extension = NULL;
-+        const char* extension = NULL;
- 
-         extension = strrchr(url.c_str(), '.');
- 
-@@ -1103,7 +1103,7 @@ char *
- Player::
- GetProtocol(const char *title)
- {
--   char *temp_proto;
-+   const char *temp_proto;
-    char *proto_return = NULL;
- 
-    temp_proto = strstr(title, "://");
-@@ -1122,7 +1122,7 @@ char *
- Player::
- GetExtension(const char *title)
- {
--   char *temp_ext;
-+   const char *temp_ext;
-    char *ext_return = NULL;
-    char *proto = NULL;
- 
-@@ -1961,15 +1961,14 @@ HandlePrefsChanged(Event *pEvent)
-            m_context->prefs->GetPrefString(kProxyHostPref, &buffer);
-        }
- 
--       char *port = strchr(buffer.c_str(),':');
--       if (port) {
--           *port = '\0';
--           port++;
--       }
-        string proxyAddr = buffer;
-        int nPort = 80;
--       if (port && *port)
--           nPort = atoi(port);
-+       size_t pos = buffer.find(':');
-+       if (pos != string::npos) {
-+          proxyAddr = buffer.substr(0, pos++);
-+          if (pos < buffer.size())
-+              nPort = atoi(buffer.substr(pos).c_str());
-+       }
-     }
- 
- 
diff --git a/audio/zinf/files/patch-base_src_playlist.cpp b/audio/zinf/files/patch-base_src_playlist.cpp
deleted file mode 100644
index 75c470dbee27..000000000000
--- a/audio/zinf/files/patch-base_src_playlist.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- base/src/playlist.cpp.orig	2003-09-16 17:58:13 UTC
-+++ base/src/playlist.cpp
-@@ -1961,7 +1961,7 @@ Error PlaylistManager::ReadPlaylist(cons
-     {
-         // find a suitable plugin
-         result = kError_FormatNotSupported;
--        char* extension = strrchr(url, '.');
-+        const char* extension = strrchr(url, '.');
- 
-         if(extension)
-         {
-@@ -2042,7 +2042,7 @@ Error PlaylistManager::WritePlaylist(con
-     {
-         // find a suitable plugin
-         result = kError_FormatNotSupported;
--        char* extension = strrchr(url, '.');
-+        const char* extension = strrchr(url, '.');
- 
-         if(extension)
-         {
diff --git a/audio/zinf/files/patch-base_src_preferences.cpp b/audio/zinf/files/patch-base_src_preferences.cpp
deleted file mode 100644
index a843333458ca..000000000000
--- a/audio/zinf/files/patch-base_src_preferences.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- base/src/preferences.cpp.orig	2004-02-14 00:24:01.000000000 +0200
-+++ base/src/preferences.cpp
-@@ -31,6 +31,9 @@ ________________________________________
- #include <string>
- #include <stdlib.h>
- 
-+extern "C" {
-+#include <strings.h>
-+}
- #ifdef __QNX__
- #include <strings.h>
- #endif
diff --git a/audio/zinf/files/patch-base_src_prefixprefs.cpp b/audio/zinf/files/patch-base_src_prefixprefs.cpp
deleted file mode 100644
index ad52522a8e17..000000000000
--- a/audio/zinf/files/patch-base_src_prefixprefs.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/src/prefixprefs.cpp.orig	2003-09-16 20:34:54.000000000 +0300
-+++ base/src/prefixprefs.cpp
-@@ -24,6 +24,7 @@ ________________________________________
- 
- #include <stdlib.h>
- #include <string>
-+#include <cstring>
- using namespace std;
- #include "prefixprefs.h"
- 
diff --git a/audio/zinf/files/patch-base_src_properties.cpp b/audio/zinf/files/patch-base_src_properties.cpp
deleted file mode 100644
index e48bc3af48f4..000000000000
--- a/audio/zinf/files/patch-base_src_properties.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- base/src/properties.cpp.orig	2003-11-11 19:59:07 UTC
-+++ base/src/properties.cpp
-@@ -29,7 +29,9 @@ ________________________________________
- #endif
- 
- 
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- // #include <map>
- #include <vector>
- #include <string>
diff --git a/audio/zinf/files/patch-base_src_registrar.cpp b/audio/zinf/files/patch-base_src_registrar.cpp
deleted file mode 100644
index 7622e072636e..000000000000
--- a/audio/zinf/files/patch-base_src_registrar.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- base/src/registrar.cpp.orig	2003-09-16 17:34:54 UTC
-+++ base/src/registrar.cpp
-@@ -35,7 +35,7 @@ ________________________________________
- #include <stdlib.h>
- #include <unistd.h>
- #include <set>
--#include <wordexp.h>
-+#include <glob.h>
- #endif // WIN32
- 
- #include <stdio.h>
-@@ -86,13 +86,13 @@ InitializeRegistry(Registry* registry, P
-         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] == '~') {
diff --git a/audio/zinf/files/patch-base_src_utility.cpp b/audio/zinf/files/patch-base_src_utility.cpp
deleted file mode 100644
index 1905157ce866..000000000000
--- a/audio/zinf/files/patch-base_src_utility.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
---- base/src/utility.cpp.orig	2004-02-10 18:20:22 UTC
-+++ base/src/utility.cpp
-@@ -33,6 +33,7 @@ ________________________________________
- #include <time.h>
- #include <ctype.h>
- #include <stdio.h>
-+#include <cstdlib>
- 
- #include <string>
- #include <vector>
-@@ -56,7 +57,7 @@ using namespace std;
- #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
-@@ -825,13 +826,13 @@ SplitPath(const string& path)
- 
-         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);
diff --git a/audio/zinf/files/patch-base_unix_include_win32impl.h b/audio/zinf/files/patch-base_unix_include_win32impl.h
deleted file mode 100644
index 629e61bb4f1e..000000000000
--- a/audio/zinf/files/patch-base_unix_include_win32impl.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/unix/include/win32impl.h.orig	2003-09-16 17:34:54 UTC
-+++ base/unix/include/win32impl.h
-@@ -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"
diff --git a/audio/zinf/files/patch-base_unix_src_browser.cpp b/audio/zinf/files/patch-base_unix_src_browser.cpp
deleted file mode 100644
index 92f06f758756..000000000000
--- a/audio/zinf/files/patch-base_unix_src_browser.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/unix/src/browser.cpp.orig	2003-09-16 20:34:54.000000000 +0300
-+++ base/unix/src/browser.cpp
-@@ -9,6 +9,7 @@
- #include <unistd.h>
- #include <sys/stat.h>
- #include <string>
-+#include <cstring>
- 
- using namespace std;
- #include "browser.h"
diff --git a/audio/zinf/files/patch-base_unix_src_win32impl.cpp b/audio/zinf/files/patch-base_unix_src_win32impl.cpp
deleted file mode 100644
index fd763cb4aab4..000000000000
--- a/audio/zinf/files/patch-base_unix_src_win32impl.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/unix/src/win32impl.cpp.orig	2003-09-16 20:34:55.000000000 +0300
-+++ base/unix/src/win32impl.cpp
-@@ -1,6 +1,7 @@
- #include <dlfcn.h>
- #include <dirent.h>
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <stdio.h>
- #include <sys/stat.h>
diff --git a/audio/zinf/files/patch-configure b/audio/zinf/files/patch-configure
deleted file mode 100644
index 870a93b632ed..000000000000
--- a/audio/zinf/files/patch-configure
+++ /dev/null
@@ -1,269 +0,0 @@
---- configure.orig	2004-02-17 22:09:31 UTC
-+++ configure
-@@ -24258,6 +24258,7 @@ _ACEOF
-       ;;
-     freebsd*)
-       ZINF_OS="freebsd";
-+      UNIX_AUDIO_API="linux"
- 
- cat >>confdefs.h <<\_ACEOF
- #define ZINF_OS_BSD 1
-@@ -26886,231 +26887,6 @@ if test x$musicbrainz_prefix != x ; then
- 
- fi
- 
--MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS $ZLIB_LIBS"
--
--CPPFLAGS="$ac_orig_CPPFLAGS $MUSICBRAINZ_CFLAGS"
--LIBS="$ac_orig_LIBS $MUSICBRAINZ_LIBS"
--
--if test "${ac_cv_header_musicbrainz_mb_c_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for musicbrainz/mb_c.h" >&5
--echo $ECHO_N "checking for musicbrainz/mb_c.h... $ECHO_C" >&6
--if test "${ac_cv_header_musicbrainz_mb_c_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_musicbrainz_mb_c_h" >&5
--echo "${ECHO_T}$ac_cv_header_musicbrainz_mb_c_h" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking musicbrainz/mb_c.h usability" >&5
--echo $ECHO_N "checking musicbrainz/mb_c.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <musicbrainz/mb_c.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking musicbrainz/mb_c.h presence" >&5
--echo $ECHO_N "checking musicbrainz/mb_c.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <musicbrainz/mb_c.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: musicbrainz/mb_c.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: musicbrainz/mb_c.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists.  ##
--## ------------------------------------------ ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--echo "$as_me:$LINENO: checking for musicbrainz/mb_c.h" >&5
--echo $ECHO_N "checking for musicbrainz/mb_c.h... $ECHO_C" >&6
--if test "${ac_cv_header_musicbrainz_mb_c_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_header_musicbrainz_mb_c_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_musicbrainz_mb_c_h" >&5
--echo "${ECHO_T}$ac_cv_header_musicbrainz_mb_c_h" >&6
--
--fi
--if test $ac_cv_header_musicbrainz_mb_c_h = yes; then
--  header_found=1
--else
--  header_found=0
--fi
--
--
--if test "$header_found" = 1; then
--  for lib in musicbrainz; do
--    as_ac_Lib=`echo "ac_cv_lib_$lib''_mb_GetVersion" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for mb_GetVersion in -l$lib" >&5
--echo $ECHO_N "checking for mb_GetVersion in -l$lib... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$lib  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char mb_GetVersion ();
--int
--main ()
--{
--mb_GetVersion ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_Lib=yes"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--eval "$as_ac_Lib=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS -l$lib"
--else
--  MUSICBRAINZ_LIBS=""
--fi
--
--    if test -n "$MUSICBRAINZ_LIBS"; then break; fi
--  done
--else
--  MUSICBRAINZ_LIBS=""
--fi
- if test "$MUSICBRAINZ_LIBS" != ""; then
-   have_mb=yes
- else
-@@ -27120,26 +26896,6 @@ fi
- LIBS="$ac_orig_LIBS"
- CPPFLAGS="$ac_orig_CPPFLAGS"
- 
--
--if test "$have_mb" = "yes"; then
--  METADATA_PLUGINS="$METADATA_PLUGINS mbcd"
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_MB 1
--_ACEOF
--
--else
--  { echo "$as_me:$LINENO: WARNING:
--  *** Zinf requires the MusicBrainz client library version 2.0.1
--  *** for cd title lookup.
--  *** Please download the library from http://www.musicbrainz.org/download.html
--  ***" >&5
--echo "$as_me: WARNING:
--  *** Zinf requires the MusicBrainz client library version 2.0.1
--  *** for cd title lookup.
--  *** Please download the library from http://www.musicbrainz.org/download.html
--  ***" >&2;}
--fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/audio/zinf/files/patch-ftc_kjofol_kjofol.cpp b/audio/zinf/files/patch-ftc_kjofol_kjofol.cpp
deleted file mode 100644
index 49546b1af04e..000000000000
--- a/audio/zinf/files/patch-ftc_kjofol_kjofol.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ftc/kjofol/kjofol.cpp.orig	2003-09-16 17:34:56 UTC
-+++ ftc/kjofol/kjofol.cpp
-@@ -47,6 +47,7 @@ using namespace std;
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <stdlib.h>
- 
- #include "path_max.h"
- 
diff --git a/audio/zinf/files/patch-io_cd_unix_src_cdpmo.cpp b/audio/zinf/files/patch-io_cd_unix_src_cdpmo.cpp
deleted file mode 100644
index 259608227b22..000000000000
--- a/audio/zinf/files/patch-io_cd_unix_src_cdpmo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- io/cd/unix/src/cdpmo.cpp.orig	2003-09-16 17:34:59 UTC
-+++ io/cd/unix/src/cdpmo.cpp
-@@ -113,7 +113,7 @@ Error CDPMO::SetTo(const char *url)
-    if (IsError(Init(&blah))) 
-        return kError_CDInitFailed;
- 
--   char *tracknumber = strrchr(url, '/');
-+   const char *tracknumber = strrchr(url, '/');
- 
-    if (!tracknumber)
-        tracknumber = (char *)url;
diff --git a/audio/zinf/files/patch-io_obs_obsinput.cpp b/audio/zinf/files/patch-io_obs_obsinput.cpp
deleted file mode 100644
index b747544747aa..000000000000
--- a/audio/zinf/files/patch-io_obs_obsinput.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- io/obs/obsinput.cpp.orig	2003-09-16 17:35:02 UTC
-+++ io/obs/obsinput.cpp
-@@ -42,6 +42,7 @@ ________________________________________
- #include <arpa/inet.h> 
- #include <netdb.h>
- #include <fcntl.h>
-+#include <limits.h> // for PATH_MAX
- #endif
- 
- 
-@@ -198,6 +199,7 @@ Error ObsInput::Open(void)
- 
-     m_pSin = (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in));
-     assert(m_pSin);
-+    (void) memset(m_pSin, 0, sizeof(*m_pSin));
- 
-     iReuse = 1;
-     m_pSin->sin_family = AF_INET;
-@@ -218,6 +220,7 @@ Error ObsInput::Open(void)
-     else
-         m_pSin->sin_addr.s_addr = htonl(INADDR_ANY);
- 
-+    (void) memset(&sMreq, 0, sizeof(sMreq));
-     sMreq.imr_multiaddr.s_addr = inet_addr(szAddr);
-     sMreq.imr_interface.s_addr = htonl(INADDR_ANY);
-     if (IN_MULTICAST(ntohl(sMreq.imr_multiaddr.s_addr)))
diff --git a/audio/zinf/files/patch-io_src_pullbuffer.cpp b/audio/zinf/files/patch-io_src_pullbuffer.cpp
deleted file mode 100644
index d216b3e074dd..000000000000
--- a/audio/zinf/files/patch-io_src_pullbuffer.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- io/src/pullbuffer.cpp.orig	2003-09-16 17:35:05 UTC
-+++ io/src/pullbuffer.cpp
-@@ -26,7 +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
diff --git a/audio/zinf/files/patch-io_wavout_src_wavoutpmo.cpp b/audio/zinf/files/patch-io_wavout_src_wavoutpmo.cpp
deleted file mode 100644
index c60508c0c322..000000000000
--- a/audio/zinf/files/patch-io_wavout_src_wavoutpmo.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- io/wavout/src/wavoutpmo.cpp.orig	2003-09-16 17:35:07 UTC
-+++ io/wavout/src/wavoutpmo.cpp
-@@ -28,7 +28,6 @@ ________________________________________
- #endif
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string>
- 
- /* project headers */
-@@ -124,7 +124,7 @@ Init(OutputInfo* info)
-    // it, appending an ! to the filename, and changing the extention
-    // to wav
-    std::string path;
--   char *pPtr = strrchr(GetUrl().c_str(), DIR_MARKER);
-+   const char *pPtr = strrchr(GetUrl().c_str(), DIR_MARKER);
-    if (pPtr){
-       path = pPtr+1;
-       pPtr = strrchr(path.c_str(), '.');
diff --git a/audio/zinf/files/patch-lib_http_src_Http.cpp b/audio/zinf/files/patch-lib_http_src_Http.cpp
deleted file mode 100644
index 86ee08b4ae01..000000000000
--- a/audio/zinf/files/patch-lib_http_src_Http.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- lib/http/src/Http.cpp.orig	2003-09-16 17:35:09 UTC
-+++ lib/http/src/Http.cpp
-@@ -31,6 +31,7 @@ ________________________________________
- 
- #include "config.h"
- #include <stdio.h> 
-+#include <stdlib.h> 
- #include <sys/types.h>
- #include <sys/stat.h>
- #ifndef WIN32
-@@ -39,6 +40,7 @@ ________________________________________
- #include <fcntl.h>    
- #include <errno.h>    
- #include <ctype.h>    
-+#include <cstring>
- 
- #ifdef WIN32
- #include <io.h>
-@@ -768,7 +768,7 @@ int32_t Http::GetContentLengthFromHeader
- {
-     int32_t result = -1;
- 
--    char* cp = strstr(buffer, "Content-Length:");
-+    const char* cp = strstr(buffer, "Content-Length:");
- 
-     if(cp)
-     {
diff --git a/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp b/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp
deleted file mode 100644
index 970e902334f7..000000000000
--- a/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/unzip/src/zip_wrapper.cpp.orig	2003-09-16 20:35:10.000000000 +0300
-+++ lib/unzip/src/zip_wrapper.cpp
-@@ -2,6 +2,7 @@
- #include <iostream>
- #include <stdlib.h>
- #include <string>
-+#include <cstring>
- #include <vector>
- 
- using namespace std;
diff --git a/audio/zinf/files/patch-lib_xml_include_Parse.h b/audio/zinf/files/patch-lib_xml_include_Parse.h
deleted file mode 100644
index c6165e95705b..000000000000
--- a/audio/zinf/files/patch-lib_xml_include_Parse.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/xml/include/Parse.h.orig	2003-09-16 17:35:11 UTC
-+++ lib/xml/include/Parse.h
-@@ -31,7 +31,10 @@ ________________________________________
- #pragma warning(disable:4786)
- #endif
- 
-+#include <inttypes.h>
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <string>
- #include <map>
- 
diff --git a/audio/zinf/files/patch-lib_xml_src_Parse.cpp b/audio/zinf/files/patch-lib_xml_src_Parse.cpp
deleted file mode 100644
index 0d2aafa5069d..000000000000
--- a/audio/zinf/files/patch-lib_xml_src_Parse.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/xml/src/Parse.cpp.orig	2003-09-16 20:35:11.000000000 +0300
-+++ lib/xml/src/Parse.cpp
-@@ -29,6 +29,7 @@ ________________________________________
- #endif
- 
- #include <stdio.h>
-+#include <cstring>
- #include <map>
- #include <assert.h>
- using namespace std;
diff --git a/audio/zinf/files/patch-plm_metadata_id3lib_id3lib.cpp b/audio/zinf/files/patch-plm_metadata_id3lib_id3lib.cpp
deleted file mode 100644
index 143797f02eb1..000000000000
--- a/audio/zinf/files/patch-plm_metadata_id3lib_id3lib.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- plm/metadata/id3lib/id3lib.cpp.orig	2004-02-14 01:51:03 UTC
-+++ plm/metadata/id3lib/id3lib.cpp
-@@ -363,7 +363,7 @@ bool ID3lib::ReadMetaData(const char* ur
-     assert(url);
-     assert(metadata);
- 
--    char *ptr = strrchr(url, '.');
-+    const char *ptr = strrchr(url, '.');
-     if (ptr == NULL)
-         return false;
- 
-@@ -421,7 +421,7 @@ bool ID3lib::WriteMetaData(const char* u
-     char      dummy[20];
-     bool      bWriteID3v1, bWriteID3v2;
-     luint     whichTags;
--    char     *ptr;
-+    const char *ptr;
- 
-     ptr = strrchr(url, '.');
-     if (ptr == NULL)
-@@ -485,7 +485,7 @@ void ID3lib::LookupGenre(int genreId, ch
- 
- bool ID3lib::readMetadata(const std::string&url, map_type& pairs)
- {
--    char *ptr = strrchr(url.c_str(), '.');
-+    const char *ptr = strrchr(url.c_str(), '.');
-     if (ptr == NULL)
-         return false;
- 
diff --git a/audio/zinf/files/patch-plm_metadata_misc_misc.cpp b/audio/zinf/files/patch-plm_metadata_misc_misc.cpp
deleted file mode 100644
index 828b88186937..000000000000
--- a/audio/zinf/files/patch-plm_metadata_misc_misc.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- plm/metadata/misc/misc.cpp.orig	2003-09-16 17:35:19 UTC
-+++ plm/metadata/misc/misc.cpp
-@@ -104,26 +104,11 @@ bool Misc::ReadMetaData(const char* url,
-     if(!strncasecmp(url, "file://", 7) && !metadata->Time())
-     {
-         RegistryItem *lmcItem = NULL;
--        char* cp;
--
--        cp = strrchr(url, '.');
--        if(cp)
--        {
--            cp++;
--            
--            char temp[256];
--
--            strcpy(temp, cp);
--
--            cp = temp;
--
--            while(*cp)
--            {
--                *cp = toupper(*cp);
--                cp++;
--            }
--
--            string ext = temp;
-+        const string temp(url);
-+        size_t pos = temp.rfind('.');
-+        if (pos != string::npos) {
-+            string ext = temp.substr(++pos);
-+            transform(ext.begin(), ext.end(), ext.begin(), ::toupper);
- 
-             ExtensionMap::const_iterator iter = m_extensions.find(ext);
-             if(iter != m_extensions.end())
diff --git a/audio/zinf/files/patch-plm_metadata_vorbis_vorbis.cpp b/audio/zinf/files/patch-plm_metadata_vorbis_vorbis.cpp
deleted file mode 100644
index 9bede1167cd6..000000000000
--- a/audio/zinf/files/patch-plm_metadata_vorbis_vorbis.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- plm/metadata/vorbis/vorbis.cpp.orig	2004-02-10 18:21:14 UTC
-+++ plm/metadata/vorbis/vorbis.cpp
-@@ -23,6 +23,7 @@ ________________________________________
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <math.h>
- #include <assert.h>
- #include <string>
-@@ -143,17 +143,18 @@ Vorbis::~Vorbis()
- bool Vorbis::WriteMetaData(const char *url, const MetaData & metadata)
- {
-     char      dummy[20];
--    char     *ptr;
-     bool     writetags;
-     // We will support only id3-like tags.  For a more complete list see 
-     //  http://reactor-core.org/ogg-tag-standard.html
- 
--    ptr = strrchr(url, '.');
-+    {
-+    const char *ptr = strrchr(url, '.');
-     if (ptr == NULL)
-         return false;
- 
-     if (strcasecmp(ptr, ".ogg"))
-         return false;  
-+    }
- 
-     m_context->prefs->GetPrefBoolean(kWriteVorbisTagsPref, &writetags);
- 
-@@ -216,7 +217,7 @@ bool Vorbis::WriteMetaData(const char *u
-     strncpy(newpath,path.c_str(),path.length());
-     FILE *out = NULL;
- 
--    ptr = strrchr(newpath, '.');
-+    char *ptr = strrchr(newpath, '.');
-     if (ptr) 
-     {
-         strcpy(ptr, "XXXXXX");
diff --git a/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp b/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp
deleted file mode 100644
index c306bbc97866..000000000000
--- a/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ui/musicbrowser/unix/src/fileselector.cpp.orig	2003-09-16 20:35:29.000000000 +0300
-+++ ui/musicbrowser/unix/src/fileselector.cpp
-@@ -25,7 +25,12 @@ ________________________________________
- #include <unistd.h>
- #include <dirent.h>
- #include <string>
-+#include <cstring>
- #include <vector>
-+
-+extern "C" {
-+#include <strings.h>
-+}
- #ifdef __QNX__
- #include <strings.h>
- #endif
diff --git a/audio/zinf/files/patch-ui_musicbrowser_unix_src_gtkmusicbrowser.cpp b/audio/zinf/files/patch-ui_musicbrowser_unix_src_gtkmusicbrowser.cpp
deleted file mode 100644
index a8656c2227e9..000000000000
--- a/audio/zinf/files/patch-ui_musicbrowser_unix_src_gtkmusicbrowser.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/musicbrowser/unix/src/gtkmusicbrowser.cpp.orig	2004-02-02 18:34:19 UTC
-+++ ui/musicbrowser/unix/src/gtkmusicbrowser.cpp
-@@ -1203,7 +1203,7 @@ void GTKMusicBrowser::SaveCurrentPlaylis
-     if (m_currentListName.length() == 0)
-         return;
- 
--    char *ext = strrchr(m_currentListName.c_str(), '.');
-+    const char *ext = strrchr(m_currentListName.c_str(), '.');
-     if (ext)
-         ext = ext + 1;
-     Error result = kError_NoErr;
diff --git a/audio/zinf/files/patch-ui_zinf_include_DialControl.h b/audio/zinf/files/patch-ui_zinf_include_DialControl.h
deleted file mode 100644
index 2431ccd71d3a..000000000000
--- a/audio/zinf/files/patch-ui_zinf_include_DialControl.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ui/zinf/include/DialControl.h.orig	2003-09-16 17:35:32 UTC
-+++ ui/zinf/include/DialControl.h
-@@ -24,7 +24,9 @@ ________________________________________
- #ifndef INCLUDED_DIALCONTROL_H__
- #define INCLUDED_DIALCONTROL_H__
- 
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include "config.h"
- 
- #include <string>
diff --git a/audio/zinf/files/patch-ui_zinf_include_PixFontControl.h b/audio/zinf/files/patch-ui_zinf_include_PixFontControl.h
deleted file mode 100644
index ffdbc089a24e..000000000000
--- a/audio/zinf/files/patch-ui_zinf_include_PixFontControl.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/zinf/include/PixFontControl.h.orig	2003-09-16 17:35:32 UTC
-+++ ui/zinf/include/PixFontControl.h
-@@ -32,7 +32,10 @@ ________________________________________
- #pragma warning(disable:4786)
- #endif
- 
-+#include <inttypes.h>
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <string>
- #include <vector>
- 
diff --git a/audio/zinf/files/patch-ui_zinf_src_Headlines.cpp b/audio/zinf/files/patch-ui_zinf_src_Headlines.cpp
deleted file mode 100644
index ae37a79554be..000000000000
--- a/audio/zinf/files/patch-ui_zinf_src_Headlines.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/zinf/src/Headlines.cpp.orig	2003-09-16 17:35:32 UTC
-+++ ui/zinf/src/Headlines.cpp
-@@ -215,7 +215,7 @@ Error Headlines::PCData(string &oData)
- 
- Error Headlines::EndElement(string &oElement)
- {
--    char *pPtr;
-+    const char *pPtr;
-     int   iOffset;
- 
-     pPtr = strrchr(m_oPath.c_str(), '/');
diff --git a/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp b/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp
deleted file mode 100644
index 207b3fd80bba..000000000000
--- a/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- ui/zinf/src/ThemeZip.cpp.orig	2003-09-16 17:36:22 UTC
-+++ ui/zinf/src/ThemeZip.cpp
-@@ -21,11 +21,12 @@
-    $Id: ThemeZip.cpp,v 1.8 2003/09/16 17:36:22 kgk Exp $
- ____________________________________________________________________________*/ 
- 
--#include <stdint.h>
- #include <time.h>
- #include <stdio.h>
- #include <ctype.h>
-+#if HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- 
- #ifdef WIN32
- #include <windows.h>
-@@ -44,6 +45,7 @@ ________________________________________
- #include <strings.h>
- #endif
- #include <string>
-+#include <cstring>
- 
- using namespace std;
- #include "zlib.h"
-@@ -143,7 +143,7 @@ Error ThemeZip::CompressThemeZip(const s
-    pBuffer = new char[iBufferSize];
-    for(i = oFileList.begin(); i != oFileList.end(); i++)
-    {
--       char *pPtr;
-+       const char *pPtr;
-        time_t ltime;
- 
-        oFile = *(*i);
diff --git a/audio/zinf/files/patch-ui_zinf_src_ZinfTheme.cpp b/audio/zinf/files/patch-ui_zinf_src_ZinfTheme.cpp
deleted file mode 100644
index 4a22704586e2..000000000000
--- a/audio/zinf/files/patch-ui_zinf_src_ZinfTheme.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/zinf/src/ZinfTheme.cpp.orig	2003-09-16 17:36:22 UTC
-+++ ui/zinf/src/ZinfTheme.cpp
-@@ -1739,7 +1739,7 @@ void ZinfTheme::DropFiles(vector<string>
-     countbefore = m_pContext->plm->CountItems();
- 
-     for(i = pFileList->begin(); i != pFileList->end(); i++){
--        char          *pExtension = NULL;
-+        const char    *pExtension = NULL;
-         vector<char*>  fileList;
-         struct _stat   st;
- 
diff --git a/audio/zinf/files/patch-ui_zinf_tools_Makefile.in b/audio/zinf/files/patch-ui_zinf_tools_Makefile.in
deleted file mode 100644
index 6b9186848bd4..000000000000
--- a/audio/zinf/files/patch-ui_zinf_tools_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/zinf/tools/Makefile.in.orig	2004-02-17 22:45:23 UTC
-+++ ui/zinf/tools/Makefile.in
-@@ -227,7 +227,7 @@ noinst_PROGRAMS = maketheme
- 
- maketheme_SOURCES = MakeTheme.cpp $(top_srcdir)/ui/zinf/src/ThemeZip.cpp
- maketheme_LDADD = $(top_builddir)/lib/unzip/libunzip.la \
--		  $(top_builddir)/base/unix/libunix.la $(ZLIB_LIBS) -ldl
-+		  $(top_builddir)/base/unix/libunix.la $(ZLIB_LIBS)
- 
- 
- AM_CPPFLAGS = $(THREAD_CFLAGS) $(base_includes) \
diff --git a/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp b/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp
deleted file mode 100644
index c7afaa9c4362..000000000000
--- a/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ui/zinf/unix/src/GTKFileSelector.cpp.orig	2003-09-16 17:36:23 UTC
-+++ ui/zinf/unix/src/GTKFileSelector.cpp
-@@ -24,8 +24,10 @@ ________________________________________
- 
- #include <unistd.h>
- #include <dirent.h>
-+#include <cstring>
- 
--#if defined(solaris)                                                          
-+#if defined(solaris) || defined(__FreeBSD__)                                                         
-+#include <stdlib.h>
- #include <sys/types.h>                                                        
- #include <sys/param.h>         /* for MAXPATHLEN */                           
- #include <sys/stat.h>                                                         
diff --git a/audio/zinf/files/patch-ui_zinf_unix_src_GTKPreferenceWindow.cpp b/audio/zinf/files/patch-ui_zinf_unix_src_GTKPreferenceWindow.cpp
deleted file mode 100644
index c28ca45c0818..000000000000
--- a/audio/zinf/files/patch-ui_zinf_unix_src_GTKPreferenceWindow.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/zinf/unix/src/GTKPreferenceWindow.cpp.orig	2003-11-20 23:58:47 UTC
-+++ ui/zinf/unix/src/GTKPreferenceWindow.cpp
-@@ -1752,7 +1752,7 @@ void GTKPreferenceWindow::UpdateThemeLis
-              originalValues.listboxIndex = proposedValues.listboxIndex 
-                                          = currentValues.listboxIndex = iLoop;
-          else {
--             char *name = strrchr((*i).second.c_str(), '/');
-+             const char *name = strrchr((*i).second.c_str(), '/');
-              if (name) {
-                  name++;
-                  if (name && *name) {
diff --git a/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp b/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp
deleted file mode 100644
index 4833ba5e3a71..000000000000
--- a/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ui/zinf/unix/src/GTKUtility.cpp.orig	2003-09-16 20:36:23.000000000 +0300
-+++ ui/zinf/unix/src/GTKUtility.cpp
-@@ -25,6 +25,7 @@ ________________________________________
- 
- #include <stdio.h>
- #include <string>
-+#include <cstdlib>
- #include "thread.h"
- #include "GTKUtility.h"
- #include "facontext.h"
diff --git a/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp b/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp
deleted file mode 100644
index 03321f3bd958..000000000000
--- a/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/zinf/unix/src/ThemeManager.cpp.orig	2003-09-16 20:36:23.000000000 +0300
-+++ ui/zinf/unix/src/ThemeManager.cpp
-@@ -28,6 +28,10 @@ ________________________________________
- #include <unistd.h>
- #include <netinet/in.h>
- #include <string>
-+#include <cstring>
-+extern "C" {
-+#include <strings.h>
-+}
- 
- #ifndef WIN32
- #include <unistd.h>
diff --git a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.zinf b/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.zinf
deleted file mode 100644
index 53b178861605..000000000000
--- a/audio/zinf/files/sdr2.plugin.S100.audio.rtp.mpa.zinf
+++ /dev/null
@@ -1,10 +0,0 @@
-media:audio
-tool:zinf
-proto:RTP/AVP
-protoname:RTP
-
-fmt:14
-{
-  fmtname:MPEG
-}
-flags:rtp://$(ADDRESS):$(PORT)
diff --git a/audio/zinf/pkg-descr b/audio/zinf/pkg-descr
deleted file mode 100644
index 1b6e45056198..000000000000
--- a/audio/zinf/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-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.
-
-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.
-
-WWW: http://www.zinf.org/
diff --git a/audio/zinf/pkg-plist b/audio/zinf/pkg-plist
deleted file mode 100644
index c534c7d5377b..000000000000
--- a/audio/zinf/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/zinf
-etc/sdr/plugins/sdr2.plugin.S100.audio.rtp.mpa.zinf
-lib/zinf/plugins/albumart.ui
-lib/zinf/plugins/cd.lmc
-lib/zinf/plugins/cd.pmo
-lib/zinf/plugins/cmdline.ui
-lib/zinf/plugins/download.ui
-lib/zinf/plugins/http.pmi
-lib/zinf/plugins/id3lib.mdf
-lib/zinf/plugins/irman.ui
-lib/zinf/plugins/kjofol.ftf
-lib/zinf/plugins/lcd.ui
-lib/zinf/plugins/local.pmi
-lib/zinf/plugins/m3u.plf
-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/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/xingmp3.lmc
-lib/zinf/plugins/zinf.ui
-share/locale/ca_ES/LC_MESSAGES/zinf.mo
-share/locale/ru/LC_MESSAGES/zinf.mo
-%%DATADIR%%/themes/Aquatica.fat
-%%DATADIR%%/themes/Zinf.fat
-%%DATADIR%%/themes/ZinfClassic.fat