Update net/coda5_server to version 5.3.19. Changes from version 5.3.13

include:

	* Installing the relevant manpages with the server programs.
	* Miscellaneous bug fixes.
	* Coda servers were doing strncmp instead of memcmp on ip-addresses.
	  This fixes 'identity-crisis' problems for replicated servers, where
	  servers didn't know which volumes they were hosting etc. (Ivan Popov)
	* Made ValidateAttrs on the server more resilient to bad input.
	* Handle reintegration conflicts when doing a partial reintegration,
	  instead of endlessly looping.
	* Searching the colon separated CODACONFPATH environment variable for
	  venus.conf and server.conf configuration files.
	* Added some more paranoia checks while parsing the /vice/db/servers
	  file.
	* No longer ordering VRDB entries entries by ip-address. This allows
	  us to resize a VSG without affecting version-vectors.
	* Added rds_print_stats to the server's printstats output to aid in
	  finding whether an RVM allocation failure is due to running out of
	  RVM space, or due to a large defragmentation that cannot be logged
	  in the RVM log.
	* Added getvolinfo program to be useful when debugging volume mounting
	  problems.
	* Avoid servers getting stuck in file-creation when there are
	  pre-existing files in /vicepa.
	* Always pre-allocate fids with the maximum possible stride, will become
	  useful when we allowing modifications to a volume's replication
	  group. However, any replicated volume over a mix of old and new
	  servers has a slightly higher probability on getting unwanted
	  fid-collissions.
	* Reduced server memory usage during reintegration.
	* Not returning ENOENT when testing inconsistent files with
	  access(F_OK).
	* Allow server-server repair with only one existing replica, needed
	  for repairing conflicts after running out of diskspace.
	* Added "skip volumes" argument to norton-reinit -load.
	* The 'change id' function of pdbtool would silently corrupt the pdb
	  databases, group owner id's were not updated, users were missing
	  as members from groups. Group could become a member of a user.
	  Hueristics to fix these corruptions are added to the 'pdbtool cm'
	  functionality.

12 files changed, 237 insertions, 159 deletions

diff --git a/net/coda5_server/DEINSTALL b/net/coda5_server/DEINSTALL
index 08e8eb9238e..0f5a45b2adf 100644
--- a/net/coda5_server/DEINSTALL
+++ b/net/coda5_server/DEINSTALL
@@ -1,72 +1,14 @@
 #! /bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:55:03 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-LN="@LN@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TRUE="@TRUE@"
-
-CONFDIR=${PKG_PREFIX}/etc/coda
+# $NetBSD: DEINSTALL,v 1.2 2002/06/20 19:28:35 jlam Exp $
 
 case ${STAGE} in
-DEINSTALL)
-	;;
-
 POST-DEINSTALL)
-	# If coda-server is installed, then point these links to the
-	# venus-* versions of these scripts.
-	#
-	for script in coda-setup-ports codaconfedit; do
-		${RM} -f ${PKG_PREFIX}/sbin/${script}
-		if [ -f ${PKG_PREFIX}/sbin/venus-${script} ]
-		then
-			${LN} -sf venus-${script} ${PKG_PREFIX}/sbin/${script}
+	for file in au coda-setup-ports codaconfedit; do
+		${RM} -f ${PKG_PREFIX}/sbin/${file}
+		if [ -f ${PKG_PREFIX}/sbin/venus-${file} ]; then
+			${LN} -sf venus-${file} ${PKG_PREFIX}/sbin/${file}
 		fi
 	done
-
-	${RMDIR} ${CONFDIR} 2>/dev/null || ${TRUE}
-
-	existing_dirs=''
-	for dir in ${CONFDIR}
-	do
-		if [ -d ${dir} ]
-		then
-			existing_dirs="${existing_dirs} ${dir}"
-		fi
-	done
-
-	if [ -n "${existing_dirs}" ]
-	then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-EOF
-		if [ -n "${existing_dirs}" ]
-		then
-			${CAT} << EOF
-
-  * the following directories:
-
-EOF
-			for dir in ${existing_dirs}
-			do
-				echo "	${dir}"
-			done
-		fi
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
 	;;
 esac
