Tools/scripts/bump_revision.pl: update

1 files changed, 77 insertions, 67 deletions

diff --git a/Tools/scripts/bump_revision.pl b/Tools/scripts/bump_revision.pl
index 33a79c0ce2d7..b2196bb3b1ee 100755
--- a/Tools/scripts/bump_revision.pl
+++ b/Tools/scripts/bump_revision.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S perl -wT
+#!/usr/bin/env -S perl -wt
 
 #
 # This script helps with bumping the PORTREVISION of all ports that depend on a
@@ -54,51 +54,58 @@ EOF
 $| = 1;
 
 sub bumpMakefile {
+    my ($taintedorigin) = @_; 
+    my $origin;
 
-    my ($p) = @_; 
+    if ($taintedorigin =~ /^([-\@\w.\/]+)$/) {
+	$origin = $1;
+    }  else {
+       	Carp::carp "cannot untaint $taintedorigin - invalid characters";
+	return;
+    }
 
-    my $makefile = "$p/Makefile";
+    my $makefile = "$origin/Makefile";
     my $fin;
-	unless(open($fin, $makefile)) {
-	    print "-- Cannot open Makefile of $p, ignored.\n";
-	    next;
-	}
-	my @lines = <$fin>;
-	if ($!) { die "Error while reading $makefile: $!. Aborting"; }
-	close($fin) or die "Can't close $makefile b/c $!";
-	chomp(@lines);
+    unless(open($fin, $makefile)) {
+	print "-- Cannot open Makefile of $origin, ignored.\n";
+	return;
+    }
+    my @lines = <$fin>;
+    if ($!) { die "Error while reading $makefile: $!. Aborting"; }
+    close($fin) or die "Can't close $makefile b/c $!";
+    chomp(@lines);
 
-	my $revision = 1;
+    my $revision = 1;
 
-	foreach my $line (@lines) {
-	    last if ($line =~ /^MAINTAINER/);
-	    $revision += $1 if ($line =~ /PORTREVISION\??=[ \t]*(\d+)$/);
-	}
+    foreach my $line (@lines) {
+	last if ($line =~ /^MAINTAINER/);
+	$revision += $1 if ($line =~ /PORTREVISION\??=[ \t]*(\d+)$/);
+    }
 
-	my $printedrev = 0;
-	open(my $fout, '>', "$makefile.bumped");
-	foreach my $line (@lines) {
-	    if (!$printedrev) {
-		if ($line =~ /^CATEGORIES??=/ || $line =~ /^PORTEPOCH??=/) {
-		    print $fout "PORTREVISION=	$revision\n";
-		    $printedrev = 1;
-		    # Fall through!
-		}
-		if ($line =~ /^PORTREVISION\?=/) {
-		    print $fout "PORTREVISION?=	$revision\n";
-		    $printedrev = 1;
-		    next;
-		}
-		if ($line =~ /^PORTREVISION=/) {
-		    print $fout "PORTREVISION=	$revision\n";
-		    $printedrev = 1;
-		    next;
-		}
+    my $printedrev = 0;
+    open(my $fout, '>', "$makefile.bumped");
+    foreach my $line (@lines) {
+	if (!$printedrev) {
+	    if ($line =~ /^CATEGORIES??=/ || $line =~ /^PORTEPOCH??=/) {
+		print $fout "PORTREVISION=	$revision\n";
+		$printedrev = 1;
+		# Fall through!
+	    }
+	    if ($line =~ /^PORTREVISION\?=/) {
+		print $fout "PORTREVISION?=	$revision\n";
+		$printedrev = 1;
+		next;
+	    }
+	    if ($line =~ /^PORTREVISION=/) {
+		print $fout "PORTREVISION=	$revision\n";
+		$printedrev = 1;
+		next;
 	    }
-	    print $fout "$line\n";
 	}
-	close($fout) or die "Can't close $makefile b/c $!";
-	rename "$makefile.bumped", $makefile or die "Can't rename $makefile.bumped to $makefile: $!";
+	print $fout "$line\n";
+    }
+    close($fout) or die "Can't close $makefile b/c $!";
+    rename "$makefile.bumped", $makefile or die "Can't rename $makefile.bumped to $makefile: $!";
 }
 
 my $osversion = `uname -r`;
@@ -167,22 +174,28 @@ my %index = ();
     my @b;
     my $origin;
     my $cat_port;
+    my $pkgname;
     map {
-	@a = split(/\|/, $_);
+	@a = split(/\|/, $_); # columns per PORTINDEX(5) aka INDEX(5)
 	@b = split(/\//, $a[1]);
 
 	$cat_port = $b[-2]."/".$a[0];
 	$cat_port =~ s/-[^-]+$//;
 	$origin = $b[-2]."/".$b[-1];
 
-	@{ $index{$cat_port} }{'portname', 'portnameversion', 'origin', 'comment', 'deps'}
-	    = ($b[-1], $a[0], $origin, $a[3], ());
+	unless ($b[-1]) { die "undefined portname"; }
+	unless ($origin) { die "undefined origin"; }
+
+	@{ $index{$a[0]} }{'portname', 'origin', 'comment', 'deps'}
+	    = ($b[-1], $origin, $a[3], ());
 
-	if ($a[8]) {
+	if ($a[8]) { # run dependencies
 	    @b = split(" ", $a[8]);
-	    @{ $index{$cat_port}{deps} }{@b} = (1) x @b;
+	    @{ $index{$a[0]}{deps} }{@b} = (1) x @b;
 	}
+	undef;
     } @lines;
+
     print "- Processed ", scalar keys(%index), " entries.\n";
     if ($debug and $debug > 1) {
 	   print STDERR Dumper(\%index);
@@ -191,28 +204,20 @@ my %index = ();
 
 my %DEPPORTS = ();
 
+my %byorigin =   map { ($index{$_}{'origin'} => $_)   } keys %index;
+my %byportname = map { ($index{$_}{'portname'} => $_) } keys %index;
+
 foreach my $PORT (@ARGV) {
     #
     # See if the port really exists.
     # If specified as category/portname, that should be enough.
     # If specified as portname, check all categories for existence or duplicates.
     #
-    unless (defined $index{$PORT}) {
-	my @found = grep /\/$PORT$/, keys(%index);
-	my $count = @found;
-
-	if ($count == 0) {
-	    die "Cannot find ${PORT} in ${INDEX}.";
-	} elsif ($count == 1) {
-	    $PORT = $found[0];
-	} else {
-	    my $n = join(" ", @found);
-	    die "Found ${PORT} more than once in ${INDEX}: $n. Try category/$PORT.\nAborting";
-	}
-    }
-
-    my $PORTNAMEVERSION = $index{$PORT}{portnameversion};
-    print "Found $PORT as $PORTNAMEVERSION\n";
+    my $r = $index{$PORT};
+    if (!defined $r) { $r = $byportname{$PORT}; }
+    if (!defined $r) { $r = $byorigin{$PORT}; }
+    if (defined $r) { print "Found $PORT as $r.\n"; $PORT = $r; }
+    else { die "Cannot find $PORT in $INDEX! Aborting"; }
 
     #
     # Figure out all the ports depending on this one.
@@ -222,7 +227,8 @@ foreach my $PORT (@ARGV) {
 	my $count = 0;
 
 	foreach my $p (keys(%index)) {
-	    if (defined $index{$p}{'deps'}{$PORTNAMEVERSION}) {
+	    my $q = $index{$p}{'deps'}{$PORT};
+	    if ($q) {
 		$DEPPORTS{$p} = 1;
 		++$count;
 	    }
@@ -243,7 +249,7 @@ sub direct_dependency($@) {
     my $deps = join(" ", @lines);
     my %deps = map { $_ =~ s[/usr/ports/][]; $_ =~ s[$portsdir/][]; ($_ => 1) } split " ", $deps;
     if ($!) { die "cannot read depends from make: $!"; }
-    close F or die "cannot read depends from make: $!";
+    close F or Carp::carp "cannot read depends from make: $!";
     my $required = grep { $_ } map { defined $deps{$_} } @requisites;
     return $required;
 }
@@ -252,9 +258,11 @@ if ($shallow) {
     my $n = keys %DEPPORTS;
     my $idx = 1;
     foreach my $p (keys %DEPPORTS) {
-	print "- Checking requisites of port $idx/$n...\r";
+	print "- Checking requisites of port $idx/$n... \r";
+	print "\n" if $debug;
 	++$idx;
-	unless (direct_dependency($p, map { $index{$_}{origin} } @ARGV)) {
+	my $pp = $index{$p}->{'origin'};
+	unless (direct_dependency($pp, map { $index{$_}{origin} } @ARGV)) {
 	    delete $DEPPORTS{$p};
 	}
     }
@@ -284,9 +292,11 @@ unless ($opt_f or $opt_n) {
 {
     print "Updating Makefiles\n";
     foreach my $p (sort keys(%DEPPORTS)) {
-	print "- Updating Makefile of $p\n";
-    next if $opt_n;
-	bumpMakefile "$p";
+	my $origin = $index{$p}->{'origin'};
+	print "- Updating Makefile of $origin\n";
+        unless($opt_n) { 
+	    bumpMakefile "$origin";
+	}
     }
 }
 
@@ -300,7 +310,7 @@ thing remains:  Committing to the ports tree.  This program is not
 going to do that for you, you have to do it manually.
 
 \$ cd $TMPDIR
-\$ svn commit
+\$ git commit
 	
 Then, remove the temp directory ($TMPDIR).
 EOF