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.
This commit is contained in:
Dag-Erling Smørgrav 2001-12-18 11:49:14 +00:00
parent e046905f75
commit 6ad60bcc22
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51730
4 changed files with 6 additions and 6 deletions

View File

@ -8,7 +8,7 @@
#
PORTNAME= porteasy
PORTVERSION= 2.6
PORTVERSION= 2.6.1
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none

View File

@ -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;

View File

@ -8,7 +8,7 @@
#
PORTNAME= porteasy
PORTVERSION= 2.6
PORTVERSION= 2.6.1
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none

View File

@ -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;