diff options
| -rw-r--r-- | ham/trustedQSL/Makefile | 5 | ||||
| -rw-r--r-- | ham/trustedQSL/PLIST | 7 | ||||
| -rw-r--r-- | ham/trustedQSL/distinfo | 14 | ||||
| -rw-r--r-- | ham/trustedQSL/patches/patch-apps_tqsl_cpp | 25 | ||||
| -rw-r--r-- | ham/trustedQSL/patches/patch-src_tqslconvert_cpp | 16 |
5 files changed, 40 insertions, 27 deletions
diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile index 46f55926e10..55c1170a68b 100644 --- a/ham/trustedQSL/Makefile +++ b/ham/trustedQSL/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2018/12/13 19:52:04 adam Exp $ +# $NetBSD: Makefile,v 1.36 2019/04/30 13:22:09 mef Exp $ -DISTNAME= tqsl-2.3.1 -PKGREVISION= 4 +DISTNAME= tqsl-2.4.2 CATEGORIES= ham MASTER_SITES= https://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v${PKGVERSION_NOREV}/ diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST index 4b2bbcc8604..58c91af9653 100644 --- a/ham/trustedQSL/PLIST +++ b/ham/trustedQSL/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2018/03/17 02:45:05 mef Exp $ +@comment $NetBSD: PLIST,v 1.8 2019/04/30 13:22:09 mef Exp $ bin/tqsl include/adif.h include/cabrillo.h @@ -8,7 +8,9 @@ include/tqsllib.h lib/libtqsllib.so man/man5/tqsl.5 share/TrustedQSL/LICENSE.txt +share/TrustedQSL/cab_modes.dat share/TrustedQSL/config.xml +share/TrustedQSL/help/tqslapp/BrokenCert.bmp share/TrustedQSL/help/tqslapp/CertProp.bmp share/TrustedQSL/help/tqslapp/EnterPassword.bmp share/TrustedQSL/help/tqslapp/LoTWCerts.bmp @@ -30,6 +32,7 @@ share/TrustedQSL/help/tqslapp/addcertreq.htm share/TrustedQSL/help/tqslapp/additional-info.htm share/TrustedQSL/help/tqslapp/addstnl0.bmp share/TrustedQSL/help/tqslapp/backuprestore.htm +share/TrustedQSL/help/tqslapp/cab-modes.htm share/TrustedQSL/help/tqslapp/cabrillo.htm share/TrustedQSL/help/tqslapp/certaccept.htm share/TrustedQSL/help/tqslapp/certaccept1.bmp @@ -124,10 +127,12 @@ share/TrustedQSL/help/tqslapp/unlock.htm share/TrustedQSL/help/tqslapp/update.htm share/TrustedQSL/help/tqslapp/update1.bmp share/TrustedQSL/help/tqslapp/update2.bmp +share/TrustedQSL/languages.dat 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/hi_IN/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 diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo index 034a3cc4acf..9c6929e12e7 100644 --- a/ham/trustedQSL/distinfo +++ b/ham/trustedQSL/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.16 2018/03/17 02:45:05 mef Exp $ +$NetBSD: distinfo,v 1.17 2019/04/30 13:22:09 mef Exp $ -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 (tqsl-2.4.2.tar.gz) = 835b5dcda9d846dc9b6ad9a53573f56d8a22c658 +RMD160 (tqsl-2.4.2.tar.gz) = 8afd84532ab75f672dfeea6f6145a65509fb70cb +SHA512 (tqsl-2.4.2.tar.gz) = ea2ee2bdbf634ccfe87e88a8a249d756bc1378491840b70055f2fd76a592b607e208f286ab1d74048f913bc2b40189f64079bf48ca8566338a602f12c4386f01 +Size (tqsl-2.4.2.tar.gz) = 3065969 bytes SHA1 (patch-apps_CMakeLists.txt) = 5063cf616a65e6d5650e946fd0929759ad04c9c0 -SHA1 (patch-apps_tqsl_cpp) = f38c8917e9bf7114060de3a2b2e2bb02eb864440 +SHA1 (patch-apps_tqsl_cpp) = bb25d35498320f308538a84881ff1a8dd7c86f32 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f -SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896 +SHA1 (patch-src_tqslconvert_cpp) = 4c64c9ad063090fb25fa4869964838c00f2db620 diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp index dc5877def95..ae194d60134 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.6 2018/03/17 02:45:05 mef Exp $ +$NetBSD: patch-apps_tqsl_cpp,v 1.7 2019/04/30 13:22:09 mef Exp $ (1) Avoid following error (interim, only valid with db5) @@ -15,14 +15,23 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi (4) Avoid error with wxGTK30 error: cannot pass objects of non-trivially-copyable type 'class wxCStrData' through '...' ---- apps/tqsl.cpp.orig 2016-03-12 14:49:01.000000000 +0900 -+++ apps/tqsl.cpp 2016-03-16 22:49:15.000000000 +0900 -@@ -64,7 +64,7 @@ - #endif - #include <zlib.h> - #include <openssl/opensslv.h> // only for version info! +--- apps/tqsl.cpp.orig 2018-11-24 07:35:22.000000000 +0900 ++++ apps/tqsl.cpp 2019-01-23 22:37:52.667485645 +0900 +@@ -67,7 +67,7 @@ + #ifdef USE_LMDB + #include <lmdb.h> //only for version info! + #else -#include <db.h> //only for version info! +#include <db5/db.h> //only for version info! + #endif #include <iostream> - #include <fstream> +@@ -3628,7 +3628,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 diff --git a/ham/trustedQSL/patches/patch-src_tqslconvert_cpp b/ham/trustedQSL/patches/patch-src_tqslconvert_cpp index 2cce15b5c87..11e5d0c63df 100644 --- a/ham/trustedQSL/patches/patch-src_tqslconvert_cpp +++ b/ham/trustedQSL/patches/patch-src_tqslconvert_cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-src_tqslconvert_cpp,v 1.2 2014/06/13 11:38:03 mef Exp $ +$NetBSD: patch-src_tqslconvert_cpp,v 1.3 2019/04/30 13:22:09 mef Exp $ Convert db.h name to pkgsrc current name ---- 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 <string> - #include <ctype.h> - #include <set> +--- src/tqslconvert.cpp.orig 2018-11-24 07:35:22.000000000 +0900 ++++ src/tqslconvert.cpp 2019-01-23 22:46:06.746888523 +0900 +@@ -27,7 +27,7 @@ + #include <lmdb.h> + #define db_strerror mdb_strerror + #else -#include <db.h> +#include <db5/db.h> + #endif #include <locale.h> - //#include <iostream> |