 @@ -1,15 +1,15 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.1 2019/10/03 09:37:41 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.2 2019/10/03 12:52:54 rillig Exp $
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Roland Illig.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -40,36 +40,37 @@ from typing import Callable, Dict, Itera
 def cvsid(fmt: str) -> str:
     return fmt % ('$' + 'NetBSD$')
 class Config:
     def __init__(self):
         self.make = '@MAKE@'
         self.libdir = '@LIBDIR@'
         self.perl5 = '@PERL5@'
         self.pkgsrcdir = '@PKGSRCDIR@'
         self.pythonbin = '@PYTHONBIN@'
         self.pkgdir = '.'  # only overridable for tests
         self.verbose = False
 config = Config()
 distname = ''
 def debug(fmt: str, *args):
     if config.verbose:
-        msg = fmt % map(repr, args)
+        msg = fmt.format(*map(repr, args)) if len(args) else fmt
         sys.stderr.write('url2pkg: %s\n' % msg)
 def run_editor(fname: str, lineno: int):
     editor = os.getenv('PKGEDITOR') or os.getenv('EDITOR') or 'vi'
     args: List[str] = [editor]
     if re.search(editor, r'(^|/)(mcedit|nano|pico|vi|vim)$'):
         args.append(f'+{lineno}')
     args.append(fname)
     code = subprocess.check_call(args)
 @@ -209,30 +210,30 @@ def generate_initial_package_Makefile_li
+    )
     lines.add('# url2pkg-marker (please do not remove this line.)')
     lines.add('.include "../../mk/bsd.pkg.mk"')
     return lines
 def generate_initial_package(url):
     try:
         os.rename('Makefile', 'Makefile-url2pkg.bak')
     except OSError:
         pass
-    generate_initial_package_Makefile_lines(url).write_to('Makefile')
+    generate_initial_package_Makefile_lines(url).write_to(config.pkgdir + '/Makefile')
-    Lines(cvsid('@comment %s')).write_to('PLIST')
+    Lines(cvsid('@comment %s')).write_to(config.pkgdir + '/PLIST')
-    Lines().write_to('DESCR')
+    Lines().write_to(config.pkgdir + '/DESCR')
-    run_editor('Makefile', 5)
+    run_editor(config.pkgdir + '/Makefile', 5)
     bmake('distinfo')
     bmake('extract')
 class Var:
     """ A variable assignment for the package Makefile """
     def __init__(self, name: str, op: str, value: str):
         self.name = name
         self.op = op
         self.value = value
 @@ -261,35 +262,35 @@ class Varassign:
     def __init__(self, index: int, varname: str, op: str, indent: str,
                  value: str, space_after_value: str, comment: str):
         self.index = index
         self.varname = varname
         self.op = op
         self.indent = indent
         self.value = value
         self.space_after_value = space_after_value
         self.comment = comment
 def find_package(pkgbase: str) -> str:
     candidates = glob.glob(config.pkgsrcdir + '/*/' + pkgbase)
-    debug('candidates for package %s are %s', pkgbase, candidates)
+    debug('candidates for package {0} are {1}', pkgbase, candidates)
     if len(candidates) != 1:
         return ''
     return candidates[0].replace(config.pkgsrcdir, '../..')
 def bmake(*args: str) -> None:
-    debug('running bmake %s', args)
+    debug('running bmake {0}', args)
-    subprocess.check_call([config.make] + list(args))
+    subprocess.check_call([config.make] + list(args), cwd=config.pkgdir)
 def show_var(varname: str) -> str:
     output = subprocess.check_output((config.make, 'show-var', 'VARNAME=' + varname))
     return output.decode('utf-8').strip()
 class Lines:
     def __init__(self, *lines: str) -> None:
         self.lines = []
         for line in lines:
             self.add(line)
 @@ -336,36 +337,36 @@ class Lines:
             if var.value != '':
                 tabs = (width - len(var.name) - len(var.op) + 7) // 8
                 self.add(var.name + var.op + '\t' * tabs + var.value)
         self.add('')
     def unique_varassign(self, varname: str) -> Optional[Varassign]:
         varassigns = self.all_varassigns(varname)
         return varassigns[0] if len(varassigns) == 1 else None
     def all_varassigns(self, varname: str) -> Sequence[Varassign]:
         varassigns = []
         for (i, line) in enumerate(self.lines):
             m = re.search(r'^(#?[\w+\-]+?)([!+:?]?=)([ \t]*)([^#\\]*?)(\s*)(#.*|)$', line)
