head	1.3;
access;
symbols
	pkgsrc-2014Q1:1.2.0.6
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.4
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.2
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2014.06.15.14.27.43;	author mef;	state dead;
branches;
next	1.2;
commitid	KkgAG2xOg9WaUCEx;

1.2
date	2013.09.13.06.35.55;	author mef;	state Exp;
branches;
next	1.1;
commitid	2QIUalkX7Hlz8f5x;

1.1
date	2013.05.06.14.49.32;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.3
log
@(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
@
text
@$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;
 
@


1.2
log
@Bump 3.21.70 to 3.21.76

=Version 3.21.76=
 2013-09-09  David Freese  <w1hkj@@w1hkj.com>
	ARQ mode character set
	RsID, Macro Queue, DTMF transmit management
	Xmlrpc method signatures
	RsID fo computation

=Version 3.21.75=
	xmlrpcpp methods
	RSID update
	Error exit
	fltk 1.1.x
	Sound File

=Version 3.21.74=
	initialize active_modem
	XML parser
	64 bit compile warnings
	Automake bug

=Version 3.21.73=
	qrunner mod
	Pskmail-test

 2013-07-24  John Phelps  <kl4yfd@@gmail.com>
	Doxygen for fldigi
	* Added scripts to generate Doxygen documentation from fldigi git
	  repository / source
	* Also executes "cppcheck" and includes those results on Doxygen
	  page (if installed on system)
	* Generates patches and log for the last 125 commits: includes
          links on Doxygen page

 2013-07-24  David Freese  <w1hkj@@w1hkj.com>
	CPPcheck errors
	Modem class
	Rigcat Thread
	Missing header
	fldigi-shell
	Fl::focus on OS X
	Data files
	KML thread
	Fl::flush
	ADIF_RW thread
	trx semaphore
	Digiscope buffer

 2013-07-07  Robert Stiles  <kk5vd@@yahoo.com>
	Portaudio exceptions

 2013-07-07  David Freese  <w1hkj@@w1hkj.com>
	mxe-win32 regex
	PSKMAIL/ARQ socket
	Thor update
	record_loader fix
	Code cleanup
	Pskmail Notify RsID
	MFSK shut down

 2013-06-27  Robert Stiles  <kk5vd@@yahoo.com>
	Cwidth test for zero

 2013-06-21  David Freese  <w1hkj@@w1hkj.com>
	XMLRPC
	MXE compile

 2013-06-19  Stefan Fendt  <smfendt@@gmail.com>
	RTTY decoder

 2013-06-09  Dennis Engdahl  <engdahl@@snowcrest.net>
	RigCAT user commands

 2013-06-08  David Freese  <w1hkj@@w1hkj.com>
	TX state
	pskmail events
	  * Changed extended rsid iaw doc/rsid_codes.gnumeric

 2013-06-01  Remi Chateauneu  <remi.chateauneu@@gmail.com>
	KML/Synop/RTTY/Navtex
	Port to MXE / MingW
	QSL VIA
	XML parser

 2013-05-31  David Freese  <w1hkj@@w1hkj.com>
	ARQ support changes
	xmlrpcpp
	PortAudio
	SysV ARQ interface
	METAR format
	RSID logic

=Version 3.21.72=
	RsID Timeout
	PSKMAIL
	Colors/Fonts Dialog
	Developer List

=Version 3.21.71=
	About update
	Wavefile generate
	MT63 mode selection
	ARQ server

 2013-04-30  Remi Chateauneu  <remi.chateauneu@@gmail.com>
	xmlrpc-c removal

 2013-04-30  David Freese  <w1hkj@@w1hkj.com>
	Signal Browser Colors
	QRZ query
	Rigsupport
	PO file update
	eQSL url
	PSKMAIL
@
text
@d1 1
a1 1
$NetBSD: patch-src_logbook_logsupport.cxx,v 1.1 2013/05/06 14:49:32 joerg Exp $
@


1.1
log
@Avoid implicit conversions to bool for streams.
Require C++11 for Clang and prefer std version over tr1 when in C++11
mode.
@
text
@d1 5
a5 1
$NetBSD$
@

