(pkgsrc):

  - DEPENDS+= mozilla-rootcerts are removed, cert included now.
  - Deleted SUBST_CLASSES+= macro_S to avoid name (_S) conflicts on NetBSD-5.*
    (The probelm no longer exists)
  - Correct MESSAGE (but this is to be committed separately)

(Upstream): Bump version 2.0 to 2.0.2RC4
---------------
This commit log compiled from that of wip/trustedQSL/Makefile by mef@
Sorry if typo or too compact.

2.0.2RC4 2014/06/07
 - No pop up when prompting user for password when batch mode
 - If QSO database is corrupted and can not be repaired, delete it
2.0.2RC3 2014/05/09
 - Ensure station locations added (sign a log -> list of stn loc.)
 - Restore from .tbk to restore multiple pending callsign
   certificates for a given callsign
 - Correct message when callsign cert. is uploaded
 - Delete any older version, when renewed callsign is installed
 - Correct the behaviour for non ascii directory name on Windows
 - Correct the number of QSO in some case when signing
   (ignoring might have shown negative number)
2.0.2RC2 2014/04/22
 - Windows only
2.0.2RC1 2014/04/16
 - OpenSSL update (Heartbleed). no practical attack anyway
   (Windows only)
2.0.1RC9 2014/03/01
 - Avoid application crash when database conversion for Open/Close
 - Faster conversion of database
2.0.1RC8 2014/02/27
 - Limit the number of copies of application running
   (multiple run might have database corrution)
2.0.1RC7 2014/02/13
 - When a callsign cert is about to expire (within 60 days), TQSL
   warns. But even after user submitted renewal, it continued
 - Correct the automatic backup directory (by from preference pane)
 - Search Log files with .ADI, .ADIF also
2.0.1RC6 2014/02/05
 - Copyright notice / date (only)
2.0.1RC5 2014/01/29
 - Avoid crash at starting if certifiacate status file is empty
 - Corrected for checking for new release even with -RC change
2.0.1RC4 2014/01/22
 - Canadian province PQ/QC issue
 - Correct start-up threads management
 - (OpenSuSE Linux) for pending callsign requests
 - Accept valid callsign only based on location
 - Correct hang if command line argument is wrong
 - Update message during callsign certificate creation

2.0.1RC3, 2014/01/13 (but hangs when reading cert_status.xml)
Two additional changes in TQSL 2.0 RC3:
  -------------
  A. Because new modes may not yet be specified in ADIF, and because
  LoTW may not accept all modes specified in ADIF, TQSL enables you to
  "map" a new mode to a mode or mode group recognized by LoTW; this
  most often takes the form of mapping a new digital mode to the DATA
  mode group. Versions of TQSL prior to 2.0 would allow you to map
  modes accepted by LoTW. This version of TQSL will refuse to map a
  mode that is accepted by LoTW. Any existing mappings of modes
  accepted by LoTW will be automatically removed on startup; you will
  be notified if this happens.

  B. When submitting log files in Cabrillo format, previous versions of
  TQSL submitted FM and PH modes as PHONE. TQSL 2.0 RC2 submits FM mode
  as FM, and PH mode as SSB.
  ----------------------------
2.0.1RC2 2013/09/01
  Contest name recognition is corrected (Re: JIDX)

6 files changed, 65 insertions, 62 deletions

diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index 21eb6d83f49..582a0d244e8 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/13 11:38:03 mef Exp $
 
-DISTNAME=		tqsl-2.0
-PKGREVISION=		3
+DISTNAME=		tqsl-2.0.2
+PKGNAME=		tqsl-2.0.2RC4
 CATEGORIES=		ham
-MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0/
-EXTRACT_SUFX=		.tgz
+MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0.2/
+DIST_SUBDIR=		tqsl-2.0.2RC4
 
 MAINTAINER=		makoto@ki.nu
 HOMEPAGE=		http://sourceforge.net/projects/trustedqsl/
