 @@ -1,15 +1,15 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.20 2019/10/12 17:28:44 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.21 2019/10/12 17:38:16 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
 @@ -58,27 +58,27 @@ class Var(NamedTuple):
 class Varassign(NamedTuple):
     """ A variable assignment including layout information. """
     index: int
     varname: str
     op: str
     indent: str
     value: str
     space_after_value: str
     comment: str
-class Url2Pkg:
+class Globals:
     make: str
     libdir: str
     perl5: str
     pkgsrcdir: Union[Path, Any]
     pythonbin: str
     editor: str
     pkgdir: Union[Path, Any]
     out: Any
     err: Any
     verbose: bool
     def __init__(self):
         self.make = os.getenv('MAKE') or '@MAKE@'
 @@ -449,56 +449,56 @@ class Generator:
         lines.add('.include "../../mk/bsd.pkg.mk"')
         return lines
     def generate_Makefile(self) -> Lines:
         self.adjust_site_SourceForge()
         self.adjust_site_GitHub_archive()
         self.adjust_site_GitHub_release()
         self.foreach_site_from_sites_mk(self.adjust_site_from_sites_mk)
         self.adjust_site_other()
         self.adjust_everything_else()
         return self.generate_lines()
-    def generate_package(self, up: Url2Pkg) -> Lines:
+    def generate_package(self, g: Globals) -> Lines:
-        pkgdir = up.pkgdir
+        pkgdir = g.pkgdir
         makefile = pkgdir / 'Makefile'
         descr = pkgdir / 'DESCR'
         plist = pkgdir / 'PLIST'
         initial_lines = self.generate_Makefile()
         try:
             makefile.replace(f'{makefile}.url2pkg~')
         except OSError:
             pass
         initial_lines.write_to(makefile)
         plist.is_file() or Lines('@comment $''NetBSD$').write_to(plist)
         descr.is_file() or Lines().write_to(descr)
-        subprocess.check_call([up.editor, makefile])
+        subprocess.check_call([g.editor, makefile])
-        up.bmake('clean', 'distinfo', 'extract')
+        g.bmake('clean', 'distinfo', 'extract')
         return initial_lines
 class Adjuster:
     """
     After the distfile has been downloaded and extracted, the
     adjust_* methods of this class inspect the extracted files
     and adjust the variable definitions in the package Makefile.
     """
-    up: Url2Pkg
+    g: Globals
     url: str
     initial_lines: Lines
     # the absolute pathname to the working directory, containing
     # the extracted distfiles.
     abs_wrkdir: Union[Path, Any]
     # the absolute pathname to a subdirectory of abs_wrkdir, typically
     # containing package-provided Makefiles or configure scripts.
     abs_wrksrc: Union[Path, Any]
     # the regular files and directories relative to abs_wrksrc.
     wrksrc_files: List[str]
 @@ -542,53 +542,53 @@ class Adjuster:
     # these are inserted below the second paragraph in the Makefile.
     todos: List[str]
     # the package name is based on DISTNAME and modified by
     # pkgname_prefix and pkgname_transform.
     pkgname_prefix: str  # example: ${PYPKGPREFIX}-
     pkgname_transform: str  # example: :S,-v,-,
     # all lines of the package Makefile, for direct modification.
     makefile_lines: Lines
     regenerate_distinfo: bool
-    def __init__(self, up: Url2Pkg, url: str, initial_lines: Lines):
+    def __init__(self, g: Globals, url: str, initial_lines: Lines):
-        self.up = up
+        self.g = g
         self.url = url
         self.initial_lines = initial_lines
         self.abs_wrkdir = Path('')
         self.abs_wrksrc = Path('')
         self.wrksrc_files = []
         self.wrksrc_dirs = []
         self.categories = []
         self.depends = []
         self.build_depends = []
         self.test_depends = []
         self.bl3_lines = []
         self.includes = []
         self.build_vars = []
         self.extra_vars = []
         self.update_vars = {}
         self.todos = []
         self.pkgname_prefix = ''
         self.pkgname_transform = ''
         self.makefile_lines = Lines()
         self.regenerate_distinfo = False
     def add_dependency(self, kind: str, pkgbase: str, constraint: str, dep_dir: str) -> None:
         """ add_dependency('DEPENDS', 'package', '>=1', '../../category/package') """
-        self.up.debug('add_dependency: {0} {1} {2} {3}', kind, pkgbase, constraint, dep_dir)
+        self.g.debug('add_dependency: {0} {1} {2} {3}', kind, pkgbase, constraint, dep_dir)
         def bl3_identifier():
             try:
                 with open(dep_dir + '/buildlink3.mk') as f:
                     for line in f:
                         m = re.search(r'^BUILDLINK_TREE\+=\s*(\S+)$', line)
                         if m:
                             return m[1]
             except OSError:
                 pass
             return ''
         if dep_dir != '':
 @@ -607,55 +607,55 @@ class Adjuster:
         if kind == 'DEPENDS':
             self.depends.append(value)
         elif kind == 'BUILD_DEPENDS':
             self.build_depends.append(value)
         elif kind == 'TEST_DEPENDS':
             self.test_depends.append(value)
         else:
             self.todos.append(f'dependency {kind} {value}')
     def read_dependencies(self, cmd: str, env: Dict[str, str], cwd: Union[Path, Any], pkgname_prefix: str) -> None:
         effective_env = dict(os.environ)
         effective_env.update(env)
-        self.up.debug('reading dependencies: cd {0} && env {1} {2}', str(cwd), env, cmd)
+        self.g.debug('reading dependencies: cd {0} && env {1} {2}', str(cwd), env, cmd)
         output: bytes = subprocess.check_output(args=cmd, shell=True, env=effective_env, cwd=cwd)
         dep_lines: List[Tuple[str, str, str, str]] = []
         for line in output.decode('utf-8').splitlines():
             # example: DEPENDS   pkgbase>=1.2.3:../../category/pkgbase
             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
             # example: var   VARNAME   value # possibly with comment
             m = re.search(r'^var\t(\S+)\t(.+)$', line)
             if m:
                 self.update_vars[m[1]] = m[2]
                 continue
             if line != '':
-                self.up.debug('unknown dependency line: {0}', line)
+                self.g.debug('unknown dependency line: {0}', line)
         for dep_line in dep_lines:
             kind, pkgbase, constraint, dep_dir = dep_line
             if dep_dir == '' and pkgname_prefix != '':
