Look for pkg-descr rather than pkg/DESCR.

Always use the -d option when invoking CVS, to work around breakage in CVS
(said breakage has reportedly been fixed in 1.11, but I haven't verified this)
Bump version number.

1 files changed, 6 insertions, 6 deletions

diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl
index f44afce3349d..eb83b9d631d3 100644
--- a/ports-mgmt/porteasy/src/porteasy.pl
+++ b/ports-mgmt/porteasy/src/porteasy.pl
@@ -34,7 +34,7 @@ use Data::Dumper;
 use Fcntl;
 use Getopt::Long;
 
-my $VERSION	= "1.6";
+my $VERSION	= "1.7";
 
 # Constants
 sub ANONCVS_ROOT	{ ":pserver:anoncvs\@anoncvs.FreeBSD.org:/home/ncvs" }
@@ -146,7 +146,7 @@ sub cvs($;@) {
 
     my @args;			# Arguments to CVS
 
-    push(@args, "-f", "-z3", "-R",
+    push(@args, "-f", "-z3", "-R", "-d$cvsroot",
 	 $verbose ? "-q" : "-Q", $cmd, "-A");
     if ($cmd eq "checkout") {
 	push(@args, "-P");
@@ -354,7 +354,7 @@ sub show_port_info($) {
     local *FILE;		# File handle
     my $info;			# Port info
 
-    sysopen(FILE, "$portsdir/$ports{$port}/pkg/DESCR", O_RDONLY)
+    sysopen(FILE, "$portsdir/$ports{$port}/pkg-descr", O_RDONLY)
 	or err(1, "can't read description for $port");
     $info = join("| ", <FILE>);
     close(FILE);
@@ -552,10 +552,10 @@ MAIN:{
     if ($anoncvs) {
 	$cvsroot = &ANONCVS_ROOT;
     }
-    if ($cvsroot) {
-	$ENV{'CVSROOT'} = $cvsroot;
+    if (!$cvsroot) {
+	$cvsroot = $ENV{'CVSROOT'};
     }
-    if (!$ENV{'CVSROOT'}) {
+    if (!$cvsroot) {
 	errx(1, "No CVS root, please use the -r option or set \$CVSROOT");
     }