CVS commit: pkgsrc/pkgtools/url2pkg

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jul 13 15:57:40 UTC 2025

Modified Files:
        pkgsrc/pkgtools/url2pkg: Makefile
        pkgsrc/pkgtools/url2pkg/files: url2pkg.py url2pkg_test.py

Log Message:
pkgtools/url2pkg: update to 23.6.0

Changes since 23.5.0:

Generate simpler package makefile for GitHub distfiles that are using a
tag but whose version number does not start with 'v'. Suggested by Greg
Troxel for geography/draco.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 pkgsrc/pkgtools/url2pkg/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
cvs rdiff -u -r1.58 -r1.59 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.

Modified files:

Index: pkgsrc/pkgtools/url2pkg/Makefile
diff -u pkgsrc/pkgtools/url2pkg/Makefile:1.143 pkgsrc/pkgtools/url2pkg/Makefile:1.144
--- pkgsrc/pkgtools/url2pkg/Makefile:1.143      Thu Jan 23 06:12:52 2025
+++ pkgsrc/pkgtools/url2pkg/Makefile    Sun Jul 13 15:57:40 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.143 2025/01/23 06:12:52 rillig Exp $
+# $NetBSD: Makefile,v 1.144 2025/07/13 15:57:40 rillig Exp $
 
-PKGNAME=       url2pkg-23.5.0
+PKGNAME=       url2pkg-23.6.0
 CATEGORIES=    pkgtools
 
 MAINTAINER=    rillig%NetBSD.org@localhost

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.64 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.65
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.64       Thu Jan 23 06:05:44 2025
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py    Sun Jul 13 15:57:40 2025
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.64 2025/01/23 06:05:44 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.65 2025/07/13 15:57:40 rillig Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -420,7 +420,7 @@ class PackageVars:
     def adjust_site_CPAN(self):
         pattern = r'''(?x)
             ^
-            https://cpan.metacpan.org/authors
+            https://cpan\.metacpan\.org/authors
             /id/(?:\w+/)+
             (               # distfile
                 (\w+-)+     # namespace prefixes
@@ -510,6 +510,13 @@ class PackageVars:
             self.wrksrc = '${WRKDIR}/${DISTNAME}'
             return
 
+        m = re.search(r'^refs/tags/(\d[\d.]*)$', tag)
+        if m:
+            version = m.group(1)
+            self.distfile = f'{proj}-{version}{ext}'
+            self.github_tag = '${PKGVERSION_NOREV}'
+            return
+
         self.github_project = proj
         self.github_tag = tag
         if proj not in tag:

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.58 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.59
--- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.58  Thu Jan 23 06:05:44 2025
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py       Sun Jul 13 15:57:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.58 2025/01/23 06:05:44 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.59 2025/07/13 15:57:40 rillig Exp $
 
 # URLs for manual testing:
 #
@@ -447,13 +447,10 @@ def test_PackageVars_adjust_site_GitHub_
     assert detab(lines) == [
         mkcvsid,
         '',
-        'DISTNAME=       1.0.0',
-        'PKGNAME=        ${GITHUB_PROJECT}-${DISTNAME}',
+        'DISTNAME=       proj-1.0.0',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
-        'GITHUB_PROJECT= proj',
-        'GITHUB_TAG=     refs/tags/1.0.0',
-        'DIST_SUBDIR=    ${GITHUB_PROJECT}',
+        'GITHUB_TAG=     ${PKGVERSION_NOREV}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',
         'HOMEPAGE=       https://github.com/org/proj/',