Update coda5*- and coda6*-affiliated software.

Fix build under fresh -CURRENT (gcc 3.4.2).

Bump or remove PORTREVISION where it needed.

17 files changed, 95 insertions, 24 deletions

diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index cf0311bbd3f7..da4fcaac2254 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lwp
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	1.11
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/
 
diff --git a/devel/lwp/distinfo b/devel/lwp/distinfo
index c378f8c6cf14..a99c9986b1f0 100644
--- a/devel/lwp/distinfo
+++ b/devel/lwp/distinfo
@@ -1,2 +1,2 @@
-MD5 (lwp-1.10.tar.gz) = 299d40e5a40924754505e2340ce74dad
-SIZE (lwp-1.10.tar.gz) = 243871
+MD5 (lwp-1.11.tar.gz) = 6a4a8a0284b2f91d40065923478a5a62
+SIZE (lwp-1.11.tar.gz) = 362137
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index ca72bea2f09d..5f4f4525aeb5 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rpc2
-PORTVERSION=	1.15
-PORTREVISION=	1
+PORTVERSION=	1.22
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rpc2/src/
 
diff --git a/devel/rpc2/distinfo b/devel/rpc2/distinfo
index 410fc2266459..152535ef6165 100644
--- a/devel/rpc2/distinfo
+++ b/devel/rpc2/distinfo
@@ -1,2 +1,2 @@
-MD5 (rpc2-1.15.tar.gz) = 7be32245001641a0a7712fe11987b0d7
-SIZE (rpc2-1.15.tar.gz) = 446504
+MD5 (rpc2-1.22.tar.gz) = c6f13aa9e78d8e1c0464a2c8a803b12c
+SIZE (rpc2-1.22.tar.gz) = 571625
diff --git a/devel/rpc2/pkg-plist b/devel/rpc2/pkg-plist
index 7df2c894dc69..d121188a500e 100644
--- a/devel/rpc2/pkg-plist
+++ b/devel/rpc2/pkg-plist
@@ -6,18 +6,19 @@ include/rpc2/fail.h
 include/rpc2/fcon.h
 include/rpc2/multi.h
 include/rpc2/rpc2.h
+include/rpc2/rpc2_addrinfo.h
 include/rpc2/se.h
 include/rpc2/sftp.h
 lib/libfail.a
 lib/libfail.la
 lib/libfail.so
-lib/libfail.so.4
+lib/libfail.so.6
 lib/librpc2.a
 lib/librpc2.la
 lib/librpc2.so
-lib/librpc2.so.4
+lib/librpc2.so.6
 lib/libse.a
 lib/libse.la
 lib/libse.so
-lib/libse.so.4
+lib/libse.so.6
 @dirrm include/rpc2
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index a7a2599a681c..94fcddef9b28 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rvm
-PORTVERSION=	1.7
-PORTREVISION=	1
+PORTVERSION=	1.9
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/
 
