audio/zinf: document ncurses requirement

While here, import several dports patches to add missing headers
for c++.

16 files changed, 151 insertions, 7 deletions

diff --git a/audio/zinf/Makefile b/audio/zinf/Makefile
index b8d103c05ed9..969f78b0c675 100644
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zinf
 PORTVERSION=	2.2.5
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF
 
@@ -13,7 +13,7 @@ COMMENT=	GTK-based MP3 player
 LIB_DEPENDS=	libid3.so:audio/id3lib \
 		libgdbm.so:databases/gdbm
 
-USES=		pathfix libtool pkgconfig gettext gmake perl5
+USES=		gettext gmake libtool ncurses pathfix perl5 pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ipv6 \
diff --git a/audio/zinf/files/patch-base_include_metadata.h b/audio/zinf/files/patch-base_include_metadata.h
new file mode 100644
index 000000000000..f44c09dac912
--- /dev/null
+++ b/audio/zinf/files/patch-base_include_metadata.h
@@ -0,0 +1,10 @@
+--- 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_src_preferences.cpp b/audio/zinf/files/patch-base_src_preferences.cpp
new file mode 100644
index 000000000000..a843333458ca
--- /dev/null
+++ b/audio/zinf/files/patch-base_src_preferences.cpp
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..ad52522a8e17
--- /dev/null
+++ b/audio/zinf/files/patch-base_src_prefixprefs.cpp
@@ -0,0 +1,10 @@
+--- 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_utility.cpp b/audio/zinf/files/patch-base_src_utility.cpp
index f0c73ce64a8e..1905157ce866 100644
--- a/audio/zinf/files/patch-base_src_utility.cpp
+++ b/audio/zinf/files/patch-base_src_utility.cpp
@@ -1,6 +1,14 @@
 --- base/src/utility.cpp.orig	2004-02-10 18:20:22 UTC
 +++ base/src/utility.cpp
-@@ -56,7 +56,7 @@ using namespace std;
+@@ -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>
@@ -9,7 +17,7 @@
  #define MKDIR(z) mkdir(z, 0755)
  #define _stat stat
  #ifndef _S_IFDIR
-@@ -825,13 +825,13 @@ SplitPath(const string& path)
+@@ -825,13 +826,13 @@ SplitPath(const string& path)
  
          if (subpath.size()) {
  #ifndef WIN32
diff --git a/audio/zinf/files/patch-base_unix_src_browser.cpp b/audio/zinf/files/patch-base_unix_src_browser.cpp
new file mode 100644
index 000000000000..92f06f758756
--- /dev/null
+++ b/audio/zinf/files/patch-base_unix_src_browser.cpp
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..fd763cb4aab4
--- /dev/null
+++ b/audio/zinf/files/patch-base_unix_src_win32impl.cpp
@@ -0,0 +1,10 @@
+--- 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-io_obs_obsinput.cpp b/audio/zinf/files/patch-io_obs_obsinput.cpp
index 5031c55dcbcb..b747544747aa 100644
--- a/audio/zinf/files/patch-io_obs_obsinput.cpp
+++ b/audio/zinf/files/patch-io_obs_obsinput.cpp
@@ -1,6 +1,14 @@
 --- io/obs/obsinput.cpp.orig	2003-09-16 17:35:02 UTC
 +++ io/obs/obsinput.cpp
-@@ -198,6 +198,7 @@ Error ObsInput::Open(void)
+@@ -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);
@@ -8,7 +16,7 @@
  
      iReuse = 1;
      m_pSin->sin_family = AF_INET;
-@@ -218,6 +219,7 @@ Error ObsInput::Open(void)
+@@ -218,6 +220,7 @@ Error ObsInput::Open(void)
      else
          m_pSin->sin_addr.s_addr = htonl(INADDR_ANY);
  
diff --git a/audio/zinf/files/patch-lib_http_src_Http.cpp b/audio/zinf/files/patch-lib_http_src_Http.cpp
index a8c8f58fd993..5cada3879152 100644
--- a/audio/zinf/files/patch-lib_http_src_Http.cpp
+++ b/audio/zinf/files/patch-lib_http_src_Http.cpp
@@ -8,3 +8,11 @@
  #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>
diff --git a/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp b/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp
new file mode 100644
index 000000000000..970e902334f7
--- /dev/null
+++ b/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp
@@ -0,0 +1,10 @@
+--- 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_src_Parse.cpp b/audio/zinf/files/patch-lib_xml_src_Parse.cpp
new file mode 100644
index 000000000000..0d2aafa5069d
--- /dev/null
+++ b/audio/zinf/files/patch-lib_xml_src_Parse.cpp
@@ -0,0 +1,10 @@
+--- 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-ui_musicbrowser_unix_src_fileselector.cpp b/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp
new file mode 100644
index 000000000000..c306bbc97866
--- /dev/null
+++ b/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp
@@ -0,0 +1,15 @@
+--- 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_zinf_src_ThemeZip.cpp b/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp
index 6619b875cf35..e84806062df8 100644
--- a/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp
+++ b/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp
@@ -14,3 +14,11 @@
  
  #ifdef WIN32
  #include <windows.h>
+@@ -44,6 +45,7 @@ ________________________________________
+ #include <strings.h>
+ #endif
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+ #include "zlib.h"
diff --git a/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp b/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp
index 79d00415a6a1..c7afaa9c4362 100644
--- a/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp
+++ b/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp
@@ -1,8 +1,10 @@
 --- ui/zinf/unix/src/GTKFileSelector.cpp.orig	2003-09-16 17:36:23 UTC
 +++ ui/zinf/unix/src/GTKFileSelector.cpp
-@@ -25,7 +25,8 @@ ________________________________________
+@@ -24,8 +24,10 @@ ________________________________________
+ 
  #include <unistd.h>
  #include <dirent.h>
++#include <cstring>
  
 -#if defined(solaris)                                                          
 +#if defined(solaris) || defined(__FreeBSD__)                                                         
diff --git a/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp b/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp
new file mode 100644
index 000000000000..4833ba5e3a71
--- /dev/null
+++ b/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..03321f3bd958
--- /dev/null
+++ b/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp
@@ -0,0 +1,13 @@
+--- 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>