(pkgsrc)

  - (patch-openssl__cert.cpp)
    Add patch to define MAX_PATH macro
  - Unable to package with x11/wxGTK30 yet
(upstream)
 - Udate 2.0.3 to 2.1.2
-----------
TQSL-2.1.2
The following links are pointers to TrustedQSL (TQSL) V2.1.2, which is
a bug fix for the official TQSL 2.1 release.
   Release Notes 	TrustedQSL-2-1-release.pdf
   http://www.rickmurphy.net/lotw/TrustedQSL-2-1-release.pdf

3 files changed, 29 insertions, 12 deletions

diff --git a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
index 69876ba091b..ec5b162b0c4 100644
--- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
+++ b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-apps_CMakeLists.txt,v 1.3 2014/06/13 11:38:03 mef Exp $
+$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	2014-01-12 23:39:24.000000000 +0900
-+++ apps/CMakeLists.txt	2014-01-14 00:13:12.000000000 +0900
-@@ -115,8 +115,8 @@ if(APPLE)
+--- 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)
  endif()
  
  if(NOT WIN32) #rpath setup
@@ -16,11 +16,12 @@ $NetBSD: patch-apps_CMakeLists.txt,v 1.3 2014/06/13 11:38:03 mef Exp $
  	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
  	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
  endif()
-@@ -144,6 +144,6 @@ if(NOT APPLE AND NOT WIN32)
+@@ -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 ca-bundle.crt 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)
- endif()
+ 	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 9c6641abe61..9e53ac30b15 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.2 2014/06/13 11:38:03 mef Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.3 2015/10/11 02:59:07 mef Exp $
 
 (1)
 Avoid following error (interim, only valid with db5)
@@ -10,8 +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
 
---- apps/tqsl.cpp.orig	2014-02-27 03:07:41.000000000 +0900
-+++ apps/tqsl.cpp	2014-02-27 20:21:11.000000000 +0900
+--- apps/tqsl.cpp.orig	2015-09-20 09:15:24.000000000 +0900
++++ apps/tqsl.cpp	2015-10-11 01:19:49.000000000 +0900
 @@ -55,7 +55,7 @@
  #endif
  #include <zlib.h>
@@ -30,8 +30,8 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi
  	#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif
  void
-@@ -3192,7 +3192,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
- 	DoCheckExpiringCerts(noGUI);
+@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, 
+ 		DoCheckExpiringCerts(noGUI);
  	return;
  }
 -#if !defined(__APPLE__) && !defined(_WIN32)
diff --git a/ham/trustedQSL/patches/patch-openssl__cert.cpp b/ham/trustedQSL/patches/patch-openssl__cert.cpp
new file mode 100644
index 00000000000..3d57e948519
--- /dev/null
+++ b/ham/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>