 @@ -1,807 +1,822 @@
 #! @PERL5@
-# $NetBSD: url2pkg.pl,v 1.64 2019/09/09 08:08:02 maya Exp $
+# $NetBSD: url2pkg.pl,v 1.65 2019/09/11 05:25:55 rillig Exp $
+#
 # Copyright (c) 2010 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
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 use feature qw{ switch };
 use strict;
 use warnings;
+#
 # Build-time Configuration.
+#
 my $make		= "@MAKE@";
 my $libdir		= "@LIBDIR@";
 my $pythonbin		= "@PYTHONBIN@";
 use constant true	=> 1;
 use constant false	=> 0;
+#
 # Some helper subroutines.
+#
 sub run_editor($$) {
 	my ($fname, $lineno) = @_;
 	my $editor = $ENV{"PKGEDITOR"} || $ENV{"EDITOR"} || "vi";
 	my @args;
 	push(@args, $editor);
 	push(@args, "+$lineno") if $editor =~ qr"(^|/)(mcedit|nano|pico|vi|vim)$";
 	push(@args, $fname);
 	system { $args[0] } (@args);
+}
 sub get_maintainer() {
 	return $ENV{"PKGMAINTAINER"} || $ENV{"REPLYTO"} || "INSERT_YOUR_MAIL_ADDRESS_HERE";
+}
 sub var($$$) {
 	my ($name, $op, $value) = @_;
 	return [$name, $op, $value];
+}
 sub read_lines($) {
 	my ($filename) = @_;
 	my @lines;
 	open(F, "<", $filename) or return @lines;
 	while (defined(my $line = <F>)) {
 		chomp($line);
 		push(@lines, $line);
+	}
 	close(F) or die;
 	return @lines;
+}
 sub write_lines($@) {
 	my ($filename, @lines) = @_;
 	open(F, ">", "$filename.tmp") or die;
 	foreach my $line (@lines) {
 		print F "$line\n";
+	}
 	close(F) or die;
 	rename("$filename.tmp", $filename) or die;
+}
 sub find_package($) {
 	my ($pkgbase) = @_;
 	my @candidates = <../../*/$pkgbase>;
 	return scalar(@candidates) == 1 ? $candidates[0] : "";
+}
 # appends the given variable assignments to the lines, aligning the
 # variable values vertically.
 sub lines_add_vars($$) {
 	my ($lines, $vars) = @_;
 	return if scalar(@$vars) == 0;
 	my $width = 0;
 	foreach my $var (@$vars) {
 		my ($name, $op, $value) = @$var;
 		next if $value eq "";
 		my $len = (length("$name$op\t") + 7) & -8;
 		$width = ($len > $width) ? $len : $width;
+	}
 	foreach my $var (@$vars) {
 		my ($name, $op, $value) = @$var;
 		next if $value eq "";
 		my $tabs = "\t" x (($width - length("$name$op") + 7) / 8);
 		push(@$lines, "$name$op$tabs$value");
+	}
 	push(@$lines, "");
+}
 # changes the value of an existing variable in the lines.
 sub lines_set($$$) {
 	my ($lines, $varname, $new_value) = @_;
 	my $i = 0;
 	foreach my $line (@$lines) {
 		if ($line =~ qr"^\Q$varname\E(\+?=)([ \t]+)([^#\\]*?)(\s*)(#.*|)$") {
 			my ($op, $indent, $old_value, $space_after_value, $comment) = ($1, $2, $3, $4, $5);
 			$lines->[$i] = "$varname$op$indent$new_value$space_after_value$comment";
 			return true;
+		}
 		$i++;
+	}
 	return false;
+}
 # appends to the value of an existing variable in the lines.
 sub lines_append($$$) {
 	my ($lines, $varname, $value) = @_;
 	return if $value eq "";
 	my $i = 0;
 	foreach my $line (@$lines) {
 		if ($line =~ qr"^\Q$varname\E(\+?=)([ \t]+)([^#\\]*)(#.*|)$") {
 			my ($op, $indent, $old_value, $comment) = ($1, $2, $3, $4);
 			my $before = $old_value =~ qr"\S$" ? " " : "";
 			my $after = $comment eq "" ? "" : " ";
 			$lines->[$i] = "$varname$op$indent$old_value$before$value$after$comment";
 			return true;
+		}
 		$i++;
+	}
 	return false;
+}
 # removes a variable assignment from the lines.
 sub lines_remove($$) {
 	my ($lines, $varname) = @_;
 	my $i = 0;
 	foreach my $line (@$lines) {
 		if ($line =~ qr"^\Q$varname\E(\+?=)") {
 			splice(@$lines, $i, 1);
 			return true;
+		}
 		$i++;
+	}
 	return false;
+}
 # removes a variable assignment from the lines if its value is the
 # expected one.
 sub lines_remove_if($$$) {
 	my ($lines, $varname, $expected_value) = @_;
 	my $i = 0;
 	foreach my $line (@$lines) {
 		if ($line =~ qr"^\Q$varname\E(\+?=)([ \t]+)([^#\\]*?)(\s*)(#.*|)$") {
 			my ($op, $indent, $old_value, $space_after_value, $comment) = ($1, $2, $3, $4, $5);
 			if ($old_value eq $expected_value) {
 				splice(@$lines, $i, 1);
 				return true;
+			}
+		}
 		$i++;
+	}
 	return false;
+}
 sub make(@) {
 	my @args = @_;
 	(system { $make } ($make, @args)) == 0 or die;
+}
 # The following adjust_* subroutines are called after the distfiles have
 # been downloaded and extracted. They inspect the extracted files
 # and adjust the variable definitions in the package Makefile.
+#
 # The following variables may be used in the adjust_* subroutines:
+#
 # the package name, including the version number.
 my $distname;
 # the absolute pathname to the working directory, containing
 # the extracted distfiles.
 my $abs_wrkdir;
 # the absolute pathname to a subdirectory of $abs_wrkdir, typically
 # containing package-provided Makefiles or configure scripts.
 my $abs_wrksrc;
 my @wrksrc_files;
 my @wrksrc_dirs;
 # the regular files and directories relative to abs_wrksrc.
+#
 # The following variables may be set by the adjust_* subroutines and
 # will later appear in the package Makefile:
+#
 # categories for the package, in addition to the usual
 # parent directory.
 my @categories;
 # the dependencies of the package, in the form
 # "package>=version:../../category/package".
 my @depends;
 my @build_depends;
 my @test_depends;
 # .include, interleaved with BUILDLINK3_API_DEPENDS.
 # These lines are added at the bottom of the Makefile.
 my @bl3_lines;
 # a list of pathnames relative to the package path.
 # All these files will be included at the bottom of the Makefile.
 my @includes;
 # a list of variable assignments that will make up the fourth
 # paragraph of the package Makefile, where the build configuration
 # takes place.
 my @build_vars;
 # similar to the @build_vars, but separated by an empty line in
 # the Makefile, thereby forming the fifth paragraph.
 my @extra_vars;
 # these are inserted below the second paragraph in the Makefile.
 my @todos;
 # the package name, in case it differs from $distname.
 my $pkgname = "";
 my $regenerate_distinfo = false;
 # Example:
 # add_dependency("DEPENDS", "package", ">=1", "../../category/package");
+#
 sub add_dependency($$$$) {
 	my ($type, $pkgbase, $constraint, $dep_dir) = @_;
 	if ($dep_dir ne "" && -f "$dep_dir/buildlink3.mk") {
 		# TODO: add type to bl3_lines (BUILDLINK_DEPENDS)
 		# TODO: add constraint to bl3_lines (BUILDLINK_API_DEPENDS)
 		push(@bl3_lines, ".include \"$dep_dir/buildlink3.mk\"");
 		return;
+	}
 	my $value = $dep_dir ne "" && -f "$dep_dir/Makefile"
 		? "$pkgbase$constraint:$dep_dir"
 		: "# TODO: $pkgbase$constraint";
 	if ($type eq "DEPENDS") {
 		push(@depends, $value);
 	} elsif ($type eq "BUILD_DEPENDS") {
 		push(@build_depends, $value);
 	} elsif ($type eq "TEST_DEPENDS") {
 		push(@test_depends, $value);
 	} else {
 		push(@todos, "dependency $type $value");
+	}
+}
 sub adjust_configure() {
 	my $gnu_configure = false;
 	open(CONF, "<", "$abs_wrksrc/configure") or return;
 	while (defined(my $line = <CONF>)) {
 		if ($line =~ qr"autoconf|Free Software Foundation"i) {
 			$gnu_configure = true;
 			last;
+		}
+	}
 	close(CONF);
 	my $varname = ($gnu_configure ? "GNU_CONFIGURE" : "HAS_CONFIGURE");
 	push(@build_vars, var($varname, "=", "yes"));
+}
 sub adjust_cmake() {
 	if (-f "$abs_wrksrc/CMakeLists.txt") {
 		push(@build_vars, var("USE_CMAKE", "=", "yes"));
+	}
+}
 sub adjust_meson() {
 	if (-f "$abs_wrksrc/meson.build") {
 		push(@includes, "../../devel/py-meson/build.mk");
+	}
+}
 sub adjust_gconf2_schemas() {
 	my @gconf2_files = grep(/schemas(?:\.in.*)$/, @wrksrc_files);
 	if (@gconf2_files) {
 		foreach my $f (@gconf2_files) {
 			if ($f =~ qr"(.*schemas)") {
 				push(@extra_vars, var("GCONF_SCHEMAS", "+=", $1));
+			}
+		}
 		push(@includes, "../../devel/GConf/schemas.mk");
+	}
+}
 sub adjust_libtool() {
 	if (-f "$abs_wrksrc/ltconfig" || -f "$abs_wrksrc/ltmain.sh") {
 		push(@build_vars, var("USE_LIBTOOL", "=", "yes"));
+	}
 	if (-d "$abs_wrksrc/libltdl") {
 		push(@includes, "../../devel/libltdl/convenience.mk");
+	}
+}
 sub adjust_perl_module() {
 	if (-f "$abs_wrksrc/Build.PL") {
 		# Example packages:
 		# devel/p5-Algorithm-CheckDigits
 		# It's a Module::Build module. Dependencies cannot yet be
 		# extracted automatically.
+		#
 		# TODO: Implement this similarly to the Makefile.PL mock below.
 		push(@todos, "Look for the dependencies in Build.PL.");
 		push(@build_vars, var("PERL5_MODULE_TYPE", "=", "Module::Build"));
 	} elsif (-f "$abs_wrksrc/Makefile.PL") {
 		# 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.
 		system("cd '$abs_wrksrc' && perl -I. Makefile.PL < /dev/null") or do {};
 		open(DEPS, "cd '$abs_wrksrc' && perl -I$libdir -I. Makefile.PL |") or die;
 		while (defined(my $dep = <DEPS>)) {
 			chomp($dep);
 			if ($dep =~ qr"^(\w+)\t(\S+)(>\S+|):(\.\./\.\./\S+)$") {
 				add_dependency($1, $2, $3, $4);
+			}
+		}
 		close(DEPS) or die;
 	} else {
 		return;
+	}
 	my $packlist = $distname =~ s/-[0-9].*//r =~ s/-/\//gr;
 	push(@build_vars, var("PERL5_PACKLIST", "=", "auto/$packlist/.packlist"));
 	push(@includes, "../../lang/perl5/module.mk");
 	$pkgname = "p5-\${DISTNAME}";
 	push(@categories, "perl5");
 	unlink("PLIST") or do {};
+}
 # Example packages:
