(trustedQSL) Update tqsl-2.1.2 to 2.2

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Thu Dec 31 01:21:37 2015 +0900
Changeset:	9b3ad71f221ab43020db0ee5d11b6e636c720cae

Modified Files:
	trustedQSL/Makefile
	trustedQSL/PLIST
	trustedQSL/distinfo
	trustedQSL/patches/patch-apps_CMakeLists.txt
	trustedQSL/patches/patch-apps_tqsl_cpp
Added Files:
	trustedQSL/patches/patch-openssl__cert.cpp

Log Message:
(trustedQSL) Update tqsl-2.1.2 to 2.2

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9b3ad71f221ab43020db0ee5d11b6e636c720cae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 trustedQSL/Makefile                          |  3 +-
 trustedQSL/PLIST                             |  1 +
 trustedQSL/distinfo                          | 12 ++++----
 trustedQSL/patches/patch-apps_CMakeLists.txt | 10 -------
 trustedQSL/patches/patch-apps_tqsl_cpp       | 42 +++++++---------------------
 trustedQSL/patches/patch-openssl__cert.cpp   | 16 +++++++++++
 6 files changed, 35 insertions(+), 49 deletions(-)

diffs:
diff --git a/trustedQSL/Makefile b/trustedQSL/Makefile
index 7f8736f..ae4b6d4 100644
--- a/trustedQSL/Makefile
+++ b/trustedQSL/Makefile
@@ -1,8 +1,9 @@
 # $NetBSD: Makefile,v 1.17 2015/10/11 02:59:07 mef Exp $
 
-DISTNAME=		tqsl-2.1.2
+DISTNAME=		tqsl-2.2
 CATEGORIES=		ham
 MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.1.2/
+MASTER_SITES=		http://www.rickmurphy.net/lotw/
 
 MAINTAINER=		makoto%ki.nu@localhost
 HOMEPAGE=		http://sourceforge.net/projects/trustedqsl/
diff --git a/trustedQSL/PLIST b/trustedQSL/PLIST
index c40957f..5187092 100644
--- a/trustedQSL/PLIST
+++ b/trustedQSL/PLIST
@@ -109,6 +109,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/trustedQSL/distinfo b/trustedQSL/distinfo
index 05b2f1f..a52b6d3 100644
--- a/trustedQSL/distinfo
+++ b/trustedQSL/distinfo
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.10 2015/10/11 02:59:07 mef Exp $
 
-SHA1 (tqsl-2.1.2.tar.gz) = b84416aba4736ddc39f638da74fb1fd8b3a52aaf
-RMD160 (tqsl-2.1.2.tar.gz) = cdf040eb24c4ad29785c360b8d93600ffcb67f75
-SHA512 (tqsl-2.1.2.tar.gz) = 7ce4779427c9fda826fef4a58fd86c1a06ea41c731c2ca8e498ff7d3a93d59d72c79b35e235be45eec348e051872932aef05abfff4416f77e80d883f09dd200e
-Size (tqsl-2.1.2.tar.gz) = 3442792 bytes
-SHA1 (patch-apps_CMakeLists.txt) = e685f6dba817c783dfe18796b714785923c42982
-SHA1 (patch-apps_tqsl_cpp) = 6ef2ba4a5cae2cb35efd80493e8f11c475d54047
+SHA1 (tqsl-2.2.tar.gz) = 9bb867363019a2f0bae6b98f562fa43fb3b96066
+RMD160 (tqsl-2.2.tar.gz) = f460c9c46fa17fc6d14ad0d90ce7895f295f0fab
+SHA512 (tqsl-2.2.tar.gz) = 57b5634c88e1a4bfcd6b6a751fce0d345493176a9125d06b98fd110c94d4eebcd940848bb7ac4d5c0be44746a794ffbec396ec894607f9b63a1c102776e885e4
+Size (tqsl-2.2.tar.gz) = 3452601 bytes
+SHA1 (patch-apps_CMakeLists.txt) = 0d602828e1f52782bbe8a6d53d0167f7b46c3fb5
+SHA1 (patch-apps_tqsl_cpp) = 7f96b6ea6a227266c3c237af0665ca47a678b058
 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
 SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896
diff --git a/trustedQSL/patches/patch-apps_CMakeLists.txt b/trustedQSL/patches/patch-apps_CMakeLists.txt
index ec5b162..e32f20e 100644
--- a/trustedQSL/patches/patch-apps_CMakeLists.txt
+++ b/trustedQSL/patches/patch-apps_CMakeLists.txt
@@ -1,7 +1,6 @@
 $NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 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
@@ -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/trustedQSL/patches/patch-apps_tqsl_cpp b/trustedQSL/patches/patch-apps_tqsl_cpp
index 836c0a7..c1d6238 100644
--- a/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -10,10 +10,8 @@ gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2
 tqsl-2.0.1/apps/tqsl.cpp:2963:10: error: #pragma GCC diagnostic not allowed inside functions
 tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed inside functions
 
-(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
+--- apps/tqsl.cpp.orig	2015-12-24 11:24:19.000000000 +0900
++++ apps/tqsl.cpp	2015-12-31 00:58:28.000000000 +0900
 @@ -64,7 +64,7 @@
  #endif
  #include <zlib.h>
@@ -23,33 +21,13 @@ 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
- // 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__)
- 	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
- #endif
- void
-@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
- 		DoCheckExpiringCerts(noGUI);
- 	return;
- }
+@@ -1725,7 +1725,8 @@ MyFrame::EditQSOData(wxCommandEvent& WXU
+ 	tqslTrace("MyFrame::EditQSOData");
+ 	QSORecordList recs;
+ 	wxString file = wxFileSelector(_("Open File"), wxConfig::Get()->Read(wxT("QSODataPath"), wxT("")), wxT(""), wxT("adi"),
 -#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];
-+#if defined (wxABI_VERSION) && (wxABI_VERSION < 30000 )
- 		if (argv[i] && (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]);
- 	}
++
+ 			_("ADIF files (*.adi;*.adif;*.ADI;*.ADIF)|*.adi;*.adif;*.ADI;*.ADIF|All files (*.*)|*.*"),
+ #else
+ 			_("ADIF files (*.adi;*.adif)|*.adi;*.adif|All files (*.*)|*.*"),
diff --git a/trustedQSL/patches/patch-openssl__cert.cpp b/trustedQSL/patches/patch-openssl__cert.cpp
new file mode 100644
index 0000000..3d57e94
--- /dev/null
+++ b/trustedQSL/patches/patch-openssl__cert.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-openssl__cert.cpp,v 1.1 2015/10/11 02:59:07 mef Exp $
+
+error: 'PATH_MAX' was not declared in this scope
+
+--- src/openssl_cert.cpp.orig	2015-09-20 09:15:24.000000000 +0900
++++ src/openssl_cert.cpp	2015-10-11 01:10:26.000000000 +0900
+@@ -131,6 +131,9 @@
+ 
+ #define TQSLLIB_DEF
+ 
++#ifdef __NetBSD__
++# include "sys/syslimits.h"
++#endif
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>