Upgrade arla to 0.35.5

Most important changes:
o added user-land programs: kalog, aklog, arla-cli
o improved user-land programs: vos, bos, pts, etc.
o added man pages
o security fix (in rx)
o and tons of bug fixes

I included a start script to be placed under /etc/rc.d.

24 files changed, 276 insertions, 214 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 8d248491843..2d22b95920b 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2001/03/29 21:02:57 wennmach Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/09 13:48:58 wennmach Exp $
 #
 
-DISTNAME=		arla-0.34.5
+DISTNAME=		arla-0.35.5
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -9,7 +9,7 @@ MAINTAINER=		wennmach@netbsd.org
 HOMEPAGE=		http://www.stacken.kth.se/project/arla/
 COMMENT=		Free AFS implementation from KTH
 
-DEPENDS+=		kth-krb4-1.0.1:../../security/kth-krb4
+DEPENDS+=		kth-krb4>=1.0.9:../../security/kth-krb4
 
 CONFLICTS+=		lwp-* rx-*
 
@@ -19,6 +19,7 @@ INFO_FILES=		arla.info
 
 .include "../../mk/bsd.prefs.mk"
 
+CONFIGURE_ARGS+=	--with-krb4=${PREFIX}
 .if !exists(/sys/lib/libkern/libkern.h)
 .if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
 CONFIGURE_ARGS+=	--with-sys=${BSDSRCDIR}/sys
@@ -27,7 +28,6 @@ IGNORE=			"${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (
 .endif
 .endif
 
-CONFIGURE_ARGS+=	--with-krb4=${PREFIX}
 .if defined(ARLA_CACHE)
 CONFIGURE_ARGS+=	--with-arlacachedir=${ARLA_CACHE}
 .endif
@@ -40,46 +40,6 @@ CACHEDIR=		${LOCALBASE}/cache
 MESSAGE_SUBST+=		ARLA_CACHE=${CACHEDIR}
 PLIST_SUBST+=		ARLA_CACHE=${CACHEDIR}
 
-post-patch:
-# This is ugly. Utterly ugly. Sigh.
-# kth-krb4 and arla both have their own, different, versions or libroken.
-# To resolve this conflict, which manifests in the inability to recompile
-# kth-krb4 once it is installed, we rename arla's roken to arla-roken.
-	@${ECHO} "===> Applying more NetBSD patches for ${DISTNAME}"
-	@${ECHO} -n "=> Patching configure,"
-	@${MV} ${WRKSRC}/configure ${WRKSRC}/configure.old
-# Notice, the following sed produces some funny comments in configure :-)
-	@${SED} -e 's/roken/arla-roken/g' ${WRKSRC}/configure.old > ${WRKSRC}/configure
-	@${CHMOD} 755 ${WRKSRC}/configure
-	@${ECHO} -n " Makefile.in,"
-	@for file in `${FIND} ${WRKSRC} -name Makefile.in -print`; {          \
-		${MV} $$file $$file.old;                                      \
-		${SED} -e 's/roken/arla-roken/g' $$file.old > $$file;         \
-	}
-	@${ECHO} -n " .c files,"
-	@for file in `${FIND} ${WRKSRC} -name "*.c" -print`; {                \
-		${MV} $$file $$file.old;                                      \
-		${SED} -e 's/roken.h/arla-roken.h/g' $$file.old > $$file;     \
-	}
-	@${ECHO} -n " .h files,"
-	@for file in `${FIND} ${WRKSRC} -name "*.h" -print`; {                \
-		${MV} $$file $$file.old;                                      \
-		${SED} -e 's/roken.h/arla-roken.h/g' $$file.old > $$file;     \
-	}
-	@${ECHO} -n " .y files,"
-	@for file in `${FIND} ${WRKSRC} -name "*.y" -print`; {                \
-		${MV} $$file $$file.old;                                      \
-		${SED} -e 's/roken.h/arla-roken.h/g' $$file.old > $$file;     \
-	}
-	@${ECHO} -n " .l files"
-	@for file in `${FIND} ${WRKSRC} -name "*.l" -print`; {                \
-		${MV} $$file $$file.old;                                      \
-		${SED} -e 's/roken.h/arla-roken.h/g' $$file.old > $$file;     \
-	}
-	@${ECHO} "."
-	@${MV} ${WRKSRC}/lib/roken/roken.h ${WRKSRC}/lib/roken/arla-roken.h
-	@${MV} ${WRKSRC}/lib/roken ${WRKSRC}/lib/arla-roken
-
 do-configure:
 # *Sometimes* it's bad to try to be too smart:
 # pkgsrc's LDFLAGS choice is completely inadequate for arla, since
@@ -103,7 +63,7 @@ post-install:
 		${ECHO} "/sbin/mount_xfs already exists";                     \
 	else                                                                  \
 		${ECHO} "Creating /sbin/mount_xfs";                           \