-                dep_dir = self.up.find_package(pkgname_prefix + pkgbase)
+                dep_dir = self.g.find_package(pkgname_prefix + pkgbase)
                 if dep_dir != '':
                     pkgbase = pkgname_prefix + pkgbase
             if dep_dir == '':
-                dep_dir = self.up.find_package(pkgbase)
+                dep_dir = self.g.find_package(pkgbase)
             self.add_dependency(kind, pkgbase, constraint, dep_dir)
     def wrksrc_open(self, relative_pathname: str):
         return (self.abs_wrksrc / relative_pathname).open()
     def wrksrc_find(self, what: Union[str, Callable[[str], bool]]) -> List[str]:
         def search(f):
             return re.search(what, f) if type(what) == str else what(f)
         return list(sorted(filter(search, self.wrksrc_files)))
     def wrksrc_grep(self, filename: str, pattern: str) -> List[Union[str, List[str]]]:
 @@ -703,41 +703,41 @@ class Adjuster:
             self.extra_vars.append(Var('GCONF_SCHEMAS', '+=', re.sub(r'(\.in)+$', '', f)))
     def adjust_libtool(self):
         if self.wrksrc_isfile('ltconfig') or self.wrksrc_isfile('ltmain.sh'):
             self.build_vars.append(Var('USE_LIBTOOL', '=', 'yes'))
         if self.wrksrc_isdir('libltdl'):
             self.includes.append('../../devel/libltdl/convenience.mk')
     def adjust_perl_module_Build_PL(self):
         # Example packages:
         # devel/p5-Algorithm-CheckDigits
-        cmd = f'{self.up.perl5} -I{self.up.libdir} -I. Build.PL'
+        cmd = f'{self.g.perl5} -I{self.g.libdir} -I. Build.PL'
         self.read_dependencies(cmd, {}, self.abs_wrksrc, '')
         self.build_vars.append(Var('PERL5_MODULE_TYPE', '=', 'Module::Build'))
     def adjust_perl_module_Makefile_PL(self):
         # Example packages:
         # devel/p5-Algorithm-Diff (no dependencies)
         # devel/p5-Carp-Assert-More (dependencies without version numbers)
         # www/p5-HTML-Quoted (dependency with version number)
         # To avoid fix_up_makefile error for p5-HTML-Quoted, generate Makefile first.
-        cmd1 = f'{self.up.perl5} -I. Makefile.PL </dev/null 1>&0 2>&0'
+        cmd1 = f'{self.g.perl5} -I. Makefile.PL </dev/null 1>&0 2>&0'
         subprocess.call(cmd1, shell=True, cwd=self.abs_wrksrc)
-        cmd2 = f'{self.up.perl5} -I{self.up.libdir} -I. Makefile.PL'
+        cmd2 = f'{self.g.perl5} -I{self.g.libdir} -I. Makefile.PL'
         self.read_dependencies(cmd2, {}, self.abs_wrksrc, '')
     def adjust_perl_module_homepage(self):
         if '${MASTER_SITE_PERL_CPAN:' not in self.makefile_lines.get('MASTER_SITES'):
             return
         homepage = self.makefile_lines.get('HOMEPAGE')
         if homepage == '' or not self.url.startswith(homepage):
             return
         distname = self.makefile_lines.get('DISTNAME')
         module_name = re.sub(r'-v?[0-9].*', '', distname).replace('-', '::')
         self.makefile_lines.set('HOMEPAGE', f'https://metacpan.org/pod/{module_name}')
 @@ -749,43 +749,43 @@ class Adjuster:
             self.adjust_perl_module_Makefile_PL()
         else:
             return
         distname = self.makefile_lines.get('DISTNAME')
         packlist = re.sub(r'-v?[0-9].*', '', distname).replace('-', '/')
         self.build_vars.append(Var('PERL5_PACKLIST', '=', f'auto/{packlist}/.packlist'))
         self.includes.append('../../lang/perl5/module.mk')
         self.pkgname_prefix = 'p5-'
         self.categories.append('perl5')
         self.adjust_perl_module_homepage()
         try:
-            (self.up.pkgdir / 'PLIST').unlink()
+            (self.g.pkgdir / 'PLIST').unlink()
         except OSError:
             pass
     def adjust_python_module(self):
         # Example packages:
         # devel/py-ZopeComponent (dependencies, test dependencies)
         # devel/py-gflags (uses distutils.core instead of setuptools; BSD license)
         # devel/py-gcovr (uses setuptools; BSD license)
         if not self.wrksrc_isfile('setup.py'):
             return
-        cmd = f'{self.up.pythonbin} setup.py build'
+        cmd = f'{self.g.pythonbin} setup.py build'
         env = {
             'PYTHONDONTWRITEBYTECODE': 'x',
-            'PYTHONPATH': self.up.libdir
+            'PYTHONPATH': self.g.libdir
+        }
         self.read_dependencies(cmd, env, self.abs_wrksrc, 'py-')
         self.pkgname_prefix = '${PYPKGPREFIX}-'
         self.categories.append('python')
         self.includes.append('../../lang/python/egg.mk')
     def adjust_cargo(self):
         if not self.wrksrc_isfile('Cargo.lock'):
             return
         # "checksum cargo-package-name cargo-package-version
         for (name, version) in self.wrksrc_grep('Cargo.lock', r'^"checksum\s(\S+)\s(\S+)'):
 @@ -867,32 +867,32 @@ class Adjuster:
         pkgversion_norev = re.sub(r'^v', '', initial_lines.get('DISTNAME'))
         tx_lines = Lines(*self.makefile_lines.lines)
         if not (tx_lines.remove('GITHUB_PROJECT')
                 and tx_lines.set('DISTNAME', f'{pkgbase}-{pkgversion_norev}')
                 and tx_lines.set('PKGNAME', '${PYPKGPREFIX}-${DISTNAME}')
                 and tx_lines.set('MASTER_SITES', f'${{MASTER_SITE_PYPI:={pkgbase1}/{pkgbase}/}}')
                 and tx_lines.remove('DIST_SUBDIR')):
             return
         tx_lines.remove_if('GITHUB_TAG', initial_lines.get('DISTNAME'))
         tx_lines.remove_if('EXTRACT_SUFX', '.zip')
-        up = self.up
+        g = self.g
-        try_mk = up.pkgdir / 'try-pypi.mk'
+        try_mk = g.pkgdir / 'try-pypi.mk'
         tx_lines.write_to(try_mk)
