ham/trustedQSL: reduce patches

This commit does not intend to make any functional changes.

  - drop removal of LIB_SUFFIX via SUBST, as that seems overtaken by
    upstream

  - set db5 include prefix correctly and drop patches to work around
    the old way

5 files changed, 7 insertions, 54 deletions

diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index 1522795391d..e0c784121e2 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2021/06/24 00:09:06 gdt Exp $
+# $NetBSD: Makefile,v 1.56 2021/09/18 15:03:04 gdt Exp $
 
 DISTNAME=		tqsl-2.5.7
 CATEGORIES=		ham
@@ -25,21 +25,13 @@ USE_CMAKE=		yes
 # cause (aside from having two pixman versions installed) is ad hoc -L
 # usage in Makefile.am, without matching -R.
 
-# Filed upstream by email 20200314.
-# remove the string $(LIB_SUFFIX), tested with NetBSD at least
-SUBST_CLASSES+=			lib-suffix
-SUBST_MESSAGE.lib-suffix=	Removing $$(LIB_SUFFIX) from src/CMakeLists.txt
-SUBST_STAGE.lib-suffix=		pre-configure
-SUBST_FILES.lib-suffix=		src/CMakeLists.txt
-SUBST_SED.lib-suffix=		-e s/\$${\LIB_SUFFIX\}//
-
 CHECK_PORTABILITY_SKIP+=	osx_createdmg.sh
 
 do-configure:
 	(cd ${WRKSRC} ; \
 	cmake \
 	-DBDB_PREFIX=${PREFIX} \
-	-DBDB_INCLUDE_DIR=${PREFIX}/include \
+	-DBDB_INCLUDE_DIR=${PREFIX}/include/db5 \
 	-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
 	-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 	-DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo
index d0765e6dd2c..49afa0efba1 100644
--- a/ham/trustedQSL/distinfo
+++ b/ham/trustedQSL/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.20 2021/06/24 00:09:06 gdt Exp $
+$NetBSD: distinfo,v 1.21 2021/09/18 15:03:04 gdt Exp $
 
 SHA1 (tqsl-2.5.7.tar.gz) = 49d718b76735906ee3e1a6bc86fc6f435687a993
 RMD160 (tqsl-2.5.7.tar.gz) = a9c184ced044921002cfb749e604ac3f3a4b53ae
 SHA512 (tqsl-2.5.7.tar.gz) = 8ce29ce1a4905590250037e9487fac6db2be590b0406b2c0452b533c28d2c7b804d26b4879b065a99670c24124ff6bdfad1c24c099a75237e5013b7b5bd8470d
 Size (tqsl-2.5.7.tar.gz) = 3526972 bytes
 SHA1 (patch-CMakeLists.txt) = db7383ea82b2cb05abfcd61430c68c90bca1b81b
-SHA1 (patch-apps_tqsl_cpp) = 9b6459e01541708354a5bf895e73c124a7fea26d
-SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f
-SHA1 (patch-src_tqslconvert_cpp) = 4c64c9ad063090fb25fa4869964838c00f2db620
+SHA1 (patch-openssl__cert.cpp) = abc51ce42a1d636f6cd46f289b4cf4c3b2243709
diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp
deleted file mode 100644
index 0da7982af12..00000000000
--- a/ham/trustedQSL/patches/patch-apps_tqsl_cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-apps_tqsl_cpp,v 1.8 2021/06/24 00:09:06 gdt 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
-
-(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	2020-11-18 19:03:28.000000000 +0000
-+++ apps/tqsl.cpp
-@@ -70,7 +70,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>
diff --git a/ham/trustedQSL/patches/patch-openssl__cert.cpp b/ham/trustedQSL/patches/patch-openssl__cert.cpp
index 3d57e948519..0db5755d7ff 100644
--- a/ham/trustedQSL/patches/patch-openssl__cert.cpp
+++ b/ham/trustedQSL/patches/patch-openssl__cert.cpp
@@ -1,6 +1,7 @@
-$NetBSD: patch-openssl__cert.cpp,v 1.1 2015/10/11 02:59:07 mef Exp $
+$NetBSD: patch-openssl__cert.cpp,v 1.2 2021/09/18 15:03:04 gdt Exp $
 
-error: 'PATH_MAX' was not declared in this scope
+\todo Figure out why this is needed, as PATH_MAX is specified by POSIX
+to be defined by <limits.h>.
 
 --- 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
diff --git a/ham/trustedQSL/patches/patch-src_tqslconvert_cpp b/ham/trustedQSL/patches/patch-src_tqslconvert_cpp
deleted file mode 100644
index 11e5d0c63df..00000000000
--- a/ham/trustedQSL/patches/patch-src_tqslconvert_cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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	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>