This will probably be the last Coda 4.6.5 related pkgsrc's.

Coda 4.6.6 should be out RSN.
Note: to agc.  I put back in the module suffix; so the client and
server are coda-...4.6.5.2.  We can straighten this out before
4.6.6 if this is a problem.  The basic idea is that we want
tosay both that our src is derived from Coda 4.6.5 and that
this is the "2"nd version of the package.  So the implication
is that there are patches here that were not in the "1"st
version.

21 files changed, 329 insertions, 25 deletions

diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 0d07dd0413f..7b1d370be5f 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1998/10/02 15:08:26 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:15 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-client-4.6.5
+PKGNAME=	coda-client-4.6.5.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	perl-5.00404:../../lang/perl5
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	client-install
diff --git a/net/coda5_client/patches/patch-ac b/net/coda5_client/patches/patch-ac
new file mode 100644
index 00000000000..4e80bd5290f
--- /dev/null
+++ b/net/coda5_client/patches/patch-ac
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..a284e48af2f
--- /dev/null
+++ b/net/coda5_client/patches/patch-ad
@@ -0,0 +1,34 @@
+$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
new file mode 100644
index 00000000000..b18f7fb8a84
--- /dev/null
+++ b/net/coda5_client/patches/patch-ae
@@ -0,0 +1,24 @@
+$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_server/Makefile b/net/coda5_server/Makefile
index 63d2db266fb..42c77531d65 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1998/10/02 15:03:50 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:16 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-server-4.6.5
+PKGNAME=	coda-server-4.6.5.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	perl-5.00404:../../lang/perl5
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	server-install
diff --git a/net/coda5_server/patches/patch-ac b/net/coda5_server/patches/patch-ac
new file mode 100644
index 00000000000..6be28845785
--- /dev/null
+++ b/net/coda5_server/patches/patch-ac
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..5492cd60981
--- /dev/null
+++ b/net/coda5_server/patches/patch-ad
@@ -0,0 +1,34 @@
+$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
new file mode 100644
index 00000000000..032ca1dee56
--- /dev/null
+++ b/net/coda5_server/patches/patch-ae
@@ -0,0 +1,24 @@
+$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/coda5_server/pkg/PLIST b/net/coda5_server/pkg/PLIST
index 9b62fccca76..028da13a0d5 100644
--- a/net/coda5_server/pkg/PLIST
+++ b/net/coda5_server/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/05 23:06:17 rvb Exp $
 bin/filcon
 bin/norton
 bin/norton-reinit
@@ -8,7 +8,6 @@ sbin/backup
 sbin/backup.sh
 sbin/bldvldb.sh
 sbin/codasrv
-sbin/createvol
 sbin/createvol_rep
 sbin/initpw
 sbin/inoder
@@ -24,8 +23,6 @@ sbin/purgevol_rep
 sbin/pwd2pdb
 sbin/rdsinit
 sbin/readdump
-sbin/recreatevol
-sbin/recreatevol_rep
 sbin/rpc2portmap
 sbin/rvmutl
 sbin/startserver
diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile
index 0d07dd0413f..7b1d370be5f 100644
--- a/net/coda_client/Makefile
+++ b/net/coda_client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1998/10/02 15:08:26 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:15 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-client-4.6.5
+PKGNAME=	coda-client-4.6.5.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	perl-5.00404:../../lang/perl5
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	client-install
diff --git a/net/coda_client/patches/patch-ac b/net/coda_client/patches/patch-ac
new file mode 100644
index 00000000000..4e80bd5290f
--- /dev/null
+++ b/net/coda_client/patches/patch-ac
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..a284e48af2f
--- /dev/null
+++ b/net/coda_client/patches/patch-ad
@@ -0,0 +1,34 @@
+$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
new file mode 100644
index 00000000000..b18f7fb8a84
--- /dev/null
+++ b/net/coda_client/patches/patch-ae
@@ -0,0 +1,24 @@
+$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_intro/Makefile b/net/coda_intro/Makefile
index 51c49ed058a..06d12134db1 100644
--- a/net/coda_intro/Makefile
+++ b/net/coda_intro/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/02 20:06:34 rvb Exp $
+# $NetBSD: Makefile,v 1.2 1998/10/05 23:06:16 rvb Exp $
 #
 
