[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg/files url2pkg: make code for analyzin...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a15aad354b63
branches:  trunk
changeset: 373221:a15aad354b63
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Feb 08 20:48:09 2022 +0000

description:
url2pkg: make code for analyzing CPAN URLs simpler

No functional change.

diffstat:

 pkgtools/url2pkg/files/url2pkg.py |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r cb36a1e0d9f7 -r a15aad354b63 pkgtools/url2pkg/files/url2pkg.py
--- a/pkgtools/url2pkg/files/url2pkg.py Tue Feb 08 20:45:00 2022 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.py Tue Feb 08 20:48:09 2022 +0000
@@ -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 @@
             ^
             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 @@
         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):