14 files changed, 52 insertions, 46 deletions

diff --git a/net/cvsup-bin/Makefile b/net/cvsup-bin/Makefile
index 0bd6a6a7069a..9d670ee39984 100644
--- a/net/cvsup-bin/Makefile
+++ b/net/cvsup-bin/Makefile
@@ -1,31 +1,30 @@
 # New ports collection makefile for:	cvsup-bin
-# Version required:	15.4.2
+# Version required:	16.0
 # Date created:		12 November 1997
 # Whom:			Sheldon Hearn <axl@iafrica.com>
 #
-# $Id: Makefile,v 1.6 1998/08/17 21:44:57 jdp Exp $
+# $Id: Makefile,v 1.7 1998/09/22 23:20:54 jdp Exp $
 #
 
-DISTNAME=	cvsup-bin-15.4.2
+DISTNAME=	cvsup-bin-16.0
 CATEGORIES=	devel net
-MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/CVSup/ \
-		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/CVSup/ \
-		ftp://ftp.polstra.com/pub/FreeBSD/CVSup/
-DISTFILES=	cvsup-bin-15.4.2.tar.gz
+MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ \
+		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/
+DISTFILES=	cvsup-bin-16.0.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
 NO_BUILD=	yes
 
-MAN1=	cvsup.1
+MAN1=	cvpasswd.1 cvsup.1
 STRIP=
 
 do-configure:
-	cd ${WRKSRC}; gunzip cvsup.1.gz
+	cd ${WRKSRC}; gunzip ${MAN1:S/$/.gz/}
 
 do-install:
 	cd ${WRKSRC}; \
-	    ${INSTALL_PROGRAM} cvsup ${PREFIX}/bin; \
+	    ${INSTALL_PROGRAM} cvpasswd cvsup ${PREFIX}/bin; \
 	    ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/cvsup-bin/distinfo b/net/cvsup-bin/distinfo
index 46e61c533d08..47035c97cba1 100644
--- a/net/cvsup-bin/distinfo
+++ b/net/cvsup-bin/distinfo
@@ -1 +1 @@
-MD5 (cvsup-bin-15.4.2.tar.gz) = 5dda893f231359dab5dc4d7d2dd7e449
+MD5 (cvsup-bin-16.0.tar.gz) = 57c25981d3c1d82a79b9ae18aaea715b
diff --git a/net/cvsup-bin/pkg-comment b/net/cvsup-bin/pkg-comment
index f1195337a1d1..b4bc57c0d16b 100644
--- a/net/cvsup-bin/pkg-comment
+++ b/net/cvsup-bin/pkg-comment
@@ -1 +1 @@
-A network file distribution and update system for CVS repositories.
+A general network file distribution system optimized for CVS repositories.
diff --git a/net/cvsup-bin/pkg-descr b/net/cvsup-bin/pkg-descr
index 3d73b2e60cae..5bbcd513f979 100644
--- a/net/cvsup-bin/pkg-descr
+++ b/net/cvsup-bin/pkg-descr
@@ -1,10 +1,12 @@
-This is the BINARY (statically linked) version of CVSup.
+This is the BINARY (statically linked) version of the CVSup client.
 
 CVSup is a software package for distributing and updating collections
-of files across a network.  CVSup is specifically tailored to
-distributing CVS repositories.  By taking advantage of the special
-properties of the files contained in CVS repositories, CVSup is
-able to perform updates much faster than traditional systems.  It
-is especially valuable for people with slow Internet connections.
+of files across a network.  It can efficiently and accurately mirror
+all types of files, including sources, binaries, hard links, symbolic
+links, and even device nodes.  CVSup's streaming communication
+protocol and multithreaded architecture make it most likely the
+fastest mirroring tool in existence today.  In addition to being
+a great general-purpose mirroring tool, CVSup includes special
+features and optimizations specifically tailored to CVS repositories.
 
 jdp@polstra.com
diff --git a/net/cvsup-bin/pkg-plist b/net/cvsup-bin/pkg-plist
index 163842dee2e2..17066c92f9fe 100644
--- a/net/cvsup-bin/pkg-plist
+++ b/net/cvsup-bin/pkg-plist
@@ -1 +1,2 @@
+bin/cvpasswd
 bin/cvsup
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index a9e0f8b67558..4c798c7a92f2 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	cvsup
-# Version required:	15.4.2
+# Version required:	16.0
 # Date created:		7 August 1996
 # Whom:			asami
 #
-# $Id: Makefile,v 1.30 1999/01/22 11:50:31 wosch Exp $
+# $Id: Makefile,v 1.31 1999/01/28 05:39:14 jdp Exp $
 #
 
-DISTNAME=	cvsup-15.4.2
+DISTNAME=	cvsup-16.0
 CATEGORIES=	devel net
-MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/CVSup/ \
-		ftp://ftp.polstra.com/pub/FreeBSD/CVSup/
+MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ \
+		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/
 
 MAINTAINER=	jdp@FreeBSD.org
 
 BUILD_DEPENDS=	m3build-6:${PORTSDIR}/lang/modula-3
 LIB_DEPENDS=	m3.6:${PORTSDIR}/lang/modula-3-lib
 
-MAN1=		cvsup.1
+MAN1=		cvpasswd.1 cvsup.1
 MAN8=		cvsupd.8
 
 # Support building on systems with or without X11 installed.
@@ -35,6 +35,6 @@ pre-fetch:
 # To link just the Modula-3 libraries statically:
 #M3FLAGS+=	-DM3STATIC
 
