Update net/coda5_client to version 5.3.19. Changes from version 5.3.13

include:

	* Installing the relevant manpages with the client programs.
	* Miscellaneous bug fixes.
	* Venus now gracefully handles the situation where getvolinfo returns
	  different replicas compared to the cached replication information.
	  Now we only need add server support for VSG changes and a trigger
	  that forces venus to make a getvolinfo call and we can start moving
	  volumes around in the system.
	* Avoid killing clients when receiving truncated directory data.
	* Block when accessing an uncached object during resolution instead of
	  failing. This is especially useful during weak-reintegration.
	* Added -local flag to cfs lv to avoid client-server rpc2 traffic.
	* Fetch data as well as status in write-disconnected mode, the dirty
	  status-only object would prevent subsequent data-fetches until
	  successful reintegration completed.
	* Added venus.conf option 'validateattrs' to limit piggybacked fids
	  during validate attrs to help reducing IP layer fragmentation.
	* Another new venus.conf option 'serverprobe' to increase server probe
	  intervals (keeps firewalls from dropping masqueraded connections).
	* venus.conf.ex file now defaults to turning on both masquerading and
	  using private mmap's for RVM.
	* Disallow unlinking special names with 'cfs rmm'
	* Optimized local-global fid replacement.
	* Moved /usr/bin/replay to /usr/bin/coda_replay to avoid name conflicts.
        * Reintroduced VSGs in venus.
        * Re-randomizing during hoardwalks to add fair reclaiming behaviour
          in the low end of the priority queue.

8 files changed, 53 insertions, 173 deletions

diff --git a/net/coda5_client/DEINSTALL b/net/coda5_client/DEINSTALL
index 8f3701672bf..8de08020f79 100644
--- a/net/coda5_client/DEINSTALL
+++ b/net/coda5_client/DEINSTALL
@@ -1,72 +1,14 @@
 #! /bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:55:02 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-LN="@LN@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
-
-CONFDIR=${PKG_PREFIX}/etc/coda
+# $NetBSD: DEINSTALL,v 1.2 2002/06/20 19:28:24 jlam Exp $
 
 case ${STAGE} in
-DEINSTALL)
-	;;
-
 POST-DEINSTALL)
-	# If coda-client is installed, then point these links to the
-	# vice-* versions of these scripts.
-	#
-	for script in coda-setup-ports codaconfedit; do
-		${RM} -f ${PKG_PREFIX}/sbin/${script}
-		if [ -f ${PKG_PREFIX}/sbin/vice-${script} ]
-		then
-			${LN} -sf vice-${script} ${PKG_PREFIX}/sbin/${script}
+	for file in au coda-setup-ports codaconfedit; do
+		${RM} -f ${PKG_PREFIX}/sbin/${file}
+		if [ -f ${PKG_PREFIX}/sbin/vice-${file} ]; then
+			${LN} -sf vice-${file} ${PKG_PREFIX}/sbin/${file}
 		fi
 	done
-
-	${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
-
-	existing_dirs=''
-	for dir in ${CONFDIR}
-	do
-		if [ -d ${dir} ]
-		then
-			existing_dirs="${existing_dirs} ${dir}"
-		fi
-	done
-
-	if [ -n "${existing_dirs}" ]
-	then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-EOF
-		if [ -n "${existing_dirs}" ]
-		then
-			${CAT} << EOF
-
-  * the following directories:
-
-EOF
-			for dir in ${existing_dirs}
-			do
-				echo "	${dir}"
-			done
-		fi
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
 	;;
 esac
-exit 0
diff --git a/net/coda5_client/DESCR b/net/coda5_client/DESCR
index 44668209467..86b04c270bf 100644
--- a/net/coda5_client/DESCR
+++ b/net/coda5_client/DESCR
@@ -2,7 +2,6 @@ Coda is a distributed file system.  Among its features are disconnected
 operation, good security model, server replication and persistent client
 side caching. 
 
-This package builds the entire source tree but only installs(/packages) the
-client side programs.
-
 For more info, contact <coda@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.
+
+This package contains the client-side programs.
diff --git a/net/coda5_client/INSTALL b/net/coda5_client/INSTALL
index 8ae1b79f976..972f7743858 100644
--- a/net/coda5_client/INSTALL
+++ b/net/coda5_client/INSTALL
@@ -1,30 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:55:03 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-LN="@LN@"
-RM="@RM@"
+# $NetBSD: INSTALL,v 1.2 2002/06/20 19:28:25 jlam Exp $
 
 case ${STAGE} in
-PRE-INSTALL)
-	;;
-
 POST-INSTALL)