-exit 0
diff --git a/net/coda5_server/DESCR b/net/coda5_server/DESCR
index 81bf42fa4b0..1890068ec5e 100644
--- a/net/coda5_server/DESCR
+++ b/net/coda5_server/DESCR
@@ -2,7 +2,6 @@ Coda is a distributed file system.  Among its features are disconnected
 operation, good security model, server replication and persistent client
 side caching. 
 
-This package builds the entire source tree but only installs(/packages) the
-server side programs.
-
 For more info, contact <coda@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.
+
+This package contains the server-side programs.
diff --git a/net/coda5_server/INSTALL b/net/coda5_server/INSTALL
index 7b065fcd3cc..8dcb5005006 100644
--- a/net/coda5_server/INSTALL
+++ b/net/coda5_server/INSTALL
@@ -1,30 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:55:04 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-LN="@LN@"
-RM="@RM@"
+# $NetBSD: INSTALL,v 1.2 2002/06/20 19:28:35 jlam Exp $
 
 case ${STAGE} in
-PRE-INSTALL)
-	;;
-
 POST-INSTALL)
-	# coda-client may have already created these links
-	for script in coda-setup-ports codaconfedit; do
-		if [ ! -f ${PKG_PREFIX}/sbin/${script} ]
-		then
-			${LN} -sf vice-${script} ${PKG_PREFIX}/sbin/${script}
+	for file in au coda-setup-ports codaconfedit; do
+		if [ ! -f ${PKG_PREFIX}/sbin/${file} ]; then
+			${LN} -sf vice-${file} ${PKG_PREFIX}/sbin/${file}
 		fi
 	done
 	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
 esac
-exit 0
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 845759c2208..cff62002a3f 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,46 +1,27 @@
-# $NetBSD: Makefile,v 1.31 2001/06/19 03:47:31 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.32 2002/06/20 19:28:35 jlam Exp $
 
-DISTNAME=		coda-5.3.13
-PKGNAME=		coda-server-5.3.13
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
+PKGNAME=	coda-server-${DIST_VERS}
+COMMENT=	server programs for a replicated high-performance network file system
 
-MAINTAINER=		phil@cs.wwu.edu
-HOMEPAGE=		http://www.coda.cs.cmu.edu/
-COMMENT=		server programs for a replicated high-performance network file system
+USE_BUILDLINK_ONLY=	yes
 
