 @@ -1,15 +1,15 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.26 2019/11/14 20:03:47 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.27 2019/11/18 07:50:51 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
 @@ -37,27 +37,27 @@
 # This happens in two phases. Phase 1 is done by the Generator and generates
 # an initial Makefile, just enough to download the distfile. Phase 2 then
 # takes the generated Makefile and applies various adjustments for different
 # types of packages, such as Perl or Python modules. This is done by the
 # Adjuster class.
 import getopt
 import os
 import re
 import subprocess
 import sys
 from pathlib import Path
-from typing import Any, Callable, Dict, List, NamedTuple, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, NamedTuple, Optional, Set, Tuple, Union
 class Var(NamedTuple):
     """ An abstract variable assignment for the package Makefile. """
     name: str
     op: str
     value: str
 class Varassign(NamedTuple):
     """ A variable assignment including layout information. """
     index: int
     varname: str
 @@ -593,26 +593,29 @@ class Adjuster:
     # "package>=version:../../category/package".
     depends: List[str]
     build_depends: List[str]
     test_depends: List[str]
     # .include, interleaved with BUILDLINK3_API_DEPENDS.
     # These lines are added at the bottom of the Makefile.
     bl3_lines: List[str]
     # a list of pathnames relative to the package directory.
     # All these files will be included at the bottom of the Makefile.
     includes: List[str]
     # the tools for USE_TOOLS. Examples are sed, echo, printf, perl5.
     tools: Set[str]
     # a list of variable assignments that will make up the fourth
     # paragraph of the package Makefile, where the build configuration
     # takes place.
     build_vars: List[Var]
     # similar to the @build_vars, but separated by an empty line in
     # the Makefile, thereby forming the fifth paragraph.
     extra_vars: List[Var]
     # these are inserted below the second paragraph in the Makefile.
     todos: List[str]
     # the package name is based on DISTNAME and modified by
 @@ -632,26 +635,27 @@ class Adjuster:
         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.tools = set()
         self.extra_vars = []
         self.todos = []
         self.pkgname_prefix = ''
         self.pkgname_transform = ''
         self.makefile_lines = Lines()
         self.regenerate_distinfo = False
         self.descr_lines = []
     def add_dependency(self, kind: str, pkgbase: str, constraint: str, dep_dir: str) -> None:
         """ add_dependency('DEPENDS', 'package', '>=1', '../../category/package') """
         self.g.debug('add_dependency: {0} {1} {2} {3}', kind, pkgbase, constraint, dep_dir)
 @@ -807,26 +811,30 @@ class Adjuster:
             return
         configures = self.wrksrc_find(r'(^|/)configure$')
         if configures:
             gnu = any(self.wrksrc_grep(configure, r'\b(Free Software Foundation|autoconf)\b')
                       for configure in configures)
             varname = 'GNU_CONFIGURE' if gnu else 'HAS_CONFIGURE'
             self.build_vars.append(Var(varname, '=', 'yes'))
     def adjust_cmake(self):
         if self.wrksrc_isfile('CMakeLists.txt'):
             self.build_vars.append(Var('USE_CMAKE', '=', 'yes'))
     def adjust_gnu_make(self):
         if self.wrksrc_isfile('Makefile') and self.wrksrc_grep('Makefile', r'^(?:ifeq|ifdef)\b'):
             self.tools.add('gmake')
     def adjust_meson(self):
         if self.wrksrc_isfile('meson.build'):
             self.includes.append('../../devel/meson/build.mk')
     def adjust_gconf2_schemas(self):
         gconf2_files = self.wrksrc_find(r'\.schemas(\.in)*$')
         if gconf2_files:
             self.includes.append('../../devel/GConf/schemas.mk')
         for f in gconf2_files:
             self.extra_vars.append(Var('GCONF_SCHEMAS', '+=', re.sub(r'(\.in)+$', '', f)))
     def adjust_libtool(self):
 @@ -1032,27 +1040,30 @@ class Adjuster:
                 lines.lines.insert(distname_index + 1, pkgname_line)
         if self.todos:
             for todo in self.todos:
                 lines.add('# TODO: ' + todo)
             lines.add('')
         depend_vars = []
         depend_vars.extend(Var('BUILD_DEPENDS', '+=', d) for d in self.build_depends)
         depend_vars.extend(Var('DEPENDS', '+=', d) for d in self.depends)
         depend_vars.extend(Var('TEST_DEPENDS', '+=', d) for d in self.test_depends)
         lines.add_vars(*depend_vars)
-        lines.add_vars(*self.build_vars)
+        build_vars = self.build_vars
         if self.tools:
             build_vars.append(Var('USE_TOOLS', '+=', ' '.join(sorted(self.tools))))
         lines.add_vars(*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)
         return lines
 @@ -1064,26 +1075,27 @@ class Adjuster:
             return list(sorted((f for f in relative if not f.startswith('.'))))
         self.g.debug('Adjusting the Makefile')
         self.makefile_lines = Lines.read_from(self.g.pkgdir / 'Makefile')
         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_descr()
         self.adjust_configure()
         self.adjust_cmake()
         self.adjust_gnu_make()
         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.g.pkgdir / 'Makefile')
         descr = (self.g.pkgdir / 'DESCR')
         descr.is_file() or Lines(*self.descr_lines).write_to(descr)

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.109 2019/11/14 20:03:47 rillig Exp $
+# $NetBSD: Makefile,v 1.110 2019/11/18 07:50:51 rillig Exp $
-PKGNAME=	url2pkg-19.3.6
+PKGNAME=	url2pkg-19.3.7
 CATEGORIES=	pkgtools
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/creating.html
 COMMENT=	Tool to automate initial steps in building a package
 LICENSE=	2-clause-bsd
 WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 USE_TOOLS+=	perl:run
 AUTO_MKDIRS=	yes

 @@ -1,14 +1,14 @@
-# $NetBSD: url2pkg_test.py,v 1.24 2019/10/28 20:17:24 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.25 2019/11/18 07:50:51 rillig Exp $
 import pytest
 from url2pkg import *
 mkcvsid = '# $''NetBSD$'
 g: Globals
 prev_dir = Path.cwd()
 def setup_function(_):
     global g
     g = Globals()
 @@ -879,26 +879,36 @@ def test_Adjuster_add_dependency__buildl
+    ]
 def test_Adjuster_adjust_cmake(tmp_path: Path):
     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_gnu_make(tmp_path: Path):
     adjuster = Adjuster(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     (tmp_path / 'Makefile').write_text('ifdef HAVE_STDIO_H')
     adjuster.adjust_gnu_make()
     assert adjuster.tools == {'gmake'}
 def test_Adjuster_adjust_configure__none(tmp_path: Path):
     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(g, '', Lines())
     adjuster.abs_wrksrc = tmp_path
     adjuster.wrksrc_files.append('configure')