From d38da5c1c10d2887f3e22c03c32c93a5a005b323 Mon Sep 17 00:00:00 2001 From: rvb Date: Tue, 27 Apr 1999 20:43:08 +0000 Subject: Add coda5.2.2 to the party and make sure that coda5_* and coda_* compile on 1.4 --- net/Makefile | 4 +- net/coda5_client/Makefile | 6 +-- net/coda5_client/files/md5 | 4 +- net/coda5_client/patches/patch-ba | 13 +++++ net/coda5_client/patches/patch-bb | 13 +++++ net/coda5_client/patches/patch-bc | 19 +++++++ net/coda5_client/patches/patch-bd | 19 +++++++ net/coda5_client/patches/patch-be | 21 ++++++++ net/coda5_server/Makefile | 6 +-- net/coda5_server/files/md5 | 4 +- net/coda5_server/patches/patch-ba | 13 +++++ net/coda5_server/patches/patch-bb | 13 +++++ net/coda5_server/patches/patch-bc | 19 +++++++ net/coda5_server/patches/patch-bd | 19 +++++++ net/coda5_server/patches/patch-be | 21 ++++++++ net/coda_client/patches/patch-ba | 13 +++++ net/coda_client/patches/patch-bb | 13 +++++ net/coda_client/patches/patch-bc | 23 ++++++++ net/coda_client/patches/patch-bd | 19 +++++++ net/coda_client/patches/patch-be | 21 ++++++++ net/coda_client/patches/patch-ca | 13 +++++ net/coda_client/patches/patch-cb | 13 +++++ net/coda_client/pkg/COMMENT | 2 +- net/coda_server/patches/patch-aa | 110 ++++++++++++++++++++++++++++++++++++++ net/coda_server/patches/patch-ab | 15 ++++++ net/coda_server/patches/patch-ba | 13 +++++ net/coda_server/patches/patch-bb | 13 +++++ net/coda_server/patches/patch-bc | 23 ++++++++ net/coda_server/patches/patch-bd | 19 +++++++ net/coda_server/patches/patch-be | 21 ++++++++ net/coda_server/patches/patch-ca | 13 +++++ net/coda_server/patches/patch-cb | 13 +++++ 32 files changed, 539 insertions(+), 12 deletions(-) create mode 100644 net/coda5_client/patches/patch-ba create mode 100644 net/coda5_client/patches/patch-bb create mode 100644 net/coda5_client/patches/patch-bc create mode 100644 net/coda5_client/patches/patch-bd create mode 100644 net/coda5_client/patches/patch-be create mode 100644 net/coda5_server/patches/patch-ba create mode 100644 net/coda5_server/patches/patch-bb create mode 100644 net/coda5_server/patches/patch-bc create mode 100644 net/coda5_server/patches/patch-bd create mode 100644 net/coda5_server/patches/patch-be create mode 100644 net/coda_client/patches/patch-ba create mode 100644 net/coda_client/patches/patch-bb create mode 100644 net/coda_client/patches/patch-bc create mode 100644 net/coda_client/patches/patch-bd create mode 100644 net/coda_client/patches/patch-be create mode 100644 net/coda_client/patches/patch-ca create mode 100644 net/coda_client/patches/patch-cb create mode 100644 net/coda_server/patches/patch-aa create mode 100644 net/coda_server/patches/patch-ab create mode 100644 net/coda_server/patches/patch-ba create mode 100644 net/coda_server/patches/patch-bb create mode 100644 net/coda_server/patches/patch-bc create mode 100644 net/coda_server/patches/patch-bd create mode 100644 net/coda_server/patches/patch-be create mode 100644 net/coda_server/patches/patch-ca create mode 100644 net/coda_server/patches/patch-cb diff --git a/net/Makefile b/net/Makefile index 960d3264524..bfac41c81e9 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 1999/04/24 23:25:04 tron Exp $ +# $NetBSD: Makefile,v 1.66 1999/04/27 20:43:08 rvb Exp $ # FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp # @@ -16,6 +16,8 @@ SUBDIR += coda_doc SUBDIR += coda_intro SUBDIR += coda_server + SUBDIR += coda5_client + SUBDIR += coda5_server # SUBDIR += cvsup # SUBDIR += cvsup-mirror SUBDIR += delegate diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile index 73b4e113231..45c82fbe147 100644 --- a/net/coda5_client/Makefile +++ b/net/coda5_client/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-client-5.2.0 +DISTNAME= coda-5.2.2 +PKGNAME= coda-client-5.2.2 CATEGORIES= net MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ EXTRACT_SUFX= .tgz diff --git a/net/coda5_client/files/md5 b/net/coda5_client/files/md5 index e06f0705e04..80425b7e16c 100644 --- a/net/coda5_client/files/md5 +++ b/net/coda5_client/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_client/patches/patch-ba b/net/coda5_client/patches/patch-ba new file mode 100644 index 00000000000..094aa6f8634 --- /dev/null +++ b/net/coda5_client/patches/patch-ba @@ -0,0 +1,13 @@ +$NetBSD: patch-ba,v 1.1 1999/04/27 20:43:09 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_client/patches/patch-bb b/net/coda5_client/patches/patch-bb new file mode 100644 index 00000000000..96a9de2a302 --- /dev/null +++ b/net/coda5_client/patches/patch-bb @@ -0,0 +1,13 @@ +$NetBSD: patch-bb,v 1.1 1999/04/27 20:43:09 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_client/patches/patch-bc b/net/coda5_client/patches/patch-bc new file mode 100644 index 00000000000..edba90ca04d --- /dev/null +++ b/net/coda5_client/patches/patch-bc @@ -0,0 +1,19 @@ +$NetBSD: patch-bc,v 1.1 1999/04/27 20:43:09 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_client/patches/patch-bd b/net/coda5_client/patches/patch-bd new file mode 100644 index 00000000000..6b7704933bc --- /dev/null +++ b/net/coda5_client/patches/patch-bd @@ -0,0 +1,19 @@ +$NetBSD: patch-bd,v 1.1 1999/04/27 20:43:09 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_client/patches/patch-be b/net/coda5_client/patches/patch-be new file mode 100644 index 00000000000..ec7d9616d70 --- /dev/null +++ b/net/coda5_client/patches/patch-be @@ -0,0 +1,21 @@ +$NetBSD: patch-be,v 1.1 1999/04/27 20:43:09 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. */ 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. */ 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 +-#include ++#include + + #include + #include 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 + #include + #include +-#include ++#include + #include + #include + #include 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 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 +-#include ++#include + + #include + #include 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 + #include + #include +-#include ++#include + #include + #include + #include -- cgit v1.2.3