-            if m and m[1] == varname:
+            if m and m[1].lstrip('#') == varname:
                 varassigns.append(Varassign(i, m[1], m[2], m[3], m[4], m[5], m[6]))
         return varassigns
     def set(self, varname: str, new_value: str) -> bool:
         """ Changes the value of an existing variable in the lines. """
         varassign = self.unique_varassign(varname)
         if varassign is not None:
-            self.lines[varassign.index] = varassign.varname + varassign.op + varassign.indent + new_value
+            self.lines[varassign.index] = varname + varassign.op + varassign.indent + new_value
         return varassign is not None
     def append(self, varname: str, value: str) -> None:
         """ Appends to the value of an existing variable in the lines. """
         if value == '':
             return
         varassign = self.unique_varassign(varname)
         # TODO: add a test for multiple assignments
         if varassign is not None:
             before = ' ' if re.search(r'\S$', varassign.value) else ''
             after = '' if varassign.comment == '' else ' '
             self.lines[varassign.index] = \
                 varassign.varname + varassign.op + varassign.indent \
 @@ -492,56 +493,57 @@ class Adjuster:
         elif kind == 'BUILD_DEPENDS':
             self.build_depends.append(value)
         elif kind == 'TEST_DEPENDS':
             self.test_depends.append(value)
         else:
             self.todos.append('dependency {0} {1}'.format(kind, value))
     def read_dependencies(self, cmd: str, env: Dict[str, str], cwd: str, pkgname_prefix: str) -> None:
         dep_lines = []
         effective_env = dict(os.environ)
         effective_env.update(env)
         debug('reading dependencies: cd {0} && env {1} {2}', cwd, env, cmd)
         output = subprocess.check_output(
             args=cmd,
             shell=True,
             env=effective_env,
             cwd=cwd
+        )
         for line in output.decode('utf-8').split('\n'):
             m = re.search(r'^(\w+)\t([^\s:>]+)(>[^\s:]+|)(?::(\.\./\.\./\S+))?$', line)
             if m:
                 dep_lines.append([m[1], m[2], m[3] or '>=0', m[4] or ''])
                 continue
             m = re.search(r'^var\t(\S+)\t(.+)$', line)
             if m:
                 self.update_vars[m[1]] = m[2]
                 continue
             if line != '':
-                debug('unknown dependency line: %s', line)
+                debug('unknown dependency line: {0}', line)
         for dep_line in dep_lines:
             type, pkgbase, constraint, dir = dep_line
             if dir == '' and pkgname_prefix != '':
                 dir = find_package(pkgname_prefix + pkgbase)
                 if dir != '':
                     pkgbase = pkgname_prefix + pkgbase
             if dir == '':
                 dir = find_package(pkgbase)
-            debug('add_dependency: %s %s %s %s', type, pkgbase, constraint, dir)
+            debug('add_dependency: {0} {1} {2} {3}', type, pkgbase, constraint, dir)
             self.add_dependency(type, pkgbase, constraint, dir)
     def wrksrc_find(self, what: Union[str, Callable]) -> Iterator[str]:
         def search(f):
             if type(what) == str:
                 return re.search(what, f)
             return what(f)
         return list(filter(search, self.wrksrc_files))
     def wrksrc_isdir(self, relative_pathname: str) -> bool:
         return isfile(self.abs_wrksrc + '/' + relative_pathname)
 @@ -717,52 +719,52 @@ class Adjuster:
                 self.build_vars.append(Var('WRKSRC', '=', '${WRKDIR}/' + files[0]))
             self.abs_wrksrc = self.abs_wrkdir + '/' + files[0]
         elif len(files) == 0:
             self.build_vars.append(Var('WRKSRC', '=', '${WRKDIR}'))
             self.abs_wrksrc = self.abs_wrkdir
         else:
             wrksrc = '${WRKDIR} # More than one possibility -- please check manually.'
             self.build_vars.append(Var('WRKSRC', '=', wrksrc))
             self.abs_wrksrc = self.abs_wrkdir
     def adjust_lines_python_module(self, lines: Lines, url: str):
         initial_lines = generate_initial_package_Makefile_lines(url)
