diff options
author | rvb <rvb> | 1998-10-09 20:45:14 +0000 |
---|---|---|
committer | rvb <rvb> | 1998-10-09 20:45:14 +0000 |
commit | 351a7c4e1e1f0f7532877b64ab1af6e93de21937 (patch) | |
tree | 12908fe507a9d25f0b25f54e858ec4dd3ef56d0a /net | |
parent | 59540f2b909d15db255d38d236a0e795a2ec7d1d (diff) | |
download | pkgsrc-351a7c4e1e1f0f7532877b64ab1af6e93de21937.tar.gz |
Upgrade to Coda 4.6.6
Diffstat (limited to 'net')
30 files changed, 24 insertions, 958 deletions
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile index 7b1d370be5f..b6f9a655a27 100644 --- a/net/coda5_client/Makefile +++ b/net/coda5_client/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:15 rvb Exp $ +# $NetBSD: Makefile,v 1.6 1998/10/09 20:45:14 rvb Exp $ # -DISTNAME= coda-4.6.5 -PKGNAME= coda-client-4.6.5.2 +DISTNAME= coda-4.6.6 +PKGNAME= coda-client-4.6.6.1 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 d65482444a1..a130c080665 100644 --- a/net/coda5_client/files/md5 +++ b/net/coda5_client/files/md5 @@ -1,3 +1 @@ -$NetBSD: md5,v 1.2 1998/10/02 13:54:31 agc Exp $ - -MD5 (coda-4.6.5.tgz) = 4c946e371c6e04aededfd3d51c004294 +MD5 (coda-4.6.6.tgz) = e05c12cbe7bd20619a253ea24b4f951e diff --git a/net/coda5_client/patches/patch-aa b/net/coda5_client/patches/patch-aa deleted file mode 100644 index 688c171c813..00000000000 --- a/net/coda5_client/patches/patch-aa +++ /dev/null @@ -1,135 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:58 rvb Exp $ - -diff -ru ../coda-4.6.5/configure ./configure ---- ../coda-4.6.5/configure Wed Sep 2 14:07:47 1998 -+++ ./configure Thu Sep 3 14:37:32 1998 -@@ -1362,8 +1362,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; -diff -ru ../coda-4.6.5/coda-src/scripts/venus-setup ./coda-src/scripts/venus-setup ---- ../coda-4.6.5/coda-src/scripts/venus-setup Wed Sep 2 14:21:24 1998 -+++ ./coda-src/scripts/venus-setup Thu Sep 3 13:48:08 1998 -@@ -22,9 +22,13 @@ - case `uname -sr` in - "NetBSD 1.2" ) - CFSMAJOR=46 ;; -- NetBSD\ 1.3* ) -+ NetBSD\ 1.3 ) -+ CFSMAJOR=51 ;; -+ NetBSD\ 1.3.* ) - CFSMAJOR=51 ;; -- FreeBSD\ 2.2* ) -+ NetBSD\ 1.3* ) -+ CFSMAJOR=60 ;; -+ FreeBSD* ) - CFSMAJOR=93 ;; - *) - CFSMAJOR=67 ;; -diff -ru ../coda-4.6.5/coda-src/vice/Makefile.in ./coda-src/vice/Makefile.in ---- ../coda-4.6.5/coda-src/vice/Makefile.in Wed Sep 2 14:21:38 1998 -+++ ./coda-src/vice/Makefile.in Thu Sep 3 13:40:46 1998 -@@ -96,7 +96,7 @@ - smon.o \ - ViceErrorMsg.o - --codasrv: ${objects} srv.o dummyplumber.o ${LIBS} -+codasrv: ${objects} srv.o dummyplumber.o ${CLIBS} - $(CXX) $(LIBFLAGS) srv.o ${objects} dummyplumber.o ${CLIBS} -lm -o codasrv - - printvrdb: printvrdb.o -diff -ru /dev/null ./configs/Makeconf.i386_fbsd3 ---- /dev/null Thu Sep 3 17:13:07 1998 -+++ ./configs/Makeconf.i386_fbsd3 Thu Sep 3 17:11:30 1998 -@@ -0,0 +1,60 @@ -+# -+# sets: -+# variables, libraries for BSD build -+ -+# -+# Coda: an Experimental Distributed File System -+# Release 4.4 -+# -+# Copyright (c) 1987-1995 Carnegie Mellon University -+# All Rights Reserved -+# -+# Permission to use, copy, modify and distribute this software and its -+# documentation is hereby granted, provided that both the copyright -+# notice and this permission notice appear in all copies of the -+# software, derivative works or modified versions, and any portions -+# thereof, and that both notices appear in supporting documentation, and -+# that credit is given to Carnegie Mellon University in all documents -+# and publicity pertaining to direct or indirect use of this code or its -+# derivatives. -+# -+# CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS KNOWN TO HAVE BUGS, -+# SOME OF WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON ALLOWS -+# FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON -+# DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER -+# RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE OR OF -+# ANY DERIVATIVE WORK. -+# -+# Carnegie Mellon encourages users of this software to return any -+# improvements or extensions that they make, and to grant Carnegie -+# Mellon the rights to redistribute these changes without encumbrance. -+# */ -+# -+# static char *rcsid = "Header: /afs/cs/project/coda-src/cvs/coda/configs/Attic/Makeconf.i386_fbsd3,v 1.1.2.1 1998/09/03 21:11:30 rvb Exp"; -+# -+ -+MACHINE_FLAGS = -D__BSD44__ -+SHORTSYS = bsd44 -+INCLFLAGS = -I/usr/include -+GFLAG = -g -+CPP = gcc -E -x c-header -+LIBCURSES = /usr/lib/aout/libcurses.a -+LIBCOMPAT = /usr/lib/aout/libcompat.a -+LIBREADLINE = /usr/lib/aout/libreadline.a -+INCREADLINE = -I/usr/include/readline -+LIBTERMCAP = /usr/lib/aout/libtermcap.a -+#for rvm -+LIBTHREADS = -+LIBMACH = -+ -+#for advice_srv -+LIBKVM = /usr/lib/aout/libkvm.a -+INCGDBM = -I/usr/local/include -+LGDBM = -L/usr/local/lib -+LIBMATH = -lm -+GUIDIR = /usr/lib/coda -+ -+KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV -+#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a -+LIBKRBS = /usr/lib/libkrb.a -+ -diff -ru ../coda-4.6.5/configs/codaconf.m4 ./configs/codaconf.m4 ---- ../coda-4.6.5/configs/codaconf.m4 Wed Sep 2 14:21:53 1998 -+++ ./configs/codaconf.m4 Thu Sep 3 14:11:57 1998 -@@ -32,8 +32,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; diff --git a/net/coda5_client/patches/patch-ab b/net/coda5_client/patches/patch-ab deleted file mode 100644 index 0973f96e7ef..00000000000 --- a/net/coda5_client/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:58 rvb Exp $ - ---- coda-b4_6_4/coda-src/venus/worker.cc Tue Jun 16 06:46:19 1998 -+++ ./coda-src/venus/worker.cc Sat Sep 12 11:24:37 1998 -@@ -289,15 +289,7 @@ - } - #endif /* __MACH__ */ - #ifdef __BSD44__ --#ifndef MOUNT_CFS -- /* for FreeBSD -- - Add line below into /usr/include/sys/mount.h. Don't forget to adjust -- MOUNT_MAXTYPE. -- # define MOUNT_CFS old MOUNT_MAXTYPE +1 -- In #define INITMOUNTNAMES, -- "cfs", /* 19 or so MOUNT_CFS */ --#endif -- if (mount(MOUNT_CFS, venusRoot, 0, kernDevice) < 0) { -+ if (mount("coda", venusRoot, 0, kernDevice) < 0) { - eprint("mount(%s, %s) failed (%d), exiting", - kernDevice, venusRoot, errno); - exit(-1); diff --git a/net/coda5_client/patches/patch-ac b/net/coda5_client/patches/patch-ac deleted file mode 100644 index 4e80bd5290f..00000000000 --- a/net/coda5_client/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/10/05 23:06:15 rvb Exp $ - -Index: configs/Makeconf.i386_fbsd3 -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/configs/Makeconf.i386_fbsd3,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 Makeconf.i386_fbsd3 ---- Makeconf.i386_fbsd3 1998/09/03 21:11:30 1.1.2.1 -+++ Makeconf.i386_fbsd3 1998/10/05 15:39:07 -@@ -54,7 +54,6 @@ - LIBMATH = -lm - GUIDIR = /usr/lib/coda - --KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV --#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a --LIBKRBS = /usr/lib/libkrb.a -+KRBINCLFLAGS = -+LIBKRBS = /usr/lib/aout/libkrb.a /usr/lib/aout/libdes.a - diff --git a/net/coda5_client/patches/patch-ad b/net/coda5_client/patches/patch-ad deleted file mode 100644 index a284e48af2f..00000000000 --- a/net/coda5_client/patches/patch-ad +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1998/10/05 23:06:15 rvb Exp $ - -Index: coda-src/venus/venusrecov.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/venusrecov.cc,v -retrieving revision 4.9.6.1 -diff -u -r4.9.6.1 venusrecov.cc ---- venusrecov.cc 1998/09/14 22:26:08 4.9.6.1 -+++ venusrecov.cc 1998/10/05 15:44:41 -@@ -123,7 +123,7 @@ - #ifdef MACH - PRIVATE const char *VM_RVGADDR = (char *)0x00c00000; - PRIVATE const char *VM_RDSADDR = (char *)0x01c00000; --#elif defined(NetBSD1_3) -+#elif defined(NetBSD1_3) || defined(__FreeBSD_version) - PRIVATE const char *VM_RVGADDR = (char *)0x50000000; - PRIVATE const char *VM_RDSADDR = (char *)0x51000000; - #elif defined(__BSD44__) -Index: coda-src/scripts/vice-setup-rvm -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/scripts/vice-setup-rvm,v -retrieving revision 4.4 -diff -u -r4.4 vice-setup-rvm ---- vice-setup-rvm 1998/05/27 20:29:20 4.4 -+++ vice-setup-rvm 1998/10/05 15:43:47 -@@ -114,6 +114,8 @@ - rvmstart=0x50000000 ;; - FreeBSD\ 2.2* ) - rvmstart=0x50000000 ;; -+ FreeBSD\ 3* ) -+ rvmstart=0x50000000 ;; - *) - rvmstart=0x20000000 ;; - esac diff --git a/net/coda5_client/patches/patch-ae b/net/coda5_client/patches/patch-ae deleted file mode 100644 index b18f7fb8a84..00000000000 --- a/net/coda5_client/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.1 1998/10/05 23:06:15 rvb Exp $ - -Index: coda-src/venus/worker.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/worker.cc,v -retrieving revision 4.17.4.2 -diff -u -r4.17.4.2 worker.cc ---- worker.cc 1998/10/05 02:09:40 4.17.4.2 -+++ worker.cc 1998/10/05 15:50:36 -@@ -290,9 +290,11 @@ - #endif /* __MACH__ */ - #ifdef __BSD44__ - if (mount("coda", venusRoot, 0, kernDevice) < 0) { -- eprint("mount(%s, %s) failed (%d), exiting", -- kernDevice, venusRoot, errno); -- exit(-1); -+ if (mount("cfs", venusRoot, 0, kernDevice) < 0) { -+ eprint("mount(%s, %s) failed (%d), exiting", -+ kernDevice, venusRoot, errno); -+ exit(-1); -+ } - } - #endif /* __BSD44__ */ - #ifdef __linux__ diff --git a/net/coda5_client/pkg/PLIST b/net/coda5_client/pkg/PLIST index 46a1515c68d..cefd8e91fbf 100644 --- a/net/coda5_client/pkg/PLIST +++ b/net/coda5_client/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1998/10/02 14:19:21 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1998/10/09 20:45:15 rvb Exp $ lib/coda/Advice.tcl lib/coda/CodaConsole lib/coda/Consider.tcl @@ -44,6 +44,9 @@ bin/cunlog bin/filcon bin/filerepair bin/hoard +bin/logbandwidth +bin/logcmls +bin/logreintegration bin/parser bin/removeinc bin/repair diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile index 42c77531d65..1bd9204aa3e 100644 --- a/net/coda5_server/Makefile +++ b/net/coda5_server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:16 rvb Exp $ +# $NetBSD: Makefile,v 1.6 1998/10/09 20:45:15 rvb Exp $ # -DISTNAME= coda-4.6.5 -PKGNAME= coda-server-4.6.5.2 +DISTNAME= coda-4.6.6 +PKGNAME= coda-server-4.6.6.1 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 bb9d89c871f..a130c080665 100644 --- a/net/coda5_server/files/md5 +++ b/net/coda5_server/files/md5 @@ -1,3 +1 @@ -$NetBSD: md5,v 1.2 1998/10/02 13:41:52 agc Exp $ - -MD5 (coda-4.6.5.tgz) = 4c946e371c6e04aededfd3d51c004294 +MD5 (coda-4.6.6.tgz) = e05c12cbe7bd20619a253ea24b4f951e diff --git a/net/coda5_server/patches/patch-aa b/net/coda5_server/patches/patch-aa deleted file mode 100644 index 9f785160df0..00000000000 --- a/net/coda5_server/patches/patch-aa +++ /dev/null @@ -1,135 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:59 rvb Exp $ - -diff -ru ../coda-4.6.5/configure ./configure ---- ../coda-4.6.5/configure Wed Sep 2 14:07:47 1998 -+++ ./configure Thu Sep 3 14:37:32 1998 -@@ -1362,8 +1362,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; -diff -ru ../coda-4.6.5/coda-src/scripts/venus-setup ./coda-src/scripts/venus-setup ---- ../coda-4.6.5/coda-src/scripts/venus-setup Wed Sep 2 14:21:24 1998 -+++ ./coda-src/scripts/venus-setup Thu Sep 3 13:48:08 1998 -@@ -22,9 +22,13 @@ - case `uname -sr` in - "NetBSD 1.2" ) - CFSMAJOR=46 ;; -- NetBSD\ 1.3* ) -+ NetBSD\ 1.3 ) -+ CFSMAJOR=51 ;; -+ NetBSD\ 1.3.* ) - CFSMAJOR=51 ;; -- FreeBSD\ 2.2* ) -+ NetBSD\ 1.3* ) -+ CFSMAJOR=60 ;; -+ FreeBSD* ) - CFSMAJOR=93 ;; - *) - CFSMAJOR=67 ;; -diff -ru ../coda-4.6.5/coda-src/vice/Makefile.in ./coda-src/vice/Makefile.in ---- ../coda-4.6.5/coda-src/vice/Makefile.in Wed Sep 2 14:21:38 1998 -+++ ./coda-src/vice/Makefile.in Thu Sep 3 13:40:46 1998 -@@ -96,7 +96,7 @@ - smon.o \ - ViceErrorMsg.o - --codasrv: ${objects} srv.o dummyplumber.o ${LIBS} -+codasrv: ${objects} srv.o dummyplumber.o ${CLIBS} - $(CXX) $(LIBFLAGS) srv.o ${objects} dummyplumber.o ${CLIBS} -lm -o codasrv - - printvrdb: printvrdb.o -diff -ru /dev/null ./configs/Makeconf.i386_fbsd3 ---- /dev/null Thu Sep 3 17:13:07 1998 -+++ ./configs/Makeconf.i386_fbsd3 Thu Sep 3 17:11:30 1998 -@@ -0,0 +1,60 @@ -+# -+# sets: -+# variables, libraries for BSD build -+ -+# -+# Coda: an Experimental Distributed File System -+# Release 4.4 -+# -+# Copyright (c) 1987-1995 Carnegie Mellon University -+# All Rights Reserved -+# -+# Permission to use, copy, modify and distribute this software and its -+# documentation is hereby granted, provided that both the copyright -+# notice and this permission notice appear in all copies of the -+# software, derivative works or modified versions, and any portions -+# thereof, and that both notices appear in supporting documentation, and -+# that credit is given to Carnegie Mellon University in all documents -+# and publicity pertaining to direct or indirect use of this code or its -+# derivatives. -+# -+# CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS KNOWN TO HAVE BUGS, -+# SOME OF WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON ALLOWS -+# FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON -+# DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER -+# RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE OR OF -+# ANY DERIVATIVE WORK. -+# -+# Carnegie Mellon encourages users of this software to return any -+# improvements or extensions that they make, and to grant Carnegie -+# Mellon the rights to redistribute these changes without encumbrance. -+# */ -+# -+# static char *rcsid = "Header: /afs/cs/project/coda-src/cvs/coda/configs/Attic/Makeconf.i386_fbsd3,v 1.1.2.1 1998/09/03 21:11:30 rvb Exp"; -+# -+ -+MACHINE_FLAGS = -D__BSD44__ -+SHORTSYS = bsd44 -+INCLFLAGS = -I/usr/include -+GFLAG = -g -+CPP = gcc -E -x c-header -+LIBCURSES = /usr/lib/aout/libcurses.a -+LIBCOMPAT = /usr/lib/aout/libcompat.a -+LIBREADLINE = /usr/lib/aout/libreadline.a -+INCREADLINE = -I/usr/include/readline -+LIBTERMCAP = /usr/lib/aout/libtermcap.a -+#for rvm -+LIBTHREADS = -+LIBMACH = -+ -+#for advice_srv -+LIBKVM = /usr/lib/aout/libkvm.a -+INCGDBM = -I/usr/local/include -+LGDBM = -L/usr/local/lib -+LIBMATH = -lm -+GUIDIR = /usr/lib/coda -+ -+KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV -+#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a -+LIBKRBS = /usr/lib/libkrb.a -+ -diff -ru ../coda-4.6.5/configs/codaconf.m4 ./configs/codaconf.m4 ---- ../coda-4.6.5/configs/codaconf.m4 Wed Sep 2 14:21:53 1998 -+++ ./configs/codaconf.m4 Thu Sep 3 14:11:57 1998 -@@ -32,8 +32,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; diff --git a/net/coda5_server/patches/patch-ab b/net/coda5_server/patches/patch-ab deleted file mode 100644 index 6946f850f68..00000000000 --- a/net/coda5_server/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:59 rvb Exp $ - ---- coda-b4_6_4/coda-src/venus/worker.cc Tue Jun 16 06:46:19 1998 -+++ ./coda-src/venus/worker.cc Sat Sep 12 11:24:37 1998 -@@ -289,15 +289,7 @@ - } - #endif /* __MACH__ */ - #ifdef __BSD44__ --#ifndef MOUNT_CFS -- /* for FreeBSD -- - Add line below into /usr/include/sys/mount.h. Don't forget to adjust -- MOUNT_MAXTYPE. -- # define MOUNT_CFS old MOUNT_MAXTYPE +1 -- In #define INITMOUNTNAMES, -- "cfs", /* 19 or so MOUNT_CFS */ --#endif -- if (mount(MOUNT_CFS, venusRoot, 0, kernDevice) < 0) { -+ if (mount("coda", venusRoot, 0, kernDevice) < 0) { - eprint("mount(%s, %s) failed (%d), exiting", - kernDevice, venusRoot, errno); - exit(-1); diff --git a/net/coda5_server/patches/patch-ac b/net/coda5_server/patches/patch-ac deleted file mode 100644 index 6be28845785..00000000000 --- a/net/coda5_server/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/10/05 23:06:16 rvb Exp $ - -Index: configs/Makeconf.i386_fbsd3 -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/configs/Makeconf.i386_fbsd3,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 Makeconf.i386_fbsd3 ---- Makeconf.i386_fbsd3 1998/09/03 21:11:30 1.1.2.1 -+++ Makeconf.i386_fbsd3 1998/10/05 15:39:07 -@@ -54,7 +54,6 @@ - LIBMATH = -lm - GUIDIR = /usr/lib/coda - --KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV --#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a --LIBKRBS = /usr/lib/libkrb.a -+KRBINCLFLAGS = -+LIBKRBS = /usr/lib/aout/libkrb.a /usr/lib/aout/libdes.a - diff --git a/net/coda5_server/patches/patch-ad b/net/coda5_server/patches/patch-ad deleted file mode 100644 index 5492cd60981..00000000000 --- a/net/coda5_server/patches/patch-ad +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1998/10/05 23:06:16 rvb Exp $ - -Index: coda-src/venus/venusrecov.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/venusrecov.cc,v -retrieving revision 4.9.6.1 -diff -u -r4.9.6.1 venusrecov.cc ---- venusrecov.cc 1998/09/14 22:26:08 4.9.6.1 -+++ venusrecov.cc 1998/10/05 15:44:41 -@@ -123,7 +123,7 @@ - #ifdef MACH - PRIVATE const char *VM_RVGADDR = (char *)0x00c00000; - PRIVATE const char *VM_RDSADDR = (char *)0x01c00000; --#elif defined(NetBSD1_3) -+#elif defined(NetBSD1_3) || defined(__FreeBSD_version) - PRIVATE const char *VM_RVGADDR = (char *)0x50000000; - PRIVATE const char *VM_RDSADDR = (char *)0x51000000; - #elif defined(__BSD44__) -Index: coda-src/scripts/vice-setup-rvm -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/scripts/vice-setup-rvm,v -retrieving revision 4.4 -diff -u -r4.4 vice-setup-rvm ---- vice-setup-rvm 1998/05/27 20:29:20 4.4 -+++ vice-setup-rvm 1998/10/05 15:43:47 -@@ -114,6 +114,8 @@ - rvmstart=0x50000000 ;; - FreeBSD\ 2.2* ) - rvmstart=0x50000000 ;; -+ FreeBSD\ 3* ) -+ rvmstart=0x50000000 ;; - *) - rvmstart=0x20000000 ;; - esac diff --git a/net/coda5_server/patches/patch-ae b/net/coda5_server/patches/patch-ae deleted file mode 100644 index 032ca1dee56..00000000000 --- a/net/coda5_server/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.1 1998/10/05 23:06:16 rvb Exp $ - -Index: coda-src/venus/worker.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/worker.cc,v -retrieving revision 4.17.4.2 -diff -u -r4.17.4.2 worker.cc ---- worker.cc 1998/10/05 02:09:40 4.17.4.2 -+++ worker.cc 1998/10/05 15:50:36 -@@ -290,9 +290,11 @@ - #endif /* __MACH__ */ - #ifdef __BSD44__ - if (mount("coda", venusRoot, 0, kernDevice) < 0) { -- eprint("mount(%s, %s) failed (%d), exiting", -- kernDevice, venusRoot, errno); -- exit(-1); -+ if (mount("cfs", venusRoot, 0, kernDevice) < 0) { -+ eprint("mount(%s, %s) failed (%d), exiting", -+ kernDevice, venusRoot, errno); -+ exit(-1); -+ } - } - #endif /* __BSD44__ */ - #ifdef __linux__ diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile index 7b1d370be5f..b6f9a655a27 100644 --- a/net/coda_client/Makefile +++ b/net/coda_client/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:15 rvb Exp $ +# $NetBSD: Makefile,v 1.6 1998/10/09 20:45:14 rvb Exp $ # -DISTNAME= coda-4.6.5 -PKGNAME= coda-client-4.6.5.2 +DISTNAME= coda-4.6.6 +PKGNAME= coda-client-4.6.6.1 CATEGORIES= net MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ EXTRACT_SUFX= .tgz diff --git a/net/coda_client/files/md5 b/net/coda_client/files/md5 index d65482444a1..a130c080665 100644 --- a/net/coda_client/files/md5 +++ b/net/coda_client/files/md5 @@ -1,3 +1 @@ -$NetBSD: md5,v 1.2 1998/10/02 13:54:31 agc Exp $ - -MD5 (coda-4.6.5.tgz) = 4c946e371c6e04aededfd3d51c004294 +MD5 (coda-4.6.6.tgz) = e05c12cbe7bd20619a253ea24b4f951e diff --git a/net/coda_client/patches/patch-aa b/net/coda_client/patches/patch-aa deleted file mode 100644 index 688c171c813..00000000000 --- a/net/coda_client/patches/patch-aa +++ /dev/null @@ -1,135 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:58 rvb Exp $ - -diff -ru ../coda-4.6.5/configure ./configure ---- ../coda-4.6.5/configure Wed Sep 2 14:07:47 1998 -+++ ./configure Thu Sep 3 14:37:32 1998 -@@ -1362,8 +1362,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; -diff -ru ../coda-4.6.5/coda-src/scripts/venus-setup ./coda-src/scripts/venus-setup ---- ../coda-4.6.5/coda-src/scripts/venus-setup Wed Sep 2 14:21:24 1998 -+++ ./coda-src/scripts/venus-setup Thu Sep 3 13:48:08 1998 -@@ -22,9 +22,13 @@ - case `uname -sr` in - "NetBSD 1.2" ) - CFSMAJOR=46 ;; -- NetBSD\ 1.3* ) -+ NetBSD\ 1.3 ) -+ CFSMAJOR=51 ;; -+ NetBSD\ 1.3.* ) - CFSMAJOR=51 ;; -- FreeBSD\ 2.2* ) -+ NetBSD\ 1.3* ) -+ CFSMAJOR=60 ;; -+ FreeBSD* ) - CFSMAJOR=93 ;; - *) - CFSMAJOR=67 ;; -diff -ru ../coda-4.6.5/coda-src/vice/Makefile.in ./coda-src/vice/Makefile.in ---- ../coda-4.6.5/coda-src/vice/Makefile.in Wed Sep 2 14:21:38 1998 -+++ ./coda-src/vice/Makefile.in Thu Sep 3 13:40:46 1998 -@@ -96,7 +96,7 @@ - smon.o \ - ViceErrorMsg.o - --codasrv: ${objects} srv.o dummyplumber.o ${LIBS} -+codasrv: ${objects} srv.o dummyplumber.o ${CLIBS} - $(CXX) $(LIBFLAGS) srv.o ${objects} dummyplumber.o ${CLIBS} -lm -o codasrv - - printvrdb: printvrdb.o -diff -ru /dev/null ./configs/Makeconf.i386_fbsd3 ---- /dev/null Thu Sep 3 17:13:07 1998 -+++ ./configs/Makeconf.i386_fbsd3 Thu Sep 3 17:11:30 1998 -@@ -0,0 +1,60 @@ -+# -+# sets: -+# variables, libraries for BSD build -+ -+# -+# Coda: an Experimental Distributed File System -+# Release 4.4 -+# -+# Copyright (c) 1987-1995 Carnegie Mellon University -+# All Rights Reserved -+# -+# Permission to use, copy, modify and distribute this software and its -+# documentation is hereby granted, provided that both the copyright -+# notice and this permission notice appear in all copies of the -+# software, derivative works or modified versions, and any portions -+# thereof, and that both notices appear in supporting documentation, and -+# that credit is given to Carnegie Mellon University in all documents -+# and publicity pertaining to direct or indirect use of this code or its -+# derivatives. -+# -+# CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS KNOWN TO HAVE BUGS, -+# SOME OF WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON ALLOWS -+# FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON -+# DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER -+# RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE OR OF -+# ANY DERIVATIVE WORK. -+# -+# Carnegie Mellon encourages users of this software to return any -+# improvements or extensions that they make, and to grant Carnegie -+# Mellon the rights to redistribute these changes without encumbrance. -+# */ -+# -+# static char *rcsid = "Header: /afs/cs/project/coda-src/cvs/coda/configs/Attic/Makeconf.i386_fbsd3,v 1.1.2.1 1998/09/03 21:11:30 rvb Exp"; -+# -+ -+MACHINE_FLAGS = -D__BSD44__ -+SHORTSYS = bsd44 -+INCLFLAGS = -I/usr/include -+GFLAG = -g -+CPP = gcc -E -x c-header -+LIBCURSES = /usr/lib/aout/libcurses.a -+LIBCOMPAT = /usr/lib/aout/libcompat.a -+LIBREADLINE = /usr/lib/aout/libreadline.a -+INCREADLINE = -I/usr/include/readline -+LIBTERMCAP = /usr/lib/aout/libtermcap.a -+#for rvm -+LIBTHREADS = -+LIBMACH = -+ -+#for advice_srv -+LIBKVM = /usr/lib/aout/libkvm.a -+INCGDBM = -I/usr/local/include -+LGDBM = -L/usr/local/lib -+LIBMATH = -lm -+GUIDIR = /usr/lib/coda -+ -+KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV -+#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a -+LIBKRBS = /usr/lib/libkrb.a -+ -diff -ru ../coda-4.6.5/configs/codaconf.m4 ./configs/codaconf.m4 ---- ../coda-4.6.5/configs/codaconf.m4 Wed Sep 2 14:21:53 1998 -+++ ./configs/codaconf.m4 Thu Sep 3 14:11:57 1998 -@@ -32,8 +32,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; diff --git a/net/coda_client/patches/patch-ab b/net/coda_client/patches/patch-ab deleted file mode 100644 index 0973f96e7ef..00000000000 --- a/net/coda_client/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:58 rvb Exp $ - ---- coda-b4_6_4/coda-src/venus/worker.cc Tue Jun 16 06:46:19 1998 -+++ ./coda-src/venus/worker.cc Sat Sep 12 11:24:37 1998 -@@ -289,15 +289,7 @@ - } - #endif /* __MACH__ */ - #ifdef __BSD44__ --#ifndef MOUNT_CFS -- /* for FreeBSD -- - Add line below into /usr/include/sys/mount.h. Don't forget to adjust -- MOUNT_MAXTYPE. -- # define MOUNT_CFS old MOUNT_MAXTYPE +1 -- In #define INITMOUNTNAMES, -- "cfs", /* 19 or so MOUNT_CFS */ --#endif -- if (mount(MOUNT_CFS, venusRoot, 0, kernDevice) < 0) { -+ if (mount("coda", venusRoot, 0, kernDevice) < 0) { - eprint("mount(%s, %s) failed (%d), exiting", - kernDevice, venusRoot, errno); - exit(-1); diff --git a/net/coda_client/patches/patch-ac b/net/coda_client/patches/patch-ac deleted file mode 100644 index 4e80bd5290f..00000000000 --- a/net/coda_client/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/10/05 23:06:15 rvb Exp $ - -Index: configs/Makeconf.i386_fbsd3 -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/configs/Makeconf.i386_fbsd3,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 Makeconf.i386_fbsd3 ---- Makeconf.i386_fbsd3 1998/09/03 21:11:30 1.1.2.1 -+++ Makeconf.i386_fbsd3 1998/10/05 15:39:07 -@@ -54,7 +54,6 @@ - LIBMATH = -lm - GUIDIR = /usr/lib/coda - --KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV --#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a --LIBKRBS = /usr/lib/libkrb.a -+KRBINCLFLAGS = -+LIBKRBS = /usr/lib/aout/libkrb.a /usr/lib/aout/libdes.a - diff --git a/net/coda_client/patches/patch-ad b/net/coda_client/patches/patch-ad deleted file mode 100644 index a284e48af2f..00000000000 --- a/net/coda_client/patches/patch-ad +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1998/10/05 23:06:15 rvb Exp $ - -Index: coda-src/venus/venusrecov.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/venusrecov.cc,v -retrieving revision 4.9.6.1 -diff -u -r4.9.6.1 venusrecov.cc ---- venusrecov.cc 1998/09/14 22:26:08 4.9.6.1 -+++ venusrecov.cc 1998/10/05 15:44:41 -@@ -123,7 +123,7 @@ - #ifdef MACH - PRIVATE const char *VM_RVGADDR = (char *)0x00c00000; - PRIVATE const char *VM_RDSADDR = (char *)0x01c00000; --#elif defined(NetBSD1_3) -+#elif defined(NetBSD1_3) || defined(__FreeBSD_version) - PRIVATE const char *VM_RVGADDR = (char *)0x50000000; - PRIVATE const char *VM_RDSADDR = (char *)0x51000000; - #elif defined(__BSD44__) -Index: coda-src/scripts/vice-setup-rvm -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/scripts/vice-setup-rvm,v -retrieving revision 4.4 -diff -u -r4.4 vice-setup-rvm ---- vice-setup-rvm 1998/05/27 20:29:20 4.4 -+++ vice-setup-rvm 1998/10/05 15:43:47 -@@ -114,6 +114,8 @@ - rvmstart=0x50000000 ;; - FreeBSD\ 2.2* ) - rvmstart=0x50000000 ;; -+ FreeBSD\ 3* ) -+ rvmstart=0x50000000 ;; - *) - rvmstart=0x20000000 ;; - esac diff --git a/net/coda_client/patches/patch-ae b/net/coda_client/patches/patch-ae deleted file mode 100644 index b18f7fb8a84..00000000000 --- a/net/coda_client/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.1 1998/10/05 23:06:15 rvb Exp $ - -Index: coda-src/venus/worker.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/worker.cc,v -retrieving revision 4.17.4.2 -diff -u -r4.17.4.2 worker.cc ---- worker.cc 1998/10/05 02:09:40 4.17.4.2 -+++ worker.cc 1998/10/05 15:50:36 -@@ -290,9 +290,11 @@ - #endif /* __MACH__ */ - #ifdef __BSD44__ - if (mount("coda", venusRoot, 0, kernDevice) < 0) { -- eprint("mount(%s, %s) failed (%d), exiting", -- kernDevice, venusRoot, errno); -- exit(-1); -+ if (mount("cfs", venusRoot, 0, kernDevice) < 0) { -+ eprint("mount(%s, %s) failed (%d), exiting", -+ kernDevice, venusRoot, errno); -+ exit(-1); -+ } - } - #endif /* __BSD44__ */ - #ifdef __linux__ diff --git a/net/coda_client/pkg/PLIST b/net/coda_client/pkg/PLIST index 46a1515c68d..cefd8e91fbf 100644 --- a/net/coda_client/pkg/PLIST +++ b/net/coda_client/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 1998/10/02 14:19:21 agc Exp $ +@comment $NetBSD: PLIST,v 1.3 1998/10/09 20:45:15 rvb Exp $ lib/coda/Advice.tcl lib/coda/CodaConsole lib/coda/Consider.tcl @@ -44,6 +44,9 @@ bin/cunlog bin/filcon bin/filerepair bin/hoard +bin/logbandwidth +bin/logcmls +bin/logreintegration bin/parser bin/removeinc bin/repair diff --git a/net/coda_server/Makefile b/net/coda_server/Makefile index 42c77531d65..1bd9204aa3e 100644 --- a/net/coda_server/Makefile +++ b/net/coda_server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:16 rvb Exp $ +# $NetBSD: Makefile,v 1.6 1998/10/09 20:45:15 rvb Exp $ # -DISTNAME= coda-4.6.5 -PKGNAME= coda-server-4.6.5.2 +DISTNAME= coda-4.6.6 +PKGNAME= coda-server-4.6.6.1 CATEGORIES= net MASTER_SITES= ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ EXTRACT_SUFX= .tgz diff --git a/net/coda_server/files/md5 b/net/coda_server/files/md5 index bb9d89c871f..a130c080665 100644 --- a/net/coda_server/files/md5 +++ b/net/coda_server/files/md5 @@ -1,3 +1 @@ -$NetBSD: md5,v 1.2 1998/10/02 13:41:52 agc Exp $ - -MD5 (coda-4.6.5.tgz) = 4c946e371c6e04aededfd3d51c004294 +MD5 (coda-4.6.6.tgz) = e05c12cbe7bd20619a253ea24b4f951e diff --git a/net/coda_server/patches/patch-aa b/net/coda_server/patches/patch-aa deleted file mode 100644 index 9f785160df0..00000000000 --- a/net/coda_server/patches/patch-aa +++ /dev/null @@ -1,135 +0,0 @@ -$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:59 rvb Exp $ - -diff -ru ../coda-4.6.5/configure ./configure ---- ../coda-4.6.5/configure Wed Sep 2 14:07:47 1998 -+++ ./configure Thu Sep 3 14:37:32 1998 -@@ -1362,8 +1362,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; -diff -ru ../coda-4.6.5/coda-src/scripts/venus-setup ./coda-src/scripts/venus-setup ---- ../coda-4.6.5/coda-src/scripts/venus-setup Wed Sep 2 14:21:24 1998 -+++ ./coda-src/scripts/venus-setup Thu Sep 3 13:48:08 1998 -@@ -22,9 +22,13 @@ - case `uname -sr` in - "NetBSD 1.2" ) - CFSMAJOR=46 ;; -- NetBSD\ 1.3* ) -+ NetBSD\ 1.3 ) -+ CFSMAJOR=51 ;; -+ NetBSD\ 1.3.* ) - CFSMAJOR=51 ;; -- FreeBSD\ 2.2* ) -+ NetBSD\ 1.3* ) -+ CFSMAJOR=60 ;; -+ FreeBSD* ) - CFSMAJOR=93 ;; - *) - CFSMAJOR=67 ;; -diff -ru ../coda-4.6.5/coda-src/vice/Makefile.in ./coda-src/vice/Makefile.in ---- ../coda-4.6.5/coda-src/vice/Makefile.in Wed Sep 2 14:21:38 1998 -+++ ./coda-src/vice/Makefile.in Thu Sep 3 13:40:46 1998 -@@ -96,7 +96,7 @@ - smon.o \ - ViceErrorMsg.o - --codasrv: ${objects} srv.o dummyplumber.o ${LIBS} -+codasrv: ${objects} srv.o dummyplumber.o ${CLIBS} - $(CXX) $(LIBFLAGS) srv.o ${objects} dummyplumber.o ${CLIBS} -lm -o codasrv - - printvrdb: printvrdb.o -diff -ru /dev/null ./configs/Makeconf.i386_fbsd3 ---- /dev/null Thu Sep 3 17:13:07 1998 -+++ ./configs/Makeconf.i386_fbsd3 Thu Sep 3 17:11:30 1998 -@@ -0,0 +1,60 @@ -+# -+# sets: -+# variables, libraries for BSD build -+ -+# -+# Coda: an Experimental Distributed File System -+# Release 4.4 -+# -+# Copyright (c) 1987-1995 Carnegie Mellon University -+# All Rights Reserved -+# -+# Permission to use, copy, modify and distribute this software and its -+# documentation is hereby granted, provided that both the copyright -+# notice and this permission notice appear in all copies of the -+# software, derivative works or modified versions, and any portions -+# thereof, and that both notices appear in supporting documentation, and -+# that credit is given to Carnegie Mellon University in all documents -+# and publicity pertaining to direct or indirect use of this code or its -+# derivatives. -+# -+# CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS KNOWN TO HAVE BUGS, -+# SOME OF WHICH MAY HAVE SERIOUS CONSEQUENCES. CARNEGIE MELLON ALLOWS -+# FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON -+# DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER -+# RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE OR OF -+# ANY DERIVATIVE WORK. -+# -+# Carnegie Mellon encourages users of this software to return any -+# improvements or extensions that they make, and to grant Carnegie -+# Mellon the rights to redistribute these changes without encumbrance. -+# */ -+# -+# static char *rcsid = "Header: /afs/cs/project/coda-src/cvs/coda/configs/Attic/Makeconf.i386_fbsd3,v 1.1.2.1 1998/09/03 21:11:30 rvb Exp"; -+# -+ -+MACHINE_FLAGS = -D__BSD44__ -+SHORTSYS = bsd44 -+INCLFLAGS = -I/usr/include -+GFLAG = -g -+CPP = gcc -E -x c-header -+LIBCURSES = /usr/lib/aout/libcurses.a -+LIBCOMPAT = /usr/lib/aout/libcompat.a -+LIBREADLINE = /usr/lib/aout/libreadline.a -+INCREADLINE = -I/usr/include/readline -+LIBTERMCAP = /usr/lib/aout/libtermcap.a -+#for rvm -+LIBTHREADS = -+LIBMACH = -+ -+#for advice_srv -+LIBKVM = /usr/lib/aout/libkvm.a -+INCGDBM = -I/usr/local/include -+LGDBM = -L/usr/local/lib -+LIBMATH = -lm -+GUIDIR = /usr/lib/coda -+ -+KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV -+#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a -+LIBKRBS = /usr/lib/libkrb.a -+ -diff -ru ../coda-4.6.5/configs/codaconf.m4 ./configs/codaconf.m4 ---- ../coda-4.6.5/configs/codaconf.m4 Wed Sep 2 14:21:53 1998 -+++ ./configs/codaconf.m4 Thu Sep 3 14:11:57 1998 -@@ -32,8 +32,14 @@ - initsuffix=../etc - ;; - -- *-*-freebsd* ) -+ *-*-freebsd2* ) - sys=i386_fbsd2 -+ vfsdir=bsd44 -+ initsuffix=../etc -+ ;; -+ -+ *-*-freebsd3* ) -+ sys=i386_fbsd3 - vfsdir=bsd44 - initsuffix=../etc - ;; diff --git a/net/coda_server/patches/patch-ab b/net/coda_server/patches/patch-ab deleted file mode 100644 index 6946f850f68..00000000000 --- a/net/coda_server/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:59 rvb Exp $ - ---- coda-b4_6_4/coda-src/venus/worker.cc Tue Jun 16 06:46:19 1998 -+++ ./coda-src/venus/worker.cc Sat Sep 12 11:24:37 1998 -@@ -289,15 +289,7 @@ - } - #endif /* __MACH__ */ - #ifdef __BSD44__ --#ifndef MOUNT_CFS -- /* for FreeBSD -- - Add line below into /usr/include/sys/mount.h. Don't forget to adjust -- MOUNT_MAXTYPE. -- # define MOUNT_CFS old MOUNT_MAXTYPE +1 -- In #define INITMOUNTNAMES, -- "cfs", /* 19 or so MOUNT_CFS */ --#endif -- if (mount(MOUNT_CFS, venusRoot, 0, kernDevice) < 0) { -+ if (mount("coda", venusRoot, 0, kernDevice) < 0) { - eprint("mount(%s, %s) failed (%d), exiting", - kernDevice, venusRoot, errno); - exit(-1); diff --git a/net/coda_server/patches/patch-ac b/net/coda_server/patches/patch-ac deleted file mode 100644 index 6be28845785..00000000000 --- a/net/coda_server/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1998/10/05 23:06:16 rvb Exp $ - -Index: configs/Makeconf.i386_fbsd3 -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/configs/Makeconf.i386_fbsd3,v -retrieving revision 1.1.2.1 -diff -u -r1.1.2.1 Makeconf.i386_fbsd3 ---- Makeconf.i386_fbsd3 1998/09/03 21:11:30 1.1.2.1 -+++ Makeconf.i386_fbsd3 1998/10/05 15:39:07 -@@ -54,7 +54,6 @@ - LIBMATH = -lm - GUIDIR = /usr/lib/coda - --KRBINCLFLAGS = -I/usr/athena/include -I/usr/include/kerberosIV --#LIBKRBS = /usr/athena/lib/libkrb4.a /usr/athena/lib/libkrb5.a /usr/athena/lib/libcrypto.a /usr/athena/lib/libcom_err.a /usr/athena/lib/libdes425.a /usr/athena/lib/libkrb524.a --LIBKRBS = /usr/lib/libkrb.a -+KRBINCLFLAGS = -+LIBKRBS = /usr/lib/aout/libkrb.a /usr/lib/aout/libdes.a - diff --git a/net/coda_server/patches/patch-ad b/net/coda_server/patches/patch-ad deleted file mode 100644 index 5492cd60981..00000000000 --- a/net/coda_server/patches/patch-ad +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1998/10/05 23:06:16 rvb Exp $ - -Index: coda-src/venus/venusrecov.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/venusrecov.cc,v -retrieving revision 4.9.6.1 -diff -u -r4.9.6.1 venusrecov.cc ---- venusrecov.cc 1998/09/14 22:26:08 4.9.6.1 -+++ venusrecov.cc 1998/10/05 15:44:41 -@@ -123,7 +123,7 @@ - #ifdef MACH - PRIVATE const char *VM_RVGADDR = (char *)0x00c00000; - PRIVATE const char *VM_RDSADDR = (char *)0x01c00000; --#elif defined(NetBSD1_3) -+#elif defined(NetBSD1_3) || defined(__FreeBSD_version) - PRIVATE const char *VM_RVGADDR = (char *)0x50000000; - PRIVATE const char *VM_RDSADDR = (char *)0x51000000; - #elif defined(__BSD44__) -Index: coda-src/scripts/vice-setup-rvm -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/scripts/vice-setup-rvm,v -retrieving revision 4.4 -diff -u -r4.4 vice-setup-rvm ---- vice-setup-rvm 1998/05/27 20:29:20 4.4 -+++ vice-setup-rvm 1998/10/05 15:43:47 -@@ -114,6 +114,8 @@ - rvmstart=0x50000000 ;; - FreeBSD\ 2.2* ) - rvmstart=0x50000000 ;; -+ FreeBSD\ 3* ) -+ rvmstart=0x50000000 ;; - *) - rvmstart=0x20000000 ;; - esac diff --git a/net/coda_server/patches/patch-ae b/net/coda_server/patches/patch-ae deleted file mode 100644 index 032ca1dee56..00000000000 --- a/net/coda_server/patches/patch-ae +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ae,v 1.1 1998/10/05 23:06:16 rvb Exp $ - -Index: coda-src/venus/worker.cc -=================================================================== -RCS file: /afs/cs/project/coda-src/cvs/coda/coda-src/venus/worker.cc,v -retrieving revision 4.17.4.2 -diff -u -r4.17.4.2 worker.cc ---- worker.cc 1998/10/05 02:09:40 4.17.4.2 -+++ worker.cc 1998/10/05 15:50:36 -@@ -290,9 +290,11 @@ - #endif /* __MACH__ */ - #ifdef __BSD44__ - if (mount("coda", venusRoot, 0, kernDevice) < 0) { -- eprint("mount(%s, %s) failed (%d), exiting", -- kernDevice, venusRoot, errno); -- exit(-1); -+ if (mount("cfs", venusRoot, 0, kernDevice) < 0) { -+ eprint("mount(%s, %s) failed (%d), exiting", -+ kernDevice, venusRoot, errno); -+ exit(-1); -+ } - } - #endif /* __BSD44__ */ - #ifdef __linux__ |