Updated ham/trusted-QSL (tqsl) to 2.3.1

Trusted QSL V2.3.1 Release Notes

This version of Trusted QSL (TQSL) has new features as well as
corrections for defects found since TQSL 2.3 was
released. This release also includes an update to the most
recent TQSL configuration file.

TQSL 2.3.1 can be installed to upgrade any older version of TQSL.

On all three supported platforms (Windows, MacOS, and Linux),
installing TQSL 2.3.1 will replace older versions of Trusted
QSL while preserving your Callsign Certificates, Station
Locations, and preferences.  On Windows, simply run the TQSL
2.3.1 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.

TQSL 2.3 has been “localized” to allow use in the native
language of non-English speakers. This could not have been
done without the help of the volunteers who have contributed
translations for TQSL. Thanks to the following for their
assistance:

Chinese: Caros, BH4TXN
Finnish: Juhani, OH8MXL
German: Andreas DF4WC
Italian: Salvatore IV4FYV
Japanese: Akihiro JL3OXR
Portuguese: Nuno CT2IRY
Russian: Vic US5WE
Spanish: Jordi EA3GCV

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

TQSL changes
Defects Corrected:

- Added 'Saving QSOs' to the messages to be translated.

- When renewing a callsign certificate and backing up to
  earlier pages in the wizard, TQSL could display an unexpected
  page for selecting the certificate type, which is not needed
  for renewals. TQSL will no longer display the unexpected page.

- When editing an ADIF file that has an invalid mode setting,
  TQSL now notifies the user that the mode is being ignored.

- For Unix systems, fix a defect that could cause the password
  prompt to not appear when the system has built the wxWidgets
  system with debug assertions enabled.

- Correct the invocation of the Windows Installer when an
  update is available.

- Correct the counts reported when duplicate QSOs are found
  along with QSOs with other errors.

- Fix formatting of the messages that appear when QSOs change
  values in the station location for duplicate QSOs.

- Correct improperly formatted frequencies from ADIF files
  (values like '7.010.20') to remove the extra periods.

- Revert the change that stripped spaces in the TQSL
  configuration file as that caused newlines to be removed in
  places like the station_data file.

- Fix "OpenSSL error - bad end line" by ensuring that there's
  always a newline starting a new certificate.

Feature Additions:
- Add Finnish translation from Juhani, OH8MXL.

- Add the ADIF satellite name to the pulldown menu in the ADIF
  editor to allow satellites to be more easily looked up.

- Allow 'LIGHT' in a Cabrillo file to represent 300 GHz and above.
- Allow TQSL to build against OpenSSL 1.1.0.
- Add the ability to pull DXCC Entity valid date ranges from the TQSL configuration file.

Reinstalling TQSL 2.3

Downgrading to TQSL 2.3 can be seamlessly performed by
uninstalling TQSL 2.3.1 and reinstalling TQSL 2.3.

4 files changed, 22 insertions, 61 deletions

diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index a4b4b066cb8..9be765133c1 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2018/01/01 21:18:36 adam Exp $
+# $NetBSD: Makefile,v 1.30 2018/03/17 02:45:05 mef Exp $
 
-DISTNAME=		tqsl-2.2.1
-PKGREVISION=		6
+DISTNAME=		tqsl-2.3.1
 CATEGORIES=		ham
 MASTER_SITES=		https://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v${PKGVERSION_NOREV}/
 
@@ -24,6 +23,13 @@ USE_CMAKE=		yes
 # cause (aside from having two pixman versions installed) is ad hoc -L
 # usage in Makefile.am, without matching -R.
 