-        current_lines = Lines.read_from('Makefile')
+        current_lines = self.makefile_lines
         if 'python' not in initial_lines.get('CATEGORIES'):
             return
         pkgbase = initial_lines.get('GITHUB_PROJECT')
         if pkgbase == '':
             return
         pkgbase1 = pkgbase[:1]
         pkgversion_norev = re.sub(r'^v', '', initial_lines.get('DISTNAME'))
         # don't risk to overwrite any changes made by the package developer.
         if '\n'.join(current_lines.lines) != '\n'.join(initial_lines.lines):
             lines.lines.insert(-2, '# TODO: Migrate MASTER_SITES to PYPI')
             return
         tx_lines = Lines(*self.makefile_lines.lines)
         if (tx_lines.remove('GITHUB_PROJECT')
                 and tx_lines.set('DISTNAME', '%s-%s' % (pkgbase, pkgversion_norev))
                 and tx_lines.set('PKGNAME', '${PYPKGPREFIX}-${DISTNAME}')
                 and tx_lines.set('MASTER_SITES', '${MASTER_SITE_PYPI:=%s/%s/}' % (pkgbase1, pkgbase))
                 and tx_lines.remove('DIST_SUBDIR')
                 and (tx_lines.remove_if('EXTRACT_SUFX', '.zip') or True)):
             self.makefile_lines = tx_lines
             self.regenerate_distinfo = True
-    def generate_adjusted_Makefile_lines(self, url):
+    def generate_adjusted_Makefile_lines(self, url) -> Lines:
         marker_index = self.makefile_lines.index(r'^# url2pkg-marker')
         if marker_index == -1:
             raise Exception('ERROR: didn\'t find the url2pkg marker in the Makefile.')
         lines = Lines(*self.makefile_lines.lines[: marker_index])
         if lines.index(r'^PKGNAME=') == -1:
             distname_index = lines.index(r'^DISTNAME=(\t+)')
             if distname_index != -1:
                 pkgname_line = 'PKGNAME=\t%s${DISTNAME%s}' % (self.pkgname_prefix, self.pkgname_transform)
                 lines.lines.insert(distname_index + 1, pkgname_line)
         if self.todos:
 @@ -779,69 +781,71 @@ class Adjuster:
         lines.add_vars(*self.build_vars)
         lines.add_vars(*self.extra_vars)
         lines.add(*self.bl3_lines)
         lines.add(*map(lambda include: '.include "%s"' % include, self.includes))
         lines.add(*self.makefile_lines.lines[marker_index + 1:])
         lines.append('CATEGORIES', ' '.join(self.categories))
         self.adjust_lines_python_module(lines, url)
         for varname in self.update_vars:
             debug('update_var {0} {1}', varname, self.update_vars[varname])
             lines.set(varname, self.update_vars[varname])
         return lines
     def adjust_package_from_extracted_distfiles(self, url: str):
         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.makefile_lines = Lines.read_from('Makefile')
+        self.makefile_lines = Lines.read_from(config.pkgdir + '/Makefile')
         self.adjust_configure()
         self.adjust_cmake()
         self.adjust_meson()
         self.adjust_gconf2_schemas()
         self.adjust_libtool()
         self.adjust_perl_module(url)
         self.adjust_python_module()
         self.adjust_cargo()
         self.adjust_pkg_config()
         self.adjust_po()
         self.adjust_use_languages()