-        args = [up.make, '-f', str(try_mk), 'distinfo']
+        args = [g.make, '-f', str(try_mk), 'distinfo']
-        up.debug('running {0} to try PyPI', args)
+        g.debug('running {0} to try PyPI', args)
-        fetch_ok = subprocess.call(args, cwd=up.pkgdir) == 0
+        fetch_ok = subprocess.call(args, cwd=g.pkgdir) == 0
         try_mk.unlink()
         if not fetch_ok:
             return
         lines.lines = tx_lines.lines
         self.regenerate_distinfo = True
     def generate_lines(self) -> Lines:
         marker_index = self.makefile_lines.index(r'^# url2pkg-marker')
         if marker_index == -1:
             sys.exit('error: didn\'t find the url2pkg marker in the Makefile.')
         lines = Lines(*self.makefile_lines.lines[: marker_index])
 @@ -918,78 +918,78 @@ class Adjuster:
         lines.add_vars(*self.build_vars)
         lines.add_vars(*self.extra_vars)
         lines.add(*self.bl3_lines)
         lines.add(*(f'.include "{include}"' for include in self.includes))
         lines.add(*self.makefile_lines.lines[marker_index + 1:])
         lines.append('CATEGORIES', ' '.join(self.categories))
         self.adjust_lines_python_module(lines)
         for varname in self.update_vars:
-            self.up.debug('update_var {0} {1}', varname, self.update_vars[varname])
+            self.g.debug('update_var {0} {1}', varname, self.update_vars[varname])
             lines.set(varname, self.update_vars[varname])
         return lines
     def adjust(self):
         def scan(basedir: Union[Path, Any], only: Callable[[Path], bool]) -> List[str]:
             relevant = (f for f in basedir.rglob('*') if only(f))
             relative = (str(f.relative_to(basedir)) for f in relevant)
             return list(sorted((f for f in relative if not f.startswith('.'))))
-        self.up.debug('Adjusting the Makefile')
+        self.g.debug('Adjusting the Makefile')
-        self.makefile_lines = Lines.read_from(self.up.pkgdir / 'Makefile')
+        self.makefile_lines = Lines.read_from(self.g.pkgdir / 'Makefile')
-        self.abs_wrkdir = Path(self.up.show_var('WRKDIR'))
+        self.abs_wrkdir = Path(self.g.show_var('WRKDIR'))
         self.determine_wrksrc()
         self.wrksrc_dirs = scan(self.abs_wrksrc, Path.is_dir)
         self.wrksrc_files = scan(self.abs_wrksrc, Path.is_file)
         self.adjust_configure()
         self.adjust_cmake()
         self.adjust_meson()
         self.adjust_gconf2_schemas()
         self.adjust_libtool()
         self.adjust_perl_module()
         self.adjust_python_module()
         self.adjust_cargo()
         self.adjust_pkg_config()
         self.adjust_po()
         self.adjust_use_languages()
-        self.generate_lines().write_to(self.up.pkgdir / 'Makefile')
+        self.generate_lines().write_to(self.g.pkgdir / 'Makefile')
         if self.regenerate_distinfo:
-            self.up.bmake('distinfo')
+            self.g.bmake('distinfo')
-def main(argv: List[str], up: Url2Pkg):
+def main(argv: List[str], g: Globals):
     if not os.path.isfile('../../mk/bsd.pkg.mk'):
         sys.exit(f'{argv[0]}: must be run from a package directory (.../pkgsrc/category/package)')
     try:
         opts, args = getopt.getopt(argv[1:], 'v', ['verbose'])
         for (opt, _) in opts:
             if opt in ('-v', '--verbose'):
-                up.verbose = True
+                g.verbose = True
     except getopt.GetoptError:
         sys.exit(f'usage: {argv[0]} [-v|--verbose] [URL]')
     url = args[0] if args else input('URL: ')
     if not re.fullmatch(r'\w+://[!-~]+?/[!-~]+', url):
         sys.exit(f'url2pkg: invalid URL: {url}')
-    initial_lines = Generator(url).generate_package(up)
+    initial_lines = Generator(url).generate_package(g)
-    Adjuster(up, url, initial_lines).adjust()
+    Adjuster(g, url, initial_lines).adjust()
-    up.out.write('\n')
+    g.out.write('\n')
-    up.out.write('Remember to run pkglint when you\'re done.\n')
+    g.out.write('Remember to run pkglint when you\'re done.\n')
-    up.out.write('See ../../doc/pkgsrc.txt to get some help.\n')
+    g.out.write('See ../../doc/pkgsrc.txt to get some help.\n')
-    up.out.write('\n')
+    g.out.write('\n')
 if __name__ == '__main__':
-    main(sys.argv, Url2Pkg())
+    main(sys.argv, Globals())

 @@ -1,49 +1,49 @@
-# $NetBSD: url2pkg_test.py,v 1.19 2019/10/12 17:28:44 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.20 2019/10/12 17:38:16 rillig Exp $
 import pytest
 from url2pkg import *
 mkcvsid = '# $''NetBSD$'
-up: Url2Pkg
+g: Globals
 prev_dir = Path.cwd()
 def setup_function(_):
-    global up
+    global g
-    up = Url2Pkg()
+    g = Globals()
-    os.chdir(up.pkgsrcdir / 'pkgtools' / 'url2pkg')
+    os.chdir(g.pkgsrcdir / 'pkgtools' / 'url2pkg')
     class Wr:
         def __init__(self) -> None:
             self.buf = ''
         def write(self, s: str):
             self.buf += s
         def written(self) -> List[str]:
             result = self.buf
             self.buf = ''
             return result.splitlines()
-    up.out = Wr()
+    g.out = Wr()
-    up.err = Wr()
+    g.err = Wr()
 def teardown_function(_):
     os.chdir(prev_dir)
-    assert up.out.written() == []
+    assert g.out.written() == []
-    assert up.err.written() == []
+    assert g.err.written() == []
 def str_vars(vars: List[Var]) -> List[str]:
     def to_string(var):
         return var.name + var.op + var.value
     return list(map(to_string, vars))
 def str_varassigns(varassigns: List[Varassign]) -> List[str]:
     def to_string(v: Varassign) -> str:
         return f'{v.varname}{v.op}{v.indent}' \
                f'{v.value}{v.space_after_value}{v.comment}'
 @@ -56,49 +56,49 @@ def detab(lines: Lines) -> List[str]:
     def detab_line(line: str) -> str:
         detabbed = []
         for ch in line:
             if ch == '\t':
                 detabbed.append('        '[:8 - len(detabbed) % 8])
             else:
                 detabbed.append(ch)
         return ''.join(detabbed)
     return list(map(detab_line, lines.lines))
