(Upstream)

  tqsl-2.0 is released
(pkgsrc)
  - Tweaks for release candidate (say DIST_SUBDIR etc) are removed
  - DEPENDS+= mozilla-rootcerts are added now. This will avoid the error as:
      "Peer certificate cannot be authenticated with given CA certificates"
      (SSL certificate problem: self signed certificate in certificate chain)
      see also http://curl.haxx.se/docs/sslcerts.html
  - Add SUBST_CLASSES+= macro_S to avoid name (_S) conflicts on NetBSD-5.*
  - Add MESSAGE for rootcerts and firt thing to do after installaton

4 files changed, 57 insertions, 11 deletions

diff --git a/ham/trustedQSL/MESSAGE b/ham/trustedQSL/MESSAGE
new file mode 100644
index 00000000000..b1216e942db
--- /dev/null
+++ b/ham/trustedQSL/MESSAGE
@@ -0,0 +1,24 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2013/12/06 05:52:42 mef Exp $
+If you see following with "Sign log and upload it automatically to LoTW",
+  "Peer certificate cannot be authenticated with given CA certificates"
+  (SSL certificate problem: self signed certificate in certificate chain)
+please see the info shown by following command and follow what to do:
+   pkg_info -D  mozilla-rootcerts
+
+To start the application, just type tqsl in shell. You will see
+the icons for operations (with Window facility).
+
+For help, man tqsl or see the following HTML file.
+  ${PREFIX}/share/TrustedQSL/help/tqslapp/main.htm
+
+Starting with 2.0, tqslcert function is included in tqsl,
+the command tqslcert by itself is no longer provided.
+
+Starting with 1.14, command line processing is available.
+  tqsl -h or tqsl --help   will show the help message.
+
+The license is arrl-license (and almost modified-bsd), its copy is also
+installed at:
+  ${PREFIX}/share/TrustedQSL/LICENSE.txt
+===========================================================================
diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index 98753ecf66e..55177ed5843 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2013/10/17 09:40:12 mef Exp $
+# $NetBSD: Makefile,v 1.9 2013/12/06 05:52:42 mef Exp $
 
 DISTNAME=		tqsl-2.0
-PKGNAME=		${DISTNAME}rc8
 CATEGORIES=		ham
-MASTER_SITES=		http://www.arrl.org/files/file/LoTW%20Instructions/
-MASTER_SITES=		http://downloads.sourceforge.net/project/trustedqsl/TrustedQSL/v2.0-rc8/
+MASTER_SITES=		http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v2.0/
+EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		makoto@ki.nu
 HOMEPAGE=		http://sourceforge.net/projects/trustedqsl/
 COMMENT=		TrustedQSL, uploading QSL Data to LoTW of ARRL
 LICENSE=		arrl-license
 
-DIST_SUBDIR=		${PKGNAME_NOREV}
+# 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
 USE_CMAKE=		yes
-WRKSRC=			${WRKDIR}/${DISTNAME}
 
 # There is an unresolved build failure, where -R for /usr/pkg/lib does
 # not precede /usr/X11R7/lib, and on a netbsd-5 system with base xorg,
@@ -24,10 +26,30 @@ WRKSRC=			${WRKDIR}/${DISTNAME}
 # 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 \
 	-DBDB_PREFIX=${PREFIX} \
+	-DBDB_INCLUDE_DIR=${PREFIX}/include \
 	-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
 	-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST
index a2335af9e43..deddd84a1b3 100644
--- a/ham/trustedQSL/PLIST
+++ b/ham/trustedQSL/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2013/09/30 05:56:56 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/12/06 05:52:42 mef Exp $
 bin/tqsl
 include/adif.h
 include/cabrillo.h
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index 3d6f7078015..f91b66c7481 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/10/17 09:40:12 mef Exp $
+$NetBSD: distinfo,v 1.7 2013/12/06 05:52:42 mef Exp $
 
-SHA1 (tqsl-2.0rc8/tqsl-2.0.tar.gz) = 567ec50ed539b71a226893d017b043ec05da32f9
-RMD160 (tqsl-2.0rc8/tqsl-2.0.tar.gz) = 0c41c1dc3bd572c6f42f5fe767048ec4bd507ff2
-Size (tqsl-2.0rc8/tqsl-2.0.tar.gz) = 2626470 bytes
+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