Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 1864A1A9239 for ; Sun, 31 Oct 2021 23:43:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 49CF585103; Sun, 31 Oct 2021 23:43:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 828EB85102 for ; Sun, 31 Oct 2021 23:43:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id sk-QTxT9iuc5 for ; Sun, 31 Oct 2021 23:43:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DADF384C86 for ; Sun, 31 Oct 2021 23:43:41 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CF9ADFA97; Sun, 31 Oct 2021 23:43:41 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1635723821207460" MIME-Version: 1.0 Date: Sun, 31 Oct 2021 23:43:41 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/ham/trustedQSL To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20211031234341.CF9ADFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1635723821207460 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Sun Oct 31 23:43:41 UTC 2021 Modified Files: pkgsrc/ham/trustedQSL: Makefile distinfo Log Message: ham/trustedQSL: Update to 2.5.8 and rationalize cmake usage Drop an explicit do-configure in favor of what is now the built-in standard approach. This resolves failure to use RELRO. It remains to clean up the cmake variable defiitions; this is more of a mechanical translation of the old form to the new. Upstream changes: there is no news, but the changes are expected to be bugfixes and minor improvements. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/ham/trustedQSL/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/ham/trustedQSL/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1635723821207460 Content-Disposition: inline Content-Length: 2890 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/ham/trustedQSL/Makefile diff -u pkgsrc/ham/trustedQSL/Makefile:1.57 pkgsrc/ham/trustedQSL/Makefile:1.58 --- pkgsrc/ham/trustedQSL/Makefile:1.57 Wed Sep 29 19:00:50 2021 +++ pkgsrc/ham/trustedQSL/Makefile Sun Oct 31 23:43:41 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.57 2021/09/29 19:00:50 adam Exp $ +# $NetBSD: Makefile,v 1.58 2021/10/31 23:43:41 gdt Exp $ -DISTNAME= tqsl-2.5.7 -PKGREVISION= 1 +DISTNAME= tqsl-2.5.8 CATEGORIES= ham MASTER_SITES= http://www.arrl.org/files/file/LoTW%20Instructions/ @@ -20,26 +19,18 @@ USE_LANGUAGES+= c c++11 USE_LIBTOOL= yes USE_CMAKE= yes -# 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, -# an old version of pixman is found by the pkgsrc cairo. The root -# cause (aside from having two pixman versions installed) is ad hoc -L -# usage in Makefile.am, without matching -R. - CHECK_PORTABILITY_SKIP+= osx_createdmg.sh -do-configure: - (cd ${WRKSRC} ; \ - cmake \ - -DBDB_PREFIX=${PREFIX} \ - -DBDB_INCLUDE_DIR=${PREFIX}/include/db5 \ - -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \ - -DCMAKE_INSTALL_PREFIX=${PREFIX} \ - -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \ - -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR} \ - .) +# \todo Check/rationalize +CMAKE_ARGS+= -DBDB_PREFIX=${PREFIX} +CMAKE_ARGS+= -DBDB_INCLUDE_DIR=${PREFIX}/include/db5 +CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE +CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} +CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib +CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE +CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR} +# \todo Move to doc post-install: (cd ${WRKSRC} ;\ ${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \ Index: pkgsrc/ham/trustedQSL/distinfo diff -u pkgsrc/ham/trustedQSL/distinfo:1.24 pkgsrc/ham/trustedQSL/distinfo:1.25 --- pkgsrc/ham/trustedQSL/distinfo:1.24 Tue Oct 26 10:48:40 2021 +++ pkgsrc/ham/trustedQSL/distinfo Sun Oct 31 23:43:41 2021 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.24 2021/10/26 10:48:40 nia Exp $ +$NetBSD: distinfo,v 1.25 2021/10/31 23:43:41 gdt Exp $ -BLAKE2s (tqsl-2.5.7.tar.gz) = 83d05c21ec16fbc1bf8314efa5189e926c1847ece1d6c96324a788f039fbe9f3 -SHA512 (tqsl-2.5.7.tar.gz) = 8ce29ce1a4905590250037e9487fac6db2be590b0406b2c0452b533c28d2c7b804d26b4879b065a99670c24124ff6bdfad1c24c099a75237e5013b7b5bd8470d -Size (tqsl-2.5.7.tar.gz) = 3526972 bytes +BLAKE2s (tqsl-2.5.8.tar.gz) = fa297a4ae072ef3dc251bbd7535482a3b708f55b89514513bb5397b67d2eea01 +SHA512 (tqsl-2.5.8.tar.gz) = 074fa76bd751be47a1ea9f42114095b26fb6cae4b3b13f432acffcb6226addfe68c5f8d503e08fb3ed5528c58bb9bc7b6b9d31a93869f6bf1307e63b77ffc0a0 +Size (tqsl-2.5.8.tar.gz) = 3627481 bytes SHA1 (patch-CMakeLists.txt) = db7383ea82b2cb05abfcd61430c68c90bca1b81b --_----------=_1635723821207460--