If no CVS root was specified, but a (possibly out-of-date) ports tree

already exists, use the CVS root specified by $portsdir/CVS/Root.

3 files changed, 12 insertions, 3 deletions

diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile
index 1a0429c53c57..0c034ce667c6 100644
--- a/misc/porteasy/Makefile
+++ b/misc/porteasy/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	porteasy
-PORTVERSION=	2.7.9
+PORTVERSION=	2.7.10
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/porteasy/src/porteasy.8 b/misc/porteasy/src/porteasy.8
index f6ed5aad624d..9cdcd20a78a8 100644
--- a/misc/porteasy/src/porteasy.8
+++ b/misc/porteasy/src/porteasy.8
@@ -27,7 +27,7 @@
 .\"
 .\"	$FreeBSD$
 .\"
-.Dd July 21, 2003
+.Dd October 1, 2003
 .Dt PORTEASY 8
 .Os
 .Sh NAME
diff --git a/misc/porteasy/src/porteasy.pl b/misc/porteasy/src/porteasy.pl
index da54066dc48c..af31490f9653 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.7.9";
+my $VERSION	= "2.7.10";
 my $COPYRIGHT	= "Copyright (c) 2000-2003 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
@@ -1119,6 +1119,15 @@ MAIN:{
     if (!$cvsroot) {
 	$cvsroot = $ENV{'CVSROOT'};
     }
+    if (!$cvsroot && -f "$portsdir/CVS/Root") {
+	local *FILE;
+
+	if (sysopen(FILE, "$portsdir/CVS/Root", O_RDONLY)) {
+	    $cvsroot = <FILE>;
+	    chomp($cvsroot);
+	    close(FILE);
+	}
+    }
     if ($update && !$cvsroot) {
 	bsd::errx(1, "No CVS root, please use the -r option or set \$CVSROOT");
     }