[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg/files pkgtools/url2pkg: use filenames...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/896a5219033e
branches:  trunk
changeset: 341523:896a5219033e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Oct 03 16:43:58 2019 +0000

description:
pkgtools/url2pkg: use filenames relative to WRKSRC

Before this change, the Python implementation had written absolute paths
to PKGCONFIG_OVERRIDE, which didn't make sense.

diffstat:

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

diffs (38 lines):

diff -r 6563a82f59cf -r 896a5219033e pkgtools/url2pkg/files/url2pkg.py
--- a/pkgtools/url2pkg/files/url2pkg.py Thu Oct 03 16:38:04 2019 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.py Thu Oct 03 16:43:58 2019 +0000
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.4 2019/10/03 16:32:47 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.5 2019/10/03 16:43:58 rillig Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -812,12 +812,16 @@
 
     def adjust_package_from_extracted_distfiles(self, url: str):
 
+        def scan(basedir: str, pattern: str) -> List[str]:
+            full_paths = glob.glob(f'{basedir}/{pattern}', recursive=True)
+            return list(f[len(basedir) + 1:] for f in full_paths)
+
         debug('Adjusting the Makefile')
 
         self.abs_wrkdir = show_var('WRKDIR')
         self.determine_wrksrc()
-        self.wrksrc_files = glob.glob(f'{self.abs_wrksrc}/**', recursive=True)
-        self.wrksrc_dirs = glob.glob(f'{self.abs_wrksrc}/**/', recursive=True)
+        self.wrksrc_files = scan(self.abs_wrksrc, '**')
+        self.wrksrc_dirs = scan(self.abs_wrksrc, '**/')
 
         self.makefile_lines = Lines.read_from(config.pkgdir + '/Makefile')
 
diff -r 6563a82f59cf -r 896a5219033e pkgtools/url2pkg/files/url2pkg_test.py
--- a/pkgtools/url2pkg/files/url2pkg_test.py    Thu Oct 03 16:38:04 2019 +0000
+++ b/pkgtools/url2pkg/files/url2pkg_test.py    Thu Oct 03 16:43:58 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.3 2019/10/03 16:32:47 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.4 2019/10/03 16:43:58 rillig Exp $
 
 from url2pkg import *