svn commit: r522078 - head/Tools/scripts
Matthias Andree
mandree at FreeBSD.org
Sun Jan 5 02:05:24 UTC 2020
Author: mandree
Date: Sun Jan 5 02:05:23 2020
New Revision: 522078
URL: https://svnweb.freebsd.org/changeset/ports/522078
Log:
Tools/scripts/bump_revision.pl: Fix a few issues
- When using a non-default ports tree (-p PATH),
strip that from the requisite origins, too.
- Fix the counters when multiple ports are given on the command line,
i. e. we are bumping depends if more requisites are updated at once.
Modified:
head/Tools/scripts/bump_revision.pl
Modified: head/Tools/scripts/bump_revision.pl
==============================================================================
--- head/Tools/scripts/bump_revision.pl Sun Jan 5 01:35:58 2020 (r522077)
+++ head/Tools/scripts/bump_revision.pl Sun Jan 5 02:05:23 2020 (r522078)
@@ -160,8 +160,8 @@ my %index = ();
$port = $b[-2]."/".$b[-1];
- @{ $index{$port} }{'portname', 'portnameversion', 'portdir', 'comment', 'deps'}
- = ($b[-1], $a[0], $a[1], $a[3], ());
+ @{ $index{$port} }{'portname', 'portnameversion', 'origin', 'comment', 'deps'}
+ = ($b[-1], $a[0], $port, $a[3], ());
if ($a[8]) {
@b = split(" ", $a[8]);
@@ -202,13 +202,15 @@ foreach my $PORT (@ARGV) {
#
{
print "Searching for ports depending on $PORT\n";
+ my $count = 0;
foreach my $p (keys(%index)) {
if (defined $index{$p}{'deps'}{$PORTNAMEVERSION}) {
$DEPPORTS{$p} = 1;
+ ++$count;
}
}
- print "- Found ", scalar keys(%DEPPORTS), " ports depending on $PORT.\n";
+ print "- Found $count ports depending on $PORT.\n";
}
}
@@ -221,7 +223,7 @@ sub direct_dependency($@) {
my @lines = <F>;
chomp @lines;
my $deps = join(" ", @lines);
- my %deps = map { $_ =~ s[/usr/ports/][]; ($_ => 1) } split " ", $deps;
+ 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: $!";
my $required = grep { $_ } map { defined $deps{$_} } @requisites;
More information about the svn-ports-all
mailing list