Date: Sun, 8 Dec 2013 01:14:18 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335860 - in head/comms/fldigi: . files Message-ID: <201312080114.rB81EIiU015763@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sun Dec 8 01:14:18 2013 New Revision: 335860 URL: http://svnweb.freebsd.org/changeset/ports/335860 Log: - Fix build on 10.x - Add STAGEDIR support Added: head/comms/fldigi/files/patch-misc_re.cxx (contents, props changed) head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx (contents, props changed) head/comms/fldigi/files/patch-src_include_qrunner.h (contents, props changed) head/comms/fldigi/files/patch-src_logbook_logsupport.cxx (contents, props changed) head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx (contents, props changed) head/comms/fldigi/files/patch-src_misc_dxcc.cxx (contents, props changed) head/comms/fldigi/files/patch-src_navtex_navtex.cxx (contents, props changed) head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx (contents, props changed) head/comms/fldigi/files/patch-src_spot_notify.cxx (contents, props changed) head/comms/fldigi/files/patch-src_spot_pskrep.cxx (contents, props changed) head/comms/fldigi/files/patch-src_spot_spot.cxx (contents, props changed) head/comms/fldigi/files/patch-src_thor_thor.cxx (contents, props changed) head/comms/fldigi/files/patch-src_wefax_wefax.cxx (contents, props changed) head/comms/fldigi/files/patch-src_widgets_FTextRXTX.cxx (contents, props changed) head/comms/fldigi/files/patch-src_widgets_FTextView.cxx (contents, props changed) head/comms/fldigi/files/patch-src_widgets_flmisc.cxx (contents, props changed) head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp (contents, props changed) head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp (contents, props changed) head/comms/fldigi/files/patch-src_xmlrpcpp_base64.h (contents, props changed) Modified: head/comms/fldigi/Makefile head/comms/fldigi/pkg-plist Modified: head/comms/fldigi/Makefile ============================================================================== --- head/comms/fldigi/Makefile Sun Dec 8 00:34:54 2013 (r335859) +++ head/comms/fldigi/Makefile Sun Dec 8 01:14:18 2013 (r335860) @@ -12,16 +12,22 @@ COMMENT= Digital decoder for psk, cw, ps LICENSE= GPLv3 -BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc\ +BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconf \ + asciidoc:${PORTSDIR}/textproc/asciidoc\ docbook-xsl>=1.0:${PORTSDIR}/textproc/docbook-xsl\ xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate\ +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ + samplerate:${PORTSDIR}/audio/libsamplerate\ + boost_system:${PORTSDIR}/devel/boost-libs\ fltk:${PORTSDIR}/x11-toolkits/fltk +CXXFLAGS +=-std=gnu++0x GNU_CONFIGURE= yes USES= pkgconfig USE_GMAKE= yes -CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" +USES= compiler:c++11-lib +CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ + EXTRA_LIBS="-lexecinfo" MAN1= fldigi.1 OPTIONS_DEFINE= NATIVE_OPT FLARQ XMLRPC OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS @@ -37,7 +43,6 @@ HAMLIB_DESC= Support rig control via ha OPTIONS_DEFAULT= OPTFLARQ OPTOSS HAMLIB -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${ARCH} == "sparc64" @@ -121,12 +126,9 @@ post-configure: post-install: .if ${PORT_OPTIONS:MDOCS} - @${ECHO} "" - ${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DOCSDIR} - @${ECHO} "fldigi docs installed in ${DOCSDIR}" - @${ECHO} "" + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.post.mk> Added: head/comms/fldigi/files/patch-misc_re.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-misc_re.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,13 @@ +--- src/misc/re.cxx.orig 2013-11-17 19:25:55.932982749 -0500 ++++ src/misc/re.cxx 2013-11-17 19:26:39.657979609 -0500 +@@ -124,8 +124,8 @@ + + size_t re_t::hash(void) const + { +- size_t h = tr1::hash<string>()(pattern); +- return h ^ (tr1::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); ++ size_t h = std::hash<string>()(pattern); ++ return h ^ (std::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); + } + + // ------------------------------------------------------------------------ Added: head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_dominoex_dominoex.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/dominoex/dominoex.cxx.orig 2013-05-14 05:06:28.000000000 -0400 ++++ src/dominoex/dominoex.cxx 2013-11-16 11:17:10.251959725 -0500 +@@ -64,7 +64,7 @@ + + strSecXmtText = progdefaults.secText; + if (strSecXmtText.length() == 0) +- strSecXmtText = "fldigi "PACKAGE_VERSION" "; ++ strSecXmtText = "fldigi " PACKAGE_VERSION; + + videoText(); + } Added: head/comms/fldigi/files/patch-src_include_qrunner.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_include_qrunner.h Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,15 @@ +--- src/include/qrunner.h.orig 2013-11-17 20:26:40.966731568 -0500 ++++ src/include/qrunner.h 2013-11-18 18:52:20.902610641 -0500 +@@ -64,9 +64,10 @@ + qexception(const char *msg_) : msg(msg_) { } + qexception(int e) : msg(strerror(e)) { } + ~qexception() throw() { } +- const char *what(void) const throw() { return msg.c_str(); } ++ const char *what(void) const throw() { return msg; } + private: +- std::string msg; ++// std::string msg; ++ const char *msg; + }; + + struct fsignal Added: head/comms/fldigi/files/patch-src_logbook_logsupport.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_logbook_logsupport.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,34 @@ +--- src/logbook/logsupport.cxx.orig 2013-05-12 06:54:05.000000000 -0400 ++++ src/logbook/logsupport.cxx 2013-11-20 11:01:28.405205821 -0500 +@@ -211,7 +211,7 @@ + } + } + string sp = p; +- if (sp.find("."ADIF_SUFFIX) == string::npos) sp.append("."ADIF_SUFFIX); ++ if (sp.find("." ADIF_SUFFIX) == string::npos) sp.append("." ADIF_SUFFIX); + adifFile.writeFile (sp.c_str(), &qsodb); + } + +@@ -308,8 +308,8 @@ + const char* p = FSEL::saveas( title.c_str(), filter.c_str(), logbook_filename.c_str()); + if (p) { + logbook_filename = p; +- if (logbook_filename.find("."ADIF_SUFFIX) == string::npos) +- logbook_filename.append("."ADIF_SUFFIX); ++ if (logbook_filename.find("." ADIF_SUFFIX) == string::npos) ++ logbook_filename.append("." ADIF_SUFFIX); + dlgLogbook->label(fl_filename_name(logbook_filename.c_str())); + + cQsoDb::reverse = false; +@@ -1544,7 +1544,11 @@ + + + #include <tr1/unordered_map> ++#ifdef __clang__ ++typedef std::unordered_map<string, unsigned> dxcc_entity_cache_t; ++#else + typedef tr1::unordered_map<string, unsigned> dxcc_entity_cache_t; ++#endif + static dxcc_entity_cache_t dxcc_entity_cache; + static bool dxcc_entity_cache_enabled = false; + Added: head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_logbook_lookupcall.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/logbook/lookupcall.cxx.orig 2013-11-18 09:00:51.559614995 -0500 ++++ src/logbook/lookupcall.cxx 2013-11-18 16:31:56.283748901 -0500 +@@ -1180,7 +1180,7 @@ + return NULL; + + size_t p; +- if (fetch_http(EQSL_url, EQSL_xmlpage, 5.0) == -1) ++ if (fetch_http(EQSL_url, EQSL_xmlpage, 5.0) == false) + LOG_ERROR("%s", "eQSL not available"); + + else if ((p = EQSL_xmlpage.find("Error:")) != std::string::npos) { Added: head/comms/fldigi/files/patch-src_misc_dxcc.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_misc_dxcc.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,25 @@ +--- src/misc/dxcc.cxx.orig 2013-05-14 05:06:28.000000000 -0400 ++++ src/misc/dxcc.cxx 2013-11-20 18:19:33.406394129 -0500 +@@ -30,7 +30,7 @@ + #include <string> + #include <list> + #include <map> +-#include <tr1/unordered_map> ++#include <unordered_map> + #include <algorithm> + + #include <FL/filename.H> +@@ -44,8 +44,11 @@ + #include "main.h" + + using namespace std; +-using tr1::unordered_map; +- ++//#ifdef __clang__ ++using std::unordered_map; ++//#else ++//using tr1::unordered_map; ++//#endif + + dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz) + : country(cn), cq_zone(cq), itu_zone(itu), latitude(lat), longitude(lon), gmt_offset(tz) Added: head/comms/fldigi/files/patch-src_navtex_navtex.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_navtex_navtex.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,32 @@ +--- src/navtex/navtex.cxx.orig 2013-11-17 19:46:34.808897323 -0500 ++++ src/navtex/navtex.cxx 2013-11-17 19:56:56.135855100 -0500 +@@ -177,12 +177,16 @@ + if( ! std::getline( istrm, parsed_str, delim ) ) return false ; + std::stringstream sstrm( parsed_str ); + sstrm >> ref ; +- return sstrm ; ++ return true ; + } + + static bool read_until_delim( std::istream & istrm, std::string & ref ) + { +- return std::getline( istrm, ref, delim ); ++ std::getline( istrm, ref, delim ); ++ if ( (istrm.rdstate() & std::ifstream::goodbit) == 0 ) ++ return true ; ++ else ++ return false ; + } + + class NavtexRecord +@@ -1113,8 +1117,8 @@ + static int cnt_read_data = 0 ; + /// This centers the carrier where the activity is the strongest. + static const int bw[][2] = { +- { -deviation_f - 2, -deviation_f + 8 }, +- { deviation_f - 8, deviation_f + 2 } }; ++ { - static_cast<int>(deviation_f) - 2, - static_cast<int>(deviation_f) + 8 }, ++ { static_cast<int>(deviation_f) - 8, static_cast<int>(deviation_f) + 2 } }; + double max_carrier = wf->powerDensityMaximum( 2, bw ); + + /// Do not change the frequency too quickly if an image is received. Added: head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_qrunner_qrunner.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/qrunner/qrunner.cxx.orig 2013-11-19 10:58:52.118170777 -0500 ++++ src/qrunner/qrunner.cxx 2013-11-19 11:00:04.670568086 -0500 +@@ -94,7 +94,7 @@ + return; + qr->inprog = true; + +- size_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE); ++ ssize_t n = QRUNNER_READ(fd, rbuf, FIFO_SIZE); + switch (n) { + case -1: + if (!QRUNNER_EAGAIN()) Added: head/comms/fldigi/files/patch-src_spot_notify.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_spot_notify.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,32 @@ +--- src/spot/notify.cxx.orig 2013-11-18 18:41:28.965212678 -0500 ++++ src/spot/notify.cxx 2013-11-18 19:17:17.004165081 -0500 +@@ -33,7 +33,10 @@ + #include <cctype> + #include <cstdlib> + +-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) ++#if __clang__ ++# define MAP_TYPE std::unordered_map ++# include <unordered_map> ++#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + # define MAP_TYPE std::tr1::unordered_map + # include <tr1/unordered_map> + #else +@@ -339,7 +342,7 @@ + void notify_rsid(trx_mode mode, int afreq) + { + const char* mode_name = mode_info[mode].name; +- regmatch_t sub[2] = { { 0, strlen(mode_name) } }; ++ regmatch_t sub[2] = { { 0, static_cast<regoff_t>(strlen(mode_name)) } }; + sub[1] = sub[0]; + for (notify_list_t::iterator i = notify_list.begin(); i != notify_list.end(); ++i) + if (i->event == NOTIFY_EVENT_RSID) +@@ -1253,7 +1256,7 @@ + + if (notify_tmp.event == NOTIFY_EVENT_RSID) { + notify_tmp.mode = active_modem->get_mode(); +- regmatch_t sub[2] = { { 0, strlen(mode_info[notify_tmp.mode].name) } }; ++ regmatch_t sub[2] = { { 0, static_cast<regoff_t>(strlen(mode_info[notify_tmp.mode].name)) } }; + sub[1] = sub[0]; + notify_recv(notify_tmp.mode, active_modem->get_freq(), + mode_info[notify_tmp.mode].name, sub, 2, ¬ify_tmp); Added: head/comms/fldigi/files/patch-src_spot_pskrep.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_spot_pskrep.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,24 @@ +--- src/spot/pskrep.cxx.orig 2013-05-12 06:54:06.000000000 -0400 ++++ src/spot/pskrep.cxx 2013-11-19 20:13:13.061879490 -0500 +@@ -50,7 +50,11 @@ + #include <algorithm> + #include <fstream> + +-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) ++#if __clang__ ++# define MAP_TYPE std::unordered_map ++#define HASH_TYPE std::hash ++# include <unordered_map> ++#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + # define MAP_TYPE std::tr1::unordered_map + #define HASH_TYPE std::tr1::hash + # include <tr1/unordered_map> +@@ -689,7 +693,7 @@ + tlen = sizeof(long_station_info_template); + station_info = &long_station_info; + } +- else if (template_count >= 0) { ++ else if (template_count != 0) { + station_info_template = short_station_info_template; + tlen = sizeof(short_station_info_template); + station_info = &short_station_info; Added: head/comms/fldigi/files/patch-src_spot_spot.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_spot_spot.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,29 @@ +--- src/spot/spot.cxx.orig 2013-11-18 20:31:18.824757958 -0500 ++++ src/spot/spot.cxx 2013-11-18 20:34:28.424968955 -0500 +@@ -23,7 +23,11 @@ + #include <config.h> + + #include <list> ++#ifdef __clang__ ++#include <unordered_map> ++#else + #include <tr1/unordered_map> ++#endif + #include <functional> + + #include "trx.h" +@@ -60,9 +64,14 @@ + }; + + typedef list<callback_t*> callback_p_list_t; ++#ifdef __clang__ ++typedef std::unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t; ++static std::unordered_map<int, string> buffers; ++#else + typedef tr1::unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t; + + static tr1::unordered_map<int, string> buffers; ++#endif + static cblist_t cblist; + static rcblist_t rcblist; + Added: head/comms/fldigi/files/patch-src_thor_thor.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_thor_thor.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/thor/thor.cxx.orig 2013-11-16 11:12:26.140977946 -0500 ++++ src/thor/thor.cxx 2013-11-16 11:13:27.127067530 -0500 +@@ -63,7 +63,7 @@ + videoText(); + strSecXmtText = progdefaults.THORsecText; + if (strSecXmtText.length() == 0) +- strSecXmtText = "fldigi "PACKAGE_VERSION" "; ++ strSecXmtText = "fldigi " PACKAGE_VERSION; + cptr = 0; + } + Added: head/comms/fldigi/files/patch-src_wefax_wefax.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_wefax_wefax.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/wefax/wefax.cxx.orig 2013-11-18 09:29:13.581496108 -0500 ++++ src/wefax/wefax.cxx 2013-11-18 09:38:30.354457373 -0500 +@@ -556,7 +556,7 @@ + = wf->powerDensity(m_carrier - 2 * m_apt_start_freq, bandwidth_apt_start) + + wf->powerDensity(m_carrier - m_apt_start_freq, bandwidth_apt_start) + + wf->powerDensity(m_carrier , bandwidth_apt_start) +- + wf->powerDensity(m_carrier + m_apt_start_freq, bandwidth_apt_start); ++ + wf->powerDensity(m_carrier + m_apt_start_freq, bandwidth_apt_start) + + wf->powerDensity(m_carrier + 2 * m_apt_start_freq, bandwidth_apt_start); + + return decayavg( avg_pwr, pwr, 10 ); Added: head/comms/fldigi/files/patch-src_widgets_FTextRXTX.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_widgets_FTextRXTX.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/widgets/FTextRXTX.cxx.orig 2013-11-18 20:37:04.508734484 -0500 ++++ src/widgets/FTextRXTX.cxx 2013-11-18 20:37:26.598733044 -0500 +@@ -263,7 +263,7 @@ + if (c == '\r') + return; + +- char s[] = { '\0', '\0', FTEXT_DEF + attr, '\0' }; ++ char s[] = { '\0', '\0', static_cast<char>(FTEXT_DEF + attr), '\0' }; + const char *cp = &s[0]; + + // The user may have moved the cursor by selecting text or Added: head/comms/fldigi/files/patch-src_widgets_FTextView.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_widgets_FTextView.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/widgets/FTextView.cxx.orig 2013-11-18 20:35:57.882739310 -0500 ++++ src/widgets/FTextView.cxx 2013-11-18 20:36:33.141869869 -0500 +@@ -133,7 +133,7 @@ + /// + void FTextBase::add(unsigned char c, int attr) + { +- char s[] = { FTEXT_DEF + attr, '\0' }; ++ char s[] = { static_cast<char>(FTEXT_DEF + attr), '\0' }; + sbuf->replace(insert_position(), insert_position() + 1, s); + + s[0] = c; Added: head/comms/fldigi/files/patch-src_widgets_flmisc.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_widgets_flmisc.cxx Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/widgets/flmisc.cxx.orig 2013-11-19 20:07:27.667902073 -0500 ++++ src/widgets/flmisc.cxx 2013-11-19 20:07:49.467902518 -0500 +@@ -104,7 +104,7 @@ + bg1r = 255 - bg1r; bg1g = 255 - bg1g; bg1b = 255 - bg1b; + Fl_Color adj = fl_rgb_color(bg1r, bg1g, bg1b); + if (fl_contrast(adj, bg2) != adj) +- Fl::get_color((def >= 0 ? def : adj), bg1r, bg1g, bg1b); ++ Fl::get_color((def != 0 ? def : adj), bg1r, bg1g, bg1b); + } + + #if !defined(__APPLE__) && !defined(__WOE32__) && USE_X Added: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,19 @@ +--- src/xmlrpcpp/XmlRpcClient.cpp.orig 2013-11-19 10:11:37.383366764 -0500 ++++ src/xmlrpcpp/XmlRpcClient.cpp 2013-11-19 10:13:43.795365774 -0500 +@@ -3,6 +3,7 @@ + // + + #include <config.h> ++#include <ios> + + #include "XmlRpcClient.h" + +@@ -319,7 +320,7 @@ + + header += "Content-Type: text/xml\r\nContent-length: "; + +- sprintf(buff,"%"PRIuSZ"\r\n\r\n", body.size()); ++ sprintf(buff,"%" PRIuSZ "\r\n\r\n", body.size()); + + return header + buff; + } Added: head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,11 @@ +--- src/xmlrpcpp/XmlRpcServer.cpp.orig 2013-11-19 10:16:57.123343807 -0500 ++++ src/xmlrpcpp/XmlRpcServer.cpp 2013-11-19 10:17:23.150721491 -0500 +@@ -481,7 +481,7 @@ + "Content-length: "; + + char buffLen[40]; +- sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size()); ++ sprintf(buffLen,"%" PRIuSZ" \r\n\r\n", body.size()); + + return header + buffLen; + } Added: head/comms/fldigi/files/patch-src_xmlrpcpp_base64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/fldigi/files/patch-src_xmlrpcpp_base64.h Sun Dec 8 01:14:18 2013 (r335860) @@ -0,0 +1,8 @@ +--- src/xmlrpcpp/base64.h.orig 2013-11-18 21:00:33.281636937 -0500 ++++ src/xmlrpcpp/base64.h 2013-11-19 10:34:45.306495676 -0500 +@@ -1,4 +1,4 @@ +- ++#include <ios> + + // base64.hpp + // Autor Konstantin Pilipchuk Modified: head/comms/fldigi/pkg-plist ============================================================================== --- head/comms/fldigi/pkg-plist Sun Dec 8 00:34:54 2013 (r335859) +++ head/comms/fldigi/pkg-plist Sun Dec 8 01:14:18 2013 (r335860) @@ -1,5 +1,8 @@ %%FLARQ%%bin/flarq bin/fldigi +%%FLARQ%%man/man1/flarq.1.gz +%%XMLRPC%%man/man1/fldigi-shell.1.gz +man/man1/fldigi.1.gz %%XMLRPC%%bin/fldigi-shell %%FLARQ%%share/applications/flarq.desktop share/applications/fldigi.desktop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312080114.rB81EIiU015763>