Update 2.1.3 to 2.2.1 (tested both with wxGTK28 and wxGTK30)

-----------------------------------------------------------------
Following is not for explicit 2.2.1 release but for 2.2,
(attached to mail from Rick Murphy on 2015/12/31 as
Subject:  TrustedQSL 2.2 final release is available for download)
-----------------------------------------------------------------
Trusted QSL V2.2 Release Notes

This version of Trusted QSL (TQSL) has corrections for defects found since
TQSL 2.1 was released (including the updates made for TQSL 2.1.1, 2.1.2,
and 2.1.3) as well as improvements to permit TQSL and Logbook of the World
to support the National Parks on the Air competition.

TQSL 2.2 can be installed to upgrade any older version of TQSL. Downgrade
to TQSL 2.1.3 can be seamlessly performed by uninstalling TQSL 2.2 and
reinstalling TQSL 2.1.3.

On all three supported platforms (Windows, MacOS, and Linux), installing
TQSL 2.2 will replace older versions of Trusted QSL while preserving your
Callsign Certificates, Station Locations, and preferences.  On Windows,
simply run the TQSL 2.2 installer, which will automatically uninstall
older versions of TQSL (and, if installed, TQSLCert). On Mac OS X, open
the disk image (.dmg) file and drag the "Trusted QSL" folder to your
Applications folder. Direct the installer to "Replace All", which will
uninstall old files. For Linux systems, unpack the tar file and read the
INSTALL file for directions.

The following list describes the major changes in the v2.2
release of Trusted QSL.

TQSL changes

Defects Corrected:

Fix a defect that could cause saving of Calllsign Certificate private keys
to be suppressed.

When renewing a Callsign Certificate, entering an invalid password would
display an incorrect "Invalid Argument" error versus displaying the proper
"Invalid password" error. Under some circumstances, this could cause the
related Callsign Certificate to be lost.

Accept C7 and 4Y as valid callsign prefixes.

When installing a Callsign Certificate fails, display the callsign and
serial number to facilitate troubleshooting.

When deleting Callsign Certificates and Station Locations, save a copy to
allow those to be restored.

Reject QSOs that do not specify at least mode, band, date, and time.

Correct the TQSL ADIF editor to not use the local decimal point separator
for frequencies, as ADIF requires a period(.).

Major feature Additions:

Use Portuguese (Portugal) translations contributed by Nuno, CT2IRY.

Allow multiple dependent fields on a station location screen. This allows
both a county and a park entry to be modified when the US state changes
for a US Station Location.

5 files changed, 60 insertions, 46 deletions

diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index 962de91e77c..43ef9bfd671 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2016/03/05 11:28:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2016/03/16 14:22:01 mef Exp $
 
-DISTNAME=		tqsl-2.1.3
-PKGREVISION=		1
+DISTNAME=		tqsl-2.2.1
 CATEGORIES=		ham
 MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v${PKGVERSION_NOREV}/
 
@@ -40,7 +39,7 @@ post-install:
 	${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \
 	)
 	# Conflicting PLIST with wxGTK28-2.8.12nb8:
-	${RM} ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo
+	${RM} -f ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../databases/db5/buildlink3.mk"
diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST
index c40957fc14d..86e3e5062b1 100644
--- a/ham/trustedQSL/PLIST
+++ b/ham/trustedQSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2015/10/11 02:59:07 mef Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/03/16 14:22:01 mef Exp $
 bin/tqsl
 include/adif.h
 include/cabrillo.h
@@ -12,6 +12,8 @@ share/TrustedQSL/config.xml
 share/TrustedQSL/help/tqslapp/CertProp.bmp
 share/TrustedQSL/help/tqslapp/EnterPassword.bmp
 share/TrustedQSL/help/tqslapp/LoTWCerts.bmp
+share/TrustedQSL/help/tqslapp/MainNoStatusTab.bmp
+share/TrustedQSL/help/tqslapp/MainWithStatusTab.bmp
 share/TrustedQSL/help/tqslapp/P12.bmp
 share/TrustedQSL/help/tqslapp/Pending.bmp
 share/TrustedQSL/help/tqslapp/RenewUpload.bmp
