(Upstream update 3.21.79 to 3.21.82)

=Version 3.21.82=

2014-04-30  David Freese  <w1hkj at w1hkj.com>
        92a7d01: hash-fix
        b0db34c: RnA Analysis
        fa9e10a: Phase accumulator
        b7ce1cd: Base Directories
        c9c6f28: WF Height/Speed
        ca61d3f: RX Only
        43fbe22: RTTY mem leak
        f470ce3: Olivia/Contestia custom
        b87e664: ARQ abort
        a9818aa: RTTY Custom Shift

=Version 3.21.81=
x        134221e: TX monitor
        922c16f: Spotter seg fault
        dbe4181: Audio selectors for PORTAUDIO
        9771f4b: M4 tr1 detect
        03643a6: ttyACMxx identification
        cfe6f87: Olivia critical section
        a60d6f7: MT63 critical section
        c97043c: Logbook fields
        3bc4f31: Hamlib selector
        d33b7e7: Combobox
        6f71f12: RTTY macro
        ac671da: clang compatibility

=Version 3.21.80=

2014-03-19  David Freese  <w1hkj at w1hkj.com>
		 FreeBSD nitems
		 Cabrillo time off
		 Change Fl_ListBox
		 Restore Fl_Choice
		 Olivia select fix
		 ComboBox
		 fluid update
