5 files changed, 45 insertions, 19 deletions

diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index 14a82560b08d..6618af359441 100644
--- a/ports-mgmt/porteasy/Makefile
+++ b/ports-mgmt/porteasy/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	porteasy
-PORTVERSION=	2.7.20
+PORTVERSION=	2.8.0
 CATEGORIES=	misc
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -32,7 +32,5 @@ do-configure:
 do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/porteasy ${PREFIX}/bin/porteasy
 	@${INSTALL_MAN} ${SRC}/porteasy.8 ${PREFIX}/man/man8
-	@${MKDIR} ${PREFIX}/share/porteasy
-	@${INSTALL_DATA} ${SRC}/cvspass ${PREFIX}/share/porteasy/cvspass
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/porteasy/pkg-plist b/ports-mgmt/porteasy/pkg-plist
index c79cbe496094..6b52c1b30876 100644
--- a/ports-mgmt/porteasy/pkg-plist
+++ b/ports-mgmt/porteasy/pkg-plist
@@ -1,3 +1 @@
 bin/porteasy
-share/porteasy/cvspass
-@dirrm share/porteasy
diff --git a/ports-mgmt/porteasy/src/cvspass b/ports-mgmt/porteasy/src/cvspass
deleted file mode 100644
index c79217923129..000000000000
--- a/ports-mgmt/porteasy/src/cvspass
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anoncvs@anoncvs.FreeBSD.org:/home/ncvs Ay=0=h<Z
diff --git a/ports-mgmt/porteasy/src/porteasy.8 b/ports-mgmt/porteasy/src/porteasy.8
index 0382bd721f40..444948a331ad 100644
--- a/ports-mgmt/porteasy/src/porteasy.8
+++ b/ports-mgmt/porteasy/src/porteasy.8
@@ -27,7 +27,7 @@
 .\"
 .\"	$FreeBSD$
 .\"
-.Dd May 24, 2004
+.Dd October 31, 2004
 .Dt PORTEASY 8
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nd fetch and build ports
 .Sh SYNOPSIS
 .Nm
-.Op Fl abCceFfhIikLlsuVvw
+.Op Fl AabCceFfhIikLlRSsuVvw
 .Op Fl D Ar date
 .Op Fl d Ar dir
 .Op Fl p Ar dir
@@ -50,7 +50,14 @@ automatically, keeping track of dependencies.
 The following options are available:
 .Bl -tag -width Fl
 .It Fl a
-Use the FreeBSD project's anoncvs server as CVS root directory.
+Use one of the FreeBSD project's anonymous CVS servers.
+Note that this forces the use of
+.Xr ssh 1 ,
+regardless of the
+.Fl R
+and
+.Fl S
+options.
 .It Fl b
 Build the selected ports.
 .It Fl C
@@ -86,8 +93,28 @@ List the selected ports.
 .It Fl p Ar dir
 Specify the ports directory (normally
 .Pa /usr/ports ) .
+.It Fl R
+Force the use of
+.Xr rsh 1
+to connect to remote CVS repositories.
+By default,
+.Nm
+respects the existing
+.Ev CVS_RSH
+setting.
+This option is ignored when using anoncvs.
 .It Fl r Ar dir
-Specify the CVS root directory.
+Specify the location of the CVS repository.
+.It Fl S
+Force the use of
+.Xr ssh 1
+to connect to remote CVS repositories.
+By default,
+.Nm
+respects the existing
+.Ev CVS_RSH
+setting.
+This option is ignored when using anoncvs.
 .It Fl s
 Indicate the installation status of the selected ports.
 Each selected port is listed with a symbol indicating its status:
diff --git a/ports-mgmt/porteasy/src/porteasy.pl b/ports-mgmt/porteasy/src/porteasy.pl
index 651675e71ed7..38847d24e525 100644
--- a/ports-mgmt/porteasy/src/porteasy.pl
+++ b/ports-mgmt/porteasy/src/porteasy.pl
@@ -33,21 +33,21 @@ use strict;
 use Fcntl;
 use Getopt::Long;
 