@@ -109,6 +111,7 @@ share/TrustedQSL/help/tqslapp/stnloc1.bmp
 share/TrustedQSL/help/tqslapp/stnloc1.htm
 share/TrustedQSL/help/tqslapp/stnloc2.bmp
 share/TrustedQSL/help/tqslapp/stnloc2.htm
+share/TrustedQSL/help/tqslapp/stnloc2park.bmp
 share/TrustedQSL/help/tqslapp/stnloc3.bmp
 share/TrustedQSL/help/tqslapp/stnloc4.bmp
 share/TrustedQSL/help/tqslapp/stnloc5.bmp
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index 4a9c62037b7..af3b84fb6c4 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2015/12/13 02:56:23 mef Exp $
+$NetBSD: distinfo,v 1.14 2016/03/16 14:22:01 mef Exp $
 
-SHA1 (tqsl-2.1.3.tar.gz) = 2297c3dc6384dde9db58d2e40d866f8383a703b0
-RMD160 (tqsl-2.1.3.tar.gz) = 526fed3b655facf685c92f90575d43d9d905f63d
-SHA512 (tqsl-2.1.3.tar.gz) = 76c83f11aca6425b78399dec1a9617ed10ac150892a28392f25ddc04cc1c6441935522c1c7a267b60a0c167aad32d154ee0c9dee097d83950984029cd11fa4a5
-Size (tqsl-2.1.3.tar.gz) = 3443675 bytes
-SHA1 (patch-apps_CMakeLists.txt) = e685f6dba817c783dfe18796b714785923c42982
-SHA1 (patch-apps_tqsl_cpp) = 6ef2ba4a5cae2cb35efd80493e8f11c475d54047
+SHA1 (tqsl-2.2.1.tar.gz) = c0bcfc9a7e5a9e53fd9c5e3debb98d1f3b8fb309
+RMD160 (tqsl-2.2.1.tar.gz) = 7e2b3f01564e48cfbee48c9e380382bba888b69e
+SHA512 (tqsl-2.2.1.tar.gz) = 8aa2577f449b20ce0f53cb7725b246ac79e5581ec9694f1189b3469883087b33d9e6262da862e537f63cdf751a77625302a06deedb70b798680aea496c7b3947
+Size (tqsl-2.2.1.tar.gz) = 3782449 bytes
+SHA1 (patch-apps_CMakeLists.txt) = e2a44d076c2e2804a45d8fc98937543105fb4d0f
+SHA1 (patch-apps_tqsl_cpp) = a21e3264051feb8230af7e031688ba98f51db1df
 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896
diff --git a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
index ec5b162b0c4..8128ec0298a 100644
--- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
+++ b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
@@ -1,11 +1,10 @@
-$NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 mef Exp $
+$NetBSD: patch-apps_CMakeLists.txt,v 1.5 2016/03/16 14:22:01 mef Exp $
 
 (1) Avoid ${WRKSRC} included in RPATH.
-(2) WARN: PLIST:105: Man pages should be installed into man/, not share/man/.
 
---- apps/CMakeLists.txt.orig	2015-09-20 09:15:24.000000000 +0900
-+++ apps/CMakeLists.txt	2015-10-11 00:57:52.000000000 +0900
-@@ -120,8 +120,8 @@ if(APPLE)
+--- apps/CMakeLists.txt.orig	2016-03-12 14:49:01.000000000 +0900
++++ apps/CMakeLists.txt	2016-03-16 21:42:51.000000000 +0900
+@@ -120,8 +120,8 @@
  endif()
  
  if(NOT WIN32) #rpath setup
@@ -16,12 +15,3 @@ $NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 mef Exp $
  	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
  endif()
-@@ -148,7 +148,7 @@ if(NOT APPLE AND NOT WIN32)
- 	add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"")
- 	install(TARGETS tqsl DESTINATION bin)
- 	install(DIRECTORY help DESTINATION share/TrustedQSL)
--	install(FILES tqsl.5 DESTINATION share/man/man5)
-+	install(FILES tqsl.5 DESTINATION man/man5)
- 	install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png)
- 	install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES)
- 	install(FILES lang/de/wxstd.mo DESTINATION share/locale/de/LC_MESSAGES)
diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
index 98e3f04ec9c..35261049d89 100644
--- a/ham/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-apps_tqsl_cpp,v 1.4 2015/11/22 09:52:55 mef Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.5 2016/03/16 14:22:01 mef Exp $
 
 (1)
 Avoid following error (interim, only valid with db5)