-DISTNAME=	coda-intro-4.6.5-1
-PKGNAME=	coda-intro-4.6.5.1
+DISTNAME=	coda-intro-4.6.5-2
+PKGNAME=	coda-intro-4.6.5.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
 EXTRACT_SUFX=	.tgz
diff --git a/net/coda_intro/files/md5 b/net/coda_intro/files/md5
index 0cef3746a3d..7c8a26d3eb5 100644
--- a/net/coda_intro/files/md5
+++ b/net/coda_intro/files/md5
@@ -1,3 +1 @@
-$NetBSD: md5,v 1.1.1.1 1998/10/02 20:06:35 rvb Exp $
-
-MD5 (coda-intro-4.6.5-1.tgz) = c396aeaff7a5ef8438909374401ab40b
+MD5 (coda-intro-4.6.5-2.tgz) = 14d937fc57dbb5dff1367ed38187fec3
diff --git a/net/coda_intro/pkg/PLIST b/net/coda_intro/pkg/PLIST
index 2285492de1f..79fd67b30ae 100644
--- a/net/coda_intro/pkg/PLIST
+++ b/net/coda_intro/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/10/02 20:06:35 rvb Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/10/05 23:06:16 rvb Exp $
 share/doc/coda-doc-4.6.5/intro/00README
 share/doc/coda-doc-4.6.5/intro/Announcement
-share/doc/coda-doc-4.6.5/intro/BUILD
+share/doc/coda-doc-4.6.5/intro/BUILD.NetBSD
 share/doc/coda-doc-4.6.5/intro/ChangeLog
-share/doc/coda-doc-4.6.5/intro/INSTALL
+share/doc/coda-doc-4.6.5/intro/INSTALL.NetBSD
 share/doc/coda-doc-4.6.5/intro/README
 share/doc/coda-doc-4.6.5/intro/RUN
 share/doc/coda-doc-4.6.5/intro/WARNING
diff --git a/net/coda_server/Makefile b/net/coda_server/Makefile
index 63d2db266fb..42c77531d65 100644
--- a/net/coda_server/Makefile
+++ b/net/coda_server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1998/10/02 15:03:50 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/10/05 23:06:16 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-server-4.6.5
+PKGNAME=	coda-server-4.6.5.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	perl-5.00404:../../lang/perl5
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	server-install
diff --git a/net/coda_server/patches/patch-ac b/net/coda_server/patches/patch-ac
new file mode 100644
index 00000000000..6be28845785
--- /dev/null
+++ b/net/coda_server/patches/patch-ac
@@ -0,0 +1,19 @@
+$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
new file mode 100644
index 00000000000..5492cd60981
--- /dev/null
+++ b/net/coda_server/patches/patch-ad
@@ -0,0 +1,34 @@
+$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
new file mode 100644
index 00000000000..032ca1dee56
--- /dev/null
+++ b/net/coda_server/patches/patch-ae
@@ -0,0 +1,24 @@
+$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_server/pkg/PLIST b/net/coda_server/pkg/PLIST
index 9b62fccca76..028da13a0d5 100644
--- a/net/coda_server/pkg/PLIST
+++ b/net/coda_server/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/05 23:06:17 rvb Exp $
 bin/filcon
 bin/norton
 bin/norton-reinit
@@ -8,7 +8,6 @@ sbin/backup
 sbin/backup.sh
 sbin/bldvldb.sh
 sbin/codasrv
-sbin/createvol
 sbin/createvol_rep
 sbin/initpw
 sbin/inoder
@@ -24,8 +23,6 @@ sbin/purgevol_rep
 sbin/pwd2pdb
 sbin/rdsinit
 sbin/readdump
-sbin/recreatevol
-sbin/recreatevol_rep
 sbin/rpc2portmap
 sbin/rvmutl
 sbin/startserver