Update to 2.3.2, adjusting MASTER_SITES. From NEWS:

=== Release 2.1, July 10, 2002

Change to handle RCS branch tags (so this tools can work with
RCS (vs CVS) repositories, too!) RCS branch tags are those
with an even number of "."s.

=== Release 2.2, July 18, 2002

You can now choose the Perforce filetype you'd like to have ALL of
your text files imported with. As long as it's "text" or "ktext" :-).
See the "$TEXTTYPE" configuration item.

For "developers": Added a new test/getgood script to grab the test
comparision files which have changed with a "runtest -gengood". Less
tedium.

Made the test/phone.gif,v a binary (-kb) RCS file, so we really test
that.

Fixed a bug in dochanges, wherupin the command to create a symlink to
the RCS archives was being created in copy mode, provided the copy did
not fail. Reported by John Wong (jw at unicom.com.au).

Added a new config item "DEADSTATE", for saying what RCS state value
means "deleted" in Perforce. It defaults correctly for CVS, so if
you're converting real CVS, you can just leave this as-it.

=== Release 2.3.1, July 30, 2002

Now always run p4d with an explicit p4d -r, in case the user's
environment has a P4ROOT set.

genmetadata now reports both the CVS file archive path and the
converted file path as it processes each file. This makes it easier to
tell what RCS archive file caused a problem if the file cannot be
parsed properly.

The scripts now use the more modern tie()/untie() database interface,
instead of the older dbmopen()/dbmclose() interface. The scripts
assume the presence of the DB_File (Berkeley DB 1.x) module. This
means that you are no longer left to the whim of the dbm support
compiled into your perl. Certain dbm implementations, notable that in
recent Solaris, caused problems. If you don't have DB_File support for
your perl, you'll need to find the tie() statements in the bin/*
scripts, and modify them to use some dbm package that you do have on
your system.

$P4_DEPOT can now be set to something that doesn't start with
"//depot/", and things will work properly (a new depot specification
will be created in the converted database).

Added README notes about conversions that merge into an existing
depot.

=== Release 2.3.2, September 3, 2002

Add $DEPOT config item, allowing RCS archives to appear as
$P4ROOT/$DEPOT/$CVS_MODULE; I.e., with $DEPOT set to "depot/IMPORT",
the RCS archive files will end up under
"depot/IMPORT/<modulename>/<filepath>"; With $DEPOT set to "depot",
they will be, simply, "depot/<modulename>/<filepath>". This makes it
easier to make later merges of subsequently imported changes easier.

Changed the database open code to allow setting the size of hash
buckets (allows large conversions without running out of space for
hash table pages).

Handle label names with '#' or '@' by substituting "_hash_" and/or
"_atsym_" into the converted label name.

(Thanks to Marc Tooley of Perforce Support for supplying these
imporvements).

3 files changed, 11 insertions, 11 deletions

diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index c60df09d8e1..59b2f2d1a89 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/01 05:02:07 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/27 02:02:17 schmonz Exp $
 #
 
-DISTNAME=	cvs2p4-2.0
+DISTNAME=	cvs2p4-2.3.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.perforce.com/perforce/utils/cvs2p4/
+MASTER_SITES=	ftp://public.perforce.com/public/perforce/utils/cvs2p4/
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	schmonz@netbsd.org
diff --git a/devel/cvs2p4/distinfo b/devel/cvs2p4/distinfo
index 7877ed7de55..076c3aaf8e1 100644
--- a/devel/cvs2p4/distinfo
+++ b/devel/cvs2p4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/01 05:02:07 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/27 02:02:18 schmonz Exp $
 
-SHA1 (cvs2p4-2.0.tar) = e867fa3be7f6820cca8fe9beaf56f108b60eb166
-Size (cvs2p4-2.0.tar) = 153600 bytes
-SHA1 (patch-aa) = ce45400202e5b107cefa41de0178cc208350e1f5
+SHA1 (cvs2p4-2.3.2.tar) = 4fa1ef417d85a9641a84293117f488086a39668b
+Size (cvs2p4-2.3.2.tar) = 163840 bytes
+SHA1 (patch-aa) = f48ff5b6956f2e422f5db07d43b7ac79bf6963f7
diff --git a/devel/cvs2p4/patches/patch-aa b/devel/cvs2p4/patches/patch-aa
index e87ad498865..67e4bfaea39 100644
--- a/devel/cvs2p4/patches/patch-aa
+++ b/devel/cvs2p4/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/01 05:02:07 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/27 02:02:19 schmonz Exp $
 
---- test/config.orig	Mon May  6 18:54:48 2002
+--- test/config.orig	Tue Sep  3 13:42:07 2002
 +++ test/config
 @@ -6,22 +6,22 @@
  
@@ -27,5 +27,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/09/01 05:02:07 schmonz Exp $
 -$P4ROOT = "p4root";
 +$P4ROOT = "@P4ROOT@";
  
- # Perforce user name to use during the conversion.
- # This code defaults it to the user name of the user running
+ # The depot pathname for copied/linked RCS archive files. (The path
+ # used will be $P4ROOT/$DEPOT/$CVS_MODULE/<filepath>).