Received: by mail.netbsd.org (Postfix, from userid 605) id 941E784D27; Sun, 22 Jan 2023 18:58:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C3F4E84D15 for ; Sun, 22 Jan 2023 18:58:46 +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 qyFMQbrP1vUB for ; Sun, 22 Jan 2023 18:58:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3889E84CF7 for ; Sun, 22 Jan 2023 18:58:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 31E6DFA90; Sun, 22 Jan 2023 18:58:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1674413926209350" MIME-Version: 1.0 Date: Sun, 22 Jan 2023 18:58:46 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/url2pkg To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20230122185846.31E6DFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1674413926209350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Sun Jan 22 18:58:46 UTC 2023 Modified Files: pkgsrc/pkgtools/url2pkg: Makefile pkgsrc/pkgtools/url2pkg/files: url2pkg.py url2pkg_test.py Log Message: pkgtools/url2pkg: update to 22.4.0 Changes since 22.2.1: In packages that use CMake, no longer set USE_CMAKE=yes but instead include the build.mk file. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 pkgsrc/pkgtools/url2pkg/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/pkgtools/url2pkg/files/url2pkg.py cvs rdiff -u -r1.41 -r1.42 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1674413926209350 Content-Disposition: inline Content-Length: 2172 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/url2pkg/Makefile diff -u pkgsrc/pkgtools/url2pkg/Makefile:1.129 pkgsrc/pkgtools/url2pkg/Makefile:1.130 --- pkgsrc/pkgtools/url2pkg/Makefile:1.129 Thu Aug 25 19:51:59 2022 +++ pkgsrc/pkgtools/url2pkg/Makefile Sun Jan 22 18:58:45 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.129 2022/08/25 19:51:59 rillig Exp $ +# $NetBSD: Makefile,v 1.130 2023/01/22 18:58:45 rillig Exp $ -PKGNAME= url2pkg-22.2.1 +PKGNAME= url2pkg-22.4.0 CATEGORIES= pkgtools MAINTAINER= rillig@NetBSD.org Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.45 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.46 --- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.45 Fri Aug 26 20:11:35 2022 +++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py Sun Jan 22 18:58:45 2023 @@ -1,5 +1,5 @@ #! @PYTHONBIN@ -# $NetBSD: url2pkg.py,v 1.45 2022/08/26 20:11:35 rillig Exp $ +# $NetBSD: url2pkg.py,v 1.46 2023/01/22 18:58:45 rillig Exp $ # Copyright (c) 2019 The NetBSD Foundation, Inc. # All rights reserved. @@ -927,7 +927,7 @@ class Adjuster: def adjust_cmake(self): if self.wrksrc_isfile('CMakeLists.txt'): - self.build_vars.append(Var('USE_CMAKE', '=', 'yes')) + self.includes.append('../../devel/cmake/build.mk') def adjust_gnu_make(self): if self.wrksrc_isfile('Makefile') \ Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.41 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.42 --- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.41 Sat Jul 16 08:59:38 2022 +++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py Sun Jan 22 18:58:45 2023 @@ -1,4 +1,4 @@ -# $NetBSD: url2pkg_test.py,v 1.41 2022/07/16 08:59:38 rillig Exp $ +# $NetBSD: url2pkg_test.py,v 1.42 2023/01/22 18:58:45 rillig Exp $ # URLs for manual testing: # @@ -990,7 +990,9 @@ def test_Adjuster_adjust_cmake(tmp_path: adjuster.adjust_cmake() - assert str_vars(adjuster.build_vars) == ['USE_CMAKE=yes'] + assert adjuster.includes == [ + '../../devel/cmake/build.mk' + ] def test_Adjuster_adjust_gnu_make(tmp_path: Path): --_----------=_1674413926209350--