(pkgsrc)
 Upstream now includes following patches:
 (with slightly different code, say, #ifdef __clang__ etc),
 thus deleted:
   patch-src_include_logsupport.h
   patch-src_include_strutil.h
   patch-src_logbook_logsupport.cxx
   patch-src_misc_dxcc.cxx
   patch-src_misc_re.cxx
   patch-src_spot_notify.cxx
   patch-src_spot_pskrep.cxx
   patch-src_spot_spot.cxx

10 files changed, 7 insertions, 269 deletions

diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index 91128ccb72e..332001e553b 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2014/06/09 14:18:07 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.44 2014/06/15 14:27:43 mef Exp $
+# $Id: Makefile,v 1.44 2014/06/15 14:27:43 mef Exp $
 
-DISTNAME=	fldigi-3.21.79
-PKGREVISION=	4
+DISTNAME=	fldigi-3.21.82
 CATEGORIES=	ham
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/
 LICENSE=	gnu-gpl-v3
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index c62c23b51a1..0c2db7605c2 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,20 +1,12 @@
-$NetBSD: distinfo,v 1.17 2014/03/14 14:39:22 mef Exp $
+$NetBSD: distinfo,v 1.18 2014/06/15 14:27:43 mef Exp $
 
-SHA1 (fldigi-3.21.79.tar.gz) = d00d29997eb809046f43231f2815d10c8f01a85d
-RMD160 (fldigi-3.21.79.tar.gz) = 5c3f949f36edbc8f156d215e18982718aaec3633
-Size (fldigi-3.21.79.tar.gz) = 2646946 bytes
+SHA1 (fldigi-3.21.82.tar.gz) = 15bb5d94530dc9273b4bb64f55ccbf60ca59464b
+RMD160 (fldigi-3.21.82.tar.gz) = 4b1f212c3c3ed4ed84f356e2b13bbd65867582d2
+Size (fldigi-3.21.82.tar.gz) = 2652964 bytes
 SHA1 (patch-src_dominoex_dominoex.cxx) = 39d2d2e75497ec5264148bc4927278df5adaa84d
-SHA1 (patch-src_include_logsupport.h) = 2291272db0ddba2d106f4006143df96e2d466e4b
 SHA1 (patch-src_include_qrunner.h) = 5dac7e9fd52f10c66978a854963bd03d39a729d0
-SHA1 (patch-src_include_strutil.h) = e35090f545ce957cf67d408e469c203e29fb7447
-SHA1 (patch-src_logbook_logsupport.cxx) = bffff9fe6ee6f07596fa1e65208377d17b822263
 SHA1 (patch-src_misc_configuration.cxx) = 4f1940b0ff9d51418b37d01636c1a45f9a392943
-SHA1 (patch-src_misc_dxcc.cxx) = 23533d5062d731b56c7f7b2e9e4cac0b2b4f7194
 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c
-SHA1 (patch-src_misc_re.cxx) = 3efef73457f404ede4a44416e6132f61ab74cf93
-SHA1 (patch-src_spot_notify.cxx) = c7ac90d1c6337061c5aa52eaab5a47a01a88ca7b
-SHA1 (patch-src_spot_pskrep.cxx) = 26b2777af505cf40a8d9d9f1dd21d7f21ca3e161
-SHA1 (patch-src_spot_spot.cxx) = b43db1a5d69f492e9ec47b211b285bdf7d5bab5e
 SHA1 (patch-src_thor_thor.cxx) = 8148f14d6f2a96d5435be871345c24ed2e4cc8b9
 SHA1 (patch-src_xmlrpcpp_XmlRpcClient.cpp) = 1307d540985fa412b445dd4b0734f115602b92b8
 SHA1 (patch-src_xmlrpcpp_XmlRpcServer.cpp) = 6c71614486971e739832ee82c669db0e0a944570
diff --git a/ham/fldigi/patches/patch-src_include_logsupport.h b/ham/fldigi/patches/patch-src_include_logsupport.h
deleted file mode 100644
index 9139776024b..00000000000
--- a/ham/fldigi/patches/patch-src_include_logsupport.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_include_logsupport.h,v 1.2 2014/03/14 14:39:22 mef Exp $
-
-Fix a header guard to reduce warnings.
-
---- src/include/logsupport.h.orig	2013-09-17 19:27:33.000000000 +0000
-+++ src/include/logsupport.h
-@@ -1,5 +1,5 @@
- #ifndef SUPPORT_H
--#define SUPPORT_h
-+#define SUPPORT_H
- 
- #include <string>
- 
diff --git a/ham/fldigi/patches/patch-src_include_strutil.h b/ham/fldigi/patches/patch-src_include_strutil.h
deleted file mode 100644
index 80a517ded61..00000000000
--- a/ham/fldigi/patches/patch-src_include_strutil.h
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-src_include_strutil.h,v 1.2 2014/03/14 14:39:22 mef Exp $
-
-Don't depend on implicit boolean conversion for streams.
-
---- src/include/strutil.h.orig	2013-09-17 19:23:48.000000000 +0000
-+++ src/include/strutil.h
-@@ -207,7 +207,8 @@ inline bool read_until_delim( char delim
- /// Reads a string up to the given delimiter.
- inline bool read_until_delim( char delim, std::istream & istrm, std::string & ref )
- {
--	return std::getline( istrm, ref, delim );
-+	std::getline( istrm, ref, delim );
-+	return istrm.good() || istrm.eof();
- }
- 
- /// For reading from a string with tokens separated by a char. Used to load CSV files.
-@@ -220,7 +221,7 @@ bool read_until_delim( char delim, std::
- 	}
- 	imemstream sstrm( parsed_str );
- 	sstrm >> ref ;
--	return sstrm ;
-+	return sstrm.good() || sstrm.eof();
- }
- 
- /// Same, with a default value if there is nothing to read.
-@@ -237,7 +238,7 @@ bool read_until_delim( char delim, std::
- 	}
- 	imemstream sstrm( parsed_str );
- 	sstrm >> ref ;
--	return sstrm ;
-+	return sstrm.good() || sstrm.eof();
- }
- 
- /// For reading from a string with tokens separated by a char to a fixed-size array.
-@@ -246,7 +247,7 @@ bool read_until_delim( char delim, std::
- {
- 	istrm.getline( ref, DtTyp< Tp >::Size, delim );
- 	// Should we return an error if buffer is too small?
--	return istrm ;
-+	return istrm.good() || istrm.eof();
- }
- 
- /// Same, with a default value if there is nothing to read. Fixed-size array.
-@@ -259,7 +260,7 @@ bool read_until_delim( char delim, std::
- 		strncpy( ref, dflt, DtTyp< Tp >::Size - 1 );
- 	}
- 	// Should we return an error if buffer is too small?
--	return istrm;
-+	return istrm.good() || istrm.eof();
- }
- 
- // ----------------------------------------------------------------------------
diff --git a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx
deleted file mode 100644
index 07253cd2903..00000000000
--- a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-src_logbook_logsupport.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
-
-Avoid implicit conversions to bool for streams.
-Require C++11 for Clang and prefer std version over tr1 when in C++11
-mode.
-
---- src/logbook/logsupport.cxx.orig	2013-05-03 14:19:39.000000000 +0000
-+++ src/logbook/logsupport.cxx
-@@ -211,7 +211,7 @@ void Export_ADIF()
- 		}
- 	}
- 	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 @@ void cb_mnuSaveLogbook(Fl_Menu_*m, void*
- 	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;
-@@ -1542,9 +1542,13 @@ SOAPBOX: \n\n",
-     return;
- }
- 
--
-+#if __cplusplus >= 200103L
-+#include <unordered_map>
-+typedef unordered_map<string, unsigned> dxcc_entity_cache_t;
-+#else
- #include <tr1/unordered_map>
- 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/ham/fldigi/patches/patch-src_misc_dxcc.cxx b/ham/fldigi/patches/patch-src_misc_dxcc.cxx
deleted file mode 100644
index 24a82426046..00000000000
--- a/ham/fldigi/patches/patch-src_misc_dxcc.cxx
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_misc_dxcc.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
-
-Avoid implicit conversions to bool for streams.
-Require C++11 for Clang and prefer std version over tr1 when in C++11
-mode.
-
---- src/misc/dxcc.cxx.orig	2013-05-03 14:21:04.000000000 +0000
-+++ src/misc/dxcc.cxx
-@@ -30,7 +30,6 @@
- #include <string>
- #include <list>
- #include <map>
--#include <tr1/unordered_map>
- #include <algorithm>
- 
- #include <FL/filename.H>
-@@ -43,8 +42,16 @@
- #include "confdialog.h"
- #include "main.h"
- 
-+#if __cplusplus >= 201103L
-+#include <unordered_map>
-+using std::unordered_map;
-+#else
-+#include <tr1/unordered_map>
-+using std::tr1::unordered_map;
-+#endif
-+
- using namespace std;
--using tr1::unordered_map;
-+
- 
- 
- dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz)
diff --git a/ham/fldigi/patches/patch-src_misc_re.cxx b/ham/fldigi/patches/patch-src_misc_re.cxx
deleted file mode 100644
index 7c06d28ab74..00000000000
--- a/ham/fldigi/patches/patch-src_misc_re.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-src_misc_re.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
-
-Avoid implicit conversions to bool for streams.
-Require C++11 for Clang and prefer std version over tr1 when in C++11
-mode.
-
---- src/misc/re.cxx.orig	2013-05-03 14:24:52.000000000 +0000
-+++ src/misc/re.cxx
-@@ -120,12 +120,17 @@ void re_t::suboff(size_t n, int* start, 
- 	}
- }
- 
-+#if __cplusplus >= 201103L
-+#include <functional>
-+#else
- #include <tr1/functional>
-+using tr1::hash;
-+#endif
- 
- 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 = ::hash<string>()(pattern);
-+	return h ^ (::hash<int>()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2));
- }
- 
- // ------------------------------------------------------------------------
diff --git a/ham/fldigi/patches/patch-src_spot_notify.cxx b/ham/fldigi/patches/patch-src_spot_notify.cxx
deleted file mode 100644
index 48721db9627..00000000000
--- a/ham/fldigi/patches/patch-src_spot_notify.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_spot_notify.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
-
-Avoid implicit conversions to bool for streams.
-Require C++11 for Clang and prefer std version over tr1 when in C++11
-mode.
-
---- src/spot/notify.cxx.orig	2013-07-06 20:54:45.000000000 +0900
-+++ src/spot/notify.cxx	2013-07-07 15:25:39.000000000 +0900
-@@ -35,7 +35,10 @@
- 
- #include "timeops.h"
- 
--#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-+#if __cplusplus >= 201103L
-+#  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
diff --git a/ham/fldigi/patches/patch-src_spot_pskrep.cxx b/ham/fldigi/patches/patch-src_spot_pskrep.cxx
deleted file mode 100644
index 1a499d83777..00000000000
--- a/ham/fldigi/patches/patch-src_spot_pskrep.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_spot_pskrep.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
-
-Avoid implicit conversions to bool for streams.
-Require C++11 for Clang and prefer std version over tr1 when in C++11
-mode.
-
---- src/spot/pskrep.cxx.orig	2013-05-03 14:36:37.000000000 +0000
-+++ src/spot/pskrep.cxx
-@@ -50,7 +50,11 @@
- #include <algorithm>
- #include <fstream>
- 
--#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
-+#if __cplusplus >= 201103L
-+#  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>
diff --git a/ham/fldigi/patches/patch-src_spot_spot.cxx b/ham/fldigi/patches/patch-src_spot_spot.cxx
deleted file mode 100644
index e6896bc58a3..00000000000
--- a/ham/fldigi/patches/patch-src_spot_spot.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_spot_spot.cxx,v 1.2 2013/09/13 06:35:55 mef Exp $
-
-Avoid implicit conversions to bool for streams.
-Require C++11 for Clang and prefer std version over tr1 when in C++11
-mode.
-
---- src/spot/spot.cxx.orig	2013-05-03 14:37:33.000000000 +0000
-+++ src/spot/spot.cxx
-@@ -23,7 +23,6 @@
- #include <config.h>
- 
- #include <list>
--#include <tr1/unordered_map>
- #include <functional>
- 
- #include "trx.h"
-@@ -33,6 +32,13 @@
- #include "debug.h"
- #include "spot.h"
- 
-+#if __cplusplus >= 201103L
-+#include <unordered_map>
-+#else
-+#include <tr1/unordered_map>
-+using std::tr1::unordered_map;
-+#endif
-+
- // the number of characters that we match our REs against
- #define SEARCHLEN 32
- #define DECBUFSIZE 8 * SEARCHLEN
-@@ -60,9 +66,9 @@ struct fre_comp : std::unary_function<co
- };
- 
- typedef list<callback_t*> callback_p_list_t;
--typedef tr1::unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t;
-+typedef unordered_map<fre_t*, callback_p_list_t, fre_hash, fre_comp> rcblist_t;
- 
--static tr1::unordered_map<int, string> buffers;
-+static unordered_map<int, string> buffers;
- static cblist_t cblist;
- static rcblist_t rcblist;
-