From owner-svn-ports-all@freebsd.org Sun Jan 5 02:05:24 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 847EC1F348C; Sun, 5 Jan 2020 02:05:24 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47r26D2w7Zz4vVF; Sun, 5 Jan 2020 02:05:24 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F6131E5F5; Sun, 5 Jan 2020 02:05:24 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00525OK4073122; Sun, 5 Jan 2020 02:05:24 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00525O7V073121; Sun, 5 Jan 2020 02:05:24 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202001050205.00525O7V073121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 5 Jan 2020 02:05:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522078 - head/Tools/scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/Tools/scripts X-SVN-Commit-Revision: 522078 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jan 2020 02:05:24 -0000 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 = ; 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;