Update to 6.9.2.

No NEWS or ChangeLog, but from mailing list this adds gcodacon, a
system tray applet to show reintegration status, converts to automake,
and various bugfixes.

5 files changed, 33 insertions, 39 deletions

diff --git a/net/coda/Makefile b/net/coda/Makefile
index 960d3d64e72..4e811ff8bd0 100644
--- a/net/coda/Makefile
+++ b/net/coda/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/08/04 14:03:27 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2007/08/06 12:31:25 gdt Exp $
 #
 
-DISTNAME=	coda-6.9.1
-PKGREVISION=	2
+DISTNAME=	coda-6.9.2
 CATEGORIES=	net
 MASTER_SITES=	http://www.coda.cs.cmu.edu/pub/coda/src/
 
@@ -13,15 +12,10 @@ COMMENT=	Coda distributed fileystem
 # See http://coda.wikidev.net/Quick_Client_Action for hints on how
 # to configure venus.
 
-# Top-level Makefile is missing .WAIT, reported upstream 20070412 by gdt.
-MAKE_JOBS_SAFE=	no
-
 USE_TOOLS+=	gmake perl
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 
-INSTALL_TARGET=	client-install server-install
-
 .include "../../devel/lwp/buildlink3.mk"
 .include "../../devel/rpc2/buildlink3.mk"
 .include "../../devel/rvm/buildlink3.mk"
diff --git a/net/coda/PLIST b/net/coda/PLIST
index de28578f42a..88a7dfec067 100644
--- a/net/coda/PLIST
+++ b/net/coda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/04/15 14:03:57 gdt Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/08/06 12:31:25 gdt Exp $
 bin/au
 bin/cfs
 bin/clog
@@ -9,6 +9,7 @@ bin/cpasswd
 bin/ctokens
 bin/cunlog
 bin/filerepair
+bin/gcodacon
 bin/getvolinfo
 bin/hoard
 bin/mkcodabf
@@ -21,7 +22,6 @@ bin/rpc2ping
 bin/rvmsizer
 bin/smon2
 bin/spy
-bin/vcodacon
 bin/xaskuser
 bin/xfrepair
 etc/coda/realms
@@ -74,7 +74,6 @@ sbin/backup
 sbin/backup.sh
 sbin/bldvldb.sh
 sbin/coda-server-logrotate
-sbin/coda-setup-ports
 sbin/codaconfedit
 sbin/codadump2tar
 sbin/codasrv
@@ -93,6 +92,7 @@ sbin/purgevol_rep
 sbin/readdump
 sbin/startserver
 sbin/tape.pl
+sbin/tokentool
 sbin/updateclnt
 sbin/updatefetch
 sbin/updatesrv
diff --git a/net/coda/distinfo b/net/coda/distinfo
index 01a482963bc..c5c6d53e68d 100644
--- a/net/coda/distinfo
+++ b/net/coda/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/04/12 18:13:05 gdt Exp $
+$NetBSD: distinfo,v 1.2 2007/08/06 12:31:25 gdt Exp $
 
-SHA1 (coda-6.9.1.tar.gz) = 503923590dbe2c4508a1b4663fb51e1dd0ca7203
-RMD160 (coda-6.9.1.tar.gz) = 1d2257b761174aa10a60a4203a0eff0f35a14c73
-Size (coda-6.9.1.tar.gz) = 1537910 bytes
-SHA1 (patch-aa) = fb8f4a235c85329cdc1e8c56d7b6cb6dd40c779a
-SHA1 (patch-ab) = 04df537a1145a5608a3eb047675c2921f56c1a69
+SHA1 (coda-6.9.2.tar.gz) = 47e71299d04dbb9e03f9f5a7101933679b1cb316
+RMD160 (coda-6.9.2.tar.gz) = 4cdf2ad53333359d39793147daee865b22b38993
+Size (coda-6.9.2.tar.gz) = 1650937 bytes
+SHA1 (patch-aa) = f9cb4a72a4ff72020ba52382481811fe71931ab2
+SHA1 (patch-ab) = 07675cfb2eb7ebe40609338368ca7df813a7d5dd
diff --git a/net/coda/patches/patch-aa b/net/coda/patches/patch-aa
index c3c7e36f3c8..bc2e5adb5f5 100644
--- a/net/coda/patches/patch-aa
+++ b/net/coda/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/12 18:13:05 gdt Exp $
+$NetBSD: patch-aa,v 1.2 2007/08/06 12:31:25 gdt Exp $
 
---- debian/coda-client.postrm.orig	2004-10-15 10:50:52.000000000 -0400
-+++ debian/coda-client.postrm
-@@ -5,7 +5,7 @@
- 
- set -e
- 
--if [ "$1" == "purge" ] ; then
-+if [ "$1" = "purge" ] ; then
-     echo "Purging Coda client configuration and cache files" >&2
-     rm -f /etc/coda/venus.conf
-     rm -rf /var/cache/coda /var/lib/coda /var/log/coda
+--- coda-src/scripts/Makefile.am.orig	2007-08-01 14:31:53.000000000 -0400
++++ coda-src/scripts/Makefile.am
+@@ -23,7 +23,7 @@ dist_man_MANS += bldvldb.sh.8 createvol_
+ if SYSVINIT
+ dist_init_SCRIPTS += auth2.init codasrv.init update.init
+ else
+-dist_init_SCRIPTS += rc.vice
++#dist_init_SCRIPTS += rc.vice
+ endif
+ endif
+ EXTRA_DIST = findparents.sh volinfo.pl volsizes.pl
diff --git a/net/coda/patches/patch-ab b/net/coda/patches/patch-ab
index 5aca6eacb80..d808caecb79 100644
--- a/net/coda/patches/patch-ab
+++ b/net/coda/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/04/12 18:13:05 gdt Exp $
+$NetBSD: patch-ab,v 1.2 2007/08/06 12:31:25 gdt Exp $
 
---- coda-src/scripts/Makefile.in.orig	2006-11-02 14:46:29.000000000 -0500
+--- coda-src/scripts/Makefile.in.orig	2007-08-02 14:59:50.000000000 -0400
 +++ coda-src/scripts/Makefile.in
-@@ -51,7 +51,7 @@ ifeq ($(SYS),solaris2)
- else
-   # use BSD style init scripts
-   CINIT-SCRIPTS   = # rc.venus
--  SINIT-SCRIPTS   = rc.vice
-+  SINIT-SCRIPTS   = # rc.vice
- endif
- endif
+@@ -51,7 +51,7 @@ host_triplet = @host@
+ @BUILD_SERVER_TRUE@		 startserver.8 vice-setup.8 volumelist.5
  
+ @BUILD_SERVER_TRUE@@SYSVINIT_TRUE@am__append_8 = auth2.init codasrv.init update.init
+-@BUILD_SERVER_TRUE@@SYSVINIT_FALSE@am__append_9 = rc.vice
++#@BUILD_SERVER_TRUE@@SYSVINIT_FALSE@am__append_9 = rc.vice
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@