Update cvsup to 16.1.f

Update cvsup-gui to 16.1.f

Fixes PR 14475 by Onno van der Linden <o.vd.linden@quicknet.nl>

6 files changed, 63 insertions, 18 deletions

diff --git a/devel/cvsup-gui/Makefile b/devel/cvsup-gui/Makefile
index e3a2ee0970d..574a61b29bf 100644
--- a/devel/cvsup-gui/Makefile
+++ b/devel/cvsup-gui/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2002/08/19 08:54:16 jdarrow Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/05 23:52:42 hubertf Exp $
 
-# XXX there's some newer version at 
-# http://people.freebsd.org/~jdp/s1g/
-
-DISTNAME=	cvsup-bin-16.1d
-PKGNAME=	cvsup-gui-16.1.d
+DISTNAME=	cvsup-gui-static-16.1.f
+PKGNAME=	${DISTNAME:C/-static//}
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/cvsupd/
+MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/cvsupd/${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://people.freebsd.org/~jdp/
 COMMENT=	cvsup gui client
 
+DEPENDS+=	cvsup-[0-9]*:../../devel/cvsup
+
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-i386
+DIST_SUBDIR=	cvsup-${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cvsup ${PREFIX}/bin/cvsup-gui
diff --git a/devel/cvsup-gui/distinfo b/devel/cvsup-gui/distinfo
index 1eb116975d4..0129322b32a 100644
--- a/devel/cvsup-gui/distinfo
+++ b/devel/cvsup-gui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/09/14 13:23:41 hubertf Exp $
+$NetBSD: distinfo,v 1.2 2002/09/05 23:52:42 hubertf Exp $
 
-SHA1 (cvsup-bin-16.1d.tgz) = 7787ad6e74b0f28730d095645c2c085cfa3044f8
-Size (cvsup-bin-16.1d.tgz) = 2226451 bytes
+SHA1 (cvsup-i386-1.6/cvsup-gui-static-16.1.f.tgz) = 17b0324d9f5c8ebda47fa42ea232fd7b738e882e
+Size (cvsup-i386-1.6/cvsup-gui-static-16.1.f.tgz) = 2046223 bytes
diff --git a/devel/cvsup/Makefile b/devel/cvsup/Makefile
index e85d33d9e31..5fad39a5c78 100644
--- a/devel/cvsup/Makefile
+++ b/devel/cvsup/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2002/08/19 08:54:16 jdarrow Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/05 23:52:41 hubertf Exp $
 
-DISTNAME=	cvsup-bin-nogui-16.1d
-PKGNAME=	cvsup-16.1.d
+DISTNAME=	cvsup-static-16.1.f
+PKGNAME=	${DISTNAME:C/-static//}
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/cvsupd/
+MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/cvsupd/${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
@@ -14,6 +14,7 @@ WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 ONLY_FOR_PLATFORM=	NetBSD-1.[5-9]*-i386
+DIST_SUBDIR=	cvsup-${MACHINE_ARCH}-${OS_VERSION:C/(...).*/\1/}
 
 do-install:
 	for i in cvpasswd cvsup ; do \
@@ -28,5 +29,11 @@ do-install:
 	for i in cvsupd.8; do \
 		${INSTALL_MAN} ${WRKSRC}/man/man8/$$i ${PREFIX}/man/man8; \
 	done
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cvsup
+	${INSTALL_DATA} ${WRKSRC}/share/doc/cvsup/License \
+		${PREFIX}/share/doc/cvsup
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cvsup
+	${INSTALL_DATA} ${FILESDIR}/supfile-cvsup.no.netbsd.org \
+		${PREFIX}/share/examples/cvsup
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsup/PLIST b/devel/cvsup/PLIST
index a18bc976279..71fb2915acc 100644
--- a/devel/cvsup/PLIST
+++ b/devel/cvsup/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/05 23:52:41 hubertf Exp $
 bin/cvpasswd
 bin/cvsup
 sbin/cvsupd
 man/man1/cvpasswd.1
 man/man1/cvsup.1
 man/man8/cvsupd.8
+share/examples/cvsup/supfile-cvsup.no.netbsd.org
+share/doc/cvsup/License
+@dirrm share/examples/cvsup
+@dirrm share/doc/cvsup
diff --git a/devel/cvsup/distinfo b/devel/cvsup/distinfo
index 6894f77bc45..c22ba19ff8d 100644
--- a/devel/cvsup/distinfo
+++ b/devel/cvsup/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/09/13 10:58:51 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2002/09/05 23:52:41 hubertf Exp $
 
-SHA1 (cvsup-bin-nogui-16.1d.tgz) = 385d70f276cff55cb0bef5859c79a9e1210bd6ad
-Size (cvsup-bin-nogui-16.1d.tgz) = 1292680 bytes
+SHA1 (cvsup-i386-1.6/cvsup-static-16.1.f.tgz) = 2d66c9259cb8369c4521d4c1e556046a3d9f8e67
+Size (cvsup-i386-1.6/cvsup-static-16.1.f.tgz) = 1252032 bytes
diff --git a/devel/cvsup/files/supfile-cvsup.no.netbsd.org b/devel/cvsup/files/supfile-cvsup.no.netbsd.org
new file mode 100644
index 00000000000..bea94981f10
--- /dev/null
+++ b/devel/cvsup/files/supfile-cvsup.no.netbsd.org
@@ -0,0 +1,34 @@
+#
+# Example cvsup config file provided by
+# Onno van der Linden <o.vd.linden@quicknet.nl>
+#
+
+
+# This file can be used to obtain the checked-out NetBSD source files
+
+*default tag=.				# Get the current files.  Replace the
+					# ``.'' with a cvs tag to get other
+					# NetBSD releases.
+*default release=cvs
+*default delete use-rel-suffix
+*default umask=022
+*default host=cvsup.no.NetBSD.org	# Machine to connect to
+*default base=/var/cvsup/		# Location to put the sources
+*default prefix=/usr/cvsup           	# Where to put the sup subdirectory
+
+*default compress			# Use this unless your network link
+					# is a T1 or faster
+
+# You can get everything using the ``netbsd'' collection.
+# netbsd-doc
+
+# Alternatively, comment out the ``netbsd'' collection and just get one or
+# more of the partial collections by uncommenting them below.
+
+netbsd-basesrc
+netbsd-doc prefix=/var/cvsup
+netbsd-gnusrc
+netbsd-sharesrc
+netbsd-syssrc
+netbsd-pkgsrc
+# netbsd-xsrc