Add coda5.2.2 to the party and make sure that coda5_* and coda_* compile on 1.4

8 files changed, 116 insertions, 1 deletions

diff --git a/net/coda_client/patches/patch-ba b/net/coda_client/patches/patch-ba
new file mode 100644
index 00000000000..617e40e75de
--- /dev/null
+++ b/net/coda_client/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/scripts/venus-setup	Thu Oct  8 12:07:49 1998
++++ coda-src/scripts/venus-setup	Tue Apr 27 14:52:30 1999
+@@ -28,6 +28,8 @@
+ 		CFSMAJOR=51 ;;
+ 	NetBSD\ 1.3* )
+ 		CFSMAJOR=60 ;;
++	NetBSD\ 1.4* )
++		CFSMAJOR=60 ;;
+ 	FreeBSD* )
+ 		CFSMAJOR=93 ;;
+ 	*)
diff --git a/net/coda_client/patches/patch-bb b/net/coda_client/patches/patch-bb
new file mode 100644
index 00000000000..8c68a68a211
--- /dev/null
+++ b/net/coda_client/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/scripts/vice-setup-rvm	Mon Oct  5 16:27:01 1998
++++ coda-src/scripts/vice-setup-rvm	Tue Apr 27 14:52:00 1999
+@@ -112,6 +112,8 @@
+                 rvmstart=0x20000000 ;;
+         NetBSD\ 1.3* )
+                 rvmstart=0x50000000 ;;
++        NetBSD\ 1.4* )
++                rvmstart=0x50000000 ;;
+         FreeBSD\ 2.2* )
+                 rvmstart=0x50000000 ;;
+         FreeBSD\ 3* )
diff --git a/net/coda_client/patches/patch-bc b/net/coda_client/patches/patch-bc
new file mode 100644
index 00000000000..c28aee1859e
--- /dev/null
+++ b/net/coda_client/patches/patch-bc
@@ -0,0 +1,23 @@
+$NetBSD: patch-bc,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/venus/venusrecov.cc	Mon Oct  5 16:13:11 1998
++++ coda-src/venus/venusrecov.cc	Tue Apr 27 14:53:50 1999
+@@ -119,11 +119,17 @@
+ 
+ 
+ /*  *****  Private Constants  *****  */
++#if	defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 104000000)
++#define	NetBSD1_4
++#else
++#undef	NetBSD1_4
++#endif
++
+ 
+ #ifdef MACH
+ PRIVATE const char *VM_RVGADDR = (char *)0x00c00000;
+ PRIVATE const char *VM_RDSADDR = (char *)0x01c00000;
+-#elif defined(NetBSD1_3) || defined(__FreeBSD_version)
++#elif defined(NetBSD1_3) || defined(NetBSD1_4) || defined(__FreeBSD_version)
+ PRIVATE const char *VM_RVGADDR = (char *)0x50000000;
+ PRIVATE const char *VM_RDSADDR = (char *)0x51000000;
+ #elif defined(__BSD44__)
diff --git a/net/coda_client/patches/patch-bd b/net/coda_client/patches/patch-bd
new file mode 100644
index 00000000000..b95a2ec7f19
--- /dev/null
+++ b/net/coda_client/patches/patch-bd
@@ -0,0 +1,19 @@
+$NetBSD: patch-bd,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/venus/vproc.cc	Mon Aug 31 10:47:56 1998
++++ coda-src/venus/vproc.cc	Tue Apr 27 14:50:40 1999
+@@ -850,7 +850,13 @@
+     sp->st_blocks = (int64_t)ceil(((double)vap->va_bytes) / S_BLKSIZE);
+     sp->st_flags = 0;
+     sp->st_gen = 0;
+-#ifdef	NetBSD1_3
++#if	defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 104000000)
++#define	NetBSD1_4
++#else
++#undef	NetBSD1_4
++#endif
++
++#if	defined(NetBSD1_3) || defined(NetBSD1_4)
+ #else
+     sp->st_lspare = 0;
+ #endif
diff --git a/net/coda_client/patches/patch-be b/net/coda_client/patches/patch-be
new file mode 100644
index 00000000000..8dd27a143f8
--- /dev/null
+++ b/net/coda_client/patches/patch-be
@@ -0,0 +1,21 @@
+$NetBSD: patch-be,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/vice/srv.cc	Wed Oct  7 20:10:39 1998
++++ coda-src/vice/srv.cc	Tue Apr 27 14:49:42 1999
+@@ -1773,9 +1773,15 @@
+ 		   "Setting Rvm Truncate threshhold to %d.\n", _Rvm_Truncate); 
+ 	    options->truncate = _Rvm_Truncate;				    
+ 	}
++#if	defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 104000000)
++#define	NetBSD1_4
++#else
++#undef	NetBSD1_4
++#endif
++
+ #if	defined(__FreeBSD__)
+ 	sbrk((void *)(0x50000000 - (int)sbrk(0))); /* for garbage reasons. */
+-#elif	defined(__NetBSD__) && NetBSD1_3
++#elif	defined(__NetBSD__) && (defined(NetBSD1_3) || defined(NetBSD1_4))
+ 	sbrk((void *)(0x50000000 - (int)sbrk(0))); /* for garbage reasons. */
+ #elif	defined(__NetBSD__) && NetBSD1_2
+ 	sbrk((void *)(0x20000000 - (int)sbrk(0))); /* for garbage reasons. */
diff --git a/net/coda_client/patches/patch-ca b/net/coda_client/patches/patch-ca
new file mode 100644
index 00000000000..3d69bca7eb6
--- /dev/null
+++ b/net/coda_client/patches/patch-ca
@@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/volutil/vol-ancient.cc	Tue Apr 27 15:49:45 1999
++++ coda-src/volutil/vol-ancient.cc	Tue Apr 27 15:50:13 1999
+@@ -41,7 +41,7 @@
+ #endif __cplusplus
+ 
+ #include <sys/types.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ 
+ #include <lwp.h>
+ #include <lock.h>
diff --git a/net/coda_client/patches/patch-cb b/net/coda_client/patches/patch-cb
new file mode 100644
index 00000000000..cd883e3bac4
--- /dev/null
+++ b/net/coda_client/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-4.6.6/coda-src/volutil/parserecdump.cc	Tue Apr 27 15:49:35 1999
++++ coda-src/volutil/parserecdump.cc	Tue Apr 27 15:50:20 1999
+@@ -51,7 +51,7 @@
+ #include <sys/time.h>
+ #include <ctype.h>
+ #include <sys/param.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <sys/file.h>
diff --git a/net/coda_client/pkg/COMMENT b/net/coda_client/pkg/COMMENT
index c533fe24a1e..63bd0981848 100644
--- a/net/coda_client/pkg/COMMENT
+++ b/net/coda_client/pkg/COMMENT
@@ -1 +1 @@
-client programs for a replicated, high-performance network file system
+client programs for a replicated high-performance network file system