-        self.generate_adjusted_Makefile_lines(url).write_to('Makefile')
+        self.generate_adjusted_Makefile_lines(url).write_to(config.pkgdir + '/Makefile')
         if self.regenerate_distinfo:
             bmake('distinfo')
 def main():
     global distname
     if not isfile('../../mk/bsd.pkg.mk'):
         sys.exit(f'ERROR: {sys.argv[0]} must be run from a package directory (.../pkgsrc/category/package).')
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'v', ['verbose'])
-        for opt in opts:
+        for (opt, optarg) in opts:
-            if opt in ('v', 'verbose'):
+            print('opt', repr(opt))
             if opt in ('-v', '--verbose'):
                 config.verbose = True
     except getopt.GetoptError:
         sys.exit(f'usage: {sys.argv[0]} [-v|--verbose] [URL]')
     if len(args) == 0:
         url = input('URL: ')
     else:
         url = args[0]
     extract_cookie = glob.glob('w*/.extract_done')
     if not extract_cookie or not isfile('Makefile'):
         generate_initial_package(url)
     else:

 @@ -1,30 +1,57 @@
-# $NetBSD: url2pkg_test.py,v 1.1 2019/10/03 09:37:41 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.2 2019/10/03 12:52:54 rillig Exp $
 import os
 from typing import List
 from url2pkg import *
-def setup_function(fn):
+def setup_function(_):
     config.pkgsrcdir = os.getenv('PKGSRCDIR')
     assert config.pkgsrcdir is not None
     os.chdir(config.pkgsrcdir + '/pkgtools/url2pkg')
-def vars(vars: List[Var]) -> List[str]:
+def str_vars(vars: List[Var]) -> List[str]:
     return list(map(lambda var: var.name + var.op + var.value, vars))
 def test_debug():
     """ Just ensure that the debug calls do not crash. """
     config.verbose = True
     try:
         debug('plain message')
         debug('list {0}', [1, 2, 3])
         debug('tuple {0}', (1, 2, 3))
         debug('cwd {0} env {1} cmd {2}', 'directory', {'VAR': 'value'}, 'command')
     finally:
         config.verbose = False
 def test_aligned__empty():
     assert aligned([]) == []
 def test_aligned__variables():
     vars = [
         Var('V', '=', 'value'),
         Var('LONG_NAME', '=', 'value # comment')
+    ]
     lines = [
         'V=\t\tvalue',
         'LONG_NAME=\tvalue # comment',
         ''
+    ]
     assert aligned(vars) == lines
 def test_Lines_add_vars__simple():
     lines = Lines()
     lines.add_vars(
         Var("1", "=", "one"),
         Var("6", "=", "six"),
+    )
     assert lines.lines == [
         "1=\tone",
         "6=\tsix",
         "",
+    ]
 @@ -84,55 +111,130 @@ def test_Lines_append__only_comment():
 def test_Lines_append__value_with_comment():
     lines = Lines("VARNAME=\tvalue # comment")
     lines.append("VARNAME", "appended")
     assert lines.lines == ["VARNAME=\tvalue appended # comment"]
 def test_Lines_append__value_without_comment():
     lines = Lines("VARNAME+=\tvalue")
-    assert lines.append("VARNAME", "appended") == True
+    assert lines.append("VARNAME", "appended")
     assert lines.lines == ["VARNAME+=\tvalue appended"]
 def test_Lines_set__previously_with_comment():
     lines = Lines("LICENSE=\t# TODO: see mk/license.mk")
-    lines.set("LICENSE", "${PERL5_LICENSE}")
+    assert lines.set("LICENSE", "${PERL5_LICENSE}")
     assert lines.lines == ["LICENSE=\t${PERL5_LICENSE}"]
 def test_Lines_unique_varassign__commented_out_no_value():
     lines = Lines("#LICENSE=\t# TODO: see mk/license.mk")
     assert len(lines.all_varassigns('LICENSE')) == 1
 def test_Lines_set__overwrite_comment_with_comment():
     lines = Lines("#LICENSE=\t# TODO: see mk/license.mk")