-		${LN} -s ${PREFIX}/bin/mount_xfs /sbin/mount_xfs;             \
+		${LN} -s ${PREFIX}/sbin/mount_xfs /sbin/mount_xfs;             \
 	fi
 	@-${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arla
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
@@ -114,6 +74,8 @@ post-install:
 	@${INSTALL_DATA}                                                      \
 		 ${FILESDIR}/fstab ${PREFIX}/share/examples/arla
 	@${SED} -e 's|@PREFIX@|${PREFIX}|' ${FILESDIR}/arlad.sh               \
+		> ${PREFIX}/etc/rc.d/arlad.sh
+	@${SED} -e 's|@PREFIX@|${PREFIX}|' ${FILESDIR}/arlad                  \
 		> ${PREFIX}/etc/rc.d/arlad
 	@${ECHO} " "
 
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 0f4a35e5976..4d1b3fc2dac 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,18 +1,22 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/08/09 13:48:58 wennmach Exp $
 
-SHA1 (arla-0.34.5.tar.gz) = 5fd06a4c10adb5a40e32f3dafa3470f79b64b7ea
-Size (arla-0.34.5.tar.gz) = 1151021 bytes
-SHA1 (patch-aa) = af23d98510b9a24ab8e8342c0533ce2a36574eab
-SHA1 (patch-ab) = 624765dbc356be276358f90c4799ca63276f83b5
-SHA1 (patch-ac) = 6b6ad4ce52811820c9dacf3d4890c54ec22e4c21
+SHA1 (arla-0.35.5.tar.gz) = 19c672f9110dfeaf1bcbeef9d07016dd1c354a55
+Size (arla-0.35.5.tar.gz) = 1280277 bytes
+SHA1 (patch-aa) = b9fcc2e3692bdb39d15feb7de2939ac927728795
+SHA1 (patch-ab) = 54aa73e8bd1e81006d0d2bac36f4b152a9007fe3
+SHA1 (patch-ac) = a1d725edea6aaf3711c0d62a5ab5acd84d5fe4b7
 SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6
-SHA1 (patch-ae) = 3bb8c024fd327c57e26d898793feeddba817fe57
+SHA1 (patch-ae) = f9255bc814f38cb8309380a44c1942d3d2cb233e
 SHA1 (patch-af) = 5df593de73674dd6a22d57df441b6e70ea145704
-SHA1 (patch-ag) = e1c7987ca7179eae6a681cc47a6ca69e00fa0434
 SHA1 (patch-ah) = 8386d4062aedbfe24c66cad84cfdcf3a2617848e
-SHA1 (patch-ak) = 70eb1d48aa523388c4eda7a9579d2c251456c048
-SHA1 (patch-an) = d22991f325c93aed2cf3f465e68f2ef0226e4071
+SHA1 (patch-ak) = 2ff053009ac94ea23b24494462e79e7507c0c1cb
+SHA1 (patch-an) = e03678a2bf21adb2dc283a960f67b993a4502b21
 SHA1 (patch-as) = 28d61906be25fc803882d4ccbe584f57e51dec63
-SHA1 (patch-at) = 0d083fcb171fcf2b4b0382128eabb896ecc2c6dd
-SHA1 (patch-au) = aaed59fe814c7364c3a281a95ee18e6d1ac8b721
-SHA1 (patch-av) = 24ebca356e5d5f95bfbf9eda5f35be1f73b614b4
+SHA1 (patch-at) = 190da9b9d9da90166845383856508187d9d1ca8f
+SHA1 (patch-aw) = 89e9853781b0f1980ef51b0a1bfb3ba98c9f508e
+SHA1 (patch-ax) = 2c7f019c5fa3c54c63fa7645d144a3d8a8a82896
+SHA1 (patch-ay) = 51796feb52dd3380fd4e4752445174dc11750652
+SHA1 (patch-az) = f74235d6d610db9b177e0f3c86ee5bf38d20a3dd
+SHA1 (patch-ba) = 8f51c21d55b8abdbb787ca8a3cab7f9915dd9709
+SHA1 (patch-bb) = dca7f0110b1d4476ecd40f0a0edc3dbfd09d8016
+SHA1 (patch-bc) = 60d9aa786e9ecd2eb319fccd13f1b8041d0f73a8
diff --git a/net/arla/files/arlad b/net/arla/files/arlad
new file mode 100644
index 00000000000..85246096400
--- /dev/null
+++ b/net/arla/files/arlad
@@ -0,0 +1,18 @@
+#!/bin/sh
+# $NetBSD: arlad,v 1.1 2001/08/09 13:48:59 wennmach Exp $
+#
+# start script for arlad (for NetBSD-1.5 and newer)
+
+# PROVIDE: arlad
+# REQUIRE: beforemountlkm
+
+. /etc/rc.subr
+
+name="arlad"
+rcvar=$name
+command="@PREFIX@/libexec/${name}"
+command_args="-z /dev/xfs0"
+required_files="/dev/xfs0"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/arla/files/arlad.sh b/net/arla/files/arlad.sh
index acb4db4f442..694ab13700a 100644
--- a/net/arla/files/arlad.sh
+++ b/net/arla/files/arlad.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
-# $NetBSD: arlad.sh,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
-if [ -f @PREFIX@/sbin/arlad ]; then
+# $NetBSD: arlad.sh,v 1.2 2001/08/09 13:48:59 wennmach Exp $
+#
+# start script for arlad (for NetBSD earlier than 1.5)
+
+if [ -f @PREFIX@/libexec/arlad ]; then
 	echo -n " arlad"
-	@PREFIX@/sbin/arlad -z /dev/xfs0
+	@PREFIX@/libexec/arlad -z /dev/xfs0
 fi
diff --git a/net/arla/files/lkm.conf b/net/arla/files/lkm.conf
index 0d9b67ec0bf..bf09db5cf08 100644
--- a/net/arla/files/lkm.conf
+++ b/net/arla/files/lkm.conf
@@ -1,2 +1,2 @@
-# $NetBSD: lkm.conf,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
-@PREFIX@/lkm/xfs_mod.o	-	xfs_mod		@PREFIX@/bin/xfs_makedev	/var/tmp/symbols	BEFOREMOUNT
+# $NetBSD: lkm.conf,v 1.2 2001/08/09 13:48:59 wennmach Exp $
+@PREFIX@/lkm/xfs_mod.o	-	xfs_mod		@PREFIX@/sbin/xfs_makedev	/var/db/xfs_sym	BEFOREMOUNT
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
index 02564b398b7..99b6569079d 100644
--- a/net/arla/patches/patch-aa
+++ b/net/arla/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.2 2000/10/18 16:32:58 wennmach Exp $
+$NetBSD: patch-aa,v 1.3 2001/08/09 13:48:59 wennmach Exp $
 
 Do not add a path to the library search path (-L) to find libsl.a. This will
 find kth-krb4's sl library, which is the wrong one.
 
---- appl/fs/Makefile.in.orig	Wed Oct 11 21:19:59 2000
-+++ appl/fs/Makefile.in	Wed Oct 18 16:13:28 2000
-@@ -50,14 +50,15 @@
+--- appl/fs/Makefile.in.orig	Fri Aug  3 15:24:20 2001
++++ appl/fs/Makefile.in	Fri Aug  3 15:27:23 2001
+@@ -54,12 +54,13 @@
  READLINE_lib	= @LIB_readline@
  KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
  LIB_tgetent     = @LIB_tgetent@
@@ -23,8 +23,5 @@ find kth-krb4's sl library, which is the wrong one.
 +		  ../../util/libutil.a \
 +		  ../../lib/sl/libsl.a \
  		  $(READLINE_lib) \
--		  -L../../lib/roken -lroken \
-+		  ../../lib/roken/libroken.a \
  		  $(RXKAD_LIBS) \
  		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-ab b/net/arla/patches/patch-ab
index a86d918a2cb..9d1013173fe 100644
--- a/net/arla/patches/patch-ab
+++ b/net/arla/patches/patch-ab
@@ -1,12 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2000/10/18 16:32:58 wennmach Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/09 13:48:59 wennmach Exp $
 
 Do not add a path to the library search path (-L) to find libsl.a. This will
 find kth-krb4's sl library, which is the wrong one. 
 
-
---- appl/vos/Makefile.in.orig	Wed Oct 11 21:20:05 2000
-+++ appl/vos/Makefile.in	Wed Oct 18 16:18:43 2000
-@@ -50,14 +50,15 @@
+--- appl/vos/Makefile.in.orig	Fri Aug  3 15:29:25 2001
++++ appl/vos/Makefile.in	Fri Aug  3 15:31:34 2001
+@@ -54,12 +54,13 @@
  READLINE_lib	= @LIB_readline@
  KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
  LIB_tgetent     = @LIB_tgetent@
@@ -24,8 +23,5 @@ find kth-krb4's sl library, which is the wrong one.
 +		  ../../util/libutil.a \
 +		  ../../lib/sl/libsl.a \
  		  $(READLINE_lib) \
--		  -L../../lib/roken -lroken \
-+		  ../../lib/roken/libroken.a \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
+ 		  @LIB_roken@ \
  		  $(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-ac b/net/arla/patches/patch-ac
index 652acf64f04..c5152d6f7b0 100644
--- a/net/arla/patches/patch-ac
+++ b/net/arla/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-ac,v 1.2 2001/08/09 13:48:59 wennmach Exp $
 
 Do not install libsl.a and ss/ss.h. There is a conflict with the libsl.a from
 the kth-krb4 package.
 
---- lib/sl/Makefile.in.orig	Mon May 29 21:40:42 2000
-+++ lib/sl/Makefile.in		Mon May 29 21:50:14 2000
-@@ -58,18 +58,8 @@
- 	$(CC) -c $(DEFS) -I../../include -I. -I$(srcdir) $(KRB4_INC_FLAGS) $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
+--- lib/sl/Makefile.in.orig	Thu Dec 21 13:35:49 2000
++++ lib/sl/Makefile.in		Fri Aug  3 14:33:44 2001
+@@ -61,18 +61,8 @@
+ 	$(CC) -c $(DEFS) -I../../include -I. -I$(srcdir) $(KRB4_INC_FLAGS) @INC_roken@ $(CFLAGS) $(CPPFLAGS) $(PICFLAGS) $<
  
  install: all
 -	$(MKINSTALLDIRS) $(DESTDIR)$(includedir)/ss
diff --git a/net/arla/patches/patch-ae b/net/arla/patches/patch-ae
index 13233b3f456..eea5fefc92d 100644
--- a/net/arla/patches/patch-ae
+++ b/net/arla/patches/patch-ae
@@ -1,11 +1,12 @@
-$NetBSD: patch-ae,v 1.2 2000/08/15 16:08:25 wennmach Exp $
+$NetBSD: patch-ae,v 1.3 2001/08/09 13:48:59 wennmach Exp $
 
 Do not install libutil.a and the header files bool.h, hash.h, heap.h, list.h,
-and log.h. There is a potential conflict with other libutils.
+and log.h, nor any of the man pages. There is a potential conflict with other
+libutils.
 
---- util/Makefile.in.orig	Tue May 30 18:49:46 2000
-+++ util/Makefile.in		Tue May 30 18:50:13 2000
-@@ -74,17 +74,8 @@
+--- util/Makefile.in.orig	Wed Oct 25 09:06:47 2000
++++ util/Makefile.in		Fri Aug  3 14:41:35 2001
+@@ -78,31 +78,8 @@
  libutil_LIB:	$(libutil_OBJS)
  
  install:	all
@@ -13,13 +14,27 @@ and log.h. There is a potential conflict with other libutils.
 -		$(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB)
 -		for i in $(HEADERS); do \
 -		  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/$$i; \
+-		done ; \
+-		MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
+-			n=`echo $$x | sed 's/\(.*\)\.[1-9a-zA-Z]*$$/\1/'`; \
+-			e=`echo $$x | sed 's/.*\.\([1-9a-zA-Z]*\)$$/\1/'`; \
+-			f=`echo $$n | sed '$(transform)'`; \
+-			$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$$e ; \
+-			$(INSTALL_DATA) $(srcdir)/$$x \
+-				$(DESTDIR)$(mandir)/man$$e/$$f.$$e; \
 -		done
  
  uninstall:
--	rm -f $(DESTDIR)$(libdir)/$(LIB)
--	for i in $(HEADERS); do \
--	  rm -f $(DESTDIR)$(includedir)/$$i; \
--	done
+-		rm -f $(DESTDIR)$(libdir)/$(LIB)
+-		for i in $(HEADERS); do \
+-			rm -f $(DESTDIR)$(includedir)/$$i; \
+-		done ; \
+-		MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
+-			n=`echo $$x | sed 's/\(.*\)\.[1-9a-zA-Z]*$$/\1/'`; \
+-			e=`echo $$x | sed 's/.*\.\([1-9a-zA-Z]*\)$$/\1/'`; \
+-			f=`echo $$n | sed '$(transform)'`; \
+-			rm -rf $(DESTDIR)$(mandir)/$$f.$$e; \
+-		done
  
  libutil.a:	$(libutil_OBJS)
  		$(AR) cr $@ $(libutil_OBJS)
diff --git a/net/arla/patches/patch-ag b/net/arla/patches/patch-ag
deleted file mode 100644
index fccbddc1b0c..00000000000
--- a/net/arla/patches/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
-
-Install arlad into $(sbindir), not $(bindir).
-
---- arlad/Makefile.in.orig	Wed May 31 23:31:50 2000
-+++ arlad/Makefile.in		Wed May 31 23:33:34 2000
-@@ -15,6 +15,7 @@
- libdir 		= @libdir@
- libexecdir 	= @libexecdir@
- bindir 		= @bindir@
-+sbindir		= @sbindir@
- sysconfdir	= @sysconfdir@
- transform	= @program_transform_name@
- ARLACACHEDIR	= @ARLACACHEDIR@
-@@ -139,16 +140,16 @@
- 		$(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(REALCFLAGS) $<
- 
- install: all
--		$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-+		$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
- 		PROG_BIN='$(ARLA_BIN)'; for x in $$PROG_BIN; do \
- 			f=`echo $$x | sed '$(transform)'`; \
--			$(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
-+			$(INSTALL_PROGRAM) $$x $(DESTDIR)$(sbindir)/$$f; \
- 		done
- 
- uninstall:
- 		PROG_BIN='$(ARLA_BIN)'; for x in $$PROG_BIN; do \
- 			f=`echo $$x | sed '$(transform)'`; \
--			rm -f $(DESTDIR)$(bindir)/$$f; \
-+			rm -f $(DESTDIR)$(sbindir)/$$f; \
- 		done
- 
- arlad:		$(arlad_OBJS) $(LIBDEPENDS)
diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak
index ae311cb0cea..ef517f7cb6c 100644
--- a/net/arla/patches/patch-ak
+++ b/net/arla/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2000/11/06 15:24:58 wennmach Exp $
+$NetBSD: patch-ak,v 1.3 2001/08/09 13:49:00 wennmach Exp $
 
 Do not print a cryptic message after xfs_mod has been modloaded, say it
 in clear text.
@@ -20,7 +20,7 @@ in clear text.
  	xfs_dev_major = _module.lkm_offset;
 -	printf ("xfs: cdev: %d, syscall: %d\n",
 -		xfs_dev_major, xfs_syscall_num);
-+	printf("driver for %s loaded.\n", arla_version);
++	printf("xfs (%s): using cdev %d, syscall %d\n", arla_version, xfs_dev_major, xfs_syscall_num);
      }
      return ret;
  }
diff --git a/net/arla/patches/patch-an b/net/arla/patches/patch-an
index 43ae1416b56..1e749acd598 100644
--- a/net/arla/patches/patch-an
+++ b/net/arla/patches/patch-an
@@ -1,11 +1,11 @@
-$NetBSD: patch-an,v 1.2 2000/10/18 16:32:58 wennmach Exp $
+$NetBSD: patch-an,v 1.3 2001/08/09 13:49:00 wennmach Exp $
 
 Do not add a path to the library search path (-L) to find libsl.a. This will
-find kth-krb4's sl library, which is the wrong one.
+find kth-krb4's sl library, which is the wrong one. The same for libroken.
 
---- appl/bos/Makefile.in.orig	Wed Oct 11 21:19:57 2000
-+++ appl/bos/Makefile.in	Wed Oct 18 16:23:34 2000
-@@ -50,14 +50,15 @@
+--- appl/bos/Makefile.in.orig	Mon May 28 13:32:03 2001
++++ appl/bos/Makefile.in	Sat Aug  4 19:12:32 2001
+@@ -55,14 +55,15 @@
  READLINE_lib	= @LIB_readline@
  KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
  LIB_tgetent     = @LIB_tgetent@
@@ -23,8 +23,8 @@ find kth-krb4's sl library, which is the wrong one.
 +		  ../../util/libutil.a \
 +		  ../../lib/sl/libsl.a \
  		  $(READLINE_lib) \
--		  -L../../lib/roken -lroken \
+-		  @LIB_roken@ \
 +		  ../../lib/roken/libroken.a \
  		  $(RXKAD_LIBS) \
  		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) \
+ 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-at b/net/arla/patches/patch-at
index 7a4d97b07ca..3c1fa103edd 100644
--- a/net/arla/patches/patch-at
+++ b/net/arla/patches/patch-at
@@ -1,24 +1,26 @@
-$NetBSD: patch-at,v 1.1 2000/10/18 16:32:59 wennmach Exp $
+$NetBSD: patch-at,v 1.2 2001/08/09 13:49:00 wennmach Exp $
 
 Set up proper path to the LKM for startarla.
 
---- xfs/bsd/bin/Makefile.in.orig	Wed Oct 18 16:50:31 2000
-+++ xfs/bsd/bin/Makefile.in	Wed Oct 18 16:53:41 2000
-@@ -19,6 +19,7 @@
+--- xfs/bsd/bin/Makefile.in.orig	Mon Jul 16 07:37:45 2001
++++ xfs/bsd/bin/Makefile.in		Fri Aug  3 14:53:46 2001
+@@ -20,6 +20,7 @@
  libdir 		= @libdir@
  libexecdir 	= @libexecdir@
  bindir 		= @bindir@
-+lkmdir		= @prefix@/lkm
++lkmdir          = @prefix@/lkm
+ sbindir 	= @sbindir@
+ mandir		= @mandir@
  transform	= @program_transform_name@
- ARLACACHEDIR	= @ARLACACHEDIR@
- 
-@@ -52,7 +53,9 @@
+@@ -58,7 +59,10 @@
  	$(RM) -f $(PROGRAMS) startarla *.o *~
  
  startarla: startarla.in
--	sed -e ' s!%bindir%!$(bindir)! ; s!%ARLACACHEDIR%!$(ARLACACHEDIR)!'  $(srcdir)/startarla.in > $@.new
-+	sed -e 's!%bindir%!$(bindir)!' \
-+	    -e 's!%ARLACACHEDIR%!$(ARLACACHEDIR)!' \
-+	    -e 's!%lkmdir%!$(lkmdir)!'  startarla.in > $@.new
+-	sed -e 's!%lkmdir%!$(bindir)!;s!%sbindir%!$(sbindir)!;s!%libexecdir%!$(libexecdir)!;s!%ARLACACHEDIR%!$(ARLACACHEDIR)!'  $(srcdir)/startarla.in > $@.new
++	sed -e 's!%lkmdir%!$(lkmdir)!' \
++	    -e 's!%sbindir%!$(sbindir)!' \
++	    -e 's!%libexecdir%!$(libexecdir)!' \
++	    -e 's!%ARLACACHEDIR%!$(ARLACACHEDIR)!' $(srcdir)/startarla.in > $@.new
  	mv $@.new $@
  	chmod +x $@
+ 
diff --git a/net/arla/patches/patch-au b/net/arla/patches/patch-au
deleted file mode 100644
index 6d1b83217d9..00000000000
--- a/net/arla/patches/patch-au
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-au,v 1.1 2000/10/18 16:32:59 wennmach Exp $
-
-We choose to install LKMs into $prefix/lkm, so we have to pay the price
-now and change startarla.
-
---- xfs/bsd/bin/startarla.in.orig	Wed Oct 18 16:54:09 2000
-+++ xfs/bsd/bin/startarla.in	Wed Oct 18 16:55:09 2000
-@@ -12,6 +12,7 @@
- PATH="/sbin:/usr/sbin:/usr/bin:/bin:%bindir%"
- BINDIR=%bindir%
- CACHEDIR=%ARLACACHEDIR%
-+LKMDIR=%lkmdir%
- 
- if [ ! -e $CACHEDIR ] ; then
-    mkdir $CACHEDIR
-@@ -27,7 +28,7 @@
- elif [ -x /sbin/kmodload ]; then
-   kmodload $BINDIR/xfs_mod.o
- else
--  modload -e xfs_mod -p $BINDIR/xfs_makedev $BINDIR/xfs_mod.o
-+  modload -e xfs_mod -p $BINDIR/xfs_makedev $LKMDIR/xfs_mod.o
- fi
- test -d /afs || mkdir /afs
- mount_xfs /dev/xfs0 /afs
diff --git a/net/arla/patches/patch-av b/net/arla/patches/patch-av
deleted file mode 100644
index 7869a0e08e4..00000000000
--- a/net/arla/patches/patch-av
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-av,v 1.1 2000/11/06 15:24:58 wennmach Exp $
-
-Do not send SIGABRT to arlad if a deadlock could be avoided. This psignal
-is cruft left over from debugging. Also, avoid "interesting" error reports,
-like: 
-"xfs_message_rpc: deadlock avoided pid = 8006 != 8006"
-
---- xfs/bsd/xfs_dev-common.c.old	Wed Sep 13 08:34:10 2000
-+++ xfs/bsd/xfs_dev-common.c	Mon Nov  6 15:50:15 2000
-@@ -399,8 +399,7 @@
- 
-     if (chan->proc != NULL && proc->p_pid == chan->proc->p_pid) {
- 	printf("xfs_message_rpc: deadlock avoided"
--	       "pid = %u != %u\n", proc->p_pid, chan->proc->p_pid);
--	psignal (proc, SIGABRT);
-+	       ", pid = %u == %u\n", proc->p_pid, chan->proc->p_pid);
- 	return EDEADLK;
-     }
- 
diff --git a/net/arla/patches/patch-aw b/net/arla/patches/patch-aw
new file mode 100644
index 00000000000..2d7e7af91cd
--- /dev/null
+++ b/net/arla/patches/patch-aw
@@ -0,0 +1,28 @@
+$NetBSD: patch-aw,v 1.1 2001/08/09 13:49:01 wennmach Exp $
+
+Use absolute library paths for linking.
+
+--- appl/afsutils/Makefile.in.orig	Mon May 28 13:31:49 2001
++++ appl/afsutils/Makefile.in		Sat Aug  4 13:07:43 2001
+@@ -52,13 +52,14 @@
+ RXKAD_LIBS	= @MILKO_RXKAD_LIBS@
+ KERNEL_INCLUDE  = @KERNEL_INCLUDE@
+ KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
+-LIBS		= -L../lib -larlalib \
+-		  -L../../rxdef -lrxdefclient \
+-		  -L../../lib/cmd -lcmd \
+-		  -L../../rx -lrx \
+-		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+-		  -L../../lib/ko -lko -L../../util -lutil \
+-		  @LIB_roken@ \
++LIBS		= ../lib/libarlalib.a \
++		  ../../rxdef/librxdefclient.a \
++		  ../../lib/cmd/libcmd.a \
++		  ../../rx/librx.a \
++		  ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
++		  ../../lib/ko/libko.a \
++		  ../../util/libutil.a \
++		  ../../lib/roken/libroken.a \
+ 		  $(RXKAD_LIBS) \
+ 		  $(KAFS_LIBS) \
+ 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-ax b/net/arla/patches/patch-ax
new file mode 100644
index 00000000000..ad02baad262
--- /dev/null
+++ b/net/arla/patches/patch-ax
@@ -0,0 +1,16 @@
+$NetBSD: patch-ax,v 1.1 2001/08/09 13:49:01 wennmach Exp $
+
+Don't use a search path for libroken.
+
+--- appl/amon/Makefile.in.orig	Sat Aug  4 18:18:55 2001
++++ appl/amon/Makefile.in	Sat Aug  4 18:19:42 2001
+@@ -60,7 +60,8 @@
+ 		  $(RXKAD_LIBS) \
+ 		  $(KAFS_LIBS) \
+ 		  $(RXKAD_LIBS) \
+-		  @LIB_roken@ @LIBS@
++		  ../../lib/roken/libroken.a \
++		  @LIBS@
+ 
+ AMON_LIBS	= @X_LIBS@  \
+ 		  -lXaw -lXt -lXmu -lXext @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
diff --git a/net/arla/patches/patch-ay b/net/arla/patches/patch-ay
new file mode 100644
index 00000000000..8536b8d140b
--- /dev/null
+++ b/net/arla/patches/patch-ay
@@ -0,0 +1,15 @@
+$NetBSD: patch-ay,v 1.1 2001/08/09 13:49:01 wennmach Exp $
+
+Don't use search path for libroken.
+
+--- appl/kalog/Makefile.in.orig	Sat Aug  4 18:30:31 2001
++++ appl/kalog/Makefile.in	Sat Aug  4 18:31:21 2001
+@@ -59,7 +59,7 @@
+ 		  -L../../rx -lrx \
+ 		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+ 		  -L../../lib/ko -lko -L../../util -lutil \
+-		  @LIB_roken@ \
++		  ../../lib/roken/libroken.a \
+ 		  $(RXKAD_LIBS) \
+ 		  $(KAFS_LIBS) \
+ 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-az b/net/arla/patches/patch-az
new file mode 100644
index 00000000000..e69bd405a16
--- /dev/null
+++ b/net/arla/patches/patch-az
@@ -0,0 +1,15 @@
+$NetBSD: patch-az,v 1.1 2001/08/09 13:49:01 wennmach Exp $
+
+Don't use library search path for libroken.
+
+--- appl/pts/Makefile.in.orig	Sat Aug  4 18:47:05 2001
++++ appl/pts/Makefile.in	Sat Aug  4 18:47:45 2001
+@@ -61,7 +61,7 @@
+ 		  -L../../lib/ko -lko -L../../util -lutil \
+ 		  -L../../lib/sl -lsl \
+ 		  $(READLINE_lib) \
+-		  @LIB_roken@ \
++		  ../../lib/roken/libroken.a \
+ 		  $(RXKAD_LIBS) \
+ 		  $(KAFS_LIBS) \
+ 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-ba b/net/arla/patches/patch-ba
new file mode 100644
index 00000000000..10ea8f87e40
--- /dev/null
+++ b/net/arla/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't use a library search path for libroken.
+
+--- appl/vos/Makefile.in.orig	Sat Aug  4 19:01:10 2001
++++ appl/vos/Makefile.in	Sat Aug  4 19:01:43 2001
+@@ -62,7 +62,7 @@
+ 		  ../../util/libutil.a \
+ 		  ../../lib/sl/libsl.a \
+ 		  $(READLINE_lib) \
+-		  @LIB_roken@ \
++		  ../../lib/roken/libroken.a \
+ 		  $(RXKAD_LIBS) \
+ 		  $(KAFS_LIBS) \
+ 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-bb b/net/arla/patches/patch-bb
new file mode 100644
index 00000000000..253652f2021
--- /dev/null
+++ b/net/arla/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.1 2001/08/09 13:49:02 wennmach Exp $
+
+Don't use search path for libroken.
+
+--- tests/Makefile.in.orig	Sat Aug  4 23:26:21 2001
++++ tests/Makefile.in	Sat Aug  4 23:27:50 2001
+@@ -14,7 +14,7 @@
+ CPPFLAGS	= @CPPFLAGS@
+ DEFS		= @DEFS@
+ LDFLAGS		= @LDFLAGS@
+-LIBS		= @LIB_roken@ @LIBS@
++LIBS		= ../lib/roken/libroken.a @LIBS@
+ KAFS_LIBS	= @AFS_EXTRA_LIBS@ @KAFS_LIBS@
+ KRB_LIBS	= @KRB4_LIB_FLAGS@
+ APPL_LIB	= -L../appl/lib -larlalib -L../lib/ko -lko
diff --git a/net/arla/patches/patch-bc b/net/arla/patches/patch-bc
new file mode 100644
index 00000000000..23f066e5431
--- /dev/null
+++ b/net/arla/patches/patch-bc
@@ -0,0 +1,24 @@
+$NetBSD: patch-bc,v 1.1 2001/08/09 13:49:02 wennmach Exp $
+
+Do not install libroken and its header files.
+
+--- lib/roken/Makefile.in.orig	Sun Aug  5 12:48:51 2001
++++ lib/roken/Makefile.in	Sun Aug  5 12:50:40 2001
+@@ -175,17 +175,8 @@
+ 	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
+ 
+ install: all
+-	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+-	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB)
+-	for x in $(include_HEADERS); do \
+-		$(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(includedir)/$$x; \
+-	done
+ 
+ uninstall:
+-	rm -f $(DESTDIR)$(libdir)/$(LIB)
+-	for x in $(include_HEADERS); do \
+-		rm -f $(DESTDIR)$(includedir)/$$x; \
+-	done
+ 
+ TAGS: $(SOURCES)
+ 	etags $(SOURCES)
diff --git a/net/arla/pkg/MESSAGE b/net/arla/pkg/MESSAGE
index 2b73334b8b2..36cee4ca372 100644
--- a/net/arla/pkg/MESSAGE
+++ b/net/arla/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ===============================================================================
-$NetBSD: MESSAGE,v 1.5 2001/07/02 15:53:49 joda Exp $
+$NetBSD: MESSAGE,v 1.6 2001/08/09 13:49:02 wennmach Exp $
 
 Arla now has been installed on your system.
 
@@ -15,11 +15,13 @@ Default configuration files are installed in ${PREFIX}/etc.
 At a minimum, to configure an arla client, copy
 ${PREFIX}/etc/{CellServDB,SuidCells,ThisCell,arla.conf}.default to
 ${PREFIX}/etc/{CellServDB,SuidCells,ThisCell,arla.conf} and customize them.
-Start arlad from rc.local, using the script provided in
-${PREFIX}/etc/rc.d/arlad and include an entry for xfs in your /etc/fstab
+Include an entry for xfs in your /etc/fstab
 (see ${PREFIX}/share/examples/arla/fstab).
 Also, append ${PREFIX}/share/examples/arla/services to /etc/services
 and append ${PREFIX}/share/examples/arla/lkm.conf to /etc/lkm.conf.
 You also have to enable loading of lkms in /etc/rc.conf (set lkm to YES).
 
+Start scripts for arlad are provided in ${PREFIX}/etc/rc.d/arlad.sh (for
+NetBSD prior to NetBSD-1.5) and ${PREFIX}/etc/rc.d/arlad (for NetBSD-1.5
+and later).
 ===============================================================================
diff --git a/net/arla/pkg/PLIST b/net/arla/pkg/PLIST
index c4e65a09609..fae6a98e0d6 100644
--- a/net/arla/pkg/PLIST
+++ b/net/arla/pkg/PLIST
@@ -1,17 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2001/01/29 11:34:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/08/09 13:49:02 wennmach Exp $
+include/arlalib.h
 include/atypes.h
 include/fs_errors.h
-include/base64.h
-include/getarg.h
-include/parse_bytes.h
-include/parse_time.h
-include/parse_units.h
-include/resolve.h
-include/arla-roken.h
+include/ka-procs.h
 include/lock.h
 include/preempt.h
 include/timer.h
-include/rtbl.h
 include/rx/rx.h
 include/rx/rx_clock.h
 include/rx/rx_event.h
@@ -46,7 +40,6 @@ include/auth.h
 include/afs/cmd.h
 @dirrm include/afs
 include/lwp.h
-lib/libarla-roken.a
 lib/liblwp.a
 lib/librx.a
 lib/librxdefclient.a
@@ -66,12 +59,9 @@ lib/libarlalib.a
 lib/libcmd.a
 lkm/xfs_mod.o
 @unexec /bin/rm -f %D/lkm/xfs_mod
-@dirrm lkm
+bin/aklog
+bin/kalog
 bin/ydr
-bin/mount_xfs
-bin/umount_xfs
-bin/xfs_makedev
-bin/startarla
 bin/klog
 bin/tokens
 bin/unlog
@@ -83,25 +73,47 @@ bin/udebug
 bin/vos
 bin/rxdebug
 bin/bos
-sbin/arlad
+libexec/arlad
+sbin/arla-cli
 sbin/rxperf
+sbin/mount_xfs
+sbin/umount_xfs
+sbin/xfs_makedev
+sbin/startarla
 etc/CellServDB.default
 etc/ThisCell.default
 etc/arla.conf.default
 etc/SuidCells.default
+etc/rc.d/arlad.sh
 etc/rc.d/arlad
 share/examples/arla/lkm.conf
 share/examples/arla/services
 share/examples/arla/fstab
 @dirrm share/examples/arla
+man/man1/rxdebug.1
+man/man1/tokens.1
+man/man1/unlog.1
+man/man1/aklog.1
+man/man1/klog.1
+man/man1/fs.1
+man/man1/kalog.1
+man/man1/pts.1
+man/man1/udebug.1   
 man/man3/cmd.3
+man/man5/DynRootDB.5
+man/man5/CellServDB.5
+man/man5/ThisCell.5
+man/man5/SuidCells.5  
+man/man8/mount_xfs.8
+man/man8/umount_xfs.8
+man/man8/arlad.8
+man/man8/arla-cli.8
+man/man8/vos.8
+man/man8/bos.8   
 @unexec install-info --delete %D/info/arla.info %D/info/dir
 info/arla.info
 @exec install-info %D/info/arla.info %D/info/dir
 @exec if [ ! -e ${ARLA_CACHE} ] ; then /bin/mkdir -p ${ARLA_CACHE}; /bin/chmod 700 ${ARLA_CACHE}; chown root ${ARLA_CACHE}; fi
-@exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/bin/mount_xfs /sbin/mount_xfs; fi
-@exec if ! /usr/bin/grep xfs_mod /etc/lkm.conf 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/lkm.conf >> /etc/lkm.conf; fi
-@exec if ! /usr/bin/grep afs3-bos /etc/services 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/services >> /etc/services; fi
-@exec if ! /usr/bin/grep afs /etc/fstab 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/fstab >> /etc/fstab; fi
+@exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/sbin/mount_xfs /sbin/mount_xfs; fi
 @unexec /bin/rm -f /sbin/mount_xfs
 @unexec /bin/rm -rf ${ARLA_CACHE}