CVS commit: pkgsrc/pkgtools/url2pkg/files

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue May 25 17:56:25 UTC 2021

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

Log Message:
url2pkg: fix dependency pattern for buildlink3 Python dependencies

This includes the PYPKGPREFIX for Python dependencies, whether or not
they use buildlink3.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
cvs rdiff -u -r1.30 -r1.31 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.31 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.32
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.31       Tue May 25 17:44:08 2021
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py    Tue May 25 17:56:24 2021
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.31 2021/05/25 17:44:08 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.32 2021/05/25 17:56:24 rillig Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -694,7 +694,7 @@ class Adjuster:
                     self.bl3_lines.append(
                         f'BUILDLINK_DEPENDS.{pkgid}+=\tbuild')
                 self.bl3_lines.append(
-                    f'BUILDLINK_API_DEPENDS.{pkgid}+=\t{pkgid}{constraint}')
+                    f'BUILDLINK_API_DEPENDS.{pkgid}+=\t{pkgbase}{constraint}')
                 self.bl3_lines.append(f'.include "{dep_dir}/buildlink3.mk"')
                 return
 

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.30 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.31
--- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.30  Tue May 25 17:44:08 2021
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py       Tue May 25 17:56:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.30 2021/05/25 17:44:08 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.31 2021/05/25 17:56:24 rillig Exp $
 
 import pytest
 from url2pkg import *
@@ -715,7 +715,7 @@ def test_Adjuster_read_dependencies():
     assert os.getenv('URL2PKG_DEPENDENCIES') is None
     assert adjuster.depends == ['package>=112.0:../../pkgtools/pkglint']
     assert adjuster.bl3_lines == [
-        'BUILDLINK_API_DEPENDS.x11-links+=\tx11-links>=120.0',
+        'BUILDLINK_API_DEPENDS.x11-links+=\tpackage>=120.0',
         ".include \"../../pkgtools/x11-links/buildlink3.mk\"",
     ]
     assert adjuster.build_depends == [
@@ -732,7 +732,7 @@ def test_Adjuster_read_dependencies():
         'HOMEPAGE=       https://homepage.example.org/',
         '#LICENSE=       BSD # (from Python package)',
         '',
-        'BUILDLINK_API_DEPENDS.x11-links+=       x11-links>=120.0',
+        'BUILDLINK_API_DEPENDS.x11-links+=       package>=120.0',
         '.include "../../pkgtools/x11-links/buildlink3.mk"'
     ]