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

7 files changed, 90 insertions, 5 deletions

diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 11c508c7a34..e3457c500c6 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 1999/04/09 21:11:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/27 20:43:09 rvb Exp $
 #
 
-DISTNAME=	coda-5.2.0
-PKGNAME=	coda-server-5.2.0
+DISTNAME=	coda-5.2.2
+PKGNAME=	coda-server-5.2.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
diff --git a/net/coda5_server/files/md5 b/net/coda5_server/files/md5
index e06f0705e04..80425b7e16c 100644
--- a/net/coda5_server/files/md5
+++ b/net/coda5_server/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/03/18 02:34:16 rvb Exp $
+$NetBSD: md5,v 1.7 1999/04/27 20:43:09 rvb Exp $
 
-MD5 (coda-5.2.0.tgz) = b8d674017c88ab28da4a70b3aa504e93
+MD5 (coda-5.2.2.tgz) = 8e0e3e0edc6d88fe0c02115aeb2deb5a
diff --git a/net/coda5_server/patches/patch-ba b/net/coda5_server/patches/patch-ba
new file mode 100644
index 00000000000..dc798d9824a
--- /dev/null
+++ b/net/coda5_server/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-5.2.2/coda-src/scripts/venus-setup	Thu Mar 11 23:16:20 1999
++++ coda-src/scripts/venus-setup	Tue Apr 27 13:38:59 1999
+@@ -28,6 +28,8 @@
+ 		CFSMAJOR=51 ;;
+ 	NetBSD\ 1.3* )
+ 		CFSMAJOR=60 ;;
++	NetBSD\ 1.4* )
++		CFSMAJOR=60 ;;
+ 	FreeBSD* )
+ 		CFSMAJOR=93 ;;
+ 	*)
diff --git a/net/coda5_server/patches/patch-bb b/net/coda5_server/patches/patch-bb
new file mode 100644
index 00000000000..e494751f748
--- /dev/null
+++ b/net/coda5_server/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-5.2.2/coda-src/scripts/vice-setup-rvm	Mon Apr  5 18:01:43 1999
++++ coda-src/scripts/vice-setup-rvm	Tue Apr 27 13:38:59 1999
+@@ -132,6 +132,8 @@
+                 rvmstart=0x20000000 ;;
+         NetBSD\ 1.3* )
+                 rvmstart=0x50000000 ;;
++        NetBSD\ 1.4* )
++                rvmstart=0x50000000 ;;
+         FreeBSD\ 2.2* )
+                 rvmstart=0x50000000 ;;
+         FreeBSD\ 3* )
diff --git a/net/coda5_server/patches/patch-bc b/net/coda5_server/patches/patch-bc
new file mode 100644
index 00000000000..169e21e8488
--- /dev/null
+++ b/net/coda5_server/patches/patch-bc
@@ -0,0 +1,19 @@
+$NetBSD: patch-bc,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-5.2.2/coda-src/venus/venusrecov.cc	Mon Apr 19 20:03:05 1999
++++ coda-src/venus/venusrecov.cc	Tue Apr 27 13:38:59 1999
+@@ -88,8 +88,13 @@
+ 
+ 
+ /*  *****  Private Constants  *****  */
++#if	defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 104000000)
++#define	NetBSD1_4
++#else
++#undef	NetBSD1_4
++#endif
+ 
+-#if defined(NetBSD1_3) || defined(__FreeBSD_version)
++#if defined(NetBSD1_3) || defined(NetBSD1_4) || defined(__FreeBSD_version)
+ static const char *VM_RVGADDR = (char *)0x50000000;
+ static const char *VM_RDSADDR = (char *)0x51000000;
+ #elif defined(__BSD44__)
diff --git a/net/coda5_server/patches/patch-bd b/net/coda5_server/patches/patch-bd
new file mode 100644
index 00000000000..d395070de9d
--- /dev/null
+++ b/net/coda5_server/patches/patch-bd
@@ -0,0 +1,19 @@
+$NetBSD: patch-bd,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-5.2.2/coda-src/venus/vproc.cc	Mon Apr 19 20:03:10 1999
++++ coda-src/venus/vproc.cc	Tue Apr 27 13:38:59 1999
+@@ -811,7 +811,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/coda5_server/patches/patch-be b/net/coda5_server/patches/patch-be
new file mode 100644
index 00000000000..6e597a514df
--- /dev/null
+++ b/net/coda5_server/patches/patch-be
@@ -0,0 +1,21 @@
+$NetBSD: patch-be,v 1.1 1999/04/27 20:43:10 rvb Exp $
+
+--- ../coda-5.2.2/coda-src/vice/srv.cc	Mon Apr 19 20:03:17 1999
++++ coda-src/vice/srv.cc	Tue Apr 27 13:38:59 1999
+@@ -1687,9 +1687,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. */