CVS commit: pkgsrc/pkgtools/url2pkg/files

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Jan 23 05:49:53 UTC 2025

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

Log Message:
url2pkg: fix WRKSRC for distfiles hosted on GitHub


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
cvs rdiff -u -r1.54 -r1.55 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/files/url2pkg.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.61 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.62
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.61       Thu Jan 23 05:23:01 2025
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py    Thu Jan 23 05:49:53 2025
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.61 2025/01/23 05:23:01 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.62 2025/01/23 05:49:53 rillig Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -507,7 +507,7 @@ class PackageVars:
             version = m.group(1)
             self.distfile = f'{proj}-{version}{ext}'
             self.github_tag = f'refs/tags/v${{PKGVERSION_NOREV}}'
-            self.wrksrc = '${GITHUB_TAG:T}'
+            self.wrksrc = '${WRKDIR}/${DISTNAME}'
             return
 
         self.github_project = proj

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.54 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.55
--- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.54  Thu Jan 23 05:23:01 2025
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py       Thu Jan 23 05:49:53 2025
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.54 2025/01/23 05:23:01 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.55 2025/01/23 05:49:53 rillig Exp $
 
 # URLs for manual testing:
 #
@@ -482,7 +482,7 @@ def test_PackageVars_adjust_site_GitHub_
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       # TODO: (see mk/license.mk)',
         '',
-        'WRKSRC= ${GITHUB_TAG:T}',
+        'WRKSRC= ${WRKDIR}/${DISTNAME}',
         '',
         '# url2pkg-marker (please do not remove this line.)',
         ".include \"../../mk/bsd.pkg.mk\"",