Index: head/Tools/scripts/bump_revision.pl
===================================================================
--- head/Tools/scripts/bump_revision.pl	(revision 506454)
+++ head/Tools/scripts/bump_revision.pl	(revision 506455)
@@ -1,213 +1,213 @@
 #!/usr/bin/env perl
 
 # $FreeBSD$
 
 #
-# MAINTAINER=	gerald@FreeBSD.org
+# MAINTAINER=	mandree@FreeBSD.org
 #
 
 use Getopt::Std;
 use strict;
 use warnings;
 use Cwd;
 use Data::Dumper;
 use File::Basename;
 
 use vars qw/$opt_c $opt_n $opt_i $opt_u/;
 
 sub usage {
 	print <<EOF;
 Usage: $0 [options] [<category>/]<portname>
 
     -c              - Just check
     -n              - No tmpdir, just use dirname(INDEX)
     -u <username>   - Your freebsd.org username. Defaults to \$ENV{USER}.
     -i <filename>   - Use this for INDEX name. Defaults to /usr/ports/INDEX.
 
 Improvements, suggestions,questions -> gerald\@FreeBSD.org
 EOF
 	exit 1;
 }
 
 sub bumpMakefile {
 
     my ($p) = @_; 
 
     my $makefile = "$p/Makefile";
     my $fin;
 	unless(open($fin, $makefile)) {
 	    print "-- Cannot open Makefile of $p, ignored.\n";
 	    next;
 	}
 	my @lines = <$fin>;
 	close($fin) or die "Can't close $makefile b/c $!";
 	chomp(@lines);
 
 	my $revision = 1;
 
 	foreach my $line (@lines) {
 	    last if ($line =~ /^MAINTAINER/);
 	    $revision += $1 if ($line =~ /PORTREVISION\??=[ \t]*(\d+)$/);
 	}
 
 	my $printedrev = 0;
 	open(my $fout, '>', "$makefile");
 	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 $!";
 }
 
 my $INDEX = "/usr/ports/INDEX";
 my $USER = $ENV{USER};
 {
     $opt_i = "";
     $opt_u = "";
     getopts("cni:u:");
     $INDEX = $opt_i if ($opt_i);
     $USER = $opt_u if ($opt_u);
 
     die "$INDEX doesn't seem to exist. Please check the value supplied with -i or use -i." unless(-f $INDEX);
 }
 my $PORT = $ARGV[0];
 usage() unless($PORT);
 
 my $CVSROOT = $ENV{CVSROOT} // ':ext:$USER\@pcvs.freebsd.org:/home/pcvs';
 
 #
 # Read the index, save some interesting keys
 #
 my %index = ();
 {
     print "Reading $INDEX\n";
     open(my $fin, '<', "$INDEX") or die "Cannot open $INDEX for reading.";
     my @lines = <$fin>;
     chomp(@lines);
     close($fin);
 
     foreach my $line (@lines) {
 	my @a = split(/\|/, $line);
 	my @b = split(/\//, $a[1]);
 
 	my $port = $b[-2]."/".$b[-1];
 
 	$index{$port}{portname} = $b[-1];
 	$index{$port}{portnameversion} = $a[0];
 	$index{$port}{portdir} = $a[1];
 	$index{$port}{comment} = $a[3];
 	$index{$port}{deps} = ();
 
 	if ($a[8]) {
 	    @b = split(" ", $a[8]);
 	    foreach my $b (@b) {
 		$index{$port}{deps}{$b} = 1;
 	    }
 	}
     }
     my @k = keys(%index);
     print "- Processed ", $#k+1, " entries.\n";
 }
 
 #
 # See if the port does really exists.
 # If specified as category/portname, that should be enough.
 # If specified as portname, check all indexes for existence or duplicates.
 #
 unless (defined $index{$PORT}) {
     my $count = 0;
     my $n = "";
     foreach my $p (keys(%index)) {
 	if ($p =~ /\/$PORT$/) {
 	    $n .= " " if ($n);
 	    $n .= $p;
 	    $count++;
 	}
     }
     if ($count == 0) {
 	die "Cannot find ${PORT} in ${INDEX}.";
     } elsif ($count == 1) {
 	$PORT = $n;
     } else {
 	die "Found ${PORT} more than once in ${INDEX}: $n. Try category/portname.";
     }
 }
 
 my $PORTNAMEVERSION = $index{$PORT}{portnameversion};
 print "Found $PORT as $PORTNAMEVERSION\n";
 
 #
 # Figure out all the ports depending on this one.
 #
 my %DEPPORTS = ();
 my $ports = "";
 {
     print "Searching for ports depending on $PORT\n";
     foreach my $p (keys(%index)) {
 	if (defined $index{$p}{deps}{$PORTNAMEVERSION}) {
 	    $DEPPORTS{$p} = 1;
 	    $ports .= " " if ($ports);
 	    $ports .= "ports/$p";
 	}
     }
     my @k = keys(%DEPPORTS);
     print "- Found ", $#k+1, " ports depending on it.\n";
 }
 
 #
 # Create a temp directory and cvs checkout the ports
 # (don't do error checking, too complicated right now)
 #
 
 my $TMPDIR = File::Basename::dirname($INDEX);
 unless ($opt_n) {
   $TMPDIR = getcwd() . "/.tmpdir.$$";
   mkdir($TMPDIR, 0755);
   chdir($TMPDIR);
   system "cvs -d $CVSROOT co -T $ports";
   chdir($TMPDIR);
 }
 
 #
 # Bump portrevisions
 #
 {
     print "Updating Makefiles\n";
     foreach my $p (keys(%DEPPORTS)) {
 	print "- Updating Makefile of $p\n";
     next if $opt_c;
 	bumpMakefile "$p";
     }
 }
 
 #
 # Commit the changes. Not automated.
 #
 unless ($opt_c) {
     print <<EOF;
 All PORTREVISIONs have been updated.  You are nearly done, only one
 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
 	
 Then, remove the temp directory ($TMPDIR).
 EOF
 }