@@ -14,8 +14,6 @@ LICENSE=		arrl-license
 # A macro _S in /usr/include/ctype.h conflicts with one in apps/tqsltrace.h
 # NOT_FOR_PLATFORM+=   NetBSD-5.*
 
-DEPENDS+=		mozilla-rootcerts-[0-9]*:../../security/mozilla-rootcerts
-
 USE_TOOLS+=		perl gmake cmake
 USE_LANGUAGES+=		c c++
 USE_LIBTOOL=		yes
@@ -27,25 +25,6 @@ USE_CMAKE=		yes
 # cause (aside from having two pixman versions installed) is ad hoc -L
 # usage in Makefile.am, without matching -R.
 
-# Following SUBST is really necessary only on NetBSD-5.*
-SUBST_CLASSES+=	macro_S
-SUBST_MESSAGE.macro_S= Replace _S with _SS to avoid conflicts on include/ctypes.h and apps/tqsltrace.h
-SUBST_STAGE.macro_S= pre-configure
-SUBST_FILES.macro_S = \
-	apps/crqwiz.cpp \
-	apps/extwizard.cpp \
-	apps/getpassword.cpp \
-	apps/loadcertwiz.cpp \
-	apps/qsodatadialog.cpp \
-	apps/stationdial.cpp \
-	apps/tqsl.cpp \
-	apps/tqsl_prefs.cpp \
-	apps/tqslhelp.cpp \
-	apps/tqsltrace.h \
-	apps/tqslvalidator.cpp \
-	apps/tqslwiz.cpp
-SUBST_SED.macro_S=	-e 's,_S(,_SS(,g'
-
 do-configure:
 	(cd $(WRKSRC) ; \
 	cmake \
diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST
index deddd84a1b3..269334147ca 100644
--- a/ham/trustedQSL/PLIST
+++ b/ham/trustedQSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/06 05:52:42 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/06/13 11:38:03 mef Exp $
 bin/tqsl
 include/adif.h
 include/cabrillo.h
@@ -8,6 +8,7 @@ include/tqsllib.h
 lib/libtqsllib.so
 man/man5/tqsl.5
 share/TrustedQSL/LICENSE.txt
+share/TrustedQSL/ca-bundle.crt
 share/TrustedQSL/config.xml
 share/TrustedQSL/help/tqslapp/P12.bmp
 share/TrustedQSL/help/tqslapp/Pending.bmp
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index f91b66c7481..645393219cc 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/12/06 05:52:42 mef Exp $
+$NetBSD: distinfo,v 1.8 2014/06/13 11:38:03 mef Exp $
 
-SHA1 (tqsl-2.0.tgz) = c132d83bb7bd2e805fe9d6df52ea235d55153153
-RMD160 (tqsl-2.0.tgz) = 7f3e3af2336e43851fb419484e7cfea0ec0089e0
-Size (tqsl-2.0.tgz) = 2626483 bytes
-SHA1 (patch-apps_CMakeLists.txt) = 6057dd58f9297b5f23158e5a959564c864d46147
-SHA1 (patch-apps_tqsl_cpp) = 93ba43c8ad0955d77b47622ac722765ba146586b
-SHA1 (patch-src_tqslconvert_cpp) = 6a0a4e54c1f351a0bd8e0e6f8c04a87ea975330e
+SHA1 (tqsl-2.0.2RC4/tqsl-2.0.2.tar.gz) = f117aa6af448724a051be0817c9be119a9cc3aca
+RMD160 (tqsl-2.0.2RC4/tqsl-2.0.2.tar.gz) = 6ffe02a8c5f51f4129af1202c4aa6a5f7c57eaf6
+Size (tqsl-2.0.2RC4/tqsl-2.0.2.tar.gz) = 2763698 bytes
+SHA1 (patch-apps_CMakeLists.txt) = eed3a7eb926cfe6c384b10a3488f8b6e47ef3795
+SHA1 (patch-apps_tqsl_cpp) = 7feb48d6070abdccd59c404ffadf1e507cebd9d4
+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 46f05292bb8..69876ba091b 100644
--- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
+++ b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt
@@ -1,26 +1,26 @@
-$NetBSD: patch-apps_CMakeLists.txt,v 1.2 2013/09/24 11:16:04 mef Exp $
+$NetBSD: patch-apps_CMakeLists.txt,v 1.3 2014/06/13 11:38:03 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	2013-09-22 00:44:59.000000000 +0900
-+++ apps/CMakeLists.txt	2013-09-22 15:44:50.000000000 +0900
-@@ -93,8 +93,8 @@ set(TQSL_RCFILE ${OSX_ICONFILE})
+--- 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)
  endif()
  
  if(NOT WIN32) #rpath setup
--SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
--SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
-+SET(CMAKE_SKIP_BUILD_RPATH  TRUE)
-+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+-	SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+-	SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
++	SET(CMAKE_SKIP_BUILD_RPATH TRUE)
++	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) 
+ 	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
  endif()
-@@ -121,6 +121,6 @@ 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)
+@@ -144,6 +144,6 @@ if(NOT APPLE AND NOT WIN32)
+ 	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()
diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
index ce6e4dd3da6..9c6641abe61 100644
--- a/ham/trustedQSL/patches/patch-apps_tqsl_cpp
+++ b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
@@ -1,18 +1,41 @@
-$NetBSD: patch-apps_tqsl_cpp,v 1.1 2013/09/13 08:45:52 mef Exp $
+$NetBSD: patch-apps_tqsl_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $
 
+(1)
 Avoid following error (interim, only valid with db5)
 /usr/pkgsrc/wip/trustedQSL/work/tqsl-2.0/apps/tqsl.cpp:1133:36: error: 'DB_VERSION_STRING' was not declared in this scope
 gmake[2]: *** [apps/CMakeFiles/tqsl.dir/tqsl.cpp.o] Error 1
 gmake[1]: *** [apps/CMakeFiles/tqsl.dir/all] Error 2
 
---- apps/tqsl.cpp.orig	2013-08-18 22:07:48.000000000 +0900
-+++ apps/tqsl.cpp	2013-09-01 00:39:30.000000000 +0900
-@@ -71,7 +71,7 @@
+(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
+@@ -55,7 +55,7 @@
  #endif
  #include <zlib.h>
  #include <openssl/opensslv.h> // only for version info!
 -#include <db.h> //only for version info!
 +#include <db5/db.h> //only for version info!
- #include "tqslwiz.h"
- #include "qsodatadialog.h"
- #include "tqslerrno.h"
+ 
+ #include <iostream>
+ #include <fstream>
+@@ -3022,7 +3022,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
+@@ -3192,7 +3192,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
+ 
diff --git a/ham/trustedQSL/patches/patch-src_tqslconvert_cpp b/ham/trustedQSL/patches/patch-src_tqslconvert_cpp
index a255cf79e69..2cce15b5c87 100644
--- a/ham/trustedQSL/patches/patch-src_tqslconvert_cpp
+++ b/ham/trustedQSL/patches/patch-src_tqslconvert_cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_tqslconvert_cpp,v 1.1 2013/09/13 08:45:52 mef Exp $
+$NetBSD: patch-src_tqslconvert_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $
 
 Convert db.h name to pkgsrc current name
 
---- src/tqslconvert.cpp.orig	2013-04-20 21:51:36.000000000 +0900
-+++ src/tqslconvert.cpp	2013-04-25 10:54:50.000000000 +0900
+--- src/tqslconvert.cpp.orig	2014-01-12 23:39:24.000000000 +0900
++++ src/tqslconvert.cpp	2014-01-14 00:46:23.000000000 +0900
 @@ -22,7 +22,7 @@
- #include <vector>
+ #include <string>
  #include <ctype.h>
  #include <set>
 -#include <db.h>