-    lines.set("#LICENSE", "${PERL5_LICENSE}")
+    assert len(lines.all_varassigns('LICENSE')) == 1
     assert lines.set("LICENSE", "${PERL5_LICENSE}")
-    assert lines.lines == ["#LICENSE=\t${PERL5_LICENSE}"]
+    assert lines.lines == ["LICENSE=\t${PERL5_LICENSE}"]
 def test_Lines_set__overwrite_commented_with_comment():
     lines = Lines("#LICENSE=\t# TODO: see mk/license.mk")
     assert lines.set("LICENSE", "${PERL5_LICENSE}")
     assert lines.lines == ["LICENSE=\t${PERL5_LICENSE}"]
 def test_Lines_set__not_found():
     lines = Lines("OLD_VAR=\told value # old comment")
-    lines.set("NEW_VAR", "new value")
+    assert not lines.set("NEW_VAR", "new value")
     assert lines.lines == ["OLD_VAR=\told value # old comment"]
 def test_Lines_remove__not_found():
     lines = Lines('VAR=\tvalue')
     assert not lines.remove('VARIABLE')
     assert lines.lines == ['VAR=\tvalue']
 def test_Lines_remove__found():
     lines = Lines('VAR=\tvalue')
     assert lines.remove('VAR')
     assert lines.lines == []
 def test_Lines_remove__found_several_times():
     lines = Lines('VAR=\tvalue1', 'VAR=\tvalue2')
     assert not lines.remove('VAR')
     assert lines.lines == ['VAR=\tvalue1', 'VAR=\tvalue2']
 def test_Lines_remove_if__different_name():
     lines = Lines('VAR=\tvalue')
     assert not lines.remove_if('VARIABLE', 'value')
     assert lines.lines == ['VAR=\tvalue']
 def test_Lines_remove_if__different_value():
     lines = Lines('VAR=\tvalue')
     assert not lines.remove_if('VAR', 'something')
     assert lines.lines == ['VAR=\tvalue']
 def test_Lines_remove_if__found():
     lines = Lines('VAR=\tvalue')
     assert lines.remove_if('VAR', 'value')
     assert lines.lines == []
 def test_Lines_remove_if__multiple():
     lines = Lines('VAR=\tvalue', 'VAR=\tvalue')
     assert lines.remove_if('VAR', 'value')
     assert lines.lines == ['VAR=\tvalue']
     assert lines.remove_if('VAR', 'value')
     assert lines.lines == []
 def test_Lines_index():
     lines = Lines("1", "2", "345")
     assert lines.index("1") == 0
     assert lines.index("2") == 1
     assert lines.index("345") == 2
     assert lines.index("4") == 2
     assert lines.index(r'^(\d\d)\d$') == 2
     assert lines.index(r"^\d\s\d$") == -1
     assert lines.index(r"(\d)") == 0
 @@ -245,48 +347,52 @@ def test_generate_initial_package_Makefi
         "# url2pkg-marker (please do not remove this line.)",
         ".include \"../../mk/bsd.pkg.mk\""
+    ]
 def test_Adjuster_read_dependencies():
     dep_lines = [
         "DEPENDS\tpackage>=version:../../pkgtools/pkglint",
         "DEPENDS\tpackage>=version:../../pkgtools/x11-links",
         "BUILD_DEPENDS\turl2pkg>=1.0",
         "TEST_DEPENDS\tpkglint",
         "A line that is not a dependency at all",
         "",
         "var\tHOMEPAGE\thttps://homepage.example.org/"
         ""
+    ]
     env = {"URL2PKG_DEPENDENCIES": '\n'.join(dep_lines)}
     cmd = "printf '%s\n' \"$URL2PKG_DEPENDENCIES\""
     adjuster = Adjuster()
     adjuster.read_dependencies(cmd, env, '.', '')
     assert os.getenv('URL2PKG_DEPENDENCIES') is None
     assert adjuster.depends == [
         "package>=version:../../pkgtools/pkglint"
+    ]
     assert adjuster.bl3_lines == [
         ".include \"../../pkgtools/x11-links/buildlink3.mk\""
+    ]
     assert adjuster.build_depends == [
         "url2pkg>=1.0:../../pkgtools/url2pkg"
+    ]
     assert adjuster.test_depends == [
         "pkglint>=0:../../pkgtools/pkglint"
+    ]
     assert adjuster.update_vars == {
         'HOMEPAGE': 'https://homepage.example.org/'
+    }
 def test_Adjuster_generate_adjusted_Makefile_lines():
     adjuster = Adjuster()
     adjuster.makefile_lines = Lines(
         "# before 1",
         "# before 2",
         "# url2pkg-marker",
         "# after 1",
         "# after 2"
+    )
     lines = adjuster.generate_adjusted_Makefile_lines("https://example.org/pkgname-1.0.tar.gz")
 @@ -299,149 +405,301 @@ def test_Adjuster_generate_adjusted_Make
