diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-11 13:30:18 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-11 13:30:18 +0000 |
| commit | 5fea26ef307a7fff0079c2d1a43479725ee7b44b (patch) | |
| tree | 45403235b57c09e05aaaa090e6e89c4fed049b59 /ports-mgmt | |
| parent | 92e92e9db1276bc26435715c4df57854582a9ccc (diff) | |
| download | ports-5fea26ef307a7fff0079c2d1a43479725ee7b44b.tar.gz ports-5fea26ef307a7fff0079c2d1a43479725ee7b44b.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/porteasy/src/porteasy.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl index ba7e1b0b6a7a..a1c4da3e39c7 100644 --- a/ports-mgmt/porteasy/src/porteasy.pl +++ b/ports-mgmt/porteasy/src/porteasy.pl @@ -581,21 +581,21 @@ sub find_master($) { while (<FILE>) { my $master; # Master directory - if (/^(?:MAIN|MASTER)DIR\s*=\s*(\S+)\s*$/) { + if (/^MASTERDIR\s*=\s*(\S+)\s*$/) { $master = $1; - } elsif (/^\.?include \"([^\"]+)\/Makefile(?:[^\/\"]*)\"\s*$/) { + } elsif (/^\.?include \"([^\s\"]+)\/(?:[^\s\/\"]*)\"\s*$/) { $master = $1; } if (defined($master) && $master !~ m/WRKDIRPREFIX/) { $master =~ s/^\$\{.CURDIR\}//; - $master =~ s/^\$\{PORTSDIR}/..\/../; + $master =~ s/^\$\{PORTSDIR\}/..\/../; $master = "/$port/$master"; $master =~ s|/+|/|g; 1 while ($master =~ s|/[^\./]*/\.\./|/|); $master =~ s|^/||; $master =~ s|/$||; if ($master eq $port) { - bsd::warnx("master port heuristics failed for %s", $port); + #bsd::warnx("master port heuristics failed for %s", $port); next; } if ($master !~ m|^[^/]+/[^/]+$|) { |