summaryrefslogtreecommitdiffstats
path: root/misc/porteasy
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2001-12-18 11:49:14 +0000
committerdes <des@FreeBSD.org>2001-12-18 11:49:14 +0000
commit2213f02ec6b035596df932d8e6fb0ec33db028cf (patch)
tree3b179176e677da3ec92eaf5ec9200346c42ec571 /misc/porteasy
parentc831c6cb77e9c0cad449ba06438af9ad74b33cba (diff)
downloadFreeBSD-ports-2213f02ec6b035596df932d8e6fb0ec33db028cf.zip
FreeBSD-ports-2213f02ec6b035596df932d8e6fb0ec33db028cf.tar.gz
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 'misc/porteasy')
-rw-r--r--misc/porteasy/Makefile2
-rw-r--r--misc/porteasy/src/porteasy.pl4
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile
index ab9416d..ef903c0 100644
--- a/misc/porteasy/Makefile
+++ b/misc/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/misc/porteasy/src/porteasy.pl b/misc/porteasy/src/porteasy.pl
index 7bad387..2798b02 100644
--- a/misc/porteasy/src/porteasy.pl
+++ b/misc/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;
OpenPOWER on IntegriCloud