+    ]
 def test_Adjuster_generate_adjusted_Makefile_lines__dependencies():
     adjuster = Adjuster()
     adjuster.makefile_lines.add(
         "# $" + "NetBSD$",
         "",
         "# url2pkg-marker",
         ".include \"../../mk/bsd.pkg.mk\""
+    )
     # some dependencies whose directory will not be found
-    adjuster.add_dependency("DEPENDS", "depends", ">=5.0", "../../devel/depends");
+    adjuster.add_dependency("DEPENDS", "depends", ">=5.0", "../../devel/depends")
-    adjuster.add_dependency("TOOL_DEPENDS", "tool-depends", ">=6.0", "../../devel/tool-depends");
+    adjuster.add_dependency("TOOL_DEPENDS", "tool-depends", ">=6.0", "../../devel/tool-depends")
-    adjuster.add_dependency("BUILD_DEPENDS", "build-depends", ">=7.0", "../../devel/build-depends");
+    adjuster.add_dependency("BUILD_DEPENDS", "build-depends", ">=7.0", "../../devel/build-depends")
-    adjuster.add_dependency("TEST_DEPENDS", "test-depends", ">=8.0", "../../devel/test-depends");
+    adjuster.add_dependency("TEST_DEPENDS", "test-depends", ">=8.0", "../../devel/test-depends")
     # some dependencies whose directory is explicitly given
     adjuster.depends.append("depends>=11.0:../../devel/depends")
     adjuster.build_depends.append("build-depends>=12.0:../../devel/build-depends")
     adjuster.test_depends.append("test-depends>=13.0:../../devel/test-depends")
     lines = adjuster.generate_adjusted_Makefile_lines("https://example.org/pkgname-1.0.tar.gz")
     assert lines.lines == [
         "# $" + "NetBSD$",
         "",
         "# TODO: dependency TOOL_DEPENDS # TODO: tool-depends>=6.0",
         "",
         "BUILD_DEPENDS+=\t# TODO: build-depends>=7.0",
         "BUILD_DEPENDS+=\tbuild-depends>=12.0:../../devel/build-depends",
         "DEPENDS+=\t# TODO: depends>=5.0",
         "DEPENDS+=\tdepends>=11.0:../../devel/depends",
         "TEST_DEPENDS+=\t# TODO: test-depends>=8.0",
         "TEST_DEPENDS+=\ttest-depends>=13.0:../../devel/test-depends",
         "",
         ".include \"../../mk/bsd.pkg.mk\""
+    ]
 def test_Adjuster_adjust_configure__not_found(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrksrc = str(tmp_path)
     adjuster.adjust_configure()
     assert adjuster.build_vars == []
 def test_Adjuster_adjust_configure__GNU_configure(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrksrc = str(tmp_path)
     (tmp_path / 'configure').write_text('# Free Software Foundation\n')
     adjuster.adjust_configure()
     assert str_vars(adjuster.build_vars) == [
         'GNU_CONFIGURE=yes',
+    ]
 def test_Adjuster_adjust_configure__other_configure(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrksrc = str(tmp_path)
     (tmp_path / 'configure').write_text('# A generic configure script\n')
     adjuster.adjust_configure()
     assert str_vars(adjuster.build_vars) == [
         'HAS_CONFIGURE=yes',
+    ]
 def test_Adjuster_adjust_cargo__not_found(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrksrc = str(tmp_path)
     adjuster.adjust_cargo()
     assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_adjust_cargo__found(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrksrc = str(tmp_path)
     (tmp_path / 'Cargo.lock').write_text('"checksum cargo-package-name cargo-package-version 1234"')
     adjuster.adjust_cargo()
     assert str_vars(adjuster.build_vars) == [
         'CARGO_CRATE_DEPENDS+=cargo-package-name-cargo-package-version',
+    ]
 def test_Adjuster_adjust_po__not_found():
     adjuster = Adjuster()
     adjuster.adjust_po()
     assert adjuster.build_vars == []
 def test_Adjuster_adjust_po__found():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['share/locale/de.mo']
     adjuster.adjust_po()
-    assert vars(adjuster.build_vars) == [
+    assert str_vars(adjuster.build_vars) == [
         'USE_PKGLOCALEDIR=yes'
+    ]
 def test_Adjuster_adjust_use_languages__none():
     adjuster = Adjuster()
     adjuster.adjust_use_languages()
-    assert vars(adjuster.build_vars) == [
+    assert str_vars(adjuster.build_vars) == [
         'USE_LANGUAGES=# none'
+    ]
 def test_Adjuster_adjust_use_languages__c():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['main.c']
     adjuster.adjust_use_languages()
-    assert vars(adjuster.build_vars) == []
+    assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_adjust_use_languages__c_in_subdir():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['subdir/main.c']
     adjuster.adjust_use_languages()
-    assert vars(adjuster.build_vars) == []
+    assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_adjust_use_languages__cplusplus_in_subdir():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['subdir/main.cpp']
     adjuster.adjust_use_languages()
-    assert vars(adjuster.build_vars) == [
+    assert str_vars(adjuster.build_vars) == [
         'USE_LANGUAGES=c++'
+    ]
 def test_Adjuster_adjust_use_languages__cplusplus_and_fortran():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['subdir/main.cpp', 'main.f']
     adjuster.adjust_use_languages()
-    assert vars(adjuster.build_vars) == [
+    assert str_vars(adjuster.build_vars) == [
         'USE_LANGUAGES=c++ fortran'
+    ]
 def test_Adjuster_adjust_pkg_config__none():
     adjuster = Adjuster()
     adjuster.adjust_pkg_config()
-    assert vars(adjuster.build_vars) == []
+    assert str_vars(adjuster.build_vars) == []
-    assert vars(adjuster.extra_vars) == []
+    assert str_vars(adjuster.extra_vars) == []
 def test_Adjuster_adjust_pkg_config__pc_in():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['library.pc.in']
     adjuster.adjust_pkg_config()
-    assert vars(adjuster.build_vars) == ['USE_TOOLS+=pkg-config']
+    assert str_vars(adjuster.build_vars) == ['USE_TOOLS+=pkg-config']
-    assert vars(adjuster.extra_vars) == ['PKGCONFIG_OVERRIDE+=library.pc.in']
+    assert str_vars(adjuster.extra_vars) == ['PKGCONFIG_OVERRIDE+=library.pc.in']
 def test_Adjuster_adjust_pkg_config__uninstalled_pc_in():
     adjuster = Adjuster()
     adjuster.wrksrc_files = ['library-uninstalled.pc.in']
     adjuster.adjust_pkg_config()
-    assert vars(adjuster.build_vars) == []
+    assert str_vars(adjuster.build_vars) == []
-    assert vars(adjuster.extra_vars) == []
+    assert str_vars(adjuster.extra_vars) == []
 def test_Adjuster_adjust_pkg_config__both():
     adjuster = Adjuster()
     adjuster.wrksrc_files = [
         'library.pc.in',
         'library-uninstalled.pc.in'
+    ]
     adjuster.adjust_pkg_config()
-    assert vars(adjuster.build_vars) == ['USE_TOOLS+=pkg-config']
+    assert str_vars(adjuster.build_vars) == ['USE_TOOLS+=pkg-config']
-    assert vars(adjuster.extra_vars) == ['PKGCONFIG_OVERRIDE+=library.pc.in']
+    assert str_vars(adjuster.extra_vars) == ['PKGCONFIG_OVERRIDE+=library.pc.in']
 def test_Adjuster__adjust_homepage():
     url = 'https://dummy.example.org/package-1.0.tar.gz'
     adjuster = Adjuster()
     adjuster.makefile_lines = generate_initial_package_Makefile_lines(url)
     adjuster.update_vars['HOMEPAGE'] = 'https://example.org/'
     adjuster.depends.append('dependency>=0:../../category/dependency')
     adjuster.todos.append('Run pkglint')
     lines = adjuster.generate_adjusted_Makefile_lines(url)
     assert lines.lines == [
         '# $' + 'NetBSD$',
         '',
         'DISTNAME=\tpackage-1.0',
         'PKGNAME=\t${DISTNAME}',
         'CATEGORIES=\tpkgtools',
         'MASTER_SITES=\thttps://dummy.example.org/',
         '',
         'MAINTAINER=\tINSERT_YOUR_MAIL_ADDRESS_HERE',
         'HOMEPAGE=\thttps://example.org/',
         'COMMENT=\tTODO: Short description of the package',
         '#LICENSE=\t# TODO: (see mk/license.mk)',
         '',
         '# TODO: Run pkglint',
         '',
         'DEPENDS+=\tdependency>=0:../../category/dependency',
         '',
         '.include "../../mk/bsd.pkg.mk"'
+    ]
 def test_Adjuster_determine_wrksrc__no_files(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrkdir = str(tmp_path)
     adjuster.determine_wrksrc()
     assert adjuster.abs_wrksrc == adjuster.abs_wrkdir
 def test_Adjuster_determine_wrksrc__single_dir(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrkdir = str(tmp_path)
     (tmp_path / 'subdir').mkdir()
     adjuster.determine_wrksrc()
     assert adjuster.abs_wrksrc == adjuster.abs_wrkdir + '/subdir'
 def test_Adjuster_determine_wrksrc__several_dirs(tmp_path):
     adjuster = Adjuster()
     adjuster.abs_wrkdir = str(tmp_path)
     (tmp_path / 'subdir1').mkdir()
     (tmp_path / 'subdir2').mkdir()
     adjuster.determine_wrksrc()
     assert adjuster.abs_wrksrc == adjuster.abs_wrkdir
     assert str_vars(adjuster.build_vars) == [
         'WRKSRC=${WRKDIR} # More than one possibility -- please check manually.'
+    ]
 def test_Adjuster_adjust_package_from_extracted_distfiles__empty_wrkdir(tmp_path):
     pkgdir = tmp_path
     wrkdir = tmp_path / 'wrkdir'
     fake = '''\
 #! /bin/sh
 case $* in
 ("show-var VARNAME=WRKDIR") echo '%s' ;;
 (*) "unknown: $*" ;;
 esac
 ''' % str(wrkdir)
     config.pkgdir = str(tmp_path)
     wrkdir.mkdir()
     url = 'https://example.org/distfile-1.0.zip'
     adjuster = Adjuster()
     adjuster.abs_wrkdir = str(wrkdir)
     (pkgdir / 'Makefile').write_text('# url2pkg-marker\n')
     fake_path = (tmp_path / "fake")
     fake_path.write_text(fake)
     fake_path.chmod(0o755)
     prev_make = config.make
     config.make = fake_path
     try:
         adjuster.adjust_package_from_extracted_distfiles(url)
     finally:
         config.make = prev_make
     assert adjuster.generate_adjusted_Makefile_lines(url).lines == [
         'WRKSRC=\t\t${WRKDIR}',
         'USE_LANGUAGES=\t# none',
         '',
+    ]