From 2213f02ec6b035596df932d8e6fb0ec33db028cf Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Tue, 18 Dec 2001 11:49:14 +0000
Subject: 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.

---
 ports-mgmt/porteasy/Makefile        | 2 +-
 ports-mgmt/porteasy/src/porteasy.pl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ports-mgmt')

diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index ab9416d..ef903c0 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 7bad387..2798b02 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;
-- 
cgit v1.1