[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg/files url2pkg: fix dependency pattern...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3419a0355222
branches:  trunk
changeset: 453249:3419a0355222
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue May 25 17:56:24 2021 +0000

description:
url2pkg: fix dependency pattern for buildlink3 Python dependencies

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

diffstat:

 pkgtools/url2pkg/files/url2pkg.py      |  4 ++--
 pkgtools/url2pkg/files/url2pkg_test.py |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 9934ff29aa43 -r 3419a0355222 pkgtools/url2pkg/files/url2pkg.py
--- a/pkgtools/url2pkg/files/url2pkg.py Tue May 25 17:44:08 2021 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.py Tue May 25 17:56:24 2021 +0000
@@ -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 @@
                     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
 
diff -r 9934ff29aa43 -r 3419a0355222 pkgtools/url2pkg/files/url2pkg_test.py
--- a/pkgtools/url2pkg/files/url2pkg_test.py    Tue May 25 17:44:08 2021 +0000
+++ b/pkgtools/url2pkg/files/url2pkg_test.py    Tue May 25 17:56:24 2021 +0000
@@ -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 @@
     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 @@
         '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"'
     ]