diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2001-12-18 11:49:14 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2001-12-18 11:49:14 +0000 |
commit | 6ad60bcc22d4e65b09ed5183217172653fd0cb72 (patch) | |
tree | c76694f412353bd6b4268918bb6078e1945d2b54 /ports-mgmt | |
parent | Bump PORTREVISION here, too, because CXX="${CC}" in master port (diff) |
2.6.1: Some ports (e.g. www/mozilla-embedded) use MAINDIR instead of
MASTERDIR to achieve slightly different semantics. Handle this just like
we handle MASTERDIR.
Diffstat (limited to 'ports-mgmt')
-rw-r--r-- | ports-mgmt/porteasy/Makefile | 2 | ||||
-rw-r--r-- | ports-mgmt/porteasy/src/porteasy.pl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile index ab9416da1fc3..ef903c031c9c 100644 --- a/ports-mgmt/porteasy/Makefile +++ b/ports-mgmt/porteasy/Makefile @@ -8,7 +8,7 @@ # PORTNAME= porteasy -PORTVERSION= 2.6 +PORTVERSION= 2.6.1 CATEGORIES= misc MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl index 7bad387d8030..2798b02ecc74 100644 --- a/ports-mgmt/porteasy/src/porteasy.pl +++ b/ports-mgmt/porteasy/src/porteasy.pl @@ -33,7 +33,7 @@ use strict; use Fcntl; use Getopt::Long; -my $VERSION = "2.6"; +my $VERSION = "2.6.1"; my $COPYRIGHT = "Copyright (c) 2000 Dag-Erling Smørgrav. All rights reserved."; # Constants @@ -470,7 +470,7 @@ sub find_master($) { open(FILE, "$portsdir/$port/Makefile") or bsd::err(1, "unable to read Makefile for $port"); while (<FILE>) { - if (/^MASTERDIR\s*=\s*(\S+)\s*$/) { + if (/^(?:MAIN|MASTER)DIR\s*=\s*(\S+)\s*$/) { $master = $1; } elsif (/^\.?include \"([^\"]+)\/Makefile\"\s*$/) { $master = $1; |