+#
 # devel/py-ZopeComponent (dependencies, test dependencies)
 sub adjust_python_module() {
 	return unless -f "$abs_wrksrc/setup.py";
 	my %old_env = %ENV;
 	$ENV{"PYTHONDONTWRITEBYTECODE"} = "x";
 	$ENV{"PYTHONPATH"} = $libdir;
 	my @dep_lines;
 	open(DEPS, "cd '$abs_wrksrc' && $pythonbin setup.py build |") or die;
 	%ENV = %old_env;
 	while (defined(my $line = <DEPS>)) {
 		chomp($line);
 		if ($line =~ qr"^(\w+)\t(\S+?)(>=.*|)$") {
 			push(@dep_lines, [$1, $2, $3]);
+		}
+	}
 	close(DEPS) or die;
 	foreach my $dep_line (@dep_lines) {
 		my ($type, $pkgbase, $constraint) = @$dep_line;
 		my $dep_dir = find_package("py-$pkgbase");
 		if ($dep_dir ne "") {
 			$pkgbase = "py-$pkgbase";
 		} else {
 			$dep_dir = find_package($pkgbase);
+		}
 		add_dependency($type, $pkgbase, $constraint, $dep_dir);
+	}
 	push(@categories, "python");
 	push(@includes, "../../lang/python/egg.mk");
+}
 sub adjust_cargo() {
 	open(CONF, "<", "$abs_wrksrc/Cargo.lock") or return;
 	while (defined(my $line = <CONF>)) {
 		# "checksum cargo-package-name cargo-package-version
 		if ($line =~ qr"^\"checksum\s(\S+)\s(\S+)") {
 			push(@build_vars, var("CARGO_CRATE_DEPENDS", "+=", "$1-$2"));
+		}
+	}
 	close(CONF);
 	push(@includes, "../../lang/rust/cargo.mk");
+}
 sub adjust_pkg_config() {
 	my @pkg_config_files = grep { /\.pc\.in$/ && ! /-uninstalled\.pc\.in$/ } @wrksrc_files;
 	if (@pkg_config_files) {
 		push(@build_vars, var("USE_TOOLS", "+=", "pkg-config"));
+	}
 	foreach my $f (@pkg_config_files) {
 		push(@extra_vars, var("PKGCONFIG_OVERRIDE", "+=", $f));
+	}
+}
 sub adjust_po() {
 	if (grep(/\.g?mo$/, @wrksrc_files)) {
 		push(@build_vars, var("USE_PKGLOCALEDIR", "=", "yes"));
+	}
+}
 sub adjust_use_languages() {
 	my @languages;
 	grep(/\.(c|xs)$/, @wrksrc_files) and push(@languages, "c");
 	grep(/\.(cpp|c\+\+|cxx|cc|C)$/, @wrksrc_files) and push(@languages, "c++");
 	grep(/\.f$/, @wrksrc_files) and push(@languages, "fortran");
 	my $use_languages = join(" ", @languages);
 	if ($use_languages eq "") {
 		$use_languages = "# none";
+	}
 	if ($use_languages ne "c") {
 		push(@build_vars, var("USE_LANGUAGES", "=", $use_languages));
+	}
+}
+#
 # Subroutines for generating the initial package and adjusting it after
 # the distfiles have been extracted.
