Sat Sep 18 15:03:05 2021 UTC ()
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


(gdt)
diff -r1.55 -r1.56 pkgsrc/ham/trustedQSL/Makefile
diff -r1.20 -r1.21 pkgsrc/ham/trustedQSL/distinfo
diff -r1.8 -r0 pkgsrc/ham/trustedQSL/patches/patch-apps_tqsl_cpp
diff -r1.1 -r1.2 pkgsrc/ham/trustedQSL/patches/patch-openssl__cert.cpp
diff -r1.3 -r0 pkgsrc/ham/trustedQSL/patches/patch-src_tqslconvert_cpp
cvs diff -r1.55 -r1.56 pkgsrc/ham/trustedQSL/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/Makefile 2021/06/24 00:09:06 1.55
+++ pkgsrc/ham/trustedQSL/Makefile 2021/09/18 15:03:04 1.56
@@ -1,55 +1,47 @@ @@ -1,55 +1,47 @@
1# $NetBSD: Makefile,v 1.55 2021/06/24 00:09:06 gdt Exp $ 1# $NetBSD: Makefile,v 1.56 2021/09/18 15:03:04 gdt Exp $
2 2
3DISTNAME= tqsl-2.5.7 3DISTNAME= tqsl-2.5.7
4CATEGORIES= ham 4CATEGORIES= ham
5MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ 5MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/
6 6
7MAINTAINER= makoto@ki.nu 7MAINTAINER= makoto@ki.nu
8HOMEPAGE= http://www.arrl.org/quick-start-tqsl 8HOMEPAGE= http://www.arrl.org/quick-start-tqsl
9COMMENT= TrustedQSL, uploading QSL Data to LoTW of ARRL 9COMMENT= TrustedQSL, uploading QSL Data to LoTW of ARRL
10LICENSE= arrl-license 10LICENSE= arrl-license
11 11
12# A macro _S in /usr/include/ctype.h conflicts with one in apps/tqsltrace.h 12# A macro _S in /usr/include/ctype.h conflicts with one in apps/tqsltrace.h
13# NOT_FOR_PLATFORM+= NetBSD-5.* 13# NOT_FOR_PLATFORM+= NetBSD-5.*
14 14
15USE_TOOLS+= perl gmake cmake 15USE_TOOLS+= perl gmake cmake
16# \todo tqsl is not documented to require c++11, but uses c++11 constructs 16# \todo tqsl is not documented to require c++11, but uses c++11 constructs
17# \todo tqsl does not add --std=c++11 17# \todo tqsl does not add --std=c++11
18USE_LANGUAGES+= c c++11 18USE_LANGUAGES+= c c++11
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_CMAKE= yes 20USE_CMAKE= yes
21 21
22# There is an unresolved build failure, where -R for /usr/pkg/lib does 22# There is an unresolved build failure, where -R for /usr/pkg/lib does
23# not precede /usr/X11R7/lib, and on a netbsd-5 system with base xorg, 23# not precede /usr/X11R7/lib, and on a netbsd-5 system with base xorg,
24# an old version of pixman is found by the pkgsrc cairo. The root 24# an old version of pixman is found by the pkgsrc cairo. The root
25# cause (aside from having two pixman versions installed) is ad hoc -L 25# cause (aside from having two pixman versions installed) is ad hoc -L
26# usage in Makefile.am, without matching -R. 26# usage in Makefile.am, without matching -R.
27 27
28# Filed upstream by email 20200314. 
29# remove the string $(LIB_SUFFIX), tested with NetBSD at least 
30SUBST_CLASSES+= lib-suffix 
31SUBST_MESSAGE.lib-suffix= Removing $$(LIB_SUFFIX) from src/CMakeLists.txt 
32SUBST_STAGE.lib-suffix= pre-configure 
33SUBST_FILES.lib-suffix= src/CMakeLists.txt 
34SUBST_SED.lib-suffix= -e s/\$${\LIB_SUFFIX\}// 
35 
36CHECK_PORTABILITY_SKIP+= osx_createdmg.sh 28CHECK_PORTABILITY_SKIP+= osx_createdmg.sh
37 29
38do-configure: 30do-configure:
39 (cd ${WRKSRC} ; \ 31 (cd ${WRKSRC} ; \
40 cmake \ 32 cmake \
41 -DBDB_PREFIX=${PREFIX} \ 33 -DBDB_PREFIX=${PREFIX} \
42 -DBDB_INCLUDE_DIR=${PREFIX}/include \ 34 -DBDB_INCLUDE_DIR=${PREFIX}/include/db5 \
43 -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ 35 -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
44 -DCMAKE_INSTALL_PREFIX=${PREFIX} \ 36 -DCMAKE_INSTALL_PREFIX=${PREFIX} \
45 -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \ 37 -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \
46 -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \ 38 -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
47 -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR} \ 39 -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR} \
48 .) 40 .)
49 41
50post-install: 42post-install:
51 (cd ${WRKSRC} ;\ 43 (cd ${WRKSRC} ;\
52 ${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \ 44 ${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \
53 ) 45 )
54 46
55# \todo Perhaps change to lmdb, and (unlikely) consider an option. 47# \todo Perhaps change to lmdb, and (unlikely) consider an option.
cvs diff -r1.20 -r1.21 pkgsrc/ham/trustedQSL/distinfo (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/distinfo 2021/06/24 00:09:06 1.20
+++ pkgsrc/ham/trustedQSL/distinfo 2021/09/18 15:03:04 1.21
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.20 2021/06/24 00:09:06 gdt Exp $ 1$NetBSD: distinfo,v 1.21 2021/09/18 15:03:04 gdt Exp $
2 2
3SHA1 (tqsl-2.5.7.tar.gz) = 49d718b76735906ee3e1a6bc86fc6f435687a993 3SHA1 (tqsl-2.5.7.tar.gz) = 49d718b76735906ee3e1a6bc86fc6f435687a993
4RMD160 (tqsl-2.5.7.tar.gz) = a9c184ced044921002cfb749e604ac3f3a4b53ae 4RMD160 (tqsl-2.5.7.tar.gz) = a9c184ced044921002cfb749e604ac3f3a4b53ae
5SHA512 (tqsl-2.5.7.tar.gz) = 8ce29ce1a4905590250037e9487fac6db2be590b0406b2c0452b533c28d2c7b804d26b4879b065a99670c24124ff6bdfad1c24c099a75237e5013b7b5bd8470d 5SHA512 (tqsl-2.5.7.tar.gz) = 8ce29ce1a4905590250037e9487fac6db2be590b0406b2c0452b533c28d2c7b804d26b4879b065a99670c24124ff6bdfad1c24c099a75237e5013b7b5bd8470d
6Size (tqsl-2.5.7.tar.gz) = 3526972 bytes 6Size (tqsl-2.5.7.tar.gz) = 3526972 bytes
7SHA1 (patch-CMakeLists.txt) = db7383ea82b2cb05abfcd61430c68c90bca1b81b 7SHA1 (patch-CMakeLists.txt) = db7383ea82b2cb05abfcd61430c68c90bca1b81b
8SHA1 (patch-apps_tqsl_cpp) = 9b6459e01541708354a5bf895e73c124a7fea26d 8SHA1 (patch-openssl__cert.cpp) = abc51ce42a1d636f6cd46f289b4cf4c3b2243709
9SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f 
10SHA1 (patch-src_tqslconvert_cpp) = 4c64c9ad063090fb25fa4869964838c00f2db620 
File Deleted: pkgsrc/ham/trustedQSL/patches/Attic/patch-apps_tqsl_cpp
cvs diff -r1.1 -r1.2 pkgsrc/ham/trustedQSL/patches/Attic/patch-openssl__cert.cpp (expand / switch to unified diff)

--- pkgsrc/ham/trustedQSL/patches/Attic/patch-openssl__cert.cpp 2015/10/11 02:59:07 1.1
+++ pkgsrc/ham/trustedQSL/patches/Attic/patch-openssl__cert.cpp 2021/09/18 15:03:04 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-openssl__cert.cpp,v 1.1 2015/10/11 02:59:07 mef Exp $ 1$NetBSD: patch-openssl__cert.cpp,v 1.2 2021/09/18 15:03:04 gdt Exp $
2 2
3error: 'PATH_MAX' was not declared in this scope 3\todo Figure out why this is needed, as PATH_MAX is specified by POSIX
 4to be defined by <limits.h>.
4 5
5--- src/openssl_cert.cpp.orig 2015-09-20 09:15:24.000000000 +0900 6--- src/openssl_cert.cpp.orig 2015-09-20 09:15:24.000000000 +0900
6+++ src/openssl_cert.cpp 2015-10-11 01:10:26.000000000 +0900 7+++ src/openssl_cert.cpp 2015-10-11 01:10:26.000000000 +0900
7@@ -131,6 +131,9 @@ 8@@ -131,6 +131,9 @@
8  9
9 #define TQSLLIB_DEF 10 #define TQSLLIB_DEF
10  11
11+#ifdef __NetBSD__ 12+#ifdef __NetBSD__
12+# include "sys/syslimits.h" 13+# include "sys/syslimits.h"
13+#endif 14+#endif
14  15
15 #include <sys/stat.h> 16 #include <sys/stat.h>
16 #include <sys/types.h> 17 #include <sys/types.h>
File Deleted: pkgsrc/ham/trustedQSL/patches/Attic/patch-src_tqslconvert_cpp