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

9 files changed, 240 insertions, 0 deletions

diff --git a/net/coda_server/patches/patch-aa b/net/coda_server/patches/patch-aa
new file mode 100644
index 00000000000..cd036e43a7d
--- /dev/null
+++ b/net/coda_server/patches/patch-aa
@@ -0,0 +1,110 @@
+$NetBSD: patch-aa,v 1.6 1999/04/27 20:43:11 rvb Exp $
+
+--- lib-src/mlwp/process.s~	Wed Oct  7 20:11:01 1998
++++ lib-src/mlwp/process.s	Wed Feb 24 01:05:51 1999
+@@ -590,5 +590,105 @@
+ 	jmp	r1
+ 
+ #endif	/* luna88k */
++	
++#ifdef arm32
++
++@ r0-r3		call arguments
++@ r4-r8		"saved over call"
++
++@ r9		frame pointer
++@ r10		stack limit
++@ r11		arg pointer
++@ r12		temp
++@ r13		sp
++@ r14		link/temp
++@ r15		pc
++
++@
++@ savecontext(f, area1, newsp)
++@    int (*f)(); struct savearea *area1; char *newsp;
++@
++@	set global _PRE_Block = 1
++
++rfp	.req	r9
++sl	.req	r10
++fp	.req	r11
++ip	.req	r12
++sp	.req	r13
++lr	.req	r14
++pc	.req	r15
++
++	.text
++	.align	0
++	
++	.global	_savecontext
++	.type	 _savecontext,#function
++
++_savecontext:
++	mov	ip, sp
++	stmfd	sp!, {fp, ip, lr, pc}
++
++	sub	fp, ip, #4
++
++	ldr	r3, Lpre_addr
++	mov	lr, #1			
++	str	lr, [r3, #0]		@ stall here waiting for r3?
++
++@ 	push callee-saves registers
++
++	stmfd	sp!, { r4-r10, fp }
++
++@	save old sp in area1
++
++	str	sp, [r1, #0]
++
++@	if newsp != 0, sp = newsp 
++
++	cmp	r2, #0
++	movne	sp, r2
++
++@	call f() with no arguments
++
++	mov	lr, pc
++	mov	pc, r0
++	bl	_abort		@ in case we fall down go boom
++
++Lpre_addr:
++	.word	_PRE_Block
++
++Lfe1:
++	.size	 _savecontext,Lfe1-_savecontext
++
++@
++@ returnto(area2)
++@     struct savearea *area2;
++@
++
++@	set _PRE_Block = 0
++	.global	_returnto
++	.type	_returnto, #function
++_returnto:
++	ldr	r3, Lpre_addr
++	mov	r2, #0
++	str	r2, [r3, #0]		@ stall here waiting for r3?
++
++@	restore sp from area2
++	ldr	sp, [r0, #0]
++
++@	pop callee-saves registers
++
++	ldmfd	sp!, { r4-r10, fp }
++
++@	return.
++
++	ldmea	fp, {fp, sp, pc}
++
++Lfe2:
++	.size	 _returnto,Lfe2-_returnto
++
++		
++
++#endif /* arm32 */
++	
+ 
+ #endif OLDLWP
diff --git a/net/coda_server/patches/patch-ab b/net/coda_server/patches/patch-ab
new file mode 100644
index 00000000000..32a1e7168ca
--- /dev/null
+++ b/net/coda_server/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.5 1999/04/27 20:43:11 rvb Exp $
+
+--- coda-src/venus/fso_cfscalls2.cc~	Wed Oct  7 20:11:22 1998
++++ coda-src/venus/fso_cfscalls2.cc	Wed Feb 24 01:52:18 1999
+@@ -538,6 +538,10 @@
+ static char cputype [] = "i386";
+ static char systype [] = "i386_nbsd1";
+ #endif /* i386 */
++#ifdef arm32
++static char cputype [] = "arm32";
++static char systype [] = "arm32_nbsd1";
++#endif /* arm32 */
+ #endif /* __NetBSD__ */
+ 
+ #ifdef __FreeBSD__
diff --git a/net/coda_server/patches/patch-ba b/net/coda_server/patches/patch-ba
new file mode 100644
index 00000000000..bc3389dc7f6
--- /dev/null
+++ b/net/coda_server/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 1999/04/27 20:43:11 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_server/patches/patch-bb b/net/coda_server/patches/patch-bb
new file mode 100644
index 00000000000..41e5550a2c0
--- /dev/null
+++ b/net/coda_server/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 1999/04/27 20:43:11 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_server/patches/patch-bc b/net/coda_server/patches/patch-bc
new file mode 100644
index 00000000000..522ff7e5565
--- /dev/null
+++ b/net/coda_server/patches/patch-bc
@@ -0,0 +1,23 @@
+$NetBSD: patch-bc,v 1.1 1999/04/27 20:43:11 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_server/patches/patch-bd b/net/coda_server/patches/patch-bd
new file mode 100644
index 00000000000..a6a6a20d0d4
--- /dev/null
+++ b/net/coda_server/patches/patch-bd
@@ -0,0 +1,19 @@
+$NetBSD: patch-bd,v 1.1 1999/04/27 20:43:11 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_server/patches/patch-be b/net/coda_server/patches/patch-be
new file mode 100644
index 00000000000..e68fc1d6bf8
--- /dev/null
+++ b/net/coda_server/patches/patch-be
@@ -0,0 +1,21 @@
+$NetBSD: patch-be,v 1.1 1999/04/27 20:43:11 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_server/patches/patch-ca b/net/coda_server/patches/patch-ca
new file mode 100644
index 00000000000..a42ba40fbb9
--- /dev/null
+++ b/net/coda_server/patches/patch-ca
@@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1 1999/04/27 20:43:11 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_server/patches/patch-cb b/net/coda_server/patches/patch-cb
new file mode 100644
index 00000000000..3b870b0c538
--- /dev/null
+++ b/net/coda_server/patches/patch-cb
@@ -0,0 +1,13 @@
+$NetBSD: patch-cb,v 1.1 1999/04/27 20:43:11 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>