+#
 sub generate_initial_package_Makefile_lines($) {
 	my ($url) = @_;
 	my $master_site = "";
 	my $master_sites = "";
 	my $distfile = "";
 	my $homepage = "";
 	my $extract_sufx = "";
 	my $categories = "";
 	my $github_project = "";
 	my $github_release = "";
 	my $dist_subdir = "";
 	open(SITES, "<", "../../mk/fetch/sites.mk") or die;
 	while (defined(my $line = <SITES>)) {
 		chomp($line);
 		if ($line =~ qr"^(MASTER_SITE_.*)\+=") {
 			$master_site = $1;
 		} elsif ($line =~ qr"^\t(.*?)(?:\s+\\)?$") {
 			my ($site) = ($1);
 			if (index($url, $site) == 0) {
 				if ($url =~ qr"^\Q$site\E(.+)/([^/]+)$") {
 					my $subdir = $1;
 					$distfile = $2;
 					$master_sites = "\${$master_site:=$subdir/}";
 					if ($master_site eq "MASTER_SITE_SOURCEFORGE") {
 						$homepage = "http://$subdir.sourceforge.net/";
 					} elsif ($master_site eq "MASTER_SITE_GNU") {
 						$homepage = "http://www.gnu.org/software/$subdir/";
 					} else {
 						$homepage = substr($url, 0, -length($distfile));
+					}
 				} else {
 					$master_sites = "\${$master_site}";
+				}
+			}
+		}
+	}
 	close(SITES) or die;
 	if ($url =~ qr"^https://downloads\.sourceforge\.net/project/([^/?]+)/[^?]+/([^/?]+)(?:[?].*)?$") {
 		my ($project, $filename) = ($1, $2);
 		$master_sites = "\${MASTER_SITE_SOURCEFORGE:=$project/}";
 		$homepage = "https://$project.sourceforge.net/";
 		$distfile = $filename;
+	}
 	if ($url =~ qr"^https://github\.com/") {
 		if ($url =~ qr"^https://github\.com/(.*)/(.*)/archive/(.*)(\.tar\.gz|\.zip)$") {
 			my ($org, $proj, $tag, $ext) = ($1, $2, $3, $4);
 			$master_sites = "\${MASTER_SITE_GITHUB:=$org/}";
 			$homepage = "https://github.com/$org/$proj/";
 			$github_project = $proj;
 			if (index($tag, $github_project) == -1) {
 				$pkgname = "\${GITHUB_PROJECT}-\${DISTNAME}";
 				$dist_subdir = "\${GITHUB_PROJECT}";
+			}
 			$distfile = "$tag$ext";
 		} elsif ($url =~ qr"^https://github\.com/(.*)/(.*)/releases/download/(.*)/(.*)(\.tar\.gz|\.zip)$") {
 			my ($org, $proj, $tag, $base, $ext) = ($1, $2, $3, $4, $5);
 			$master_sites = "\${MASTER_SITE_GITHUB:=$org/}";
 			$homepage = "https://github.com/$org/$proj/";
 			if (index($base, $proj) == -1) {
 				$github_project = $proj;
 				$dist_subdir = "\${GITHUB_PROJECT}";
+			}
 			$github_release = $tag eq $base ? "\${DISTNAME}" : $tag;
 			$distfile = "$base$ext";
 		} else {
 			print("$0: ERROR: Invalid GitHub URL: $url, handling as normal URL\n");
+		}
+	}
 	if ($master_sites eq "") {
 		if ($url =~ qr"^(.*/)(.*)$") {
 			$master_sites = $1;
 			$distfile = $2;
 			$homepage = $master_sites;
 		} else {
 			die("$0: ERROR: Invalid URL: $url\n");
+		}
+	}
 	if ($distfile =~ qr"^(.*?)((?:\.tar)?\.\w+)$") {
 		$distname = $1;
 		$extract_sufx = $2;
 	} else {
 		$distname = $distfile;
 		$extract_sufx = "# none";
+	}
 	`pwd` =~ qr".*/([^/]+)/[^/]+$" or die;
 	$categories = $1 eq "wip" ? "# TODO: add primary category" : $1;
 	if ($extract_sufx eq ".tar.gz" || $extract_sufx eq ".gem") {
 		$extract_sufx = "";
+	}
 	my @lines;
 	push(@lines, "# \$" . "NetBSD\$");
 	push(@lines, "");
 	lines_add_vars(\@lines, [
 		var("GITHUB_PROJECT", "=", $github_project),
 		var("DISTNAME", "=", $distname),
 		var("CATEGORIES", "=", $categories),
 		var("MASTER_SITES", "=", $master_sites),
 		var("GITHUB_RELEASE", "=", $github_release),
 		var("EXTRACT_SUFX", "=", $extract_sufx),
 		var("DIST_SUBDIR", "=", $dist_subdir),
 	]);
 	lines_add_vars(\@lines, [
 		var("MAINTAINER", "=", get_maintainer()),
 		var("HOMEPAGE", "=", $homepage),
 		var("COMMENT", "=", "TODO: Short description of the package"),
 		var("#LICENSE", "=", "# TODO: (see mk/license.mk)"),
 	]);
 	push(@lines, "# url2pkg-marker (please do not remove this line.)");
 	push(@lines, ".include \"../../mk/bsd.pkg.mk\"");
 	return @lines;
+}
 sub generate_initial_package($) {
 	my ($url) = @_;
 	rename("Makefile", "Makefile-url2pkg.bak") or do {};
 	write_lines("Makefile", generate_initial_package_Makefile_lines($url));
 	write_lines("PLIST", "\@comment \$" . "NetBSD\$");
 	write_lines("DESCR", ());
 	run_editor("Makefile", 5);
 	make("distinfo");
 	make("extract");
+}
 sub adjust_lines_python_module($$) {
 	my ($lines, $url) = @_;
 	my @initial_lines = generate_initial_package_Makefile_lines($url);
 	my @current_lines = read_lines("Makefile");
 	# don't risk to overwrite any changes made by the package developer.
 	if (join('\n', @current_lines) ne join('\n', @initial_lines)) {
 		splice(@$lines, -2, 0, "# TODO: Migrate MASTER_SITES to PYPI");
 		return;
 	my %old;
 	foreach my $line (@initial_lines) {
 		if ($line =~ qr"^(\w+)(\+?=)([ \t]+)([^#\\]*?)(\s*)(#.*|)$") {
 			my ($varname, $op, $indent, $value, $space_after_value, $comment) = ($1, $2, $3, $4, $5, $6);
 			if ($op eq "=") {
 				$old{$varname} = $value;
+			}
+		}
+	}
 	return unless $old{"CATEGORIES"} =~ qr"python";
 	my $pkgbase = $old{"GITHUB_PROJECT"};
 	return unless defined($pkgbase);
 	my $pkgbase1 = substr($pkgbase, 0, 1);
 	my $pkgversion_norev = $old{"DISTNAME"} =~ s/^v//r;
 	# don't risk to overwrite any changes made by the package developer.
 	if (join('\n', @current_lines) ne join('\n', @initial_lines)) {
 		splice(@$lines, -2, 0, "# TODO: Migrate MASTER_SITES to PYPI");
 		return;
+	}
 	my @lines = @$lines;
 	if (lines_remove(\@lines, "GITHUB_PROJECT")
 		&& lines_set(\@lines, "DISTNAME", "$pkgbase-$pkgversion_norev")
 		&& lines_set(\@lines, "PKGNAME", "\${PYPKGPREFIX}-\${DISTNAME}")
 		&& lines_set(\@lines, "MASTER_SITES", "\${MASTER_SITE_PYPI:=$pkgbase1/$pkgbase/}")
 		&& lines_remove(\@lines, "DIST_SUBDIR")
 		&& (lines_remove_if(\@lines, "EXTRACT_SUFX", ".zip") || true)) {
 		@$lines = @lines;
 		$regenerate_distinfo = true
+	}
+}
 sub adjust_package_from_extracted_distfiles($)
+{
 	my ($url) = @_;
 	chomp($abs_wrkdir = `$make show-var VARNAME=WRKDIR`);
+	#
 	# Determine the value of WRKSRC.
+	#
 	my @files = ();
 	opendir(WRKDIR, $abs_wrkdir) or die;
 	while (defined(my $f = readdir(WRKDIR))) {
 		no if $] >= 5.018, warnings => "experimental::smartmatch";
 		given ($f) {
 			next when qr"^\.";
 			next when "pax_global_header";
 			next when "package.xml";
 			next when qr".*\.gemspec";
 			default { push(@files, $f) }
+		}
+	}
 	closedir(WRKDIR);
 	if (@files == 1) {
 		if ($files[0] ne $distname) {
 			push(@build_vars, var("WRKSRC", "=", "\${WRKDIR}/$files[0]"));
+		}
 		$abs_wrksrc = "$abs_wrkdir/$files[0]";
 	} else {
 		push(@build_vars, var("WRKSRC", "=", "\${WRKDIR}" .
 		    ((@files > 1) ? " # More than one possibility -- please check manually." : "")));
 		$abs_wrksrc = $abs_wrkdir;
+	}
 	chomp(@wrksrc_files = `cd "$abs_wrksrc" && find * -type f`);
 	chomp(@wrksrc_dirs = `cd "$abs_wrksrc" && find * -type d`);
 	adjust_configure();
 	adjust_cmake();
 	adjust_meson();
 	adjust_gconf2_schemas();
 	adjust_libtool();
 	adjust_perl_module();
 	adjust_python_module();
 	adjust_cargo();
 	adjust_pkg_config();
 	adjust_po();
 	adjust_use_languages();
 	print("url2pkg> Adjusting the Makefile\n");
 	my $seen_marker = false;
 	my @lines;
 	open(MF1, "<", "Makefile") or die;
 	# Copy the user-edited part of the Makefile.
 	while (defined(my $line = <MF1>)) {
 		chomp($line);
 		if ($line =~ qr"^# url2pkg-marker\b") {
 			$seen_marker = true;
 			last;
+		}
 		push(@lines, $line);
 		if ($pkgname ne "" && $line =~ qr"^DISTNAME=(\t+)") {
 			push(@lines, "PKGNAME=$1$pkgname");
+		}
+	}
 	if (!$seen_marker) {
 		die("$0: ERROR: didn't find the url2pkg marker in the file.\n");
+	}
 	if (@todos) {
 		foreach my $todo (@todos) {
 			push(@lines, "# TODO: $todo");
+		}
 		push(@lines, "");
+	}
 	my @depend_vars;
 	push(@depend_vars, map { var("BUILD_DEPENDS", "+=", $_) } @build_depends);
 	push(@depend_vars, map { var("DEPENDS", "+=", $_) } @depends);
 	push(@depend_vars, map { var("TEST_DEPENDS", "+=", $_) } @test_depends);
 	lines_add_vars(\@lines, \@depend_vars);
 	lines_add_vars(\@lines, \@build_vars);
 	lines_add_vars(\@lines, \@extra_vars);
 	push(@lines, @bl3_lines);
 	push(@lines, map { $_ = ".include \"$_\"" } @includes);
 	# Copy the rest of the user-edited part of the Makefile.
 	while (defined(my $line = <MF1>)) {
 		chomp($line);
 		push(@lines, $line);
+	}
 	close(MF1);
 	lines_append(\@lines, "CATEGORIES", join(" ", @categories));
 	adjust_lines_python_module(\@lines, $url);
 	write_lines("Makefile", @lines);
 	if ($regenerate_distinfo) {
 		make("distinfo");
+	}
+}
 sub main() {
 	my $url;
 	if (!-f "../../mk/bsd.pkg.mk") {
 		die("ERROR: $0 must be run from a package directory (.../pkgsrc/category/package).\n");
+	}
 	my @extract_cookie = <w*/.extract_done>;
 	if (scalar(@extract_cookie) == 0) {
 		if (scalar(@ARGV) == 0) {
 			print("URL: ");
 			if (!defined($url = <STDIN>)) {
 				print("\n");
 				exit(0);
+			}
 			chomp($url);
 		} else {
 			$url = shift(@ARGV);
+		}
 		generate_initial_package($url);
 	} else {
 		chomp($distname = `$make show-var VARNAME=DISTNAME`);
+	}
 	adjust_package_from_extracted_distfiles($url);
 	print("\n");
 	print("Remember to run pkglint when you're done.\n");
 	print("See ../../doc/pkgsrc.txt to get some help.\n");
 	print("\n");
+}
 main() unless caller();

 @@ -1,45 +1,41 @@
