 @@ -1,15 +1,15 @@
 #! @PERL5@
-# $NetBSD: url2pkg.pl,v 1.71 2019/09/13 05:38:27 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.72 2019/09/13 06:22:33 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.
 @@ -22,42 +22,34 @@
 # 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 strict;
 use warnings;
 # Build-time Configuration.
 my $make		= '@MAKE@';
 my $libdir		= '@LIBDIR@';
 my $pythonbin		= '@PYTHONBIN@';
 my $pkgsrcdir		= '@PKGSRCDIR@';
 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);
+}
 @@ -124,48 +116,48 @@ sub lines_add_vars($$) {
 		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*)(#.*|)$") {
+		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";
 			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]+)([^#\\]*)(#.*|)$") {
+		if ($line =~ qr"^\Q$varname\E(\+?=)([ \t]*)([^#\\]*?)(\s*)(#.*|)$") {
-			my ($op, $indent, $old_value, $comment) = ($1, $2, $3, $4);
+			my ($op, $indent, $old_value, $space_after_value, $comment) = ($1, $2, $3, $4, $5);
 			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.
 @@ -174,34 +166,52 @@ sub lines_remove($$) {
 	my $i = 0;
 	foreach my $line (@$lines) {
 		if ($line =~ qr"^\Q$varname\E(\+?=)") {
 			splice(@$lines, $i, 1);
 			return true;
+		}
 		$i++;
+	}
 	return false;
+}
 # returns the variable value from the only variable assignment, or an empty
 # string.
 sub lines_get($$) {
 	my ($lines, $varname) = @_;
 	my $only_value = "";
 	foreach my $line (@$lines) {
 		if ($line =~ qr"^\Q$varname\E(\+?=)([ \t]*)([^#\\]*?)(\s*)(#.*|)$") {
 			my ($op, $indent, $value, $space_after_value, $comment) = ($1, $2, $3, $4, $5);
 			return "" if $only_value ne "";
 			$only_value = $value;
+		}
+	}
 	return $only_value;
+}
 # 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*)(#.*|)$") {
+		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;
+}
 @@ -275,26 +285,29 @@ our @build_vars;
 # the Makefile, thereby forming the fifth paragraph.
 our @extra_vars;
 # variables from the initial Makefile whose values are replaced
 our %update_vars;
 # these are inserted below the second paragraph in the Makefile.
 our @todos;
 # the package name is $pkgname_prefix${DISTNAME$pkgname_transform}.
 our $pkgname_prefix = "";     # example: ${PYPKGPREFIX}-
 our $pkgname_transform = "";  # example: :S,-v,-,
 # all lines of the package Makefile, for direct modification.
 our $makefile_lines;
 our $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;
 @@ -417,40 +430,55 @@ sub adjust_perl_module_Build_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)
 sub adjust_perl_module_Makefile_PL() {
 	# To avoid fix_up_makefile error for p5-HTML-Quoted, generate Makefile first.
 	system("cd '$abs_wrksrc' && perl -I. Makefile.PL < /dev/null") == 0 or do {};
 	read_dependencies("cd '$abs_wrksrc' && perl -I$libdir -I. Makefile.PL", {}, "");
+}
-sub adjust_perl_module() {
+sub adjust_perl_module_homepage($) {
 	my ($url) = @_;
 	if (lines_get($makefile_lines, "MASTER_SITES") =~ qr"\$\{MASTER_SITE_PERL_CPAN:") {
 		my $homepage = lines_get($makefile_lines, "HOMEPAGE");
 		if ($homepage ne "" && index($url, $homepage) == 0) {
 			my $module_name = $distname =~ s/-v?[0-9].*//r =~ s/-/::/gr;
 			lines_set($makefile_lines, "HOMEPAGE", "https://metacpan.org/pod/$module_name");
+		}
+	}
+}
 sub adjust_perl_module($) {
 	my ($url) = @_;
 	if (-f "$abs_wrksrc/Build.PL") {
 		adjust_perl_module_Build_PL();
 	} elsif (-f "$abs_wrksrc/Makefile.PL") {
 		adjust_perl_module_Makefile_PL();
 	} else {
 		return;
+	}
 	my $packlist = $distname =~ s/-v?[0-9].*//r =~ s/-/\//gr;
 	push(@build_vars, var("PERL5_PACKLIST", "=", "auto/$packlist/.packlist"));
 	push(@includes, "../../lang/perl5/module.mk");
 	$pkgname_prefix = "p5-";
 	push(@categories, "perl5");
 	adjust_perl_module_homepage($url);
 	unlink("PLIST") or do {};
+}
 # Example packages:
+#
 # devel/py-ZopeComponent (dependencies, test dependencies)
 sub adjust_python_module() {
 	return unless -f "$abs_wrksrc/setup.py";
 	my $cmd = "cd '$abs_wrksrc' && $pythonbin setup.py build";
 	my $env = {
 @@ -734,52 +762,54 @@ sub determine_wrksrc() {
 			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;
+	}
+}
 sub adjust_package_from_extracted_distfiles($) {
 	my ($url) = @_;
 	print("url2pkg> Adjusting the Makefile\n");
 	chomp($abs_wrkdir = `$make show-var VARNAME=WRKDIR`);
 	determine_wrksrc();
 	chomp(@wrksrc_files = `cd "$abs_wrksrc" && find * -type f -print`);
 	chomp(@wrksrc_dirs = `cd "$abs_wrksrc" && find * -type d -print`);
 	my @makefile_lines = read_lines("Makefile");
 	$makefile_lines = \@makefile_lines;
 	adjust_configure();
 	adjust_cmake();
 	adjust_meson();
 	adjust_gconf2_schemas();
 	adjust_libtool();
-	adjust_perl_module();
+	adjust_perl_module($url);
 	adjust_python_module();
 	adjust_cargo();
 	adjust_pkg_config();
 	adjust_po();
 	adjust_use_languages();
-	print("url2pkg> Adjusting the Makefile\n");
+	my $marker_index = lines_index($makefile_lines, qr"^# url2pkg-marker");
 	my @prev_lines = read_lines("Makefile");
 	my $marker_index = lines_index(\@prev_lines, qr"^# url2pkg-marker");
 	if ($marker_index == -1) {
 		die("$0: ERROR: didn't find the url2pkg marker in the Makefile.\n");
+	}
-	my @lines = @prev_lines[0 .. $marker_index - 1];
+	my @lines = @$makefile_lines[0 .. $marker_index - 1];
 	if (lines_index(\@lines, qr"^PKGNAME=") == -1) {
 		my $distname_index = lines_index(\@lines, qr"^DISTNAME=(\t+)");
 		if ($distname_index != -1) {
 			my $pkgname_line = "PKGNAME=\t$pkgname_prefix\${DISTNAME$pkgname_transform}";
 			splice(@lines, $distname_index + 1, 0, $pkgname_line);
+		}
+	}
 	if (@todos) {
 		foreach my $todo (@todos) {
 			push(@lines, "# TODO: $todo");
+		}
 @@ -788,27 +818,27 @@ sub adjust_package_from_extracted_distfi
 	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);
-	push(@lines, @prev_lines[$marker_index + 1 .. $#prev_lines]);
+	push(@lines, $makefile_lines->[$marker_index + 1 .. $#$makefile_lines]);
 	lines_append(\@lines, "CATEGORIES", join(" ", @categories));
 	adjust_lines_python_module(\@lines, $url);
 	foreach my $varname (keys %update_vars) {
 		lines_set(\@lines, $varname, $update_vars{$varname});
+	}
 	write_lines("Makefile", @lines);
 	if ($regenerate_distinfo) {
 		make("distinfo");

 @@ -1,15 +1,15 @@
 # -*- perl -*-
-# $NetBSD: url2pkg.t,v 1.10 2019/09/12 18:23:00 rillig Exp $
+# $NetBSD: url2pkg.t,v 1.11 2019/09/13 06:22:33 rillig Exp $
 require "url2pkg.pl";
 use Test::More;
 use strict;
 use warnings;
 sub test_lines_add_vars__simple() {
 	my $lines = [];
 	lines_add_vars($lines, [
 		var("1", "=", "one"),
 @@ -103,26 +103,38 @@ sub test_lines_index() {
 	my $lines = ["1", "2", "345"];
 	is(lines_index($lines, "1"), 0);
 	is(lines_index($lines, "2"), 1);
 	is(lines_index($lines, "345"), 2);
 	is(lines_index($lines, "4"), 2);
 	is(lines_index($lines, qr"^(\d\d)\d$"), 2);
 	is(lines_index($lines, qr"^\d\s\d$"), -1);
 	is(lines_index($lines, qr"(\d)"), 0);
 	is($1, undef);  # capturing groups do not work here
+}
 sub test_lines_get() {
 	my $lines = [
 		"VAR=value",
 		"VAR=\tvalue # comment",
 		"UNIQUE=\tunique"
 	];
 	is(lines_get($lines, "VAR"), "");     # too many values
 	is(lines_get($lines, "ENOENT"), "");  # no value at all
 	is(lines_get($lines, "UNIQUE"), "unique");
+}
 sub test_generate_initial_package_Makefile_lines__GitHub_archive() {
 	my $url = "https://github.com/org/proj/archive/v1.0.0.tar.gz";
 	my @lines = generate_initial_package_Makefile_lines($url);
 	is_deeply(\@lines, [
 		"# \$" . "NetBSD\$",
 		"",
 		"GITHUB_PROJECT=\tproj",
 		"DISTNAME=\tv1.0.0",
 		"PKGNAME=\t\${GITHUB_PROJECT}-\${DISTNAME:S,^v,,}",
 		"CATEGORIES=\tpkgtools",
 		"MASTER_SITES=\t\${MASTER_SITE_GITHUB:=org/}",
 @@ -254,26 +266,27 @@ sub set_up_test() {
 	@main::depends = ();
 	@main::build_depends = ();
 	@main::test_depends = ();
 	@main::bl3_lines = ();
 	@main::includes = ();
 	@main::build_vars = ();
 	@main::extra_vars = ();
 	%main::update_vars = ();
 	@main::todos = ();
 	$main::pkgname_prefix = "";
 	$main::pkgname_transform = "";
 	$main::makefile_lines = [];
 	$main::regenerate_distinfo = 0;
+}
 sub t_main() {
 	my $pkgsrcdir = $ENV{"PKGSRCDIR"} or die;
 	chdir("$pkgsrcdir/pkgtools/url2pkg") or die;
 	no strict 'refs';
 	foreach my $testname (sort grep { $_ =~ qr"^test_" } keys %{"main::"}) {
 		next if $testname eq "test_depends";  # it's an array
 		set_up_test();
 		&{"main::$testname"}();
+	}