 @@ -1,15 +1,15 @@
 #! @PERL5@
-# $NetBSD: url2pkg.pl,v 1.58 2019/08/18 13:49:13 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.59 2019/08/18 16:09:01 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.
 @@ -84,61 +84,134 @@ sub add_section($$) {
 		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, "");
+}
 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) or die;
+	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] : "";
+}
 sub update_var_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 the given value to the variable assignment.
 sub update_var_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;
+			return true;
+		}
 		$i++;
+	}
 	return false;
+}
 sub update_var_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;
+}
 sub update_var_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;
 @@ -182,26 +255,28 @@ my @includes;
 # 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;
+	}
 @@ -327,26 +402,27 @@ sub adjust_python_module() {
 	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 =~ m/("checksum)\s(\S+)\s(\S+)/) {
 			push(@build_vars, var("CARGO_CRATE_DEPENDS", "=", "$2-$3"));
+		}
+	}
 	close(CONF);
 @@ -520,43 +596,77 @@ sub generate_initial_package_Makefile_li
 	]);
 	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);
-	print ("url2pkg> Running \"make distinfo\" ...\n");
+	make("distinfo");
-	(system { $make } ($make, "distinfo")) == 0 or die;
+	make("extract");
+}
 sub adjust_lines_python_module($$) {
 	my ($lines, $url) = @_;
-	print ("url2pkg> Running \"make extract\" ...\n");
+	my @initial_lines = generate_initial_package_Makefile_lines($url);
-	(system { $make } ($make, "extract")) == 0 or die;
+	my @current_lines = read_lines("Makefile");
 	# don't risk to overwrite any changes 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;
+			}
+		}
+	}
 	my $pkgbase = $old{"GITHUB_PROJECT"};
 	my $pkgbase1 = substr($pkgbase, 0, 1);
 	my $pkgversion_norev = $old{"DISTNAME"} =~ s/^v//r;
 	my @tx_lines = @$lines;
 	if (update_var_remove(\@tx_lines, "GITHUB_PROJECT")
 		&& update_var_set(\@tx_lines, "DISTNAME", "$pkgbase-$pkgversion_norev")
 		&& update_var_set(\@tx_lines, "PKGNAME", "\${PYPKGPREFIX}-\${DISTNAME}")
 		&& update_var_set(\@tx_lines, "MASTER_SITES", "\${MASTER_SITE_PYPI:=$pkgbase1/$pkgbase/}")
 		&& update_var_remove(\@tx_lines, "DIST_SUBDIR")
 		&& (update_var_remove_if(\@tx_lines, "EXTRACT_SUFX", ".zip") || true)) {
 		@$lines = @tx_lines;
 		$regenerate_distinfo = true
+	}
+}
-sub adjust_package_from_extracted_distfiles()
+sub adjust_package_from_extracted_distfiles($)
+{
-	my ($seen_marker);
+	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";
 @@ -584,44 +694,48 @@ sub adjust_package_from_extracted_distfi
 	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);
 	add_section(\@lines, \@depend_vars);
 @@ -632,33 +746,32 @@ sub adjust_package_from_extracted_distfi
 	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);
 	update_var_append(\@lines, "CATEGORIES", join(" ", @categories));
-	write_lines("Makefile-url2pkg.new", @lines);
+	adjust_lines_python_module(\@lines, $url);
-	if ($seen_marker) {
+	write_lines("Makefile", @lines);
 		rename("Makefile-url2pkg.new", "Makefile") or die;
-	} else {
+	if ($regenerate_distinfo) {
-		unlink("Makefile-url2pkg.new");
+		make("distinfo");
 		die("$0: ERROR: didn't find the url2pkg marker in the file.\n");
+	}
+}
 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) {
 @@ -667,22 +780,22 @@ sub main() {
 				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();
+	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();