Index: head/audio/zinf/Makefile =================================================================== --- head/audio/zinf/Makefile (revision 420748) +++ head/audio/zinf/Makefile (revision 420749) @@ -1,53 +1,53 @@ # Created by: Roman Shterenzon # $FreeBSD$ PORTNAME= zinf PORTVERSION= 2.2.5 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= audio ipv6 MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org 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 \ --disable-arts CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_DEFINE= ESOUND VORBIS OPTIONS_DEFAULT=VORBIS OPTIONS_SUB= yes ESOUND_CONFIGURE_OFF= --disable-esd ESOUND_USE= GNOME=esound INSTALL_TARGET= install-strip VORBIS_CONFIGURE_OFF= --disable-vorbis VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis .include .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 Index: head/audio/zinf/files/patch-base_include_metadata.h =================================================================== --- head/audio/zinf/files/patch-base_include_metadata.h (nonexistent) +++ head/audio/zinf/files/patch-base_include_metadata.h (revision 420749) @@ -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 ++#include + #include + + Property changes on: head/audio/zinf/files/patch-base_include_metadata.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-base_src_preferences.cpp =================================================================== --- head/audio/zinf/files/patch-base_src_preferences.cpp (nonexistent) +++ head/audio/zinf/files/patch-base_src_preferences.cpp (revision 420749) @@ -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 + #include + ++extern "C" { ++#include ++} + #ifdef __QNX__ + #include + #endif Property changes on: head/audio/zinf/files/patch-base_src_preferences.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-base_src_prefixprefs.cpp =================================================================== --- head/audio/zinf/files/patch-base_src_prefixprefs.cpp (nonexistent) +++ head/audio/zinf/files/patch-base_src_prefixprefs.cpp (revision 420749) @@ -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 + #include ++#include + using namespace std; + #include "prefixprefs.h" + Property changes on: head/audio/zinf/files/patch-base_src_prefixprefs.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-base_src_utility.cpp =================================================================== --- head/audio/zinf/files/patch-base_src_utility.cpp (revision 420748) +++ head/audio/zinf/files/patch-base_src_utility.cpp (revision 420749) @@ -1,29 +1,37 @@ --- 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 + #include + #include ++#include + + #include + #include +@@ -56,7 +57,7 @@ using namespace std; #include "win32impl.h" #include "browser.h" #include -#include +#include #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 - 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); Index: head/audio/zinf/files/patch-base_unix_src_browser.cpp =================================================================== --- head/audio/zinf/files/patch-base_unix_src_browser.cpp (nonexistent) +++ head/audio/zinf/files/patch-base_unix_src_browser.cpp (revision 420749) @@ -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 + #include + #include ++#include + + using namespace std; + #include "browser.h" Property changes on: head/audio/zinf/files/patch-base_unix_src_browser.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-base_unix_src_win32impl.cpp =================================================================== --- head/audio/zinf/files/patch-base_unix_src_win32impl.cpp (nonexistent) +++ head/audio/zinf/files/patch-base_unix_src_win32impl.cpp (revision 420749) @@ -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 + #include + #include ++#include + #include + #include + #include Property changes on: head/audio/zinf/files/patch-base_unix_src_win32impl.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-io_obs_obsinput.cpp =================================================================== --- head/audio/zinf/files/patch-io_obs_obsinput.cpp (revision 420748) +++ head/audio/zinf/files/patch-io_obs_obsinput.cpp (revision 420749) @@ -1,18 +1,26 @@ --- 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 + #include + #include ++#include // 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 +219,7 @@ Error ObsInput::Open(void) +@@ -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))) Index: head/audio/zinf/files/patch-lib_http_src_Http.cpp =================================================================== --- head/audio/zinf/files/patch-lib_http_src_Http.cpp (revision 420748) +++ head/audio/zinf/files/patch-lib_http_src_Http.cpp (revision 420749) @@ -1,10 +1,18 @@ --- 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 +#include #include #include #ifndef WIN32 +@@ -39,6 +40,7 @@ ________________________________________ + #include + #include + #include ++#include + + #ifdef WIN32 + #include Index: head/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp =================================================================== --- head/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp (nonexistent) +++ head/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp (revision 420749) @@ -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 + #include + #include ++#include + #include + + using namespace std; Property changes on: head/audio/zinf/files/patch-lib_unzip_src_zip_wrapper.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-lib_xml_src_Parse.cpp =================================================================== --- head/audio/zinf/files/patch-lib_xml_src_Parse.cpp (nonexistent) +++ head/audio/zinf/files/patch-lib_xml_src_Parse.cpp (revision 420749) @@ -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 ++#include + #include + #include + using namespace std; Property changes on: head/audio/zinf/files/patch-lib_xml_src_Parse.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp =================================================================== --- head/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp (nonexistent) +++ head/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp (revision 420749) @@ -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 + #include + #include ++#include + #include ++ ++extern "C" { ++#include ++} + #ifdef __QNX__ + #include + #endif Property changes on: head/audio/zinf/files/patch-ui_musicbrowser_unix_src_fileselector.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp =================================================================== --- head/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp (revision 420748) +++ head/audio/zinf/files/patch-ui_zinf_src_ThemeZip.cpp (revision 420749) @@ -1,16 +1,24 @@ --- 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 #include #include #include +#if HAVE_STDINT_H #include +#endif #ifdef WIN32 #include +@@ -44,6 +45,7 @@ ________________________________________ + #include + #endif + #include ++#include + + using namespace std; + #include "zlib.h" Index: head/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp =================================================================== --- head/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp (revision 420748) +++ head/audio/zinf/files/patch-ui_zinf_unix_src_GTKFileSelector.cpp (revision 420749) @@ -1,12 +1,14 @@ --- 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 #include ++#include -#if defined(solaris) +#if defined(solaris) || defined(__FreeBSD__) +#include #include #include /* for MAXPATHLEN */ #include Index: head/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp =================================================================== --- head/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp (nonexistent) +++ head/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp (revision 420749) @@ -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 + #include ++#include + #include "thread.h" + #include "GTKUtility.h" + #include "facontext.h" Property changes on: head/audio/zinf/files/patch-ui_zinf_unix_src_GTKUtility.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp =================================================================== --- head/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp (nonexistent) +++ head/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp (revision 420749) @@ -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 + #include + #include ++#include ++extern "C" { ++#include ++} + + #ifndef WIN32 + #include Property changes on: head/audio/zinf/files/patch-ui_zinf_unix_src_ThemeManager.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property