-# $NetBSD: Makefile,v 1.96 2019/09/09 08:08:02 maya Exp $
+# $NetBSD: Makefile,v 1.97 2019/09/11 05:25:55 rillig Exp $
-PKGNAME=	url2pkg-2.33
+PKGNAME=	url2pkg-2.34
 CATEGORIES=	pkgtools
 MAINTAINER=	pkgsrc-users@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
 do-extract:
 	${RUN} cd ${FILESDIR} && cp *.* ${WRKSRC}/
 do-test:
 	${RUN} cd ${WRKSRC} && env PKGSRCDIR=${PKGSRCDIR} perl -I. url2pkg.t
 .include "../../mk/bsd.prefs.mk"
 SUBST_CLASSES+=		up
 SUBST_STAGE.up=		do-configure
 SUBST_MESSAGE.up=	Replacing variable placeholders
 SUBST_FILES.up=		url2pkg.pl MakeMaker.pm
 SUBST_VARS.up=		MAKE PERL5 PYTHONBIN
 SUBST_SED.up+=		-e 's,@LIBDIR@,${PREFIX}/lib/url2pkg,g'
-.if defined(BATCH)
+SUBST_SED.up+=		-e 's,@PKGSRCDIR@,${BATCH:D/usr/pkgsrc:U${PKGSRCDIR}},g'
 SUBST_SED.up+=		-e 's,@PKGSRCDIR@,/usr/pkgsrc,g'
 .else
 SUBST_VARS.up+=		PKGSRCDIR
 .endif
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/url2pkg.pl ${DESTDIR}${PREFIX}/bin/url2pkg
 	${INSTALL_MAN} ${FILESDIR}/url2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/MakeMaker.pm ${DESTDIR}${PREFIX}/lib/url2pkg/ExtUtils/
 	${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,15 +1,15 @@
-# $NetBSD: setuptools.py,v 1.1 2019/08/18 11:26:33 rillig Exp $
+# $NetBSD: setuptools.py,v 1.2 2019/09/11 05:25:55 rillig Exp $
 def url2pkg_print_depends(keyword, depends):
-	for dep in depends:
+    for dep in depends:
-		if '>' not in dep:
+        print('%s\t%s%s' % (keyword, dep.replace(' ', ''), '' if '>' in dep else '>=0'))
 			dep = dep + '>=0'
 		print('%s\t%s' % (keyword, dep))
 def setup(**kwargs):
     if 'install_requires' in kwargs:
         url2pkg_print_depends('DEPENDS', kwargs['install_requires'])
-	if 'install_requires' in kwargs:
+    if 'tests_require' in kwargs:
-		url2pkg_print_depends('DEPENDS', kwargs['install_requires'])
+        url2pkg_print_depends('TEST_DEPENDS', kwargs['tests_require'])
-	if 'tests_require' in kwargs:
+def find_packages(where='.', exclude=(), include=('*',)):
-		url2pkg_print_depends('TEST_DEPENDS', kwargs['tests_require'])
+    return []