-def test_Url2Pkg_debug():
+def test_Global_debug():
-    up.verbose = True
+    g.verbose = True
-    up.debug('plain message')
+    g.debug('plain message')
-    up.debug('list {0}', [1, 2, 3])
+    g.debug('list {0}', [1, 2, 3])
-    up.debug('tuple {0}', (1, 2, 3))
+    g.debug('tuple {0}', (1, 2, 3))
-    up.debug('cwd {0} env {1} cmd {2}', 'directory', {'VAR': 'value'}, 'command')
+    g.debug('cwd {0} env {1} cmd {2}', 'directory', {'VAR': 'value'}, 'command')
-    assert up.err.written() == [
+    assert g.err.written() == [
         'url2pkg: plain message',
         'url2pkg: list [1, 2, 3]',
         'url2pkg: tuple (1, 2, 3)',
         'url2pkg: cwd \'directory\' env {\'VAR\': \'value\'} cmd \'command\'',
+    ]
-def test_Url2Pkg_bmake():
+def test_Global_bmake():
-    up.verbose = True
+    g.verbose = True
-    up.make = 'echo'
+    g.make = 'echo'
-    up.bmake('hello', 'world')
+    g.bmake('hello', 'world')
-    assert up.err.written() == [
+    assert g.err.written() == [
         'url2pkg: running bmake (\'hello\', \'world\') in \'.\'',
+    ]
 def test_Lines__write_and_read(tmp_path: Path):
     example = tmp_path / 'example'
     lines = Lines('1', '2', '3')
     lines.write_to(example)
     assert example.read_text() == '1\n2\n3\n'
 @@ -524,27 +524,27 @@ def test_Generator_adjust_site_from_site
         'MASTER_SITES=   ${MASTER_SITE_GNU:=cflow/}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
         'HOMEPAGE=       https://www.gnu.org/software/cflow/',
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       # TODO: (see mk/license.mk)',
         '',
         '# url2pkg-marker (please do not remove this line.)',
         '.include "../../mk/bsd.pkg.mk"',
+    ]
 def test_Generator_adjust_site_from_sites_mk__R(tmp_path: Path):
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
     url = 'http://cran.r-project.org/src/contrib/forecast_8.7.tar.gz'
     generator = Generator(url)
     with pytest.raises(SystemExit, match='^url2pkg: to create R packages, use pkgtools/R2pkg instead$'):
         generator.generate_Makefile()
     assert list(tmp_path.glob('*')) == []
 def test_Generator_adjust_site_other__malformed_URL():
     # This error is supposed to be handled by the URL check in main.
     error = "'NoneType' object has no attribute 'groups'"
 @@ -615,58 +615,58 @@ def test_Generator_adjust_everything_els
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
         'HOMEPAGE=       https://example.org/',
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       # TODO: (see mk/license.mk)',
         '',
         '# url2pkg-marker (please do not remove this line.)',
         '.include "../../mk/bsd.pkg.mk"',
+    ]
 def test_Generator_generate_package(tmp_path: Path):
     url = 'https://ftp.gnu.org/pub/gnu/cflow/cflow-1.6.tar.gz'
-    up.editor = 'true'  # the shell command
+    g.editor = 'true'  # the shell command
-    up.make = 'true'  # the shell command
+    g.make = 'true'  # the shell command
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
-    Generator(url).generate_package(up)
+    Generator(url).generate_package(g)
     assert (tmp_path / 'DESCR').read_text() == ''
     assert len((tmp_path / 'Makefile').read_text().splitlines()) == 13
     assert (tmp_path / 'PLIST').read_text() == '@comment $''NetBSD$\n'
     # Since bmake is only fake in this test, the distinfo file is not created.
     expected_files = ['DESCR', 'Makefile', 'PLIST']
     assert sorted([f.name for f in tmp_path.glob("*")]) == expected_files
 def test_Adjuster_read_dependencies():
     child_process_output = [
         'DEPENDS\tpackage>=112.0:../../pkgtools/pkglint',
         'DEPENDS\tpackage>=120.0:../../pkgtools/x11-links',
         'BUILD_DEPENDS\turl2pkg>=1.0',
         'BUILD_DEPENDS\tdoes-not-exist>=1.0',
         'TEST_DEPENDS\tpkglint',
         'A line that is not a dependency at all',
         '',
         'var\tHOMEPAGE\thttps://homepage.example.org/',
         'var\t#LICENSE\tBSD # TODO: too unspecific',
         ''
+    ]
     env = {'URL2PKG_DEPENDENCIES': '\n'.join(child_process_output)}
     cmd = "printf '%s\n' \"$URL2PKG_DEPENDENCIES\""
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.read_dependencies(cmd, env, '.', '')
     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',
         ".include \"../../pkgtools/x11-links/buildlink3.mk\"",
+    ]
     assert adjuster.build_depends == [
         'url2pkg>=1.0:../../pkgtools/url2pkg',
         '# TODO: does-not-exist>=1.0',
+    ]
     assert adjuster.test_depends == ['pkglint>=0:../../pkgtools/pkglint']
 @@ -674,71 +674,71 @@ def test_Adjuster_read_dependencies():
         'HOMEPAGE': 'https://homepage.example.org/',
         '#LICENSE': 'BSD # TODO: too unspecific',
+    }
 def test_Adjuster_read_dependencies__lookup_with_prefix():
     child_process_output = [
         'DEPENDS\tpyobjc-framework-Quartz>=0',
         ''
+    ]
     env = {'URL2PKG_DEPENDENCIES': '\n'.join(child_process_output)}
     cmd = "printf '%s\n' \"$URL2PKG_DEPENDENCIES\""
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.read_dependencies(cmd, env, '.', 'py-')
     assert adjuster.depends == [
         'py-pyobjc-framework-Quartz>=0:../../devel/py-pyobjc-framework-Quartz',
+    ]
 def test_Adjuster_wrksrc_grep(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'file').write_text('\n'.join(
         ('a', 'b', 'c', 'd', 'e', 'abc', 'def', 'ghi')
     ))
     assert adjuster.wrksrc_grep('file', r'e') == ['e', 'def']
     assert adjuster.wrksrc_grep('file', r'(.)(.)(.)') == [
         ['a', 'b', 'c'],
         ['d', 'e', 'f'],
         ['g', 'h', 'i'],
+    ]
 def test_Adjuster_generate_adjusted_Makefile_lines():