-MAKE_ENV+=	M3FLAGS="${M3FLAGS}"
+MAKE_ARGS+=	PREFIX=${PREFIX} M3FLAGS="${M3FLAGS}"
 
 .include <bsd.port.mk>
diff --git a/net/cvsup/distinfo b/net/cvsup/distinfo
index 489f2e419819..34ea96003462 100644
--- a/net/cvsup/distinfo
+++ b/net/cvsup/distinfo
@@ -1 +1 @@
-MD5 (cvsup-15.4.2.tar.gz) = 089a3a06c47927630ffc6b13f5cbd0de
+MD5 (cvsup-16.0.tar.gz) = bad884ccbd4ed129d360487c87c089a4
diff --git a/net/cvsup/pkg-comment b/net/cvsup/pkg-comment
index f1195337a1d1..b4bc57c0d16b 100644
--- a/net/cvsup/pkg-comment
+++ b/net/cvsup/pkg-comment
@@ -1 +1 @@
-A network file distribution and update system for CVS repositories.
+A general network file distribution system optimized for CVS repositories.
diff --git a/net/cvsup/pkg-descr b/net/cvsup/pkg-descr
index f21031e91fc8..eacebe4f08ec 100644
--- a/net/cvsup/pkg-descr
+++ b/net/cvsup/pkg-descr
@@ -1,8 +1,10 @@
 CVSup is a software package for distributing and updating collections
-of files across a network.  CVSup is specifically tailored to
-distributing CVS repositories.  By taking advantage of the special
-properties of the files contained in CVS repositories, CVSup is
-able to perform updates much faster than traditional systems.  It
-is especially valuable for people with slow Internet connections.
+of files across a network.  It can efficiently and accurately mirror
+all types of files, including sources, binaries, hard links, symbolic
+links, and even device nodes.  CVSup's streaming communication
+protocol and multithreaded architecture make it most likely the
+fastest mirroring tool in existence today.  In addition to being
+a great general-purpose mirroring tool, CVSup includes special
+features and optimizations specifically tailored to CVS repositories.
 
 jdp@polstra.com
diff --git a/net/cvsup/pkg-plist b/net/cvsup/pkg-plist
index ccf5115ed8ef..ad815aafd5c7 100644
--- a/net/cvsup/pkg-plist
+++ b/net/cvsup/pkg-plist
@@ -1,2 +1,3 @@
+bin/cvpasswd
 bin/cvsup
 sbin/cvsupd
diff --git a/net/cvsupd-bin/Makefile b/net/cvsupd-bin/Makefile
index d69e66ae7e3e..a9cf0def3a30 100644
--- a/net/cvsupd-bin/Makefile
+++ b/net/cvsupd-bin/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	cvsupd-bin
-# Version required:	15.4.2
+# Version required:	16.0
 # Date created:		17 August 1998
 # Whom:			Sheldon Hearn <axl@iafrica.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/17 21:37:02 jdp Exp $
+# $Id: Makefile,v 1.2 1998/09/22 23:21:00 jdp Exp $
 #
 
-DISTNAME=	cvsupd-bin-15.4.2
+DISTNAME=	cvsupd-bin-16.0
 CATEGORIES=	devel net
-MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/CVSup/ \
-		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/CVSup/ \
-		ftp://ftp.polstra.com/pub/FreeBSD/CVSup/
-DISTFILES=	cvsupd-bin-15.4.2.tar.gz
+MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/ \
+		ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/
+DISTFILES=	cvsupd-bin-16.0.tar.gz
 
 MAINTAINER=	axl@iafrica.com
 
diff --git a/net/cvsupd-bin/distinfo b/net/cvsupd-bin/distinfo
index a856dc373ae9..57acd4f39eaf 100644
--- a/net/cvsupd-bin/distinfo
+++ b/net/cvsupd-bin/distinfo
@@ -1 +1 @@
-MD5 (cvsupd-bin-15.4.2.tar.gz) = ad30058ce6f70957618b3124405a155d
+MD5 (cvsupd-bin-16.0.tar.gz) = c03347b4c0dbfc2a911cc1b5a045c3bb
diff --git a/net/cvsupd-bin/pkg-comment b/net/cvsupd-bin/pkg-comment
index f1195337a1d1..b4bc57c0d16b 100644
--- a/net/cvsupd-bin/pkg-comment
+++ b/net/cvsupd-bin/pkg-comment
@@ -1 +1 @@
-A network file distribution and update system for CVS repositories.
+A general network file distribution system optimized for CVS repositories.
diff --git a/net/cvsupd-bin/pkg-descr b/net/cvsupd-bin/pkg-descr
index 4e7cd1ccd604..2b45f61f17e7 100644
--- a/net/cvsupd-bin/pkg-descr
+++ b/net/cvsupd-bin/pkg-descr
@@ -1,10 +1,12 @@
 This is the BINARY (statically linked) version of the CVSup server.
 
 CVSup is a software package for distributing and updating collections
-of files across a network.  CVSup is specifically tailored to
-distributing CVS repositories.  By taking advantage of the special
-properties of the files contained in CVS repositories, CVSup is
-able to perform updates much faster than traditional systems.  It
-is especially valuable for people with slow Internet connections.
+of files across a network.  It can efficiently and accurately mirror
+all types of files, including sources, binaries, hard links, symbolic
+links, and even device nodes.  CVSup's streaming communication
+protocol and multithreaded architecture make it most likely the
+fastest mirroring tool in existence today.  In addition to being
+a great general-purpose mirroring tool, CVSup includes special
+features and optimizations specifically tailored to CVS repositories.
 
 jdp@polstra.com