-	# coda-server may have already created these links
-	for script in coda-setup-ports codaconfedit; do
-		if [ ! -f ${PKG_PREFIX}/sbin/${script} ]
-		then
-			${LN} -sf venus-${script} ${PKG_PREFIX}/sbin/${script}
+	for file in au coda-setup-ports codaconfedit; do
+		if [ ! -f ${PKG_PREFIX}/sbin/${file} ]; then
+			${LN} -sf venus-${file} ${PKG_PREFIX}/sbin/${file}
 		fi
 	done
 	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
 esac
-exit 0
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 8d63cdaf88c..dad1e2de2d1 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,47 +1,32 @@
-# $NetBSD: Makefile,v 1.32 2001/06/19 03:48:01 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.33 2002/06/20 19:28:25 jlam Exp $
 
-DISTNAME=		coda-5.3.13
-PKGNAME=		coda-client-5.3.13
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+PKGNAME=	coda-client-${DIST_VERS}
+COMMENT=	client programs for a replicated high-performance network file system
 
-MAINTAINER=		phil@cs.wwu.edu
-HOMEPAGE=		http://www.coda.cs.cmu.edu/
-COMMENT=		client programs for a replicated high-performance network file system
+USE_BUILDLINK_ONLY=	yes
 
-# Requires "lwp" plus "filesystem CODA" to operate. Should build on
-# any NetBSD-*-m68k, though.
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* NetBSD-*-arm32
+.include "../../net/coda5_server/Makefile.common"
 
 ALL_TARGET=		coda
 INSTALL_TARGET=		client-install
+INSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 
-USE_PERL5=		yes
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USE_BUILDLINK_ONLY=	yes
-
-.include "../../devel/lwp/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../devel/rpc2/buildlink.mk"
-.include "../../devel/rvm/buildlink.mk"
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
-INSTALL_SUBST=		CAT=${CAT:Q}
-INSTALL_SUBST+=		LN=${LN:Q}
-INSTALL_SUBST+=		RM=${RM:Q}
-INSTALL_SUBST+=		RMDIR=${RMDIR:Q}
-INSTALL_SUBST+=		TRUE=${TRUE:Q}
-INSTALL_SUBST_SED=	${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-pre-install:
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+CONF_FILES+=	${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
+CONF_FILES+=	${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
 
 post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
+	cd ${PREFIX}; ${PAX} -zr					\
+		-s "/usr\/\(man\/man.\/\)au.8/\1venus-au.8/"		\
+		-s "/usr\/\(man\/man.\/\)replay.8/\1coda_replay.8/"	\
+		-s "/usr\///"						\
+		-f ${_DISTDIR}/${CODADOC_DISTFILE}			\
+		`${GREP} "^man/" ${PLIST_SRC} |				\
+			${GREP} -v "man/man8/au.8" |			\
+			${SED}	-e "s|^|usr/|"				\
+				-e "s|coda_replay\.8|replay.8|"		\
+				-e "s|venus-au\.8|au.8|"`
+	${LN} -sf venus-au.8 ${PREFIX}/man/man8/au.8
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_client/PLIST b/net/coda5_client/PLIST
index 382b5b1a4c8..603f682c45c 100644
--- a/net/coda5_client/PLIST
+++ b/net/coda5_client/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:25 jlam Exp $
 bin/cfs
 bin/clog
 bin/cmon
+bin/coda_replay
 bin/codacon
 bin/cpasswd
 bin/ctokens
@@ -11,17 +12,31 @@ bin/hoard
 bin/parser
 bin/removeinc
 bin/repair
-bin/replay
 bin/spy
 bin/xaskuser
 bin/xfrepair
-etc/coda/sidekick.intr.ex
-etc/coda/venus.conf.ex
-sbin/au
+man/man1/cfs.1
+man/man1/clog.1
+man/man1/cmon.1
+man/man1/cpasswd.1
+man/man1/ctokens.1
+man/man1/cunlog.1
+man/man1/hoard.1
+man/man1/repair.1
+man/man1/spy.1
+man/man8/au.8
+man/man8/coda_replay.8
+man/man8/venus.8
+man/man8/venus-au.8
+man/man8/vutil.8
 sbin/sidekick
 sbin/venus
+sbin/venus-au
 sbin/venus-coda-setup-ports
 sbin/venus-codaconfedit
 sbin/venus-setup
 sbin/volmunge
 sbin/vutil
+share/examples/coda/sidekick.intr.ex
+share/examples/coda/venus.conf.ex
+@unexec ${RMDIR} %D/share/examples/coda 2>/dev/null || ${TRUE}
diff --git a/net/coda5_client/distinfo b/net/coda5_client/distinfo
deleted file mode 100644
index bd1003bd9af..00000000000
--- a/net/coda5_client/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/05/31 22:55:54 jlam Exp $
-
-SHA1 (coda-5.3.13.tar.gz) = 6f06e73d8441f4ae7010acb2a35d0f0bde6ff7a4
-Size (coda-5.3.13.tar.gz) = 1324328 bytes
-SHA1 (patch-aa) = 8b837514b87683608b52d103a3743396027145d9
-SHA1 (patch-ab) = 0170aeef668bb4a1ace0691beaefa9d67e95f28a
diff --git a/net/coda5_client/patches/patch-aa b/net/coda5_client/patches/patch-aa
deleted file mode 100644
index ed19ad3470b..00000000000
--- a/net/coda5_client/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2001/05/31 22:55:54 jlam Exp $
-
---- coda-src/scripts/Makefile.in.orig	Wed Aug 30 16:41:33 2000
-+++ coda-src/scripts/Makefile.in	Thu May 31 16:06:31 2001
-@@ -25,7 +25,7 @@
- # Need to conditionalize this
- include $(TOPDIR)/Makeconf
- 
--VENUS-SCRIPTS = vutil volmunge venus-setup codaconfedit coda-setup-ports
-+VENUS-SCRIPTS = vutil volmunge venus-setup venus-codaconfedit venus-coda-setup-ports
- 
- VOL-SCRIPTS	= createvol_rep purgevol purgevol_rep bldvldb.sh
- VICE-SCRIPTS	= startserver codastart
-@@ -66,3 +66,8 @@
- 
- include $(TOPDIR)/configs/Makerules
- 
-+venus-coda-setup-ports: coda-setup-ports
-+	cp coda-setup-ports venus-coda-setup-ports
-+
-+venus-codaconfedit: codaconfedit
-+	cp codaconfedit venus-codaconfedit
diff --git a/net/coda5_client/patches/patch-ab b/net/coda5_client/patches/patch-ab
deleted file mode 100644
index 4f613e96e5d..00000000000
--- a/net/coda5_client/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2001/05/31 22:55:55 jlam Exp $
-
---- lib-src/base/parser.c.orig	Sun Jan 30 19:01:28 2000
-+++ lib-src/base/parser.c	Thu May 31 14:29:28 2001
-@@ -34,10 +34,7 @@
- 
- #define	READLINE_LIBRARY
- #include <readline/readline.h>
--
--extern void using_history();
--extern void stifle_history(int);
--extern void add_history(char *);
-+#include <readline/history.h>
- 
- #ifdef __cplusplus
- }