-    adjuster = Adjuster(up, 'https://example.org/pkgname-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/pkgname-1.0.tar.gz', Lines())
     adjuster.makefile_lines = Lines(
         '# before 1',
         '# before 2',
         '# url2pkg-marker',
         '# after 1',
         '# after 2'
+    )
     lines = adjuster.generate_lines()
     assert lines.lines == [
         '# before 1',
         '# before 2',
         '# after 1',
         '# after 2',
+    ]
 def test_Adjuster_generate_adjusted_Makefile_lines__dependencies():
-    adjuster = Adjuster(up, 'https://example.org/pkgname-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/pkgname-1.0.tar.gz', Lines())
     adjuster.makefile_lines.add(
         mkcvsid,
         '',
         '# 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('TOOL_DEPENDS', 'tool-depends', '>=6.0', '../../devel/tool-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')
     # some dependencies whose directory is explicitly given
     adjuster.depends.append('depends>=11.0:../../devel/depends')
 @@ -754,273 +754,273 @@ def test_Adjuster_generate_adjusted_Make
         '',
         'BUILD_DEPENDS+= # TODO: build-depends>=7.0',
         'BUILD_DEPENDS+= build-depends>=12.0:../../devel/build-depends',
         'DEPENDS+=       # TODO: depends>=5.0',
         'DEPENDS+=       depends>=11.0:../../devel/depends',
         'TEST_DEPENDS+=  # TODO: test-depends>=8.0',
         'TEST_DEPENDS+=  test-depends>=13.0:../../devel/test-depends',
         '',
         ".include \"../../mk/bsd.pkg.mk\""
+    ]
 def test_Adjuster_generate_adjusted_Makefile_lines__dont_overwrite_PKGNAME():
-    adjuster = Adjuster(up, 'https://example.org/pkgname-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/pkgname-1.0.tar.gz', Lines())
     adjuster.makefile_lines.add(
         mkcvsid,
         'DISTNAME=\tdistname-1.0',
         'PKGNAME=\tmanually-edited-pkgname-1.0'
         '',
         '# url2pkg-marker',
         ".include \"../../mk/bsd.pkg.mk\""
+    )
     lines = adjuster.generate_lines()
     assert detab(lines) == [
         mkcvsid,
         'DISTNAME=       distname-1.0',
         'PKGNAME=        manually-edited-pkgname-1.0',
         ".include \"../../mk/bsd.pkg.mk\""
+    ]
 def test_Adjuster_generate_adjusted_Makefile_lines__add_PKGNAME():
-    adjuster = Adjuster(up, 'https://example.org/pkgname-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/pkgname-1.0.tar.gz', Lines())
     adjuster.makefile_lines.add(
         mkcvsid,
         'DISTNAME=\tdistname-1.0',
         '',
         '# url2pkg-marker',
         ".include \"../../mk/bsd.pkg.mk\""
+    )
     lines = adjuster.generate_lines()
     assert lines.lines == [
         mkcvsid,
         'DISTNAME=\tdistname-1.0',
         '',
         ".include \"../../mk/bsd.pkg.mk\""
+    ]
 def test_Adjuster_generate_adjusted_Makefile_lines__add_PKGNAME_with_prefix():
-    adjuster = Adjuster(up, 'https://example.org/pkgname-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/pkgname-1.0.tar.gz', Lines())
     adjuster.makefile_lines.add(
         mkcvsid,
         'DISTNAME=\tdistname-1.0',
         '',
         '# url2pkg-marker',
         ".include \"../../mk/bsd.pkg.mk\""
+    )
     adjuster.pkgname_prefix = '${PYPKGPREFIX}-'
     lines = adjuster.generate_lines()
     assert lines.lines == [
         mkcvsid,
         'DISTNAME=\tdistname-1.0',
         'PKGNAME=\t${PYPKGPREFIX}-${DISTNAME}',
         '',
         ".include \"../../mk/bsd.pkg.mk\""
+    ]
 def test_Adjuster_add_dependency__buildlink():
     # Note: this test only works because it runs in pkgtools/url2pkg,
     # and from there the file ../../devel/libusb/buildlink3.mk is visible.
