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 928E81A9239 for ; Tue, 8 Feb 2022 20:48:12 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A214C84EC4; Tue, 8 Feb 2022 20:48:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DC78C84EBB for ; Tue, 8 Feb 2022 20:48:10 +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 ULLz-lsnAOZ0 for ; Tue, 8 Feb 2022 20:48:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2561984E96 for ; Tue, 8 Feb 2022 20:48:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1E7A3FB24; Tue, 8 Feb 2022 20:48:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16443532901840" MIME-Version: 1.0 Date: Tue, 8 Feb 2022 20:48:10 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/url2pkg/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220208204810.1E7A3FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16443532901840 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Feb 8 20:48:09 UTC 2022 Modified Files: pkgsrc/pkgtools/url2pkg/files: url2pkg.py Log Message: url2pkg: make code for analyzing CPAN URLs simpler No functional change. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/pkgtools/url2pkg/files/url2pkg.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16443532901840 Content-Disposition: inline Content-Length: 1538 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.41 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.42 --- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.41 Sun Feb 6 21:07:44 2022 +++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py Tue Feb 8 20:48:09 2022 @@ -1,5 +1,5 @@ #! @PYTHONBIN@ -# $NetBSD: url2pkg.py,v 1.41 2022/02/06 21:07:44 rillig Exp $ +# $NetBSD: url2pkg.py,v 1.42 2022/02/08 20:48:09 rillig Exp $ # Copyright (c) 2019 The NetBSD Foundation, Inc. # All rights reserved. @@ -407,8 +407,8 @@ class PackageVars: ^ https://cpan.metacpan.org/authors /id/(?:\w+/)+ - (\w+-)+ # namespace prefixes - ( # distname + ( # distfile + (\w+-)+ # namespace prefixes (\w+) # project name -v?[0-9].+ ) @@ -418,12 +418,12 @@ class PackageVars: if not m: return - prefixes, distfile, name = m.groups() + distfile, prefixes, name = m.groups() prefixes_slash = prefixes.replace('-', '/') prefixes_colon = prefixes.replace('-', '::') self.master_sites = f'${{MASTER_SITE_PERL_CPAN:={prefixes_slash}}}' self.homepage = f'https://metacpan.org/pod/{prefixes_colon}{name}' - self.distfile = f'{prefixes}{distfile}' + self.distfile = distfile self.pkgname_prefix = 'p5-' def adjust_site_SourceForge(self): --_----------=_16443532901840--