CVS commit: pkgsrc/pkgtools/url2pkg

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Oct 30 07:12:49 UTC 2023

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

Log Message:
url2pkg: use wheel.mk for Python packages

Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 pkgsrc/pkgtools/url2pkg/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
cvs rdiff -u -r1.46 -r1.47 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.134 pkgsrc/pkgtools/url2pkg/Makefile:1.135
--- pkgsrc/pkgtools/url2pkg/Makefile:1.134      Mon Aug 14 05:25:05 2023
+++ pkgsrc/pkgtools/url2pkg/Makefile    Mon Oct 30 07:12:49 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.134 2023/08/14 05:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.135 2023/10/30 07:12:49 wiz Exp $
 
-PKGNAME=       url2pkg-23.2.0
-PKGREVISION=   1
+PKGNAME=       url2pkg-23.2.1
 CATEGORIES=    pkgtools
 
 MAINTAINER=    rillig%NetBSD.org@localhost

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.50 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.51
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.50       Tue Aug 15 21:20:03 2023
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py    Mon Oct 30 07:12:49 2023
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.50 2023/08/15 21:20:03 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.51 2023/10/30 07:12:49 wiz Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1038,7 +1038,7 @@ class Adjuster:
         self.pkgname_prefix = '${PYPKGPREFIX}-'
         self.categories.append('python')
         self.extra_vars.append(Var('PYTHON_VERSIONS_INCOMPATIBLE', '=', '27'))
-        self.includes.append('../../lang/python/egg.mk')
+        self.includes.append('../../lang/python/wheel.mk')
 
     def adjust_cargo(self):
         if not self.wrksrc_isfile('Cargo.lock'):

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.46 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.47
--- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.46  Tue Aug 15 21:20:03 2023
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py       Mon Oct 30 07:12:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.46 2023/08/15 21:20:03 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.47 2023/10/30 07:12:49 wiz Exp $
 
 # URLs for manual testing:
 #
@@ -1288,7 +1288,7 @@ def test_Adjuster_adjust_python_module(t
         '',
         'PYTHON_VERSIONS_INCOMPATIBLE=   27',
         '',
-        '.include "../../lang/python/egg.mk"',
+        '.include "../../lang/python/wheel.mk"',
         '.include "../../mk/bsd.pkg.mk"',
     ]