-    adjuster = Adjuster(up, 'https://example.org/distfile-1.0.zip', Lines())
+    adjuster = Adjuster(g, 'https://example.org/distfile-1.0.zip', Lines())
     adjuster.makefile_lines.add('# url2pkg-marker')
     adjuster.add_dependency('BUILD_DEPENDS', 'libusb', '>=2019', '../../devel/libusb')
     lines = adjuster.generate_lines()
     assert lines.lines == [
         'BUILDLINK_DEPENDS.libusb+=\tbuild',
         'BUILDLINK_API_DEPENDS.libusb+=\tlibusb>=2019',
         '.include "../../devel/libusb/buildlink3.mk"',
+    ]
 def test_Adjuster_adjust_cmake(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'CMakeLists.txt').touch()
     adjuster.adjust_cmake()
     assert str_vars(adjuster.build_vars) == ['USE_CMAKE=yes']
 def test_Adjuster_adjust_configure__none(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.adjust_configure()
     assert adjuster.build_vars == []
 def test_Adjuster_adjust_configure__GNU(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.wrksrc_files.append('configure')
     (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(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.wrksrc_files.append('configure')
     (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: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.adjust_cargo()
     assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_adjust_cargo__found(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'Cargo.lock').write_text('"checksum cargo-pkg 1.2.3 1234"')
     adjuster.adjust_cargo()
     assert str_vars(adjuster.build_vars) == [
         'CARGO_CRATE_DEPENDS+=cargo-pkg-1.2.3',
+    ]
 def test_Adjuster_adjust_gconf2():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = [
         'file1.schemas',
         'file2.schemas.in',
         'file6.schemas.in.in.in.in.in.in',  # realistic maximum is 2 times
+    ]
     adjuster.adjust_gconf2_schemas()
     assert adjuster.includes == [
         '../../devel/GConf/schemas.mk',
+    ]
     assert str_vars(adjuster.extra_vars) == [
         'GCONF_SCHEMAS+=file1.schemas',
         'GCONF_SCHEMAS+=file2.schemas',
         'GCONF_SCHEMAS+=file6.schemas',
+    ]
 def test_Adjuster_adjust_libtool__ltconfig(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'ltconfig').write_text('')
     adjuster.adjust_libtool()
     assert str_vars(adjuster.build_vars) == ['USE_LIBTOOL=yes']
 def test_Adjuster_adjust_libtool__libltdl(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'libltdl').mkdir()
     adjuster.adjust_libtool()
     assert adjuster.includes == [
         '../../devel/libltdl/convenience.mk',
+    ]
 def test_Adjuster_adjust_meson(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'meson.build').touch()
     adjuster.adjust_meson()
     assert adjuster.includes == ['../../devel/meson/build.mk']
 def test_Adjuster_adjust_perl_module_Build_PL(tmp_path: Path):
-    up.perl5 = 'echo perl5'
+    g.perl5 = 'echo perl5'
-    up.libdir = '/libdir'
+    g.libdir = '/libdir'
-    up.verbose = True
+    g.verbose = True
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.adjust_perl_module_Build_PL()
     assert str_vars(adjuster.build_vars) == ['PERL5_MODULE_TYPE=Module::Build']
-    assert up.err.written() == [
+    assert g.err.written() == [
         f'url2pkg: reading dependencies: cd \'{tmp_path}\' && env {{}} \'echo perl5 -I/libdir -I. Build.PL\'',
         'url2pkg: unknown dependency line: \'perl5 -I/libdir -I. Build.PL\''
+    ]
 def test_Adjuster_adjust_perl_module_Makefile_PL(tmp_path: Path):
-    up.perl5 = 'echo perl5'
+    g.perl5 = 'echo perl5'
-    up.libdir = '/libdir'
+    g.libdir = '/libdir'
-    up.verbose = True
+    g.verbose = True
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.adjust_perl_module_Makefile_PL()
     assert str_vars(adjuster.build_vars) == []
-    assert up.err.written() == [
+    assert g.err.written() == [
         f'url2pkg: reading dependencies: cd \'{tmp_path}\' && env {{}} \'echo perl5 -I/libdir -I. Makefile.PL\'',
         'url2pkg: unknown dependency line: \'perl5 -I/libdir -I. Makefile.PL\''
+    ]
 def test_Adjuster_adjust_perl_module_homepage():
-    adjuster = Adjuster(up, 'https://example.org/Perl-Module-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/Perl-Module-1.0.tar.gz', Lines())
     adjuster.makefile_lines.add_vars(
         Var('DISTNAME', '=', 'Perl-Module-1.0.tar.gz'),
         Var('MASTER_SITES', '=', '${MASTER_SITE_PERL_CPAN:=subdir/}'),
         Var('HOMEPAGE', '=', 'https://example.org/'),
+    )
     adjuster.adjust_perl_module_homepage()
     assert adjuster.makefile_lines.get('HOMEPAGE') == 'https://metacpan.org/pod/Perl::Module'
 def test_Adjuster_adjust_perl_module__Build_PL(tmp_path: Path):
-    up.perl5 = 'echo perl5'
+    g.perl5 = 'echo perl5'
-    up.pkgdir = tmp_path  # for removing the PLIST
+    g.pkgdir = tmp_path  # for removing the PLIST
-    adjuster = Adjuster(up, 'https://example.org/Perl-Module-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/Perl-Module-1.0.tar.gz', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.makefile_lines.add_vars(
         Var('DISTNAME', '=', 'Perl-Module-1.0.tar.gz'),
         Var('MASTER_SITES', '=', '${MASTER_SITE_PERL_CPAN:=subdir/}'),
         Var('HOMEPAGE', '=', 'https://example.org/'),
+    )
     adjuster.makefile_lines.add('# url2pkg-marker')
     (tmp_path / 'Build.PL').touch()
     (tmp_path / 'PLIST').touch()
     adjuster.adjust_perl_module()
     assert detab(adjuster.generate_lines()) == [
 @@ -1030,187 +1030,187 @@ def test_Adjuster_adjust_perl_module__Bu
         'HOMEPAGE=       https://metacpan.org/pod/Perl::Module',
         '',
         'PERL5_MODULE_TYPE=      Module::Build',
         'PERL5_PACKLIST=         auto/Perl/Module/.packlist',
         '',
         '.include "../../lang/perl5/module.mk"',
+    ]
     assert not (tmp_path / 'PLIST').exists()
 def test_Adjuster_adjust_perl_module__Makefile_PL_without_PLIST(tmp_path: Path):
     # For code coverage, when PLIST cannot be unlinked.
-    up.perl5 = 'echo perl5'
+    g.perl5 = 'echo perl5'
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
-    adjuster = Adjuster(up, 'https://example.org/Mod-1.0.tar.gz', Lines())
+    adjuster = Adjuster(g, 'https://example.org/Mod-1.0.tar.gz', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.makefile_lines.add_vars(
         Var('DISTNAME', '=', 'Mod-1.0.tar.gz'),
         Var('MASTER_SITES', '=', '${MASTER_SITE_PERL_CPAN:=subdir/}'),
         Var('HOMEPAGE', '=', 'https://example.org/'),
+    )
     adjuster.makefile_lines.add('# url2pkg-marker')
     (tmp_path / 'Makefile.PL').touch()
     adjuster.adjust_perl_module()
     assert not (tmp_path / 'PLIST').exists()
 def test_Adjuster_adjust_python_module(tmp_path: Path):
     url = 'https://example.org/Mod-1.0.tar.gz'
-    up.pythonbin = 'echo python'
+    g.pythonbin = 'echo python'
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
-    adjuster = Adjuster(up, url, Lines())
+    adjuster = Adjuster(g, url, Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.makefile_lines = Generator(url).generate_Makefile()
     (tmp_path / 'setup.py').touch()
     adjuster.adjust_python_module()
     assert detab(adjuster.generate_lines()) == [
         mkcvsid,
         '',
         'DISTNAME=       Mod-1.0',
         'PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}',
         'CATEGORIES=     pkgtools python',
         'MASTER_SITES=   https://example.org/',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
         'HOMEPAGE=       https://example.org/',
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       # TODO: (see mk/license.mk)',
         '',
         '.include "../../lang/python/egg.mk"',
         '.include "../../mk/bsd.pkg.mk"',
+    ]
 def test_Adjuster_adjust_po__not_found():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.adjust_po()
     assert adjuster.build_vars == []
 def test_Adjuster_adjust_po__mo_found():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['share/locale/de.mo']
     adjuster.adjust_po()
     assert str_vars(adjuster.build_vars) == ['USE_PKGLOCALEDIR=yes']
 def test_Adjuster_adjust_po__po_found():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['po/de.po']
     adjuster.adjust_po()
     assert str_vars(adjuster.build_vars) == ['USE_PKGLOCALEDIR=yes']
 def test_Adjuster_adjust_use_languages__none():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.adjust_use_languages()
     assert str_vars(adjuster.build_vars) == ['USE_LANGUAGES=# none']
 def test_Adjuster_adjust_use_languages__c():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['main.c']
     adjuster.adjust_use_languages()
     assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_adjust_use_languages__c_in_subdir():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['subdir/main.c']
     adjuster.adjust_use_languages()
     assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_adjust_use_languages__cplusplus_in_subdir():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['subdir/main.cpp']
     adjuster.adjust_use_languages()
     assert str_vars(adjuster.build_vars) == ['USE_LANGUAGES=c++']
 def test_Adjuster_adjust_use_languages__cplusplus_and_fortran():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['subdir/main.cpp', 'main.f']
     adjuster.adjust_use_languages()
     assert str_vars(adjuster.build_vars) == ['USE_LANGUAGES=c++ fortran']
 def test_Adjuster_adjust_pkg_config__none():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.adjust_pkg_config()
     assert str_vars(adjuster.build_vars) == []
     assert str_vars(adjuster.extra_vars) == []
 def test_Adjuster_adjust_pkg_config__pc_in():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['library.pc.in']
     adjuster.adjust_pkg_config()
     assert str_vars(adjuster.build_vars) == ['USE_TOOLS+=pkg-config']
     assert str_vars(adjuster.extra_vars) == ['PKGCONFIG_OVERRIDE+=library.pc.in']
 def test_Adjuster_adjust_pkg_config__uninstalled_pc_in():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = ['library-uninstalled.pc.in']
     adjuster.adjust_pkg_config()
     assert str_vars(adjuster.build_vars) == []
     assert str_vars(adjuster.extra_vars) == []
 def test_Adjuster_adjust_pkg_config__both():
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.wrksrc_files = [
         'library.pc.in',
         'library-uninstalled.pc.in',
+    ]
     adjuster.adjust_pkg_config()
     assert str_vars(adjuster.build_vars) == ['USE_TOOLS+=pkg-config']
     assert str_vars(adjuster.extra_vars) == ['PKGCONFIG_OVERRIDE+=library.pc.in']
 def test_Adjuster_generate_lines():
     url = 'https://dummy.example.org/package-1.0.tar.gz'
-    adjuster = Adjuster(up, url, Lines())
+    adjuster = Adjuster(g, url, Lines())
     adjuster.makefile_lines = Generator(url).generate_Makefile()
     adjuster.update_vars['HOMEPAGE'] = 'https://example.org/'
     adjuster.update_vars['#LICENSE'] = 'BSD # TODO: too unspecific'
     adjuster.depends.append('dependency>=0:../../category/dependency')
     adjuster.todos.append('Run pkglint')
     lines = adjuster.generate_lines()
     assert detab(lines) == [
         mkcvsid,
         '',
         'DISTNAME=       package-1.0',
         'CATEGORIES=     pkgtools',
 @@ -1220,126 +1220,126 @@ def test_Adjuster_generate_lines():
         'HOMEPAGE=       https://example.org/',
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       BSD # TODO: too unspecific',
         '',
         '# TODO: Run pkglint',
         '',
         'DEPENDS+=       dependency>=0:../../category/dependency',
         '',
         '.include "../../mk/bsd.pkg.mk"',
+    ]
 def test_Adjuster_determine_wrksrc__no_files(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrkdir = tmp_path
     adjuster.determine_wrksrc()
     assert adjuster.abs_wrksrc == adjuster.abs_wrkdir
 def test_Adjuster_determine_wrksrc__single_dir(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrkdir = tmp_path
     (tmp_path / 'subdir').mkdir()
     adjuster.determine_wrksrc()
     assert adjuster.abs_wrksrc == adjuster.abs_wrkdir / 'subdir'
 def test_Adjuster_determine_wrksrc__distname_dir(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrkdir = tmp_path
     adjuster.makefile_lines.add_vars(Var('DISTNAME', '=', 'distname-1.0'))
     (tmp_path / 'distname-1.0').mkdir()
     adjuster.determine_wrksrc()
     assert adjuster.abs_wrksrc == adjuster.abs_wrkdir / 'distname-1.0'
     assert str_vars(adjuster.build_vars) == []
 def test_Adjuster_determine_wrksrc__several_dirs(tmp_path: Path):
-    adjuster = Adjuster(up, '', Lines())
+    adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrkdir = 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} # TODO: one of subdir1 subdir2, or leave it as-is',
+    ]
 def test_Adjuster_adjust__empty_wrkdir(tmp_path: Path):
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
-    up.show_var = lambda varname: {'WRKDIR': str(tmp_path)}[varname]
+    g.show_var = lambda varname: {'WRKDIR': str(tmp_path)}[varname]
-    adjuster = Adjuster(up, 'https://example.org/distfile-1.0.zip', Lines())
+    adjuster = Adjuster(g, 'https://example.org/distfile-1.0.zip', Lines())
     (tmp_path / 'Makefile').write_text('# url2pkg-marker\n')
     adjuster.adjust()
     assert detab(adjuster.generate_lines()) == [
         'WRKSRC=         ${WRKDIR}',
         'USE_LANGUAGES=  # none',
         '',
+    ]
 def test_Adjuster_adjust__files_in_wrksrc(tmp_path: Path):
     wrkdir = tmp_path / 'work'
     wrkdir.mkdir()
     (wrkdir / '.hidden').touch()
     (wrkdir / 'file').touch()
     (wrkdir / 'dir').mkdir()
     (wrkdir / 'dir' / '.hidden-dir').mkdir()
     (wrkdir / 'dir' / 'subdir').mkdir()
     (wrkdir / 'dir' / 'subdir' / '.hidden').touch()
     (wrkdir / 'dir' / 'subdir' / 'file').touch()
     (wrkdir / 'dir2').mkdir()  # to make WRKSRC = WRKDIR
-    up.show_var = lambda varname: {'WRKDIR': str(wrkdir)}[varname]
+    g.show_var = lambda varname: {'WRKDIR': str(wrkdir)}[varname]
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
     (tmp_path / 'Makefile').write_text('# url2pkg-marker\n')
-    adjuster = Adjuster(up, 'https://example.org/distfile-1.0.zip', Lines())
+    adjuster = Adjuster(g, 'https://example.org/distfile-1.0.zip', Lines())
     adjuster.adjust()
     assert adjuster.wrksrc_dirs == [
         'dir',
         'dir/.hidden-dir',
         'dir/subdir',
         'dir2',
+    ]
     assert adjuster.wrksrc_files == [
         'dir/subdir/.hidden',
         'dir/subdir/file',
         'file',
+    ]
 def test_Adjuster_adjust_lines_python_module(tmp_path: Path):
     url = 'https://github.com/espressif/esptool/archive/v2.7.tar.gz'
-    up.pkgdir = tmp_path
+    g.pkgdir = tmp_path
-    up.make = 'true'  # the shell command
+    g.make = 'true'  # the shell command
-    up.verbose = True
+    g.verbose = True
     initial_lines = Generator(url).generate_Makefile()
     initial_lines.append('CATEGORIES', 'python')
-    adjuster = Adjuster(up, url, initial_lines)
+    adjuster = Adjuster(g, url, initial_lines)
     adjuster.makefile_lines = Lines(*initial_lines.lines)
-    (up.pkgdir / 'Makefile').touch()
+    (g.pkgdir / 'Makefile').touch()
     assert detab(adjuster.makefile_lines) == [
         mkcvsid,
         '',
         'GITHUB_PROJECT= esptool',
         'GITHUB_TAG=     v2.7',
         'DISTNAME=       v2.7',
         'PKGNAME=        ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}',
         'CATEGORIES=     pkgtools python',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=espressif/}',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
 @@ -1361,91 +1361,91 @@ def test_Adjuster_adjust_lines_python_mo
         'CATEGORIES=     pkgtools python',
         'MASTER_SITES=   ${MASTER_SITE_PYPI:=e/esptool/}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
         'HOMEPAGE=       https://github.com/espressif/esptool/',
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       # TODO: (see mk/license.mk)',
         '',
         '# url2pkg-marker (please do not remove this line.)',
         '.include "../../mk/bsd.pkg.mk"',
+    ]
     try_mk = tmp_path / 'try-pypi.mk'
-    assert up.err.written() == [
+    assert g.err.written() == [
         f"url2pkg: running ['true', '-f', '{try_mk}', 'distinfo'] to try PyPI",
+    ]
 def test_Adjuster_adjust_lines_python_module__edited():
     # When the package developer has edited the Makefile, it's unclear
     # what has changed. To not damage anything, let the package
     # developer migrate manually.
     url = 'https://github.com/espressif/esptool/archive/v2.7.tar.gz'
     initial_lines = Generator(url).generate_Makefile()
     initial_lines.append('CATEGORIES', 'python')
-    adjuster = Adjuster(up, url, initial_lines)
+    adjuster = Adjuster(g, url, initial_lines)
     adjuster.makefile_lines = Lines(*initial_lines.lines)
     initial_lines.add('')  # to make the lines different
     lines = adjuster.generate_lines()
     assert lines.get('GITHUB_PROJECT') == 'esptool'
     adjuster.adjust_lines_python_module(lines)
     assert lines.get('GITHUB_PROJECT') == 'esptool'
     assert lines.index('TODO: Migrate MASTER_SITES to MASTER_SITE_PYPI') == 14
 def test_main__wrong_dir(tmp_path):
     os.chdir(tmp_path)
     error = r'url2pkg: must be run from a package directory'
     with pytest.raises(SystemExit, match=error):
-        main(['url2pkg'], up)
+        main(['url2pkg'], g)
 def test_main__unknown_option():
     with pytest.raises(SystemExit, match=r'usage:'):
-        main(['url2pkg', '--unknown'], up)
+        main(['url2pkg', '--unknown'], g)
 def test_main__verbose():
     with pytest.raises(SystemExit, match=r'url2pkg: invalid URL: broken URL'):
-        main(['url2pkg', '--verbose', 'broken URL'], up)
+        main(['url2pkg', '--verbose', 'broken URL'], g)
 def test_main__valid_URL():
     import shutil
-    up.editor = 'true'
+    g.editor = 'true'
-    up.make = os.getenv('MAKE') or sys.exit('MAKE must be set')
+    g.make = os.getenv('MAKE') or sys.exit('MAKE must be set')
-    up.pkgdir = up.pkgsrcdir / 'pkgtools' / 'url2pkg-test-main'
+    g.pkgdir = g.pkgsrcdir / 'pkgtools' / 'url2pkg-test-main'
-    up.pkgdir.is_dir() and shutil.rmtree(up.pkgdir)
+    g.pkgdir.is_dir() and shutil.rmtree(g.pkgdir)
     try:
-        up.pkgdir.mkdir()
+        g.pkgdir.mkdir()
     except OSError:
         return  # skip if the directory is not writable
-    os.chdir(up.pkgdir)
+    os.chdir(g.pkgdir)
-    main(['url2pkg', '-v', 'https://github.com/rillig/checkperms/archive/v1.12.tar.gz'], up)
+    main(['url2pkg', '-v', 'https://github.com/rillig/checkperms/archive/v1.12.tar.gz'], g)
-    assert up.out.written() == [
+    assert g.out.written() == [
         '',
         'Remember to run pkglint when you\'re done.',
         'See ../../doc/pkgsrc.txt to get some help.',
         '',
+    ]
-    assert up.err.written() == [
+    assert g.err.written() == [
-        f'url2pkg: running bmake (\'clean\', \'distinfo\', \'extract\') in \'{up.pkgdir}\'',
+        f'url2pkg: running bmake (\'clean\', \'distinfo\', \'extract\') in \'{g.pkgdir}\'',
         'url2pkg: Adjusting the Makefile',
+    ]
-    up.verbose = False
+    g.verbose = False
-    up.bmake('clean')  # remove the work directory
+    g.bmake('clean')  # remove the work directory
     expected_files = ['DESCR', 'Makefile', 'PLIST', 'distinfo']
-    assert sorted([f.name for f in up.pkgdir.glob("*")]) == expected_files
+    assert sorted([f.name for f in g.pkgdir.glob("*")]) == expected_files
-    shutil.rmtree(up.pkgdir)
+    shutil.rmtree(g.pkgdir)