@@ -12,8 +12,11 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
 
 (3) Trial code for wxGTK30
 
---- apps/tqsl.cpp.orig	2015-09-20 09:15:24.000000000 +0900
-+++ apps/tqsl.cpp	2015-11-17 23:08:20.000000000 +0900
+(4) Avoid error with wxGTK30
+ error: cannot pass objects of non-trivially-copyable type 'class wxCStrData' through '...'
+
+--- apps/tqsl.cpp.orig	2016-03-12 14:49:01.000000000 +0900
++++ apps/tqsl.cpp	2016-03-16 22:49:15.000000000 +0900
 @@ -64,7 +64,7 @@
  #endif
  #include <zlib.h>
@@ -23,30 +26,49 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  
  #include <iostream>
  #include <fstream>
-@@ -3428,7 +3428,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
+@@ -3145,7 +3145,7 @@ void MyFrame::UpdateConfigFile() {
+ 		FILE *configFile = fopen(filename.ToUTF8(), "wb");
+ #endif
+ 		if (!configFile) {
+-			tqslTrace("UpdateConfigFile", "Can't open new file %s: %hs", filename.c_str(), strerror(errno));
++		  tqslTrace("UpdateConfigFile", "Can't open new file %s: %hs", ((const wxChar*) filename), strerror(errno));
+ 			wxMessageBox(wxString::Format(_("Can't open new configuration file %s: %hs"), filename.c_str(), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this);
+ 			return;
+ 		}
+@@ -3153,15 +3153,15 @@ void MyFrame::UpdateConfigFile() {
+ 		while (left > 0) {
+ 			size_t written = fwrite(newconfig, 1, left, configFile);
+ 			if (written == 0) {
+-				tqslTrace("UpdateConfigFile", "Can't write new file %s: %hs", filename.c_str(), strerror(errno));
+-				wxMessageBox(wxString::Format(_("Can't write new configuration file %s: %hs"), filename.c_str(), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this);
++				tqslTrace("UpdateConfigFile", "Can't write new file %s: %hs", ((const wxChar*) filename), strerror(errno));
++				wxMessageBox(wxString::Format(_("Can't write new configuration file %s: %hs"), ((const wxChar*) filename), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this);
+ 				if (configFile) fclose(configFile);
+ 				return;
+ 			}
+ 			left -= written;
+ 		}
+ 		if (fclose(configFile)) {
+-			tqslTrace("UpdateConfigFile", "Error writing new file %s: %hs", filename.c_str(), strerror(errno));
++			tqslTrace("UpdateConfigFile", "Error writing new file %s: %hs", ((const wxChar*) filename), strerror(errno));
+ 			wxMessageBox(wxString::Format(_("Error writing new configuration file %s: %hs"), filename.c_str(), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this);
+ 			return;
+ 		}
+@@ -3489,7 +3489,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven
  // The macro for declaring a hash map defines a couple of typedefs
  // that it never uses. Current GCC warns about those. The pragma
  // below suppresses those warnings for those.
--#if !defined(__APPLE__) && !defined(_WIN32)
-+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
+-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__)
++#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
  	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif
  void
-@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
- 		DoCheckExpiringCerts(noGUI);
- 	return;
- }
--#if !defined(__APPLE__) && !defined(_WIN32)
-+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
- 	#pragma GCC diagnostic warning "-Wunused-local-typedefs"
- #endif
- 
-@@ -4676,7 +4676,11 @@ QSLApp::OnInit() {
- 	for (int i = 1; i < argc; i++) {
- 		origCommandLine += wxT(" ");
- 		origCommandLine += argv[i];
+@@ -4770,7 +4770,11 @@ QSLApp::OnInit() {
+ 		// Well, if it's a pointer and it might be null but it's also not a pointer
+ 		// and can't be null, then it's not possible to compile this without warning.
+ 		// Warnings ahoy!
 +#if defined (wxABI_VERSION) && (wxABI_VERSION < 30000 )
- 		if (argv[i] && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
+ 		if (argv[i][0] == wxT('-') || argv[i][0] == wxT('/'))
 +#else
 +		if (!argv[i].empty() && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
 +#endif