diff options
Diffstat (limited to 'ham')
| -rw-r--r-- | ham/trustedQSL/Makefile | 19 | ||||
| -rw-r--r-- | ham/trustedQSL/distinfo | 11 | ||||
| -rw-r--r-- | ham/trustedQSL/patches/patch-CMakeLists.txt | 21 |
3 files changed, 38 insertions, 13 deletions
diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile index c68583d15aa..550e092afb4 100644 --- a/ham/trustedQSL/Makefile +++ b/ham/trustedQSL/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2020/03/08 16:50:11 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2020/03/16 16:43:22 gdt Exp $ -DISTNAME= tqsl-2.4.7 -PKGREVISION= 3 +DISTNAME= tqsl-2.5.1 CATEGORIES= ham MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ @@ -26,6 +25,7 @@ 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 @@ -49,12 +49,15 @@ post-install: (cd ${WRKSRC} ;\ ${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \ ) - # Conflicting PLIST with wxGTK28-2.8.12nb8: - ${RM} -f ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo -.include "../../textproc/expat/buildlink3.mk" +# \todo Perhaps change to lmdb, and (unlikely) consider an option. .include "../../databases/db5/buildlink3.mk" -.include "../../mk/wxGTK.mk" -.include "../../www/curl/buildlink3.mk" +#.include "../../databases/lmdb/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../www/curl/buildlink3.mk" +# Upstream uses wxGTK28 on Windows because it has accessibility patches, but +# 30 is newer. +.include "../../x11/wxGTK30/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo index a5a60c04046..2350c7172ab 100644 --- a/ham/trustedQSL/distinfo +++ b/ham/trustedQSL/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.18 2019/10/26 11:06:22 mef Exp $ +$NetBSD: distinfo,v 1.19 2020/03/16 16:43:22 gdt Exp $ -SHA1 (tqsl-2.4.7.tar.gz) = 3052dbcccbb9d8b7188a8d5dea9b61a8560628b5 -RMD160 (tqsl-2.4.7.tar.gz) = 99e5ff2a63d671a632817dc8e5fc0567bb348fba -SHA512 (tqsl-2.4.7.tar.gz) = 957a88accd5d87434cdcc85cfdd9ced3ad1484816738a04d09056c29b7675ba768605a072ea834169d33c82895c52a333a0fca6ad358ec985332581e36f1882b -Size (tqsl-2.4.7.tar.gz) = 3332542 bytes +SHA1 (tqsl-2.5.1.tar.gz) = 59f01749e56ab4bbf79b2ecdeac633b591b4cf08 +RMD160 (tqsl-2.5.1.tar.gz) = 2c7bdec9e1881850ef8849f020d25156e861c32e +SHA512 (tqsl-2.5.1.tar.gz) = 35f699da45a02851956a1abb800919b4fa8ce78dd4fb67e0a3dc480816f7018c85b543d751a2f53b040fcf6c6b46e2b84cc42e46c7efc1096546b74f45b81d25 +Size (tqsl-2.5.1.tar.gz) = 3362342 bytes +SHA1 (patch-CMakeLists.txt) = db7383ea82b2cb05abfcd61430c68c90bca1b81b SHA1 (patch-apps_CMakeLists.txt) = 5063cf616a65e6d5650e946fd0929759ad04c9c0 SHA1 (patch-apps_tqsl_cpp) = bb25d35498320f308538a84881ff1a8dd7c86f32 SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f diff --git a/ham/trustedQSL/patches/patch-CMakeLists.txt b/ham/trustedQSL/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..f274279f63d --- /dev/null +++ b/ham/trustedQSL/patches/patch-CMakeLists.txt @@ -0,0 +1,21 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2020/03/16 16:43:23 gdt Exp $ + +Force off LMDB, because while we don't include the bl3, cmake finds it +anyway. + +The general issue was mentioned to upstream, but as a change to lmdb +is likely, pkgsrc doesn't need this fixed. + +--- CMakeLists.txt.orig 2019-11-14 02:17:06.000000000 +0000 ++++ CMakeLists.txt +@@ -55,7 +55,9 @@ else() + endif() + + # Prefer LMDB, fall back to BDB if that's not available +-find_package(LMDB) ++# pkgsrc: stay with BDB until upgrade issues are resolved. ++# (cmake finds lmdb even when not bl3'd) ++# find_package(LMDB) + if(NOT LMDB_FOUND) + set (LMDB_LIBRARIES "") + find_package(BDB REQUIRED) |