diff options
Diffstat (limited to 'comms/fldigi')
19 files changed, 33 insertions, 254 deletions
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile index a9d5c68b4066..815e7e07c516 100644 --- a/comms/fldigi/Makefile +++ b/comms/fldigi/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= fldigi -PORTVERSION= 3.21.72 -PORTREVISION= 1 +PORTVERSION= 3.21.81 CATEGORIES= comms hamradio MASTER_SITES= http://www.w1hkj.com/downloads/fldigi/\ ${MASTER_SITE_LOCAL} @@ -27,13 +26,12 @@ GNU_CONFIGURE= yes USES= gmake pkgconfig compiler:c++11-lib CONFIGURE_ENV= FLTK_CONFIG="${LOCALBASE}/bin/fltk-config" \ EXTRA_LIBS="-lexecinfo" -MAN1= fldigi.1 +MAN1= fldigi.1 fldigi-shell.1 -OPTIONS_DEFINE= NATIVE_OPT FLARQ XMLRPC OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS +OPTIONS_DEFINE= NATIVE_OPT FLARQ OSS SNDFILE PORTAUDIO PULSEAUDIO HAMLIB NLS NATIVE_OPT_DESC= Enable Native Optimizations FLARQ_DESC= Compile flarq -XMLRPC_DESC= Support XMLrpc (fldigi-shell) OSS_DESC= Support OSS SNDFILE_DESC= Support for libsndfile PORTAUDIO_DESC= PortAudio support @@ -60,15 +58,7 @@ PLIST_SUB+= FLARQ="" CONFIGURE_ARGS+=--disable-flarq PLIST_SUB+= FLARQ="@comment " .endif -.if ${PORT_OPTIONS:MXMLRPC} -CONFIGURE_ARGS+=--with-xmlrpc -LIB_DEPENDS+= xmlrpc:${PORTSDIR}/net/xmlrpc-c PLIST_SUB+= XMLRPC="" -MAN1+= fldigi-shell.1 -.else -CONFIGURE_ARGS+=--without-xmlrpc -PLIST_SUB+= XMLRPC="@comment " -.endif .if ${PORT_OPTIONS:MOSS} CONFIGURE_ARGS+=--enable-oss .else diff --git a/comms/fldigi/distinfo b/comms/fldigi/distinfo index 6522280c7842..a5e8ab53265e 100644 --- a/comms/fldigi/distinfo +++ b/comms/fldigi/distinfo @@ -1,2 +1,2 @@ -SHA256 (fldigi-3.21.72.tar.gz) = 352952c03b64f6cc002aceca895a97861cf5c684865828ff8ff5d8b733816f7d -SIZE (fldigi-3.21.72.tar.gz) = 2156241 +SHA256 (fldigi-3.21.81.tar.gz) = a2d02b31e0e41b9b8fded44433f381f390347b30db8aee7610caa61516ea58c5 +SIZE (fldigi-3.21.81.tar.gz) = 2651662 diff --git a/comms/fldigi/files/patch-doc-Makefile.in b/comms/fldigi/files/patch-doc-Makefile.in index c2bb40fe76be..afb0ce602bde 100644 --- a/comms/fldigi/files/patch-doc-Makefile.in +++ b/comms/fldigi/files/patch-doc-Makefile.in @@ -1,6 +1,6 @@ ---- doc/Makefile.in.orig 2013-05-17 05:57:05.000000000 -0500 -+++ doc/Makefile.in 2013-06-17 19:11:13.000000000 -0500 -@@ -565,7 +565,7 @@ +--- doc/Makefile.in.orig 2014-03-21 11:35:47.000000000 -0500 ++++ doc/Makefile.in 2014-03-21 18:19:16.000000000 -0500 +@@ -563,7 +563,7 @@ # The rest of the Makefile is enabled only if we have asciidoc diff --git a/comms/fldigi/files/patch-misc_newinstall.cxx b/comms/fldigi/files/patch-misc_newinstall.cxx index bc60389a52fc..53c3ad085485 100644 --- a/comms/fldigi/files/patch-misc_newinstall.cxx +++ b/comms/fldigi/files/patch-misc_newinstall.cxx @@ -1,6 +1,6 @@ ---- src/misc/newinstall.cxx.orig 2011-04-22 08:25:20.000000000 -0400 -+++ src/misc/newinstall.cxx 2011-04-22 08:25:51.000000000 -0400 -@@ -66,7 +66,7 @@ +--- src/misc/newinstall.cxx.orig 2014-03-21 11:25:57.000000000 -0500 ++++ src/misc/newinstall.cxx 2014-03-21 18:19:24.000000000 -0500 +@@ -67,7 +67,7 @@ label[4] = "SK @||"; text[4] = "\n\ @@ -9,7 +9,7 @@ <ZDT> <CALL> de <MYCALL> sk\n\ <RX>"; -@@ -83,7 +83,7 @@ +@@ -84,7 +84,7 @@ Rig: \n\ Pwr: \n\ Ant: \n\ diff --git a/comms/fldigi/files/patch-misc_re.cxx b/comms/fldigi/files/patch-misc_re.cxx deleted file mode 100644 index 73f864efe9f1..000000000000 --- a/comms/fldigi/files/patch-misc_re.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- 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)); - } - - // ------------------------------------------------------------------------ diff --git a/comms/fldigi/files/patch-src_dominoex_dominoex.cxx b/comms/fldigi/files/patch-src_dominoex_dominoex.cxx index b5ecb7405901..5f7548ce643d 100644 --- a/comms/fldigi/files/patch-src_dominoex_dominoex.cxx +++ b/comms/fldigi/files/patch-src_dominoex_dominoex.cxx @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/dominoex/dominoex.cxx.orig 2014-03-21 11:25:57.000000000 -0500 ++++ src/dominoex/dominoex.cxx 2014-03-21 18:19:42.000000000 -0500 +@@ -63,7 +63,7 @@ strSecXmtText = progdefaults.secText; if (strSecXmtText.length() == 0) diff --git a/comms/fldigi/files/patch-src_logbook_logsupport.cxx b/comms/fldigi/files/patch-src_logbook_logsupport.cxx deleted file mode 100644 index 1eeb82695b3d..000000000000 --- a/comms/fldigi/files/patch-src_logbook_logsupport.cxx +++ /dev/null @@ -1,34 +0,0 @@ ---- 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; - diff --git a/comms/fldigi/files/patch-src_logbook_lookupcall.cxx b/comms/fldigi/files/patch-src_logbook_lookupcall.cxx index 28b3ce3d01a7..f37bf5f0dc44 100644 --- a/comms/fldigi/files/patch-src_logbook_lookupcall.cxx +++ b/comms/fldigi/files/patch-src_logbook_lookupcall.cxx @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/logbook/lookupcall.cxx.orig 2014-03-21 11:25:57.000000000 -0500 ++++ src/logbook/lookupcall.cxx 2014-03-21 18:19:53.000000000 -0500 +@@ -1188,7 +1188,7 @@ return NULL; size_t p; diff --git a/comms/fldigi/files/patch-src_misc_dxcc.cxx b/comms/fldigi/files/patch-src_misc_dxcc.cxx deleted file mode 100644 index 56d168186bee..000000000000 --- a/comms/fldigi/files/patch-src_misc_dxcc.cxx +++ /dev/null @@ -1,25 +0,0 @@ ---- 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) diff --git a/comms/fldigi/files/patch-src_navtex_navtex.cxx b/comms/fldigi/files/patch-src_navtex_navtex.cxx deleted file mode 100644 index de6ac855b72d..000000000000 --- a/comms/fldigi/files/patch-src_navtex_navtex.cxx +++ /dev/null @@ -1,32 +0,0 @@ ---- 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. diff --git a/comms/fldigi/files/patch-src_spot_notify.cxx b/comms/fldigi/files/patch-src_spot_notify.cxx deleted file mode 100644 index 798313467e96..000000000000 --- a/comms/fldigi/files/patch-src_spot_notify.cxx +++ /dev/null @@ -1,32 +0,0 @@ ---- 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); diff --git a/comms/fldigi/files/patch-src_spot_pskrep.cxx b/comms/fldigi/files/patch-src_spot_pskrep.cxx deleted file mode 100644 index 2af0f288607e..000000000000 --- a/comms/fldigi/files/patch-src_spot_pskrep.cxx +++ /dev/null @@ -1,24 +0,0 @@ ---- 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; diff --git a/comms/fldigi/files/patch-src_spot_spot.cxx b/comms/fldigi/files/patch-src_spot_spot.cxx deleted file mode 100644 index 17b83ee7f1e2..000000000000 --- a/comms/fldigi/files/patch-src_spot_spot.cxx +++ /dev/null @@ -1,29 +0,0 @@ ---- 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; - diff --git a/comms/fldigi/files/patch-src_widgets_FTextRXTX.cxx b/comms/fldigi/files/patch-src_widgets_FTextRXTX.cxx deleted file mode 100644 index 516d48b3597a..000000000000 --- a/comms/fldigi/files/patch-src_widgets_FTextRXTX.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/comms/fldigi/files/patch-src_widgets_FTextView.cxx b/comms/fldigi/files/patch-src_widgets_FTextView.cxx deleted file mode 100644 index 8a1b053f13c0..000000000000 --- a/comms/fldigi/files/patch-src_widgets_FTextView.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp index 01f852e5fb08..9b4a68a24626 100644 --- a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp +++ b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcClient.cpp @@ -1,14 +1,14 @@ ---- 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 @@ - // +--- src/xmlrpcpp/XmlRpcClient.cpp.orig 2014-03-21 11:25:57.000000000 -0500 ++++ src/xmlrpcpp/XmlRpcClient.cpp 2014-03-21 18:21:01.000000000 -0500 +@@ -22,6 +22,7 @@ + // ---------------------------------------------------------------------------- #include <config.h> +#include <ios> #include "XmlRpcClient.h" -@@ -319,7 +320,7 @@ +@@ -338,7 +339,7 @@ header += "Content-Type: text/xml\r\nContent-length: "; diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp index 59ec85233c28..fd3030bcc938 100644 --- a/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp +++ b/comms/fldigi/files/patch-src_xmlrpcpp_XmlRpcServer.cpp @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/xmlrpcpp/XmlRpcServer.cpp.orig 2014-03-21 11:25:57.000000000 -0500 ++++ src/xmlrpcpp/XmlRpcServer.cpp 2014-03-21 18:21:06.000000000 -0500 +@@ -500,7 +500,7 @@ "Content-length: "; char buffLen[40]; diff --git a/comms/fldigi/files/patch-src_xmlrpcpp_base64.h b/comms/fldigi/files/patch-src_xmlrpcpp_base64.h index 86e69d500e4f..a8061844a7c9 100644 --- a/comms/fldigi/files/patch-src_xmlrpcpp_base64.h +++ b/comms/fldigi/files/patch-src_xmlrpcpp_base64.h @@ -1,8 +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 +--- src/xmlrpcpp/base64.h.orig 2014-03-21 11:25:57.000000000 -0500 ++++ src/xmlrpcpp/base64.h 2014-03-21 18:21:09.000000000 -0500 @@ -1,4 +1,4 @@ -- +-// base64.hpp +#include <ios> - - // base64.hpp // Autor Konstantin Pilipchuk + // mailto:lostd@ukr.net + // ---------------------------------------------------------------------------- diff --git a/comms/fldigi/pkg-plist b/comms/fldigi/pkg-plist index 5b1a01da2681..0905b21a1ff5 100644 --- a/comms/fldigi/pkg-plist +++ b/comms/fldigi/pkg-plist @@ -1,9 +1,9 @@ %%FLARQ%%bin/flarq bin/fldigi %%FLARQ%%man/man1/flarq.1.gz -%%XMLRPC%%man/man1/fldigi-shell.1.gz +man/man1/fldigi-shell.1.gz man/man1/fldigi.1.gz -%%XMLRPC%%bin/fldigi-shell +bin/fldigi-shell %%FLARQ%%share/applications/flarq.desktop share/applications/fldigi.desktop %%NLS%%share/locale/es/LC_MESSAGES/fldigi.mo |