-# Only enable platforms that can build "lwp".
-ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc
+.include "Makefile.common"
 
 ALL_TARGET=		coda
 INSTALL_TARGET=		server-install
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
-USE_PERL5=		yes
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-USE_BUILDLINK_ONLY=	yes
-
-.include "../../devel/lwp/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../devel/rpc2/buildlink.mk"
-.include "../../devel/rvm/buildlink.mk"
-
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
-INSTALL_SUBST=		CAT=${CAT:Q}
-INSTALL_SUBST+=		LN=${LN:Q}
-INSTALL_SUBST+=		RM=${RM:Q}
-INSTALL_SUBST+=		RMDIR=${RMDIR:Q}
-INSTALL_SUBST+=		TRUE=${TRUE:Q}
-INSTALL_SUBST_SED=	${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-
-pre-install:
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${INSTALL_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+CONF_FILES+=	${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
 
 post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
+	cd ${PREFIX}; ${PAX} -zr					\
+		-s "/usr\/\(man\/man.\/\)au.8/\1vice-au.8/"		\
+		-s "/usr\///"						\
+		-f ${_DISTDIR}/${CODADOC_DISTFILE}			\
+		`${GREP} "^man/" ${PLIST_SRC} |				\
+			${SED}	-e "s|^|usr/|"				\
+				-e "s|vice-au\.8|au.8|"`
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda5_server/Makefile.common b/net/coda5_server/Makefile.common
new file mode 100644
index 00000000000..18c0754daa1
--- /dev/null
+++ b/net/coda5_server/Makefile.common
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile.common,v 1.1 2002/06/20 19:28:35 jlam Exp $
+
+DISTNAME?=		coda-${DIST_VERS}
+DIST_VERS?=		5.3.19
+CATEGORIES?=		net
+MASTER_SITES?=		ftp://ftp.coda.cs.cmu.edu/pub/coda/src/		\
+			ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
+DISTFILES?=		${CODASRC_DISTFILE} ${CODADOC_DISTFILE}
+EXTRACT_ONLY?=		${CODASRC_DISTFILE}
+
+CODASRC_DISTFILE=	${DISTNAME}${EXTRACT_SUFX}
+CODADOC_DISTFILE=	coda-doc-5.2.0-1.tgz
+
+MAINTAINER?=		phil@cs.wwu.edu
+HOMEPAGE?=		http://www.coda.cs.cmu.edu/
+
+DISTINFO_FILE?=		${.CURDIR}/../../net/coda5_server/distinfo
+PATCHDIR?=		${.CURDIR}/../../net/coda5_server/patches
+
+USE_PERL5=		yes
+USE_GMAKE=		yes
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--without-openssl
+
+PKG_SYSCONFSUBDIR?=	coda
+EGDIR=			${PREFIX}/share/examples/coda
+
+pre-install: install-egdir
+
+install-egdir:
+	${INSTALL_DATA_DIR} ${EGDIR}
+
+.include "../../devel/lwp/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../devel/rpc2/buildlink.mk"
+.include "../../devel/rvm/buildlink.mk"
diff --git a/net/coda5_server/PLIST b/net/coda5_server/PLIST
index 42818d3639e..8eb7cc140dd 100644
--- a/net/coda5_server/PLIST
+++ b/net/coda5_server/PLIST
@@ -1,9 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:04 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:35 jlam Exp $
+bin/getvolinfo
 bin/norton
 bin/norton-reinit
 bin/reinit
-etc/coda/server.conf.ex
+bin/rpc2ping
+bin/smon2
 etc/rc.d/rc.vice
+man/man5/backuplogs.5
+man/man5/dumpfile.5
+man/man5/dumplist.5
+man/man5/maxgroupid.5
+man/man5/passwd.coda.5
+man/man5/servers.5
+man/man5/vicetab.5
+man/man5/volumelist.5
+man/man5/vrdb.5
+man/man5/vrlist.5
+man/man5/vsgdb.5
+man/man8/auth2.8
+man/man8/backup.8
+man/man8/bldvldb.8
+man/man8/codasrv.8
+man/man8/createvol.8
+man/man8/createvol_rep.8
+man/man8/initpw.8
+man/man8/merge.8
+man/man8/norton.8
+man/man8/pdbtool.8
+man/man8/purgevol.8
+man/man8/purgevol_rep.8
+man/man8/readdump.8
+man/man8/startserver.8
+man/man8/updateclnt.8
+man/man8/updatesrv.8
+man/man8/vice-au.8
+man/man8/volutil.8
 sbin/auth2
 sbin/backup
 sbin/backup.sh
@@ -28,6 +59,7 @@ sbin/tape.pl
 sbin/updateclnt
 sbin/updatefetch
 sbin/updatesrv
+sbin/vice-au
 sbin/vice-coda-setup-ports
 sbin/vice-codaconfedit
 sbin/vice-killvolumes
@@ -37,3 +69,5 @@ sbin/vice-setup-scm
 sbin/vice-setup-srvdir
 sbin/vice-setup-user
 sbin/volutil
+share/examples/coda/server.conf.ex
+@unexec ${RMDIR} %D/share/examples/coda 2>/dev/null || ${TRUE}
diff --git a/net/coda5_server/distinfo b/net/coda5_server/distinfo
index 08adb88c1df..90c195647b1 100644
--- a/net/coda5_server/distinfo
+++ b/net/coda5_server/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.4 2001/05/31 22:58:08 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/06/20 19:28:35 jlam Exp $
 
-SHA1 (coda-5.3.13.tar.gz) = 6f06e73d8441f4ae7010acb2a35d0f0bde6ff7a4
-Size (coda-5.3.13.tar.gz) = 1324328 bytes
-SHA1 (patch-aa) = 085adda0e65ff348e3679813b79197e9856c109c
-SHA1 (patch-ab) = c80609c7bd113799587827fc9f0ad3770c441de1
-SHA1 (patch-ac) = 3f746a14752a0bae6d68e9d5c4071904e9fc6c7d
+SHA1 (coda-5.3.19.tar.gz) = 2cfa0b04e0590ec9e7f23420a0b7de4f9acfa504
+Size (coda-5.3.19.tar.gz) = 1342652 bytes
+SHA1 (coda-doc-5.2.0-1.tgz) = f54c2d1b454a5d97f50f8c9b30c012d770384c2f
+Size (coda-doc-5.2.0-1.tgz) = 1604755 bytes
+SHA1 (patch-aa) = deac7bc8b153654e1c36adf119085a7dc9171f55
+SHA1 (patch-ab) = 25fa067a244ea185f3b24efd3a5762737658e5db
+SHA1 (patch-ac) = f21f883512c4b149d92401d7ec525aa57218761e
+SHA1 (patch-ad) = 21c374be911aeece2a9702ed4abb748c5e92384a
+SHA1 (patch-ae) = da991ef825170e33d746f98834ca1dd2ec009ba0
diff --git a/net/coda5_server/patches/patch-aa b/net/coda5_server/patches/patch-aa
index 639b34fdc52..86b32c175d5 100644
--- a/net/coda5_server/patches/patch-aa
+++ b/net/coda5_server/patches/patch-aa
@@ -1,20 +1,34 @@
-$NetBSD: patch-aa,v 1.9 2000/02/20 07:19:02 fredb Exp $
+$NetBSD: patch-aa,v 1.10 2002/06/20 19:28:35 jlam Exp $
 
---- coda-src/auth2/Makefile.in.orig	Sun Jan 30 18:01:06 2000
-+++ coda-src/auth2/Makefile.in	Sun Feb 20 00:48:38 2000
-@@ -63,12 +63,12 @@
+--- coda-src/auth2/Makefile.in.orig	Fri May 25 07:48:01 2001
++++ coda-src/auth2/Makefile.in
+@@ -63,12 +63,13 @@
  ifeq ($(SHORTSYS),djgpp)
  EXECUTABLES = $(CLOG)
  else
 -EXECUTABLES = $(CLOG) $(AUTH2) initpw $(AU) cpasswd ctokens cunlog tokentool
 +EXECUTABLES = $(CLOG) $(AUTH2) initpw cpasswd ctokens cunlog tokentool
++EXECUTABLES += venus-$(AU) vice-$(AU)
  CBINS       = $(CLOG) cpasswd ctokens cunlog
  
 -CSBINS      = $(AU)
-+CSBINS      =
++CSBINS      = venus-$(AU)
  SBINS       = 
 -SSBINS      = $(AU) $(AUTH2) initpw
-+SSBINS      = $(AUTH2) initpw
++SSBINS      = vice-$(AU) $(AUTH2) initpw
  endif
  
  CFLAGS := -Wall $(CFLAGS)
+@@ -96,6 +97,12 @@
+ 
+ $(AU): au.o libauser.a $(DEPLIBS)
+ 	$(CC) $(LDFLAGS) au.o libauser.a $(LIBKRBS) $(LIBS) -o $(AU)
++
++venus-$(AU): au.o libauser.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) au.o libauser.a $(LIBKRBS) $(LIBS) -o venus-$(AU)
++
++vice-$(AU): au.o libauser.a $(DEPLIBS)
++	$(CC) $(LDFLAGS) au.o libauser.a $(LIBKRBS) $(LIBS) -o vice-$(AU)
+ 
+ $(CLOG): clog.o tokenfile.o libauser.a ${DEPLIBS}
+ 	${CC} $(LDFLAGS) clog.o tokenfile.o libauser.a $(LIBKRBS) ${LIBS} -o $(CLOG)
diff --git a/net/coda5_server/patches/patch-ab b/net/coda5_server/patches/patch-ab
index 1f84a3ee142..b4dcff902e5 100644
--- a/net/coda5_server/patches/patch-ab
+++ b/net/coda5_server/patches/patch-ab
@@ -1,13 +1,20 @@
-$NetBSD: patch-ab,v 1.9 2001/05/31 22:58:08 jlam Exp $
+$NetBSD: patch-ab,v 1.10 2002/06/20 19:28:35 jlam Exp $
 
---- coda-src/scripts/Makefile.in.orig	Wed Aug 30 16:41:33 2000
-+++ coda-src/scripts/Makefile.in	Thu May 31 16:09:20 2001
-@@ -31,7 +31,7 @@
+--- coda-src/scripts/Makefile.in.orig	Thu Jan 24 18:35:50 2002
++++ coda-src/scripts/Makefile.in
+@@ -25,13 +25,13 @@
+ # Need to conditionalize this
+ include $(TOPDIR)/Makeconf
+ 
+-VENUS-SCRIPTS = vutil volmunge venus-setup coda-setup-ports
++VENUS-SCRIPTS = vutil volmunge venus-setup venus-coda-setup-ports
+ 
+ VOL-SCRIPTS	= createvol_rep purgevol purgevol_rep bldvldb.sh
  VICE-SCRIPTS	= startserver codastart
  REINIT-SCRIPTS	= partial-reinit.sh
  UPGRADE-SCRIPTS	= pwdtopdbtool.py
--VICE-SETUP      = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes coda-setup-ports codaconfedit
-+VICE-SETUP      = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes vice-coda-setup-ports vice-codaconfedit
+-VICE-SETUP      = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes coda-setup-ports
++VICE-SETUP      = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes vice-coda-setup-ports
  
  BACKUP-SCRIPTS	= backup.sh tape.pl
  
@@ -15,8 +22,8 @@ $NetBSD: patch-ab,v 1.9 2001/05/31 22:58:08 jlam Exp $
  
  include $(TOPDIR)/configs/Makerules
  
++venus-coda-setup-ports: coda-setup-ports
++	cp coda-setup-ports venus-coda-setup-ports
++
 +vice-coda-setup-ports: coda-setup-ports
 +	cp coda-setup-ports vice-coda-setup-ports
-+
-+vice-codaconfedit: codaconfedit
-+	cp codaconfedit vice-codaconfedit
diff --git a/net/coda5_server/patches/patch-ac b/net/coda5_server/patches/patch-ac
index 9186878bd1f..8f9ecd267ad 100644
--- a/net/coda5_server/patches/patch-ac
+++ b/net/coda5_server/patches/patch-ac
@@ -1,16 +1,40 @@
-$NetBSD: patch-ac,v 1.5 2001/05/31 22:58:08 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2002/06/20 19:28:35 jlam Exp $
 
---- lib-src/base/parser.c.orig	Sun Jan 30 19:01:28 2000
-+++ lib-src/base/parser.c	Wed May 30 22:00:39 2001
-@@ -34,10 +34,7 @@
+--- coda-src/vtools/Makefile.in.orig	Fri Jan 25 16:24:46 2002
++++ coda-src/vtools/Makefile.in
+@@ -26,15 +26,16 @@
+ include $(TOPDIR)/Makeconf
  
- #define	READLINE_LIBRARY
- #include <readline/readline.h>
--
--extern void using_history();
--extern void stifle_history(int);
--extern void add_history(char *);
-+#include <readline/history.h>
+ LOGSCRIPTS = # logbandwidth logcmls logreintegration logprogress
+-EXECUTABLES = codacon cfs hoard spy coda_replay
++CEXECUTABLES = codacon cfs hoard spy coda_replay
+ ifneq ($(SYS),cygwin32)
+-EXECUTABLES += cmon $(LOGSCRIPTS)
++CEXECUTABLES += cmon $(LOGSCRIPTS)
+ endif
++EXECUTABLES = $(CEXECUTABLES)
  
- #ifdef __cplusplus
- }
+-CBINS  = $(EXECUTABLES)
+-CSBINS = codaconfedit
+-SSBINS = codaconfedit
+-EXECUTABLES += codaconfedit
++CBINS  = $(CEXECUTABLES)
++CSBINS = venus-codaconfedit
++SSBINS = vice-codaconfedit
++EXECUTABLES += venus-codaconfedit vice-codaconfedit
+ 
+ CMON_LIBS   = $(LIBVICEDEP) $(LIBBASE)
+ CFS_LIBS    = $(LIBKERNDEP) $(LIBUTIL) $(LIBBASE)
+@@ -53,6 +54,12 @@
+ 
+ codaconfedit: codaconfedit.o $(LIBBASE)
+ 	$(CXX) $(LDFLAGS) codaconfedit.o $(LIBBASE) $(LIBS) -o codaconfedit
++
++venus-codaconfedit: codaconfedit.o $(LIBBASE)
++	$(CXX) $(LDFLAGS) codaconfedit.o $(LIBBASE) $(LIBS) -o venus-codaconfedit
++
++vice-codaconfedit: codaconfedit.o $(LIBBASE)
++	$(CXX) $(LDFLAGS) codaconfedit.o $(LIBBASE) $(LIBS) -o vice-codaconfedit
+ 
+ cfs:  cfs.o $(CFS_LIBS)
+ 	$(CXX) $(LDFLAGS) cfs.o $(CFS_LIBS) $(STD_LIBS) -o cfs
diff --git a/net/coda5_server/patches/patch-ad b/net/coda5_server/patches/patch-ad
new file mode 100644
index 00000000000..834a0dad1a5
--- /dev/null
+++ b/net/coda5_server/patches/patch-ad
@@ -0,0 +1,30 @@
+$NetBSD: patch-ad,v 1.3 2002/06/20 19:28:36 jlam Exp $
+
+--- configs/Makerules.orig	Wed Aug 30 15:33:28 2000
++++ configs/Makerules
+@@ -117,11 +117,7 @@
+ 
+ c_conf_install: $(CCONFFILES)
+ ifdef CCONFFILES
+-	if test $(sysconfdir) = /etc/coda ; then \
+-	    $(TOPDIR)/tools/our-install 644 $(prefix)/..$(sysconfdir) $? ; \
+-	else \
+-	    $(TOPDIR)/tools/our-install 644 $(sysconfdir) $? ; \
+-	fi
++	$(TOPDIR)/tools/our-install 644 $(prefix)/share/examples/coda $?
+ endif
+ 
+ c_script_install: $(CSCRIPTS)
+@@ -156,11 +152,7 @@
+ 
+ s_conf_install: $(SCONFFILES)
+ ifdef SCONFFILES
+-	if test $(sysconfdir) = /etc/coda ; then \
+-	    $(TOPDIR)/tools/our-install 644 $(prefix)/..$(sysconfdir) $? ; \
+-	else \
+-	    $(TOPDIR)/tools/our-install 644 $(sysconfdir) $? ; \
+-	fi
++	$(TOPDIR)/tools/our-install 644 $(prefix)/share/examples/coda $?
+ endif
+ 
+ s_script_install: $(SSCRIPTS)
diff --git a/net/coda5_server/patches/patch-ae b/net/coda5_server/patches/patch-ae
new file mode 100644
index 00000000000..af526207c3a
--- /dev/null
+++ b/net/coda5_server/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.3 2002/06/20 19:28:36 jlam Exp $
+
+--- configure.orig	Tue Mar 12 15:25:53 2002
++++ configure
+@@ -1246,6 +1246,7 @@
+     fi
+ 
+ echo $ac_n "checking configuration file location""... $ac_c" 1>&6
++if false; then
+ echo "configure:1250: checking configuration file location" >&5
+ case ${prefix} in
+     /usr )
+@@ -1272,6 +1273,9 @@
+ 	initsuffix='etc'
+ 	;;
+ esac
++else
++	initsuffix=etc
++fi
+ echo "$ac_t""${sysconfdir}" 1>&6
+ 
+