-my $VERSION	= "2.7.20";
+my $VERSION	= "2.8.0";
 my $COPYRIGHT	= "Copyright (c) 2000-2004 Dag-Erling Smørgrav. " .
 		  "All rights reserved.";
 
 # Constants
-sub ANONCVS_ROOT	{ ":pserver:anoncvs\@anoncvs.FreeBSD.org:/home/ncvs" }
+sub ANONCVS_ROOT	{ ":ext:anoncvs\@anoncvs.FreeBSD.org:/home/ncvs" }
 sub REQ_EXPLICIT	{ 1 }
 sub REQ_IMPLICIT	{ 2 }
 
-sub CVS_PASSFILE	{ "%%PREFIX%%/share/porteasy/cvspass" }
-
 sub PATH_CVS		{ "/usr/bin/cvs" }
 sub PATH_FETCH		{ "/usr/bin/fetch" }
 sub PATH_LDCONFIG	{ "/sbin/ldconfig" }
 sub PATH_MAKE		{ "/usr/bin/make" }
+sub PATH_RSH		{ "/usr/bin/rsh" }
+sub PATH_SSH		{ "/usr/bin/ssh" }
 
 # Global parameters
 my $dbdir     = "/var/db/pkg";	# Package database directory
@@ -59,7 +59,7 @@ my $date      = undef;		# CVS date to use
 my $release   = undef;		# OS release
 
 # Global flags
-my $anoncvs   = 0;		# Use anoncvs.FreeBSD.org
+my $anoncvs   = 0;		# Use anoncvs1.FreeBSD.org
 my $clean     = 0;		# Clean ports
 my $cvsroot   = 0;		# CVS root directory
 my $exclude   = 0;		# Do not list installed ports
@@ -423,7 +423,9 @@ sub find_port($) {
 
     stderr("Can't find required port '$port'");
     my $portre = $port;
-    $portre =~ s/([^\w])/\\$1/g;
+    $portre =~ s/([^\w\*\?])/\\$1/g;
+    $portre =~ s/\*/\.\*/g;
+    $portre =~ s/\?/\./g;
     @suggest = grep(/^$portre/i, keys(%ports));
     if (@suggest == 1 && $suggest[0] =~ m/^$portre[0-9.-]/) {
 	$port = $ports{$suggest[0]};
@@ -1110,6 +1112,8 @@ Options:
   -k, --packages           Build packages for the specified ports
   -L, --plist              Show the packing lists for the specified ports
   -l, --list               List required ports and their dependencies
+  -R, --use-rsh            Force use of rsh for cvs :ext: method
+  -S, --use-ssh            Force use of ssh for cvs :ext: method
   -s, --status             List installed ports and their status
   -u, --update             Update relevant portions of the ports tree
   -V, --version            Show version number
@@ -1166,7 +1170,9 @@ MAIN:{
 	       "L|plist"		=> \$plist,
 	       "l|list"			=> \$list,
 	       "p|portsdir=s"		=> \$portsdir,
+	       "R|use-rsh"		=> sub { $ENV{'CVS_RSH'} = &PATH_RSH },
 	       "r|cvsroot=s"		=> \$cvsroot,
+	       "S|use-ssh"		=> sub { $ENV{'CVS_RSH'} = &PATH_SSH },
 	       "s|status"		=> \$status,
 	       "t|tag=s"		=> \$tag,
 	       "u|update"		=> \$update,
@@ -1198,10 +1204,8 @@ MAIN:{
 
     # Set and check CVS root
     if ($anoncvs && !$cvsroot) {
+	$ENV{'CVS_RSH'} = &PATH_SSH;
 	$cvsroot = &ANONCVS_ROOT;
-	if (-f &CVS_PASSFILE) {
-	    $ENV{'CVS_PASSFILE'} = &CVS_PASSFILE;
-	}
     }
     if (!$cvsroot) {
 	$cvsroot = $ENV{'CVSROOT'};