cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the -y option to test for possible duplicate ports; use INDEX instead of

Browse Source 
modules file that was removed.

It's fast, use it!
This commit is contained in:
Chris Rees 2012-08-25 12:02:28 +00:00
parent 85a8a5bfcc
commit e7045e4591
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303131
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tools/scripts/addport
View File

@ -169,9 +169,9 @@ if ($dir eq "") {
if ($checkexist) {
my $found = 0;
print ">> Checking out modules file to scan for duplicates...";
# system("$cvs -q co -p modules > $tmpdir/modules") && errx(1, "Could not checkout CVSROOT/modules.");
print " [DONE]\n";
print ">> Fetching INDEX to scan for duplicates...\n";
my $indexfile = "$tmpdir/" . `$make -C $portsdir -V INDEXFILE`;
system("$make -C /usr/ports INDEXDIR=$tmpdir fetchindex") && errx(1, "Could not fetch INDEX file.");
my @namepart;
foreach (split(/\,/, $dir)) {
s/^.*\///;
@ -180,9 +180,10 @@ if ($checkexist) {
push(@namepart, $_);
}
}
open(MODULES_FILE, "< $tmpdir/modules") or errx(1, "Modules file in $tmpdir unreadable.");
while (my $line = <MODULES_FILE>) {
next if $line =~ /^#/;
open(INDEXFILE, "< $indexfile") or errx(1, "$indexfile unreadable.");
while (my $line = <INDEXFILE>) {
$line =~ m,^[^|]*\|/usr/ports/[^/]*/([^|]*)\|,;
$line = $1;
foreach my $dpart (@namepart) {
if ($line =~ /^[^ ]*\b$dpart\b/i) {
$line =~ s/\s+/ /g;