aboutsummaryrefslogtreecommitdiff
path: root/misc/porteasy
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2000-10-09 11:45:46 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2000-10-09 11:45:46 +0000
commit1f3c3106a8c7242b88f8e0de4e36780821c0f7fe (patch)
tree9f3ec581d6506389a6af387d51b61fc82e216de6 /misc/porteasy
parentf605096311f6bbd1b29843194826d0ff8b14ced0 (diff)
downloadports-1f3c3106a8c7242b88f8e0de4e36780821c0f7fe.tar.gz
ports-1f3c3106a8c7242b88f8e0de4e36780821c0f7fe.zip
Notes
Diffstat (limited to 'misc/porteasy')
-rw-r--r--misc/porteasy/Makefile2
-rw-r--r--misc/porteasy/src/porteasy.pl12
2 files changed, 7 insertions, 7 deletions
diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile
index 14ba69544491..640577dc2672 100644
--- a/misc/porteasy/Makefile
+++ b/misc/porteasy/Makefile
@@ -8,7 +8,7 @@
#
PORTNAME= porteasy
-PORTVERSION= 1.6
+PORTVERSION= 1.7
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none
diff --git a/misc/porteasy/src/porteasy.pl b/misc/porteasy/src/porteasy.pl
index f44afce3349d..eb83b9d631d3 100644
--- a/misc/porteasy/src/porteasy.pl
+++ b/misc/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");
}