diff --git a/devel/rvm/distinfo b/devel/rvm/distinfo
index 437c4b2b8b04..79dcfd469c04 100644
--- a/devel/rvm/distinfo
+++ b/devel/rvm/distinfo
@@ -1,2 +1,2 @@
-MD5 (rvm-1.7.tar.gz) = 7968fd88667aea6dd89096b9650d7169
-SIZE (rvm-1.7.tar.gz) = 405289
+MD5 (rvm-1.9.tar.gz) = 2f0c6aaa12f2da92d53f57b72e7c42e4
+SIZE (rvm-1.9.tar.gz) = 521792
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 51f8e2daea1c..b37125db80b9 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coda
 PORTVERSION=	${CODA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 
 MAINTAINER=	coda@cs.cmu.edu
 COMMENT=	Client programs for a replicated high-performance network file system
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 5d3bf47cd50b..4875a678038a 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	coda
 PORTVERSION=	${CODA_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 PKGNAMESUFFIX=	-${CODA_SUITE}
@@ -18,7 +18,7 @@ COMMENT?=	Server programs for a replicated high-performance network file system
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 		lwp.2:${PORTSDIR}/devel/lwp \
-		rpc2.4:${PORTSDIR}/devel/rpc2 \
+		rpc2.6:${PORTSDIR}/devel/rpc2 \
 		rvm.2:${PORTSDIR}/devel/rvm
 
 ALL_TARGET=	coda
diff --git a/net/coda5_server/files/patch-coda-src-venus-comm.cc b/net/coda5_server/files/patch-coda-src-venus-comm.cc
new file mode 100644
index 000000000000..c96c4f6ee08a
--- /dev/null
+++ b/net/coda5_server/files/patch-coda-src-venus-comm.cc
@@ -0,0 +1,11 @@
+--- coda-src/venus/comm.cc.orig	Fri Aug  6 23:32:52 2004
++++ coda-src/venus/comm.cc	Fri Aug  6 23:33:07 2004
+@@ -245,7 +245,7 @@
+     sei.PacketSize = sftp_packetsize;
+     sei.EnforceQuota = 1;
+ 
+-    sei.Port.Tag = (enum PortTag)0;
++    sei.Port.Tag = (PortTag)0;
+     if (!masquerade) {
+         sei.Port.Tag = RPC2_PORTBYINETNUMBER;
+ 
diff --git a/net/coda5_server/files/patch-coda-src-venus-fso.h b/net/coda5_server/files/patch-coda-src-venus-fso.h
new file mode 100644
index 000000000000..9da292d69e52
--- /dev/null
+++ b/net/coda5_server/files/patch-coda-src-venus-fso.h
@@ -0,0 +1,20 @@
+--- coda-src/venus/fso.h.orig	Fri Aug  6 23:31:46 2004
++++ coda-src/venus/fso.h	Fri Aug  6 23:32:05 2004
+@@ -537,7 +537,7 @@
+     void DetachHdbBindings();
+     void DetachHdbBinding(binding *, int =0);
+     int PredetermineFetchState(int, int);
+-    void SetFetchAllowed(enum HoardFetchState new_state)
++    void SetFetchAllowed(HoardFetchState new_state)
+         { FetchAllowed = new_state; }
+     int IsFetchAllowed()
+         { if (FetchAllowed == HF_Fetch) 
+@@ -545,7 +545,7 @@
+           else 
+               return 0; 
+         }
+-    void SetAskingAllowed(enum HoardAskState new_state)
++    void SetAskingAllowed(HoardAskState new_state)
+         { AskingAllowed = new_state; }
+     int IsAskingAllowed()
+         { if (AskingAllowed == HA_Ask)
diff --git a/net/coda6_client/Makefile b/net/coda6_client/Makefile
index 904818a3bbf8..e7302bf593d9 100644
--- a/net/coda6_client/Makefile
+++ b/net/coda6_client/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	coda
 PORTVERSION=	${CODA_VERSION}
-PORTREVISION=	1
 
 COMMENT=	Client programs for a replicated high-performance network file system
 
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index e63e46d3b778..7523b4ac47d0 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	coda
 PORTVERSION=	${CODA_VERSION}
-PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 PKGNAMESUFFIX=	-${CODA_SUITE}
@@ -17,7 +16,7 @@ COMMENT=	Server programs for a replicated high-performance network file system
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 		lwp.2:${PORTSDIR}/devel/lwp \
-		rpc2.4:${PORTSDIR}/devel/rpc2 \
+		rpc2.6:${PORTSDIR}/devel/rpc2 \
 		rvm.2:${PORTSDIR}/devel/rvm
 
 CONFLICTS=	coda-server-5.*
@@ -30,7 +29,7 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS?=	--sysconfdir=${PREFIX}/etc/rc.d
 
 CODA_SUITE?=	server
-CODA_VERSION?=	6.0.2
+CODA_VERSION?=	6.0.6
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/coda6_server/distinfo b/net/coda6_server/distinfo
index 67c1f5b9e06a..63a6c7c77daf 100644
--- a/net/coda6_server/distinfo
+++ b/net/coda6_server/distinfo
@@ -1,2 +1,2 @@
-MD5 (coda-6.0.2.tar.gz) = bb3b98c3302e0d5a2a9d16e88055838c
-SIZE (coda-6.0.2.tar.gz) = 1487309
+MD5 (coda-6.0.6.tar.gz) = 1feb4b431b72f725b568cc57a759714f
+SIZE (coda-6.0.6.tar.gz) = 1497287
diff --git a/net/coda6_server/files/patch-coda-src-venus-comm.cc b/net/coda6_server/files/patch-coda-src-venus-comm.cc
new file mode 100644
index 000000000000..08745c321fee
--- /dev/null
+++ b/net/coda6_server/files/patch-coda-src-venus-comm.cc
@@ -0,0 +1,11 @@
+--- coda-src/venus/comm.cc.orig	Fri Aug  6 23:01:08 2004
++++ coda-src/venus/comm.cc	Fri Aug  6 23:02:04 2004
+@@ -173,7 +173,7 @@
+     sei.AckPoint = sftp_ackpoint;
+     sei.PacketSize = sftp_packetsize;
+     sei.EnforceQuota = 1;
+-    sei.Port.Tag = (enum PortTag)0;
++    sei.Port.Tag = (PortTag)0;
+     SFTP_Activate(&sei);
+ 
+     /* RPC2 initialization. */
diff --git a/net/coda6_server/files/patch-coda-src-venus-fso.h b/net/coda6_server/files/patch-coda-src-venus-fso.h
new file mode 100644
index 000000000000..e416579b5a96
--- /dev/null
+++ b/net/coda6_server/files/patch-coda-src-venus-fso.h
@@ -0,0 +1,32 @@
+--- coda-src/venus/fso.h.orig	Fri Aug  6 22:52:18 2004
++++ coda-src/venus/fso.h	Fri Aug  6 22:54:34 2004
+@@ -539,7 +539,7 @@
+     void DetachHdbBindings();
+     void DetachHdbBinding(binding *, int =0);
+     int PredetermineFetchState(int, int);
+-    void SetFetchAllowed(enum HoardFetchState new_state)
++    void SetFetchAllowed(HoardFetchState new_state)
+         { FetchAllowed = new_state; }
+     int IsFetchAllowed()
+         { if (FetchAllowed == HF_Fetch) 
+@@ -547,7 +547,7 @@
+           else 
+               return 0; 
+         }
+-    void SetAskingAllowed(enum HoardAskState new_state)
++    void SetAskingAllowed(HoardAskState new_state)
+         { AskingAllowed = new_state; }
+     int IsAskingAllowed()
+         { if (AskingAllowed == HA_Ask)
+@@ -820,9 +820,8 @@
+ #define	CFSOP_PRELUDE(str, comp, fid)\
+ {\
+     char buf[256];\
+-    strcpy(buf, (comp));\
+-    if (buf[0] == '\0')\
+-	sprintf(buf, "%s", FID_(&(fid)));\
++    if (comp) strcpy(buf, (comp));\
++    else sprintf(buf, "%s", FID_(&(fid)));\
+     MarinerLog((str), buf);\
+ }
+ #define	CFSOP_POSTLUDE(str)\
diff --git a/net/coda6_server/pkg-plist b/net/coda6_server/pkg-plist
index e7866bdd655c..e9aa2405b6d8 100644
--- a/net/coda6_server/pkg-plist
+++ b/net/coda6_server/pkg-plist
@@ -3,6 +3,7 @@ bin/norton-reinit
 bin/reinit
 bin/getvolinfo
 bin/rpc2ping
+bin/rvmsizer
 bin/smon2
 etc/coda/server.conf.ex
 @dirrm etc/coda