+# remove the string $(LIB_SUFFIX), tested with NetBSD at least
+SUBST_CLASSES+=		lib-suffix
+SUBST_MESSAGE.lib-suffix= Removing $$(LIB_SUFFIX) from src/CMakeLists.txt
+SUBST_STAGE.lib-suffix= post-patch
+SUBST_FILES.lib-suffix= src/CMakeLists.txt
+SUBST_SED.lib-suffix= 	-e s/\$$\(LIB_SUFFIX\)//
+
 do-configure:
 	(cd ${WRKSRC} ; \
 	cmake \
diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST
index 86e3e5062b1..4b2bbcc8604 100644
--- a/ham/trustedQSL/PLIST
+++ b/ham/trustedQSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/03/16 14:22:01 mef Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/03/17 02:45:05 mef Exp $
 bin/tqsl
 include/adif.h
 include/cabrillo.h
@@ -23,6 +23,8 @@ share/TrustedQSL/help/tqslapp/TQ8.bmp
 share/TrustedQSL/help/tqslapp/TQSLCert.bmp
 share/TrustedQSL/help/tqslapp/about.bmp
 share/TrustedQSL/help/tqslapp/addcert1.bmp
+share/TrustedQSL/help/tqslapp/addcert2.bmp
+share/TrustedQSL/help/tqslapp/addcert3.bmp
 share/TrustedQSL/help/tqslapp/addcertaccept.htm
 share/TrustedQSL/help/tqslapp/addcertreq.htm
 share/TrustedQSL/help/tqslapp/additional-info.htm
@@ -115,7 +117,6 @@ share/TrustedQSL/help/tqslapp/stnloc2park.bmp
 share/TrustedQSL/help/tqslapp/stnloc3.bmp
 share/TrustedQSL/help/tqslapp/stnloc4.bmp
 share/TrustedQSL/help/tqslapp/stnloc5.bmp
-share/TrustedQSL/help/tqslapp/tqslapp.chm
 share/TrustedQSL/help/tqslapp/tqslapp.hhp
 share/TrustedQSL/help/tqslapp/tqslstyle.css
 share/TrustedQSL/help/tqslapp/unlock.bmp
@@ -125,8 +126,11 @@ share/TrustedQSL/help/tqslapp/update1.bmp
 share/TrustedQSL/help/tqslapp/update2.bmp
 share/locale/de/LC_MESSAGES/tqslapp.mo
 share/locale/es/LC_MESSAGES/tqslapp.mo
+share/locale/fi/LC_MESSAGES/tqslapp.mo
 share/locale/fr/LC_MESSAGES/tqslapp.mo
 share/locale/it/LC_MESSAGES/tqslapp.mo
 share/locale/ja/LC_MESSAGES/tqslapp.mo
 share/locale/pt/LC_MESSAGES/tqslapp.mo
+share/locale/ru/LC_MESSAGES/tqslapp.mo
+share/locale/zh/LC_MESSAGES/tqslapp.mo
 share/pixmaps/TrustedQSL.png
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index c7b17dec819..034a3cc4acf 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2016/04/21 12:26:19 jperkin Exp $
+$NetBSD: distinfo,v 1.16 2018/03/17 02:45:05 mef Exp $
 
-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 (tqsl-2.3.1.tar.gz) = ebdb025e1454addfb2087ee0d5e3e0a783156aa0
+RMD160 (tqsl-2.3.1.tar.gz) = 5d7bf95f299496d130a3fa6b989e380007ad296e
+SHA512 (tqsl-2.3.1.tar.gz) = edaa21b1605bcb38790a66d61e1498a04f41c4f9b3b577908a6e57cd38e1ac2e1724e9c6d5421e0ca4a4ea72d1d5f5d54f08bf5a6c202bf68181ec12f27d4afd
+Size (tqsl-2.3.1.tar.gz) = 2896807 bytes
 SHA1 (patch-apps_CMakeLists.txt) = 5063cf616a65e6d5650e946fd0929759ad04c9c0
-SHA1 (patch-apps_tqsl_cpp) = a21e3264051feb8230af7e031688ba98f51db1df
+SHA1 (patch-apps_tqsl_cpp) = f38c8917e9bf7114060de3a2b2e2bb02eb864440
 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896
diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
index 35261049d89..dc5877def95 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.5 2016/03/16 14:22:01 mef Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.6 2018/03/17 02:45:05 mef Exp $
 
 (1)
 Avoid following error (interim, only valid with db5)
@@ -26,52 +26,3 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  
  #include <iostream>
  #include <fstream>
-@@ -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) && !defined(__clang__)
-+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__)
- 	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #endif
- void
-@@ -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][0] == wxT('-') || argv[i][0] == wxT('/'))
-+#else
-+		if (!argv[i].empty() && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')))
-+#endif
- 			if (wxIsalpha(argv[i][1]) && wxIsupper(argv[i][1]))
- 				argv[i][1] = wxTolower(argv[i][1]);
- 	}