Update arla to 0.41. The update is necessary to support NetBSD-2.1

and NetBSD-3.0 and should fix the broken bulk build.

Tested on NetBSD-2.0.2/i386 and NetBSD-2.1/i386.

40 files changed, 241 insertions, 1072 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 37b74a6d228..98af733724b 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2005/12/05 23:55:13 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/15 21:28:47 wennmach Exp $
 
-DISTNAME=		arla-0.38
-PKGREVISION=		2
+DISTNAME=		arla-0.41
+#PKGREVISION=		1
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -45,12 +45,14 @@ PLIST_SUBST+=		ARLA_CACHE=${ARLA_CACHE:Q}
 FILES_SUBST+=		ARLA_CACHE=${ARLA_CACHE:Q}
 
 EGDIR=		${PREFIX}/share/examples/arla
-RCD_SCRIPTS=	arlad
 
-CONF_FILES=	${EGDIR}/CellServDB ${PKG_SYSCONFDIR}/CellServDB
-CONF_FILES+=	${EGDIR}/SuidCells ${PKG_SYSCONFDIR}/SuidCells
-CONF_FILES+=	${EGDIR}/ThisCell ${PKG_SYSCONFDIR}/ThisCell
-CONF_FILES+=	${EGDIR}/arla.conf ${PKG_SYSCONFDIR}/arla.conf
+EGFILES=	CellServDB DynRootDB SuidCells ThisCell arla.conf
+
+.for f in ${EGFILES}
+CONF_FILES+=    ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+
+RCD_SCRIPTS=	arlad
 OWN_DIRS_PERMS=	${ARLA_CACHE} ${ROOT_USER} ${ROOT_GROUP} 0700
 
 INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
diff --git a/net/arla/PLIST b/net/arla/PLIST
index 917213ae2e9..57df43bdb67 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,101 +1,115 @@
-@comment $NetBSD: PLIST,v 1.18 2005/05/02 20:34:01 reed Exp $
-bin/ydr
-bin/rxdebug
-bin/rxperf
+@comment $NetBSD: PLIST,v 1.19 2005/12/15 21:28:47 wennmach Exp $
+bin/afsfsperf
+bin/afstool
 bin/amon
+bin/arla-send-pr
+bin/bos
 bin/fs
-bin/tokens
-bin/afstool
+bin/kalog
+bin/mk_cmds
 bin/pts
+bin/rxdebug
+bin/rxperf
+bin/tokens
 bin/udebug
-bin/afsfsperf
+bin/unlog
 bin/vos
-bin/bos
-bin/kalog
-bin/arla-send-pr
-bin/mk_cmds
+bin/ydr
+include/arla/afs_uuid.h
+include/arla/agetarg.h
+include/arla/cellconfig.h
+include/arla/ko.h
+include/arla/part.h
+include/arla/ports.h
+include/arla/uae.h
+include/arlamath.h
 include/atypes.h
-include/fs_errors.h
 include/base64.h
+include/bool.h
+include/fs_errors.h
 include/getarg.h
+include/hash.h
+include/heap.h
+include/list.h
+include/lock.h
+include/log.h
+include/lwp.h
 include/parse_bytes.h
 include/parse_time.h
 include/parse_units.h
+include/preempt.h
 include/resolve.h
 include/roken-common.h
-include/rtbl.h
-include/xdbm.h
 include/roken.h
-include/lock.h
-include/preempt.h
-include/timer.h
-include/lwp.h
-include/vldb.h
-include/cb.h
-include/fs.h
-include/pts.h
-include/vldb.cs.h
-include/vldb.ss.h
-include/cb.cs.h
-include/cb.ss.h
-include/fs.cs.h
-include/fs.ss.h
-include/pts.cs.h
-include/pts.ss.h
-include/ubik.cs.h
-include/ubik.ss.h
-include/bos.cs.h
+include/rtbl.h
+include/rx/rx-new.h
+include/rx/rx.h
+include/rx/rx_clock.h
+include/rx/rx_event.h
+include/rx/rx_globs.h
+include/rx/rx_kern.h
+include/rx/rx_kmutex.h
+include/rx/rx_locl.h
+include/rx/rx_mach.h
+include/rx/rx_misc.h
+include/rx/rx_multi.h
+include/rx/rx_null.h
+include/rx/rx_pkt.h
+include/rx/rx_queue.h
+include/rx/rx_strm.h
+include/rx/rx_trace.h
+include/rx/rx_user.h
+include/rx/rxgencon.h
+include/rxkad/rxkad.h
 include/sl.h
 include/ss/ss.h
-include/bool.h
-include/hash.h
-include/heap.h
-include/list.h
-include/log.h
-include/arlamath.h
-lib/libroken.la
+include/timer.h
+include/xdbm.h
+lib/emacs/site-lisp/send-pr.el
+lib/libarlalib.la
+lib/libarlautil.la
+lib/libbosclient.la
+lib/libbosserver.la
+lib/libbufdir.la
+lib/libkaclient.la
+lib/libkaserver.la
 lib/liblwp.a
-lib/librxdefclient.a
-lib/librxfsserver.a
-lib/librxvlserver.a
-lib/librxvolserver.a
-lib/libptserver.a
-lib/libptclient.a
-lib/libbosserver.a
-lib/libbosclient.a
-lib/libkaclient.a
-lib/libkaserver.a
-lib/librxcbclient.a
-lib/librxcbserver.a
+lib/libptclient.la
+lib/libptserver.la
+lib/libroken.la
 lib/librx.la
-lib/libbufdir.a
-lib/libarlalib.la
+lib/librxcbclient.la
+lib/librxcbserver.la
+lib/librxdefclient.la
+lib/librxfsserver.la
+lib/librxvlserver.la
+lib/librxvolserver.la
 lib/libsl.la
 lib/libss.la
-lib/libarlautil.la
-lib/emacs/site-lisp/send-pr.el
 libexec/arlad
-man/cat3/getarg.0
+lkm/nnpfs_mod.o
 man/cat3/arg_printusage.0
-man/man1/rxdebug.1
-man/man1/tokens.1
+man/cat3/getarg.0
 man/man1/afstool.1
+man/man1/arla-send-pr.1
+man/man1/kalog.1
 man/man1/pts.1
+man/man1/rxdebug.1
+man/man1/tokens.1
 man/man1/udebug.1
-man/man1/kalog.1
-man/man1/arla-send-pr.1
-man/man3/getarg.3
+man/man1/unlog.1
 man/man3/arg_printusage.3
-man/man3/log_log.3
-man/man3/log_vlog.3
-man/man3/log_open.3
+man/man3/getarg.3
 man/man3/log_close.3
-man/man3/log_unit_init.3
-man/man3/log_unit_free.3
-man/man3/log_set_mask.3
 man/man3/log_get_mask.3
+man/man3/log_log.3
 man/man3/log_mask2str.3
+man/man3/log_open.3
+man/man3/log_set_mask.3
 man/man3/log_set_mask_str.3
+man/man3/log_unit_free.3
+man/man3/log_unit_init.3
+man/man3/log_vlog.3
 man/man4/nnpfs.4
 man/man5/AliasDB.5
 man/man5/CellServDB.5
@@ -103,23 +117,23 @@ man/man5/DynRootDB.5
 man/man5/SuidCells.5
 man/man5/ThisCell.5
 man/man5/arla.conf.5
+man/man8/arla-cli.8
+man/man8/arlad.8
 man/man8/mount_nnpfs.8
 man/man8/umount_nnpfs.8
-man/man8/arlad.8
-man/man8/arla-cli.8
 man/man8/vos.8
+sbin/arla-cli
 sbin/mount_nnpfs
-sbin/umount_nnpfs
 sbin/nnpfs_makedev
 sbin/startarla
-sbin/arla-cli
-share/examples/arla/lkm.conf
+sbin/umount_nnpfs
 share/examples/arla/CellServDB
-share/examples/arla/ThisCell
-share/examples/arla/fstab
+share/examples/arla/DynRootDB
 share/examples/arla/SuidCells
+share/examples/arla/ThisCell
 share/examples/arla/arla.conf
-share/examples/rc.d/arlad
+share/examples/arla/fstab
+share/examples/arla/lkm.conf
 @dirrm share/examples/arla
+share/examples/rc.d/arlad
 share/gnats/stacken
-lkm/nnpfs_mod.o
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 0302dcfb67c..b82856b531f 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,43 +1,20 @@
-$NetBSD: distinfo,v 1.18 2005/09/03 23:12:20 rillig Exp $
+$NetBSD: distinfo,v 1.19 2005/12/15 21:28:47 wennmach Exp $
 
-SHA1 (arla-0.38.tar.gz) = f0e46d4ebf37c137c7a4ba98f6bdc66e7617fd0f
-RMD160 (arla-0.38.tar.gz) = 9af0c70f6233ab7aa8d6eddfd30583b788a8aaa1
-Size (arla-0.38.tar.gz) = 2138444 bytes
-SHA1 (patch-aa) = 3f2393932d2b764293c26a6f8ef588e248c7bf1f
-SHA1 (patch-ab) = fc896369ba3e346f4fcb3dd1f82592db4fb2d45c
+SHA1 (arla-0.41.tar.gz) = ee343833649924d829f547a6fddc88da4f3a3c83
+RMD160 (arla-0.41.tar.gz) = a4c7cdc17559d900b6ac2ede5f0f3cb29fa08b23
+Size (arla-0.41.tar.gz) = 2200301 bytes
 SHA1 (patch-ac) = abee32015e06033a22eebcd914463a3776db7127
-SHA1 (patch-ad) = bc38ab53f9584d137d182fd086b4148a841b2f7d
-SHA1 (patch-ae) = 581235cc7b29840a4889f7c0700add1b7d739864
-SHA1 (patch-af) = cf5a7e072278d79efa1e5e6377f83be4271868bb
-SHA1 (patch-ag) = ccd26378143f7193ad669543e1085358fa9305dd
-SHA1 (patch-ah) = c88e2f541d1a80a127af8e4defacc0605ee2a216
-SHA1 (patch-ai) = fc9f72982d5174b5d8ce695ef8040cb14a479183
-SHA1 (patch-aj) = 252b106cabfa498059156dc685d1b358fe8d1a8a
+SHA1 (patch-af) = d5a897fbdf2326940fc42a1330f8f712960e9de2
+SHA1 (patch-ah) = d3b9a28d336a2f148613bc1f40cd3c568d4c40ce
 SHA1 (patch-ak) = 7cf6a36acc9107458c8165a4c5ff4821fc8a946f
-SHA1 (patch-al) = 5c2f0283bdacbddc6a6632df1c758150e12953ef
-SHA1 (patch-am) = 1efe1b5b9fddf023fbc7a9cead28c607a0ada2e0
-SHA1 (patch-an) = 9b07bd7036b2e674a9ea5330cd348b5883eabdf9
-SHA1 (patch-ao) = 780a129d1d998b3234b2475f9018d18736ffa34c
-SHA1 (patch-ap) = 78d28a8a3f7b70c0a8900319288168117ede2a77
-SHA1 (patch-aq) = 17266907f3f3fb09441cd2a548cc65138e0457b4
-SHA1 (patch-ar) = af5f9d365262d66ae71a9115dc257e1d42ddc0d0
-SHA1 (patch-as) = 3572389f4bf2449a2ee0a6b5180b0f46db7d3745
+SHA1 (patch-al) = 6d7af2b8fe990232a5aa684c039dfc565ecebdf8
 SHA1 (patch-at) = 94566c0016e686d29bc65a29b5047654759dec70
-SHA1 (patch-au) = 6c2786341dca064975dbca1a3b31110dfe395b48
-SHA1 (patch-av) = 513a80307d896cc43ecbd0f436bc070ca95f3901
-SHA1 (patch-aw) = d5c5f3321595c419f3873ba158fc228498dab4d5
-SHA1 (patch-ax) = bd21ea5951c7bf657a0ce830ec365bdadd472c2f
-SHA1 (patch-ay) = 550f04a7c6c0d52377430f535afee3a3833314b8
+SHA1 (patch-aw) = 0d93bece3c221590b1ca2fb3133128266b460820
 SHA1 (patch-az) = 072c2d9c8a2fea61fc04bff5d0d9fb211bbb67d6
-SHA1 (patch-bb) = 94cc830efcd70dbd1bddded7955b06373f56ea3c
-SHA1 (patch-bc) = 61374abb7d0a60bf1dfcef78e88a5eae9d3bc1dd
-SHA1 (patch-bd) = 8f7028ef8dad43cb7689efae8e0bdc759938a019
-SHA1 (patch-be) = 0084f721cef2663428be37fab3d921d9fb17a60b
-SHA1 (patch-bf) = a85c5cceb564366bb553d5d9edaa7dfb12dfd184
-SHA1 (patch-bg) = 2fcb2460e063145c699cfc9dcb6fadf996778383
-SHA1 (patch-bh) = 5789f72078c906ec1bd160783e04cd6b21a5c16f
 SHA1 (patch-bi) = 2e8201964c64b128025a752ee7354f0cc8305b1b
-SHA1 (patch-bj) = 7d0f6bf02d4f635f5862363581930e43ed3811a8
-SHA1 (patch-bk) = 78720a513c6fea420cb91b6fa3e515467347441a
-SHA1 (patch-bl) = d886b25ac1e6b7af4dd52bb055083a0bc6c36177
-SHA1 (patch-bm) = a0282ec548cc673bb43bb43e0883cbb2b027af30
+SHA1 (patch-bj) = e98877cce457c01f76680f74ef9107bbed0a9654
+SHA1 (patch-bl) = 83478bc5217cb95000cfb99af0c642602b7893b2
+SHA1 (patch-bn) = 5d182241d72bc095785f95929192a27ef29c409b
+SHA1 (patch-bo) = 8f3cfe162f22b38f25963d9e9195946c0cabf4e0
+SHA1 (patch-bp) = c38f93427694ec57dc0557518efe984b14334ef1
+SHA1 (patch-bq) = c7bac5059b39ee4edfdf5215c0d4e5f1bf987c56
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
deleted file mode 100644
index 619b080c9b5..00000000000
--- a/net/arla/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2005/03/25 17:40:25 wennmach Exp $
-
-From christos.
-
---- nnpfs/bsd/nnpfs_vfsops-common.c.orig	2004-07-22 10:02:16.000000000 -0400
-+++ nnpfs/bsd/nnpfs_vfsops-common.c	2004-12-22 21:28:22.000000000 -0500
-@@ -260,7 +260,7 @@
- 	msg.cred.pag = nnpfs_get_pag(cred);
- 	error = nnpfs_message_rpc(nnpfsp->fd, &msg.header, sizeof(msg), proc);
- 	if (error == 0)
--	    error = ((struct nnpfs_message_wakeup *) & msg)->error;
-+	    error = ((struct nnpfs_message_wakeup *)(void *)& msg)->error;
-     } while (error == 0);
-     /*
-      * Failed to get message through, need to pretend that all went well
diff --git a/net/arla/patches/patch-ab b/net/arla/patches/patch-ab
deleted file mode 100644
index 259cb65c685..00000000000
--- a/net/arla/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/03/25 17:40:25 wennmach Exp $
-
-Reorder libs.
-
---- lib/ko/Makefile.in.orig	Mon Mar 14 11:06:15 2005
-+++ lib/ko/Makefile.in	Mon Mar 14 11:07:19 2005
-@@ -489,9 +489,9 @@
- restest_SOURCES = restest.c
- LDADD = \
- 	../../util/libarlautil.la 	\
--	$(LIB_roken)			\
- 	$(KRB5_LIB_FLAGS)		\
--	$(LIBS)
-+	$(LIBS)				\
-+	$(LIB_roken)
- 
- gensysname_LDADD = $(LDADD)
- kotest_LDADD = libko.la $(LDADD)
diff --git a/net/arla/patches/patch-ad b/net/arla/patches/patch-ad
deleted file mode 100644
index ff67db0376e..00000000000
--- a/net/arla/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/03/25 17:40:25 wennmach Exp $
-
-Do not install libacl.a, which conflicts with libacl.a from kth-krb4.
-
---- lib/acl/Makefile.in.orig	Mon May 29 21:52:48 2000
-+++ lib/acl/Makefile.in		Mon May 29 21:53:22 2000
-@@ -46,11 +46,8 @@
- 	$(CC) -c $(DEFS) $(REALCFLAGS) $(PICFLAGS) $(CPPFLAGS) $<
- 
- install: all
--	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(INSTALL_DATA) -m 0555 $(LIB) $(DESTDIR)$(libdir)/$(LIB)
- 
- uninstall:
--	rm -f $(DESTDIR)$(libdir)/$(LIB)
- 
- TAGS: $(SOURCES)
- 	etags $(SOURCES)
diff --git a/net/arla/patches/patch-ae b/net/arla/patches/patch-ae
deleted file mode 100644
index 6d684962926..00000000000
--- a/net/arla/patches/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/03/25 17:40:25 wennmach Exp $
-
-Conditionaly remove unneeded include file, else it won't compile under
-NetBSD-1.6.x.
-
-Include <krb5/kafs.h> instead of <kafs.h> in order to get the right prototype
-for kafs_settoken_rxkad.
-
---- appl/lib/ka-procs.c.orig	Mon Mar 14 19:33:24 2005
-+++ appl/lib/ka-procs.c	Mon Mar 14 19:33:38 2005
-@@ -53,7 +53,9 @@
- 
- #ifdef HAVE_OPENSSL
- #include <openssl/des.h>
-+#if __NetBSD_Version__ >= 200000000
- #include <openssl/ui.h>
-+#endif
- #include <openssl/opensslv.h>
- #endif
- 
-@@ -80,7 +82,7 @@
- #include <ka.h>
- #include <ka.cs.h>
- 
--#include <kafs.h>
-+#include <krb5/kafs.h>
- 
- typedef struct {
-     char dat[MAXKTCTICKETLEN];
diff --git a/net/arla/patches/patch-af b/net/arla/patches/patch-af
index 4a4af9fb97a..b9c1a2e2583 100644
--- a/net/arla/patches/patch-af
+++ b/net/arla/patches/patch-af
@@ -1,17 +1,17 @@
-$NetBSD: patch-af,v 1.4 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-af,v 1.5 2005/12/15 21:28:47 wennmach Exp $
 
 Use correct defaults for pkgsrc.
 
---- conf/Makefile.in.orig	2003-02-12 07:43:36.000000000 -0500
-+++ conf/Makefile.in	2004-12-22 20:24:49.000000000 -0500
-@@ -14,7 +14,9 @@
+--- conf/Makefile.in.orig	2005-10-28 16:33:38.000000000 +0200
++++ conf/Makefile.in	2005-12-14 09:49:20.000000000 +0100
+@@ -14,7 +14,8 @@
  CHMOD		= @chmod@
  
  prefix 		= @prefix@
 -sysconfdir	= @sysconfdir@
-+#sysconfdir	= @sysconfdir@
 +exampledir	= $(prefix)/share/examples/arla
 +sysconfdir	= $(exampledir)
  
- CONF_FILES	= CellServDB ThisCell SuidCells
+ CONF_FILES	= CellServDB ThisCell SuidCells DynRootDB
+ 
  
diff --git a/net/arla/patches/patch-ag b/net/arla/patches/patch-ag
deleted file mode 100644
index 9f13c09ca69..00000000000
--- a/net/arla/patches/patch-ag
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2005/03/25 17:40:25 wennmach Exp $
-
-From christos.
-
---- nnpfs/bsd/nnpfs_vnodeops-common.c.orig	2004-08-09 10:25:39.000000000 -0400
-+++ nnpfs/bsd/nnpfs_vnodeops-common.c	2004-12-22 21:34:18.000000000 -0500
-@@ -90,7 +90,7 @@
- 	    error = nnpfs_message_rpc(nnpfsp->fd, &msg.header, sizeof(msg), p);
- 
- 	    if (error == 0)
--		error = ((struct nnpfs_message_wakeup *) & msg)->error;
-+		error = ((struct nnpfs_message_wakeup *)(void *)& msg)->error;
- 	} else {
- 	    goto done;
- 	}
-@@ -121,7 +121,7 @@
- 	    msg.handle = xn->handle;
- 	    error = nnpfs_message_rpc(nnpfsp->fd, &msg.header, sizeof(msg), p);
- 	    if (error == 0)
--		error = ((struct nnpfs_message_wakeup *) & msg)->error;
-+		error = ((struct nnpfs_message_wakeup *)(void *)& msg)->error;
- 	} else {
- 	    goto done;
- 	}
-@@ -169,7 +169,7 @@
- 	error = nnpfs_message_rpc(nnpfsp->fd, &msg.header, sizeof(msg), p);
- 	
- 	if (error == 0)
--	    error = ((struct nnpfs_message_wakeup *) & msg)->error;
-+	    error = ((struct nnpfs_message_wakeup *)(void *)& msg)->error;
- 	
-     } while (error == 0);
- 
-@@ -227,7 +227,7 @@
-     error = nnpfs_message_rpc(nnpfsp->fd, &msg.header, sizeof(msg), p);
- 
-     if (error == 0)
--	error = ((struct nnpfs_message_wakeup *) & msg)->error;
-+	error = ((struct nnpfs_message_wakeup *)(void *)& msg)->error;
- 
-     if (error == 0)
- 	xn->flags &= ~NNPFS_DATA_DIRTY;
-@@ -490,7 +490,7 @@
- 	NNPFS_TOKEN_CLEAR(xn, NNPFS_ATTR_VALID, NNPFS_ATTR_MASK);
- 	error = nnpfs_message_rpc(nnpfsp->fd, &msg.header, sizeof(msg), p);
- 	if (error == 0)
--	    error = ((struct nnpfs_message_wakeup *) & msg)->error;
-+	    error = ((struct nnpfs_message_wakeup *)(void *)& msg)->error;
-     }
- 
- done:
diff --git a/net/arla/patches/patch-ah b/net/arla/patches/patch-ah
index d74bbe148e8..3b10b0c82f9 100644
--- a/net/arla/patches/patch-ah
+++ b/net/arla/patches/patch-ah
@@ -1,19 +1,20 @@
-$NetBSD: patch-ah,v 1.4 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ah,v 1.5 2005/12/15 21:28:47 wennmach Exp $
 
 Install nnpfs_mod.o into $(lkmdir), not $(bindir).
-Do not strip nnpfs_mod.o while installing it.
+Don't strip  nnpfs_mod.o while installing.
 
---- nnpfs/bsd/Makefile.in.orig	2004-07-20 07:28:23.000000000 -0400
-+++ nnpfs/bsd/Makefile.in	2004-12-22 20:32:06.000000000 -0500
-@@ -20,6 +20,7 @@
+--- nnpfs/bsd/Makefile.in.orig	2005-11-22 17:53:54.000000000 +0100
++++ nnpfs/bsd/Makefile.in	2005-12-15 12:55:27.000000000 +0100
+@@ -19,7 +19,7 @@
  
  INSTALL		= @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_LKMD   = ${INSTALL_PROGRAM:C/-s//}
+-INSTALL_LKM_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_LKM_PROGRAM = ${INSTALL_PROGRAM:C/-s//}
  INSTALL_DATA	= @INSTALL_DATA@
  MKINSTALLDIRS 	= @top_srcdir@/mkinstalldirs
  
-@@ -28,7 +29,7 @@
+@@ -28,7 +28,7 @@
  libdir 		= @libdir@
  libexecdir 	= @libexecdir@
  bindir 		= @bindir@
@@ -22,12 +23,3 @@ Do not strip nnpfs_mod.o while installing it.
  transform	= @program_transform_name@
  EXECSUFFIX	= @EXECSUFFIX@
  VARDB		= /var/db
-@@ -136,7 +137,7 @@
- install-bsd:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(lkmdir)
- 	LKM_BIN='$(NNPFS_BIN)'; for x in $$LKM_BIN; do \
--		$(INSTALL_PROGRAM) $$x $(DESTDIR)$(lkmdir)/$$x; \
-+		$(INSTALL_LKMD) $$x $(DESTDIR)$(lkmdir)/$$x; \
- 	done
- 
- install: all $(INSTALL_LKM)
diff --git a/net/arla/patches/patch-ai b/net/arla/patches/patch-ai
deleted file mode 100644
index 9e0743297b3..00000000000
--- a/net/arla/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2005/03/25 17:40:25 wennmach Exp $
-
-Define $(LIB_crypt).
-
---- lwp/Makefile.in.orig	2005-03-09 16:18:26.000000000 +0100
-+++ lwp/Makefile.in	2005-03-09 16:19:36.000000000 +0100
-@@ -50,6 +50,7 @@
- REALCFLAGS	= $(INCLUDES) @DEFS@ @CFLAGS@ -DFD_SPEED_HACK -DDEBUG \
- 		  $(CFLAGS) @PLWP_INC_FLAGS@
- 
-+LIB_crypt	= @LIB_crypt@
- LIB		= liblwp.a
- 
- include_HEADERS = lock.h preempt.h timer.h
diff --git a/net/arla/patches/patch-aj b/net/arla/patches/patch-aj
deleted file mode 100644
index 0db184533b5..00000000000
--- a/net/arla/patches/patch-aj
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2005/03/25 17:40:25 wennmach Exp $
-
-test_rx_clock needs -llwp.
-
-Add target for rxdebug in order to compile non-C99 comformant code with
-option "-fno-strict-aliasing" as a workaround.
-
---- rx/Makefile.in.orig	2005-03-09 16:44:39.000000000 +0100
-+++ rx/Makefile.in	2005-03-09 16:46:18.000000000 +0100
-@@ -489,7 +489,7 @@
- librx_la_CPPFLAGS = $(DEFS) -DRXDEBUG -DSOFT_ACK
- man_MANS = rxdebug.1
- test_rx_clock_SOURCES = test_rx_clock.c
--test_rx_clock_LDADD = librx.la $(LIBS)
-+test_rx_clock_LDADD = librx.la -L../lwp -llwp $(LIBS)
- rxdebug_SOURCES = rxdebug.c
- rxdebug_LDADD = librx.la -L../lwp -llwp $(PLWP_LIB_FLAGS) \
- 	../lib/ko/libko.la $(LIB_roken) $(LIBS)
-@@ -602,6 +602,8 @@
- rx_trace$(EXEEXT): $(rx_trace_OBJECTS) $(rx_trace_DEPENDENCIES) 
- 	@rm -f rx_trace$(EXEEXT)
- 	$(LINK) $(rx_trace_LDFLAGS) $(rx_trace_OBJECTS) $(rx_trace_LDADD) $(LIBS)
-+$(rxdebug_OBJECTS): $(rxdebug_SOURCES)
-+	$(COMPILE) -fno-strict-aliasing -c $<
- rxdebug$(EXEEXT): $(rxdebug_OBJECTS) $(rxdebug_DEPENDENCIES) 
- 	@rm -f rxdebug$(EXEEXT)
- 	$(LINK) $(rxdebug_LDFLAGS) $(rxdebug_OBJECTS) $(rxdebug_LDADD) $(LIBS)
diff --git a/net/arla/patches/patch-al b/net/arla/patches/patch-al
index 235125b162a..f895d13e68f 100644
--- a/net/arla/patches/patch-al
+++ b/net/arla/patches/patch-al
@@ -1,16 +1,14 @@
-$NetBSD: patch-al,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-al,v 1.4 2005/12/15 21:28:47 wennmach Exp $
 
 Add missing lib and reorder.
 
---- appl/amon/Makefile.in.orig	2005-03-10 13:45:49.000000000 +0100
-+++ appl/amon/Makefile.in	2005-03-10 14:13:32.000000000 +0100
-@@ -459,9 +459,11 @@
- 
+--- appl/amon/Makefile.in.orig	2005-12-08 22:56:34.000000000 +0100
++++ appl/amon/Makefile.in	2005-12-08 22:57:57.000000000 +0100
+@@ -455,8 +455,10 @@
  amon_LDADD = \
  		../lib/libarlalib.la \
--		-L../../rxdef -lrxdefclient \
-+		../../rxdef/librxdefclient.a \
-+		../../rxdef/libkaclient.a \
+ 		../../rxdef/librxdefclient.la \
++		../../rxdef/libkaclient.la \
  		../../rx/librx.la \
 -		-L../../lwp -llwp @PLWP_LIB_FLAGS@ \
 +		../../lwp/liblwp.a \
diff --git a/net/arla/patches/patch-am b/net/arla/patches/patch-am
deleted file mode 100644
index afa5daefe4a..00000000000
--- a/net/arla/patches/patch-am
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-am,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Sigh ... buildlink3 reorders libs in the wrong order. Work around.
-Add missing lib.
-
---- appl/fs/Makefile.in.orig	2005-03-10 17:27:52.000000000 +0100
-+++ appl/fs/Makefile.in	2005-03-10 17:30:09.000000000 +0100
-@@ -506,18 +506,22 @@
- 	$(INC_roken)
- 
- fs_LDADD = \
--	-L../lib -larlalib \
--	-L../../rxdef -lrxdefclient \
--	-L../../rx -lrx \
--	-L../../lwp -llwp $(PLWP_LIB_FLAGS) \
-+	../lib/libarlalib.la \
-+	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
-+	../../rx/librx.la \
-+	../../lwp/liblwp.a \
-+	$(PLWP_LIB_FLAGS) \
- 	../../lib/vers/libvers.la \
--	../../lib/ko/libko.la ../../util/libarlautil.la \
-+	../../lib/ko/libko.la \
-+	../../util/libarlautil.la \
- 	$(LIB_sl) \
- 	$(READLINE_lib) \
--	$(LIB_roken) \
- 	$(RXKAD_LIBS) \
- 	$(KAFS_LIBS) \
--	$(RXKAD_LIBS) @LIBS@
-+	$(RXKAD_LIBS) \
-+	@LIBS@ \
-+	$(LIB_roken) \
- 
- all: all-am
- 
diff --git a/net/arla/patches/patch-an b/net/arla/patches/patch-an
deleted file mode 100644
index a9345608d78..00000000000
--- a/net/arla/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.5 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib.
-
---- appl/afsutils/Makefile.in.orig	2005-03-10 21:52:01.000000000 +0100
-+++ appl/afsutils/Makefile.in	2005-03-10 21:53:56.000000000 +0100
-@@ -450,6 +450,7 @@
- tokens_SOURCES = tokens.c
- LDADD = ../lib/libarlalib.la \
- 	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
- 	../../lib/ko/libko.la \
- 	../../util/libarlautil.la \
- 	../../rx/librx.la \
diff --git a/net/arla/patches/patch-ao b/net/arla/patches/patch-ao
deleted file mode 100644
index d6e43f2ab3d..00000000000
--- a/net/arla/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib.
-
---- appl/afstool/Makefile.in.orig	2005-03-10 22:16:23.000000000 +0100
-+++ appl/afstool/Makefile.in	2005-03-10 22:17:38.000000000 +0100
-@@ -468,6 +468,7 @@
- 
- LDADD = ../lib/libarlalib.la \
- 	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
- 	../../rxdef/librxcbclient.a \
- 	../../rxdef/librxcbserver.a \
- 	../../lib/ko/libko.la \
diff --git a/net/arla/patches/patch-ap b/net/arla/patches/patch-ap
deleted file mode 100644
index a608831744b..00000000000
--- a/net/arla/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib.
-
---- appl/pts/Makefile.in.orig	2005-03-10 22:36:30.000000000 +0100
-+++ appl/pts/Makefile.in	2005-03-10 22:37:12.000000000 +0100
-@@ -450,6 +450,7 @@
- pts_SOURCES = pts.c
- LDADD = ../lib/libarlalib.la \
- 	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
- 	../../lib/ko/libko.la \
- 	../../util/libarlautil.la \
- 	../../rx/librx.la \
diff --git a/net/arla/patches/patch-aq b/net/arla/patches/patch-aq
deleted file mode 100644
index 22f5a78f20b..00000000000
--- a/net/arla/patches/patch-aq
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib.
-
---- appl/perf/Makefile.in.orig	2005-03-10 22:59:14.000000000 +0100
-+++ appl/perf/Makefile.in	2005-03-10 23:04:01.000000000 +0100
-@@ -458,16 +458,18 @@
- 	$(LIB_sl) \
- 	$(LIB_readline) \
- 	../../rx/librx.la \
--	-L../../lwp -llwp $(PLWP_LIB_FLAGS) \
--	-L../../appl/lib -larlalib \
--	-L../../rxdef -lrxdefclient -lrxcbserver \
-+	../../lwp/liblwp.a $(PLWP_LIB_FLAGS) \
-+	../lib/libarlalib.la \
-+	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
-+	../../rxdef/librxcbserver.a \
- 	../../lib/ko/libko.la \
- 	../../lib/vers/libvers.la \
- 	../../util/libarlautil.la \
--	$(LIB_roken) \
- 	$(KAFS_LIBS) \
- 	$(RXKAD_LIBS) \
--	$(LIBS)
-+	$(LIBS) \
-+	$(LIB_roken) \
- 
- all: all-am
- 
diff --git a/net/arla/patches/patch-ar b/net/arla/patches/patch-ar
deleted file mode 100644
index 74051a0ba8d..00000000000
--- a/net/arla/patches/patch-ar
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib & reorder them.
-
---- appl/vos/Makefile.in.orig	2005-03-10 23:27:45.000000000 +0100
-+++ appl/vos/Makefile.in	2005-03-10 23:29:44.000000000 +0100
-@@ -483,17 +483,19 @@
- 
- LDADD = \
- 	../lib/libarlalib.la \
--	-L../../rxdef -lrxdefclient \
-+	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
- 	../../rx/librx.la \
--	-L../../lwp -llwp $(PLWP_LIB_FLAGS) \
-+	../../lwp/liblwp.a $(PLWP_LIB_FLAGS) \
- 	../../lib/ko/libko.la ../../util/libarlautil.la \
- 	../../lib/vers/libvers.la \
- 	$(LIB_sl) \
- 	$(READLINE_lib) \
--	$(LIB_roken) \
- 	$(RXKAD_LIBS) \
- 	$(KAFS_LIBS) \
--	$(RXKAD_LIBS) $(LIBS)
-+	$(RXKAD_LIBS) \
-+	$(LIBS) \
-+	$(LIB_roken)
- 
- all: all-am
- 
diff --git a/net/arla/patches/patch-as b/net/arla/patches/patch-as
deleted file mode 100644
index 89e08ef60d0..00000000000
--- a/net/arla/patches/patch-as
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-as,v 1.3 2005/03/25 17:40:25 wennmach Exp $
-
-Make arla compile on pmax.
-Make configure find com_err.h.
-Define LIB_com_err.
-
---- configure.orig	2004-12-25 17:45:33.000000000 +0100
-+++ configure	2005-03-22 15:01:20.000000000 +0100
-@@ -467,7 +467,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT AS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CANONICAL_HOST LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC EGREP SYMORDER DVI2PS TEXI2DVI TEXI2PDF TEXI2HTML DVIPS chmod GUILE_GTK X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE LIB_pthread_create LIB_sched_yield SYS BSDMAKE BSD_WERROR FREEBSD_GENSETDEFS COM_APPLE_KERNEL_BSD YDR_CPPFLAGS DFLY_TRUE DFLY_FALSE FBSD5_TRUE FBSD5_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE NNPFS_AFS_READDIR_TRUE NNPFS_AFS_READDIR_FALSE OSF1_TRUE OSF1_FALSE DCE_TRUE DCE_FALSE MACOSX_TRUE MACOSX_FALSE LWP_REDZONE_TRUE LWP_REDZONE_FALSE ARLA_KNFS LWP_PROCESS PLWP_LIB_FLAGS PLWP_INC_FLAGS LWP_C LWP_O LWP_H INCLUDE_readline LIB_readline LIB_tgetent LIB_el_init INC_sl LIB_sl DIR_sl SL_H DEPEND_sl ac_cv_prog_getconf editline_OBJS editline_dir GCC KERNEL_INCLUDE KERNEL_SRCS KERNEL_HDRS KERNEL_CPPFLAGS KERNEL_CFLAGS KERNEL_LD_FLAGS KERNEL_CC KERNEL_LD MODLOAD MODUNLOAD MODULE NNPFS_SUBDIR NNPFS_SRCS RXKAD_LIBS ARLACACHEDIR ARLACONFFILE MILKO_ROOT have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE have_glob_h_TRUE have_glob_h_FALSE do_roken_rename_TRUE do_roken_rename_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM INC_roken LIB_roken DIR_roken ROKEN_H WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT VOID_RETSIGTYPE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIBOBJS LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror LIB_crypt INCLUDES_roken ARLA_LOCAL_ROKEN_TRUE ARLA_LOCAL_ROKEN_FALSE NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT KRB5_LIB_DIR KRB5_INC_DIR KRB5_INC_FLAGS KRB5_LIB_LIBS KRB5_LIB_FLAGS KRB4_LIB_DIR KRB4_INC_DIR KRB4_INC_FLAGS KRB4_LIB_LIBS KRB4_LIB_FLAGS KRB5_TRUE KRB5_FALSE KRB4_TRUE KRB4_FALSE KAFS_LIBS KAFS_CPPFLAGS RXKAD_TRUE RXKAD_FALSE AFS_EXTRA_OBJS AFS_EXTRA_LIBS AFS_EXTRA_LD AFS_EXTRA_DEFS AIX_EXTRA_KAFS LIB_res_init COMERR_CPPFLAGS VNODE_IF_H ARLA_CONF_HIGHVNODES ARLA_CONF_LOWVNODES ARLA_CONF_HIGHBYTES ARLA_CONF_LOWBYTES LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT AS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CANONICAL_HOST LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC EGREP SYMORDER DVI2PS TEXI2DVI TEXI2PDF TEXI2HTML DVIPS chmod GUILE_GTK X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE LIB_pthread_create LIB_sched_yield SYS BSDMAKE BSD_WERROR FREEBSD_GENSETDEFS COM_APPLE_KERNEL_BSD YDR_CPPFLAGS DFLY_TRUE DFLY_FALSE FBSD5_TRUE FBSD5_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE NNPFS_AFS_READDIR_TRUE NNPFS_AFS_READDIR_FALSE OSF1_TRUE OSF1_FALSE DCE_TRUE DCE_FALSE MACOSX_TRUE MACOSX_FALSE LWP_REDZONE_TRUE LWP_REDZONE_FALSE ARLA_KNFS LWP_PROCESS PLWP_LIB_FLAGS PLWP_INC_FLAGS LWP_C LWP_O LWP_H INCLUDE_readline LIB_readline LIB_tgetent LIB_el_init INC_sl LIB_sl DIR_sl SL_H DEPEND_sl ac_cv_prog_getconf editline_OBJS editline_dir GCC KERNEL_INCLUDE KERNEL_SRCS KERNEL_HDRS KERNEL_CPPFLAGS KERNEL_CFLAGS KERNEL_LD_FLAGS KERNEL_CC KERNEL_LD MODLOAD MODUNLOAD MODULE NNPFS_SUBDIR NNPFS_SRCS RXKAD_LIBS ARLACACHEDIR ARLACONFFILE MILKO_ROOT have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE have_glob_h_TRUE have_glob_h_FALSE do_roken_rename_TRUE do_roken_rename_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM INC_roken LIB_roken DIR_roken ROKEN_H WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT VOID_RETSIGTYPE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIBOBJS LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror LIB_crypt LIB_com_err INCLUDES_roken ARLA_LOCAL_ROKEN_TRUE ARLA_LOCAL_ROKEN_FALSE NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT KRB5_LIB_DIR KRB5_INC_DIR KRB5_INC_FLAGS KRB5_LIB_LIBS KRB5_LIB_FLAGS KRB4_LIB_DIR KRB4_INC_DIR KRB4_INC_FLAGS KRB4_LIB_LIBS KRB4_LIB_FLAGS KRB5_TRUE KRB5_FALSE KRB4_TRUE KRB4_FALSE KAFS_LIBS KAFS_CPPFLAGS RXKAD_TRUE RXKAD_FALSE AFS_EXTRA_OBJS AFS_EXTRA_LIBS AFS_EXTRA_LD AFS_EXTRA_DEFS AIX_EXTRA_KAFS LIB_res_init COMERR_CPPFLAGS VNODE_IF_H ARLA_CONF_HIGHVNODES ARLA_CONF_LOWVNODES ARLA_CONF_HIGHBYTES ARLA_CONF_LOWBYTES LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -6566,10 +6566,19 @@
-   then
- 	flags="$flags${flags:+ }-mno-fp-regs"
-   fi
-+  if test `uname -m` = pmax
-+  then
-+	KERNEL_CFLAGS="${KERNEL_CFLAGS} -G 0 -mno-abicalls -mno-half-pic"
-+	KERNEL_LDFLAGS="${KERNEL_LDFLAGS} -G 0 -Ttext 0x80030000 -T ${SYS}/arch/mips/conf/kern.ldscript"
-+  fi
-   KERNEL_CPPFLAGS="${KERNEL_CPPFLAGS} -D_LKM"
-   KERNEL_CPPFLAGS="${KERNEL_CPPFLAGS} $defs${defs:+ }$flags${flags:+ }$incl"
--  test_KERNEL_CFLAGS="${KERNEL_CFLAGS}"
-   KERNEL_LD='ld'
-+  test_KERNEL_CFLAGS="${KERNEL_CFLAGS}"
-+  if test `uname -m` = pmax
-+  then
-+      ac_kernel_ld='${KERNEL_LD} ${KERNEL_LDFLAGS} -o conftest $LDFLAGS -R $KERNEL conftest.o -e _foo 1>&5'
-+  fi
-   NNPFS_SRCS='nnpfs_wrap-bsd.c nnpfs_common-bsd.c nnpfs_dev-common.c nnpfs_dev-bsd.c nnpfs_syscalls-common.c nnpfs_syscalls-wrap-bsd.c nnpfs_node-bsd.c nnpfs_vfsops-common.c nnpfs_vfsops-bsd.c nnpfs_vfsops-openbsd.c nnpfs_vnodeops-common.c nnpfs_vnodeops-bsd.c'
-   NNPFS_SUBDIR=bsd
-   KERNEL=/bsd
-@@ -53808,7 +53817,7 @@
- 
- 
- 
--for ac_header in ktypes.h com_err.h et/com_err.h
-+for ac_header in ktypes.h com_err.h et/com_err.h krb5/com_err.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -64758,6 +64767,7 @@
- s,@LIB_freeaddrinfo@,$LIB_freeaddrinfo,;t t
- s,@LIB_gai_strerror@,$LIB_gai_strerror,;t t
- s,@LIB_crypt@,$LIB_crypt,;t t
-+s,@LIB_com_err@,$LIB_com_err,;t t
- s,@INCLUDES_roken@,$INCLUDES_roken,;t t
- s,@ARLA_LOCAL_ROKEN_TRUE@,$ARLA_LOCAL_ROKEN_TRUE,;t t
- s,@ARLA_LOCAL_ROKEN_FALSE@,$ARLA_LOCAL_ROKEN_FALSE,;t t
diff --git a/net/arla/patches/patch-au b/net/arla/patches/patch-au
deleted file mode 100644
index a4c56462e69..00000000000
--- a/net/arla/patches/patch-au
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-au,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib and reorder them.
-
---- appl/bos/Makefile.in.orig	2005-03-11 09:17:26.000000000 +0100
-+++ appl/bos/Makefile.in	2005-03-11 09:19:43.000000000 +0100
-@@ -477,17 +477,19 @@
- 
- bos_LDADD = \
- 	../lib/libarlalib.la \
--	-L../../rxdef -lrxdefclient \
-+	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
- 	../../rx/librx.la \
--	-L../../lwp -llwp $(PLWP_LIB_FLAGS) \
-+	../../lwp/liblwp.a $(PLWP_LIB_FLAGS) \
- 	../../lib/vers/libvers.la \
- 	../../lib/ko/libko.la ../../util/libarlautil.la \
- 	$(LIB_sl) \
- 	$(READLINE_lib) \
--	$(LIB_roken) \
- 	$(RXKAD_LIBS) \
- 	$(KAFS_LIBS) \
--	$(RXKAD_LIBS) @LIBS@
-+	$(RXKAD_LIBS) \
-+	@LIBS@ \
-+	$(LIB_roken)
- 
- all: all-am
- 
diff --git a/net/arla/patches/patch-av b/net/arla/patches/patch-av
deleted file mode 100644
index 548e3c435da..00000000000
--- a/net/arla/patches/patch-av
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-av,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-Add missing lib and reorder them.
-
---- appl/kalog/Makefile.in.orig	2005-03-11 09:39:40.000000000 +0100
-+++ appl/kalog/Makefile.in	2005-03-11 09:41:58.000000000 +0100
-@@ -450,16 +450,18 @@
- kalog_SOURCES = kalog.c
- LDADD = \
- 	../lib/libarlalib.la \
--	-L../../rxdef -lkaclient -lrxdefclient \
-+	../../rxdef/librxdefclient.a \
-+	../../rxdef/libkaclient.a \
- 	../../rx/librx.la \
--	-L../../lwp -llwp @PLWP_LIB_FLAGS@ \
-+	../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
- 	../../lib/vers/libvers.la \
- 	../../lib/ko/libko.la \
- 	../../util/libarlautil.la \
--	$(LIB_roken) \
- 	$(RXKAD_LIBS) \
- 	$(KAFS_LIBS) \
--	$(RXKAD_LIBS) $(LIBS)
-+	$(RXKAD_LIBS) \
-+	$(LIBS) \
-+	$(LIB_roken)
- 
- all: all-am
- 
diff --git a/net/arla/patches/patch-aw b/net/arla/patches/patch-aw
index 770c0a2508c..431e5366b46 100644
--- a/net/arla/patches/patch-aw
+++ b/net/arla/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-aw,v 1.4 2005/12/15 21:28:48 wennmach Exp $
 
 Don't build tests that won't compile (they're not installed anyway).
-Reorder libs: put libroken at the end.
+Fiddle with libs.
 
 --- tests/Makefile.in.orig	2005-03-11 10:03:00.000000000 +0100
 +++ tests/Makefile.in	2005-03-11 10:06:47.000000000 +0100
@@ -18,14 +18,14 @@ Reorder libs: put libroken at the end.
  		  ../lib/ko/libko.la ../util/libarlautil.la
  
  
-@@ -30,15 +30,14 @@
+@@ -30,17 +30,15 @@
  		mmap-and-read large-dir large-dir2 large-dir3 mountpoint \
  		test-setgroups test-setpag hardlink1 hardlink2 mkdir2	 \
  		create-files create-symlinks create-dirs dup2-and-unlog	 \
 -		readdir-vs-lstat read-write ga-test create-remove	 \
 -		symlink echo-n test-parallel1 test-parallel2 create-stat \
 -		kill-softly kill-softer rm-rf apwd exit-wo-close	 \
-+		readdir-vs-lstat read-write create-remove \
++		readdir-vs-lstat read-write create-remove	 \
 +		symlink echo-n test-parallel1 test-parallel2 \
  		mmap-vs-read mmap-vs-read2 strange-characters-c pine	 \
  		append-over-page write-ucc utime-dir mmap-shared-write	 \
@@ -34,254 +34,11 @@ Reorder libs: put libroken at the end.
 -		invalidate-file write3 still-there-p			 \
 -		intr-read asu truncate-files mmap-cat blocks-new-file	 \
 +		rename5 rename-under-feet write-closed \
-+		truncate fchmod make-page utime-file \
-+		write3 still-there-p \
-+		intr-read asu blocks-new-file \
++		truncate fchmod make-page utime-file		 \
++		write3 still-there-p			 \
++		intr-read asu blocks-new-file	 \
  		read-past-eof						 \
+-		write-6G-file						 \
  		mmap-and-fork
  
-@@ -88,176 +87,176 @@
- 	@chmod +x run-tests
- 
- write-ro-file: write-ro-file.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-ro-file.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-ro-file.o $(LIBS) $(ROKEN_LIBS)
- 
- read-vs-mmap: read-vs-mmap.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-vs-mmap.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-vs-mmap.o $(LIBS) $(ROKEN_LIBS)
- 
- read-vs-mmap2: read-vs-mmap2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-vs-mmap2.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-vs-mmap2.o $(LIBS) $(ROKEN_LIBS)
- 
- mmap-vs-read: mmap-vs-read.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-vs-read.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-vs-read.o $(LIBS) $(ROKEN_LIBS)
- 
- mmap-vs-read2: mmap-vs-read2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-vs-read2.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-vs-read2.o $(LIBS) $(ROKEN_LIBS)
- 
- mmap-and-fork: mmap-and-fork.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-and-fork.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-and-fork.o $(LIBS) $(ROKEN_LIBS)
- 
- read-write: read-write.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-write.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-write.o $(LIBS) $(ROKEN_LIBS)
- 
- mmap-and-read: mmap-and-read.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-and-read.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-and-read.o $(LIBS) $(ROKEN_LIBS)
- 
- large-dir: large-dir.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ large-dir.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ large-dir.o $(LIBS) $(ROKEN_LIBS)
- 
- large-dir2: large-dir2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ large-dir2.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ large-dir2.o $(LIBS) $(ROKEN_LIBS)
- 
- large-dir3: large-dir3.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ large-dir3.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ large-dir3.o $(LIBS) $(ROKEN_LIBS)
- 
- fchmod: fchmod.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ fchmod.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ fchmod.o $(LIBS) $(ROKEN_LIBS)
- 
- read-past-eof: read-past-eof.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-past-eof.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ read-past-eof.o $(LIBS) $(ROKEN_LIBS)
- 
- truncate: truncate.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ truncate.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ truncate.o $(LIBS) $(ROKEN_LIBS)
- 
- make-page: make-page.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ make-page.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ make-page.o $(LIBS) $(ROKEN_LIBS)
- 
- still-there-p: still-there-p.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ still-there-p.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ still-there-p.o $(LIBS) $(ROKEN_LIBS)
- 
- intr-read: intr-read.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ intr-read.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ intr-read.o $(LIBS) $(ROKEN_LIBS)
- 
- blocks-new-file: blocks-new-file.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ blocks-new-file.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ blocks-new-file.o $(LIBS) $(ROKEN_LIBS)
- 
--ga-test: ga-test.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ ga-test.o $(APPL_LIB) $(ROKEN_LIBS) $(LIBS)
-+#ga-test: ga-test.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ ga-test.o $(APPL_LIB) $(ROKEN_LIBS) $(LIBS)
- 
- asu: asu.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ asu.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ asu.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- test-setgroups: test-setgroups.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-setgroups.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-setgroups.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- test-setpag: test-setpag.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-setpag.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-setpag.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- hardlink1: hardlink1.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ hardlink1.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ hardlink1.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- hardlink2: hardlink2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ hardlink2.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ hardlink2.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- mkdir2: mkdir2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mkdir2.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mkdir2.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- create-files: create-files.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-files.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-files.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- create-symlinks: create-symlinks.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-symlinks.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-symlinks.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- create-dirs: create-dirs.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-dirs.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-dirs.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- create-remove: create-remove.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-remove.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-remove.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- 
- dup2-and-unlog: dup2-and-unlog.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ dup2-and-unlog.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ dup2-and-unlog.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- readdir-vs-lstat: readdir-vs-lstat.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ readdir-vs-lstat.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ readdir-vs-lstat.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- symlink: symlink.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ symlink.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ symlink.o $(KAFS_LIBS) $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- echo-n: echo-n.o
- 	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ echo-n.o
- 
- test-parallel1: test-parallel1.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-parallel1.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-parallel1.o $(LIBS) $(ROKEN_LIBS)
- 
- test-parallel2: test-parallel2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-parallel2.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ test-parallel2.o $(LIBS) $(ROKEN_LIBS)
- 
--create-stat: create-stat.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-stat.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#create-stat: create-stat.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ create-stat.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--kill-softly: kill-softly.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ kill-softly.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#kill-softly: kill-softly.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ kill-softly.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--kill-softer: kill-softer.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ kill-softer.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#kill-softer: kill-softer.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ kill-softer.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--rm-rf: rm-rf.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ rm-rf.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#rm-rf: rm-rf.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ rm-rf.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--apwd: apwd.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ apwd.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#apwd: apwd.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ apwd.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--invalidate-file: invalidate-file.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ invalidate-file.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#invalidate-file: invalidate-file.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ invalidate-file.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--exit-wo-close: exit-wo-close.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ exit-wo-close.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#exit-wo-close: exit-wo-close.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ exit-wo-close.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
- strange-characters-c: strange-characters-c.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ strange-characters-c.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ strange-characters-c.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- pine: pine.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ pine.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ pine.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- append-over-page: append-over-page.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ append-over-page.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ append-over-page.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- write-ucc: write-ucc.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-ucc.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-ucc.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- utime-dir: utime-dir.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ utime-dir.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ utime-dir.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- utime-file: utime-file.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ utime-file.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ utime-file.o $(LIBS) $(ROKEN_LIBS)
- 
- mmap-shared-write: mmap-shared-write.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-shared-write.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-shared-write.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- rename5: rename5.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ rename5.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ rename5.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- write3: write3.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write3.o $(ROKEN_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write3.o $(LIBS) $(ROKEN_LIBS)
- 
- rename-under-feet: rename-under-feet.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ rename-under-feet.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ rename-under-feet.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
- write-closed: write-closed.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-closed.o $(ROKEN_LIBS) $(KRB_LIBS) $(LIBS)
-+	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-closed.o $(KRB_LIBS) $(LIBS) $(ROKEN_LIBS)
- 
--write-closed2: write-closed2.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-closed2.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#write-closed2: write-closed2.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ write-closed2.o $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--fhbench: fhbench.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ fhbench.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#fhbench: fhbench.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ fhbench.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--truncate-files: truncate-files.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ truncate-files.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#truncate-files: truncate-files.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ truncate-files.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
--mmap-cat: mmap-cat.o
--	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-cat.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
-+#mmap-cat: mmap-cat.o
-+#	$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ mmap-cat.o $(APPL_LIB) $(ROKEN_LIBS) $(KAFS_LIBS) $(KRB_LIBS) $(LIBS)
- 
- .c.o:
- 	$(top_builddir)/libtool --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) -I. $(REALCFLAGS) $<
+ TEST_OBJS     = write-ro-file.o read-vs-mmap.o read-vs-mmap2.o		   \
diff --git a/net/arla/patches/patch-ax b/net/arla/patches/patch-ax
deleted file mode 100644
index bc10eb12b52..00000000000
--- a/net/arla/patches/patch-ax
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ax,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-
-LIB_crypt needs to be defined.
-
---- tools/release-tools/Makefile.in.orig	2005-03-11 13:28:25.000000000 +0100
-+++ tools/release-tools/Makefile.in	2005-03-11 13:31:26.000000000 +0100
-@@ -46,6 +46,7 @@
- KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
- LIB_tgetent     = @LIB_tgetent@
- LIB_readline	= @LIB_readline@
-+LIB_crypt	= @LIB_crypt@
- LIBS		= @LIB_roken@  @LIBS@
- 
- LIBDEPENDS	= 
diff --git a/net/arla/patches/patch-ay b/net/arla/patches/patch-ay
deleted file mode 100644
index 08249b188f5..00000000000
--- a/net/arla/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.3 2005/03/25 17:40:25 wennmach Exp $
-
---- lib/roken/snprintf.c.orig	2005-03-22 09:42:52.000000000 +0100
-+++ lib/roken/snprintf.c	2005-03-22 09:47:40.000000000 +0100
-@@ -64,7 +64,7 @@
-   /* XXX - methods */
- };
- 
--#if TEST_SNPRINTF
-+#if defined(TEST_SNPRINTF)
- #include "snprintf-test.h"
- #endif /* TEST_SNPRINTF */
- 
diff --git a/net/arla/patches/patch-bb b/net/arla/patches/patch-bb
deleted file mode 100644
index bc07c2129cb..00000000000
--- a/net/arla/patches/patch-bb
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2005/03/25 17:40:25 wennmach Exp $
-
-Make ss.c find com_err.h on NetBSD.
-
-
---- lib/sl/ss.c.orig	2005-03-22 10:57:30.000000000 +0100
-+++ lib/sl/ss.c	2005-03-22 10:58:37.000000000 +0100
-@@ -36,6 +36,8 @@
- #include <com_err.h>
- #elif defined(HAVE_ET_COM_ERR_H)
- #include <et/com_err.h>
-+#elif defined(HAVE_KRB5_COM_ERR_H)
-+#include <krb5/com_err.h>
- #endif
- #include "ss.h"
- 
diff --git a/net/arla/patches/patch-bc b/net/arla/patches/patch-bc
deleted file mode 100644
index 5aa330d36ba..00000000000
--- a/net/arla/patches/patch-bc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2005/03/25 17:40:25 wennmach Exp $
-
-Add placeholder for HAVE_KRB5_COM_ERR_H in config.h.in.
-
---- include/config.h.in.orig	2005-03-22 14:30:49.000000000 +0100
-+++ include/config.h.in	2005-03-22 14:31:34.000000000 +0100
-@@ -196,6 +196,9 @@
- /* Define to 1 if you have the <et/com_err.h> header file. */
- #undef HAVE_ET_COM_ERR_H
- 
-+/* Define to 1 if you have the <krb5/com_err.h> header file. */
-+#undef HAVE_KRB5_COM_ERR_H
-+
- /* Define if you have the function `fchown'. */
- #undef HAVE_FCHOWN
- 
diff --git a/net/arla/patches/patch-bd b/net/arla/patches/patch-bd
deleted file mode 100644
index 32fd1a80f65..00000000000
--- a/net/arla/patches/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bd,v 1.4 2005/03/25 17:40:25 wennmach Exp $
-
-Define LIB_com_err.
-
---- lib/sl/Makefile.in.orig	2005-03-22 14:38:21.000000000 +0100
-+++ lib/sl/Makefile.in	2005-03-22 14:39:59.000000000 +0100
-@@ -297,6 +297,7 @@
- LIB_NDBM = @LIB_NDBM@
- LIB_bswap16 = @LIB_bswap16@
- LIB_bswap32 = @LIB_bswap32@
-+LIB_com_err = @LIB_com_err@
- LIB_crypt = @LIB_crypt@
- LIB_db_create = @LIB_db_create@
- LIB_dbm_firstkey = @LIB_dbm_firstkey@
diff --git a/net/arla/patches/patch-be b/net/arla/patches/patch-be
deleted file mode 100644
index b0ec1c05875..00000000000
--- a/net/arla/patches/patch-be
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-be,v 1.5 2005/03/26 16:50:59 wennmach Exp $
-
-From Love.
-
---- lib/ko/gensysname.c.orig	2005-03-22 14:43:34.000000000 +0100
-+++ lib/ko/gensysname.c	2005-03-22 14:47:20.000000000 +0100
-@@ -230,7 +230,7 @@
- static void
- usage(void)
- {
--    arg_printusage(args, NULL, "[sysname]", 0);
-+    arg_printusage(args, sizeof(args)/sizeof(args[0]), "[sysname]", NULL);
-     exit(1);
-     
- }
diff --git a/net/arla/patches/patch-bf b/net/arla/patches/patch-bf
deleted file mode 100644
index 8338262011c..00000000000
--- a/net/arla/patches/patch-bf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bf,v 1.5 2005/03/25 17:40:25 wennmach Exp $
-
-Fix LP64 issue.
-
---- rx/rx.c.orig	2005-03-22 15:23:15.000000000 +0100
-+++ rx/rx.c	2005-03-22 15:42:55.000000000 +0100
-@@ -3647,7 +3647,7 @@
-     peer->refCount++;		       /* So it won't disappear underneath
- 				        * us! */
-     /* this is stupid  - sending an int as a pointer is begging for trouble */
--    rxevent_Post(&tmp, rxi_DecongestionEvent, (void *) peer, (void *)nPackets);
-+    rxevent_Post(&tmp, rxi_DecongestionEvent, (void *) peer, (void *)(long)nPackets);
- }
- 
- /*
diff --git a/net/arla/patches/patch-bg b/net/arla/patches/patch-bg
deleted file mode 100644
index f24a86f2c26..00000000000
--- a/net/arla/patches/patch-bg
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bg,v 1.4 2005/03/25 17:40:25 wennmach Exp $
-
-Fix LP64 issue.
-
---- rx/rx_multi.c.orig	2005-03-22 15:53:00.000000000 +0100
-+++ rx/rx_multi.c	2005-03-22 15:53:33.000000000 +0100
-@@ -51,7 +51,7 @@
- 	struct rx_call *call;
- 
- 	call = mh->calls[i] = rx_NewCall(conns[i]);
--	rx_SetArrivalProc(call, multi_Ready, (void *) mh, (void *) i);
-+	rx_SetArrivalProc(call, multi_Ready, (void *) mh, (void *)(long) i);
-     }
-     return mh;
- }
diff --git a/net/arla/patches/patch-bh b/net/arla/patches/patch-bh
deleted file mode 100644
index 51a1fc67a27..00000000000
--- a/net/arla/patches/patch-bh
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-bh,v 1.4 2005/03/25 17:40:25 wennmach Exp $
-
-Portability fix for output conversion.
-
---- rx/rxperf.c.orig	2005-03-22 16:02:32.000000000 +0100
-+++ rx/rxperf.c	2005-03-22 16:05:46.000000000 +0100
-@@ -776,8 +776,8 @@
- 	    if (ptr != 0 && ptr[0] != '\0')
- 		errx (1, "can't resolve readsize");
- 	    if (rxread_size > sizeof(somebuf))
--	      errx(1, "%d > sizeof(somebuf) (%d)",
--		   rxread_size, sizeof(somebuf));
-+	      errx(1, "%d > sizeof(somebuf) (%ld)",
-+		   rxread_size, (unsigned long)sizeof(somebuf));
- 	    break;
- 	case 'p':
- 	    port = strtol(optarg, &ptr, 0);
-@@ -789,8 +789,8 @@
- 	    if (ptr != 0 && ptr[0] != '\0')
- 		errx (1, "can't resolve writesize");
- 	    if (rxwrite_size > sizeof(somebuf))
--		errx(1, "%d > sizeof(somebuf) (%d)",
--		     rxwrite_size, sizeof(somebuf));
-+		errx(1, "%d > sizeof(somebuf) (%ld)",
-+		     rxwrite_size, (unsigned long)sizeof(somebuf));
- 	    break;
- 	default:
- 	    usage();
-@@ -870,8 +870,8 @@
- 	    if (ptr != 0 && ptr[0] != '\0')
- 		errx (1, "can't resolve readsize");
- 	    if (rxread_size > sizeof(somebuf))
--		errx(1, "%d > sizeof(somebuf) (%d)",
--		     rxread_size, sizeof(somebuf));
-+		errx(1, "%d > sizeof(somebuf) (%ld)",
-+		     rxread_size, (unsigned long)sizeof(somebuf));
- 	    break;
- 	case 's':
- 	    host = strdup(optarg);
-@@ -883,8 +883,8 @@
- 	    if (ptr != 0 && ptr[0] != '\0')
- 		errx (1, "can't resolve writesize");
- 	    if (rxwrite_size > sizeof(somebuf))
--		errx(1, "%d > sizeof(somebuf) (%d)",
--		     rxwrite_size, sizeof(somebuf));
-+		errx(1, "%d > sizeof(somebuf) (%ld)",
-+		     rxwrite_size, (unsigned long)sizeof(somebuf));
- 	    break;
- 	case 'T':
- 	    times = strtol (optarg, &ptr, 0);
diff --git a/net/arla/patches/patch-bj b/net/arla/patches/patch-bj
index 635b3aa3e0f..ad2b6b08288 100644
--- a/net/arla/patches/patch-bj
+++ b/net/arla/patches/patch-bj
@@ -1,23 +1,13 @@
-$NetBSD: patch-bj,v 1.5 2005/03/26 16:50:59 wennmach Exp $
+$NetBSD: patch-bj,v 1.6 2005/12/15 21:28:48 wennmach Exp $
 
-From Love.  Still cast "size" to (unsigned long long) to avoid a
-compiler warning on amd64.
+Cast "size" to (unsigned long long) to avoid a compiler warning on amd64.
 
---- tools/release-tools/tar-rootify.c.orig	2005-03-23 11:07:28.000000000 +0100
-+++ tools/release-tools/tar-rootify.c	2005-03-23 11:23:11.000000000 +0100
-@@ -108,6 +108,7 @@
- 	    if (i < 148 || 155 < i)
- 		cksum += (u_long)(buf[i] & 0xff);
- 
-+	size = estrntoll(p->size, 12, 8);
- 	if (verbose) {
- 	    fprintf(stderr, "rec #%d\n", rec);
- 	    fprintf(stderr, "name = %.*s\n", (int)sizeof(p->name), p->name);
-@@ -117,8 +118,7 @@
+--- tools/release-tools/tar-rootify.c.orig	2005-12-14 11:21:11.000000000 +0100
++++ tools/release-tools/tar-rootify.c	2005-12-14 11:22:34.000000000 +0100
+@@ -118,7 +118,7 @@
  	    fprintf(stderr, "gname = %.*s\n", (int)sizeof(p->gname), p->gname);
  	    fprintf(stderr, "type =     %c\n", p->typeflag);
  	    fprintf(stderr, "size = %.*s\n", (int)sizeof(p->size), p->size);
--	    size = estrntoll(p->size, 12, 8);
 -	    fprintf(stderr, "size = %llo\n", size);
 +	    fprintf(stderr, "size = %llo\n", (unsigned long long)size);
  	}
diff --git a/net/arla/patches/patch-bk b/net/arla/patches/patch-bk
deleted file mode 100644
index 9cf6fc80b43..00000000000
--- a/net/arla/patches/patch-bk
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bk,v 1.5 2005/03/26 16:50:59 wennmach Exp $
-
-From Love.
-
---- appl/vos/vos_dump.c.orig	2005-03-23 12:41:00.000000000 +0100
-+++ appl/vos/vos_dump.c	2005-03-23 12:53:50.000000000 +0100
-@@ -95,14 +95,24 @@
- 	goto out;
-     }
-
--    if (isdigit(volume[0])) {
-+    if (isdigit((unsigned char)volume[0])) {
- 	char *end;
--	vol_id = strtoul(volume, &end, 10);
--	if (vol_id != ULONG_MAX && *end == '\0')
-+	long v;
-+	v = strtoul(volume, &end, 10);
-+	if (v != ULONG_MAX && *end == '\0')
- 	    have_volid = 1;
-+	vol_id = v;
-     }
-     if (!have_volid) {
--	int type = volname_canonicalize(volume);
-+	char *v = strdup(volume);
-+	int type;
-+
-+	if (v == NULL) {
-+	    fprintf(stderr, "dump_volume: out of memory\n");
-+	    goto out;
-+	}
-+	type = volname_canonicalize(v);
-+	free(v);
- 	vol_id = the_vlentry.volumeId[type];
-     }
diff --git a/net/arla/patches/patch-bl b/net/arla/patches/patch-bl
index c87c966f0d1..f20cb084f1a 100644
--- a/net/arla/patches/patch-bl
+++ b/net/arla/patches/patch-bl
@@ -1,18 +1,9 @@
-$NetBSD: patch-bl,v 1.4 2005/04/05 15:00:10 agc Exp $
+$NetBSD: patch-bl,v 1.5 2005/12/15 21:28:48 wennmach Exp $
 
---- nnpfs/bsd/nnpfs_vfsops-netbsd.c	2005/04/05 12:43:51	1.1
-+++ nnpfs/bsd/nnpfs_vfsops-netbsd.c	2005/04/05 13:03:41
-@@ -170,7 +168,7 @@
-     nnpfs_unmount,
-     nnpfs_root,
-     (void *)nnpfs_quotactl,
--    nnpfs_statfs,
-+    (void *)nnpfs_statfs,
-     nnpfs_sync,
-     nnpfs_vget,
-     nnpfs_fhtovp,
-@@ -191,7 +189,7 @@
-     nnpfs_snapshot,
+--- nnpfs/bsd/nnpfs_vfsops-netbsd.c.orig	2005-12-14 11:25:41.000000000 +0100
++++ nnpfs/bsd/nnpfs_vfsops-netbsd.c	2005-12-14 11:26:39.000000000 +0100
+@@ -198,7 +198,7 @@
+     vfs_stdextattrctl,
  #endif
  #ifdef HAVE_STRUCT_VFSOPS_VFS_OPV_DESCS
 -    nnpfs_vnodeopv_descs
diff --git a/net/arla/patches/patch-bm b/net/arla/patches/patch-bm
deleted file mode 100644
index 51f221f4b1e..00000000000
--- a/net/arla/patches/patch-bm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bm,v 1.4 2005/09/03 23:12:20 rillig Exp $
-
-Shut up gcc.
-
---- include/bits.c.orig	2005-03-22 10:38:58.000000000 +0100
-+++ include/bits.c	2005-03-22 10:39:43.000000000 +0100
-@@ -140,4 +140,4 @@
- 	f = fopen(argv[1], "w");
-     }
-     fprintf(f, "/* %s -- this file was generated for %s by\n", fn, HOST);
--    fprintf(f, "   %*s    %s */\n\n", strlen(fn), "", 
-+    fprintf(f, "   %*s    %s */\n\n", (int)strlen(fn), "", 
diff --git a/net/arla/patches/patch-bn b/net/arla/patches/patch-bn
new file mode 100644
index 00000000000..2e62098de25
--- /dev/null
+++ b/net/arla/patches/patch-bn
@@ -0,0 +1,23 @@
+$NetBSD: patch-bn,v 1.4 2005/12/15 21:28:48 wennmach Exp $
+
+If we have krb4, do not rename the functions, else we're not going
+to find them.
+
+--- rxkad/krb4-protos.h.orig	2005-12-09 15:18:27.000000000 +0100
++++ rxkad/krb4-protos.h	2005-12-09 15:20:14.000000000 +0100
+@@ -36,6 +36,7 @@
+ #ifndef __KRB4_PROTOS_H
+ #define __KRB4_PROTOS_H
+ 
++#ifndef HAVE_KRB4
+ #define krb4_get_int _rxkad_krb4_get_int
+ #define krb4_put_int _rxkad_krb4_put_int
+ #define krb4_get_address _rxkad_krb4_get_address
+@@ -48,6 +49,7 @@
+ #define krb4_atime_to_life _rxkad_krb4_atime_to_life
+ #define krb4_life_to_time _rxkad_krb4_life_to_time
+ #define decomp_ticket _rxkad_decomp_ticket
++#endif /* ndef HAVE_KRB4 */
+ 
+ int
+ krb4_get_int(void *f, u_int32_t *to, int size, int lsb);
diff --git a/net/arla/patches/patch-bo b/net/arla/patches/patch-bo
new file mode 100644
index 00000000000..0023e12d971
--- /dev/null
+++ b/net/arla/patches/patch-bo
@@ -0,0 +1,31 @@
+$NetBSD: patch-bo,v 1.4 2005/12/15 21:28:48 wennmach Exp $
+
+Define and reach down EXTRADEFS.
+
+--- configure.orig	2005-12-09 16:12:06.000000000 +0100
++++ configure	2005-12-09 16:13:45.000000000 +0100
+@@ -467,7 +467,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT AS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CANONICAL_HOST LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC EGREP SYMORDER DVI2PS TEXI2DVI TEXI2PDF TEXI2HTML DVIPS chmod GUILE_GTK X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE LIB_pthread_create LIB_sched_yield SYS FBSDKERNBUILDDIR BSDMAKE BSD_WERROR FREEBSD_GENSETDEFS COM_APPLE_KERNEL_BSD YDR_CPPFLAGS DFLY_TRUE DFLY_FALSE FBSD5_TRUE FBSD5_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE NNPFS_AFS_READDIR_TRUE NNPFS_AFS_READDIR_FALSE DCE_TRUE DCE_FALSE MACOSX_TRUE MACOSX_FALSE LWP_REDZONE_TRUE LWP_REDZONE_FALSE ARLA_KNFS LWP_PROCESS PLWP_LIB_FLAGS PLWP_INC_FLAGS LWP_C LWP_O LWP_H INCLUDE_readline LIB_readline LIB_tgetent LIB_el_init ac_cv_prog_getconf editline_OBJS editline_dir GCC KERNEL_INCLUDE KERNEL_SRCS KERNEL_HDRS KERNEL_CPPFLAGS KERNEL_CFLAGS KERNEL_LD_FLAGS KERNEL_CC KERNEL_LD MODLOAD MODUNLOAD MODULE NNPFS_SUBDIR NNPFS_SRCS RXKAD_LIBS ARLACACHEDIR ARLACONFFILE MILKO_ROOT have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE have_glob_h_TRUE have_glob_h_FALSE do_roken_rename_TRUE do_roken_rename_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM KRB5_LIB_DIR KRB5_INC_DIR KRB5_INC_FLAGS KRB5_LIB_LIBS KRB5_LIB_FLAGS KRB4_LIB_DIR KRB4_INC_DIR KRB4_INC_FLAGS KRB4_LIB_LIBS KRB4_LIB_FLAGS KRB5_TRUE KRB5_FALSE KRB4_TRUE KRB4_FALSE KAFS_LIBS KAFS_CPPFLAGS INC_roken LIB_roken DIR_roken ROKEN_H INC_sl LIB_sl DIR_sl SL_H DEPEND_sl WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT VOID_RETSIGTYPE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIBOBJS LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror LIB_crypt INCLUDES_roken ARLA_LOCAL_ROKEN_TRUE ARLA_LOCAL_ROKEN_FALSE NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT RXKAD_TRUE RXKAD_FALSE AFS_EXTRA_OBJS AFS_EXTRA_LIBS AFS_EXTRA_LD AFS_EXTRA_DEFS AIX_EXTRA_KAFS LIB_res_init COMERR_CPPFLAGS VNODE_IF_H ARLA_CONF_HIGHVNODES ARLA_CONF_LOWVNODES ARLA_CONF_HIGHBYTES ARLA_CONF_LOWBYTES LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS EXTRADEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT AS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CANONICAL_HOST LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC EGREP SYMORDER DVI2PS TEXI2DVI TEXI2PDF TEXI2HTML DVIPS chmod GUILE_GTK X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X11_TRUE X11_FALSE LIB_pthread_create LIB_sched_yield SYS FBSDKERNBUILDDIR BSDMAKE BSD_WERROR FREEBSD_GENSETDEFS COM_APPLE_KERNEL_BSD YDR_CPPFLAGS DFLY_TRUE DFLY_FALSE FBSD5_TRUE FBSD5_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE NNPFS_AFS_READDIR_TRUE NNPFS_AFS_READDIR_FALSE DCE_TRUE DCE_FALSE MACOSX_TRUE MACOSX_FALSE LWP_REDZONE_TRUE LWP_REDZONE_FALSE ARLA_KNFS LWP_PROCESS PLWP_LIB_FLAGS PLWP_INC_FLAGS LWP_C LWP_O LWP_H INCLUDE_readline LIB_readline LIB_tgetent LIB_el_init ac_cv_prog_getconf editline_OBJS editline_dir GCC KERNEL_INCLUDE KERNEL_SRCS KERNEL_HDRS KERNEL_CPPFLAGS KERNEL_CFLAGS KERNEL_LD_FLAGS KERNEL_CC KERNEL_LD MODLOAD MODUNLOAD MODULE NNPFS_SUBDIR NNPFS_SRCS RXKAD_LIBS ARLACACHEDIR ARLACONFFILE MILKO_ROOT have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE have_glob_h_TRUE have_glob_h_FALSE do_roken_rename_TRUE do_roken_rename_FALSE ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM KRB5_LIB_DIR KRB5_INC_DIR KRB5_INC_FLAGS KRB5_LIB_LIBS KRB5_LIB_FLAGS KRB4_LIB_DIR KRB4_INC_DIR KRB4_INC_FLAGS KRB4_LIB_LIBS KRB4_LIB_FLAGS KRB5_TRUE KRB5_FALSE KRB4_TRUE KRB4_FALSE KAFS_LIBS KAFS_CPPFLAGS INC_roken LIB_roken DIR_roken ROKEN_H INC_sl LIB_sl DIR_sl SL_H DEPEND_sl WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT VOID_RETSIGTYPE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIBOBJS LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror LIB_crypt INCLUDES_roken ARLA_LOCAL_ROKEN_TRUE ARLA_LOCAL_ROKEN_FALSE NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT RXKAD_TRUE RXKAD_FALSE AFS_EXTRA_OBJS AFS_EXTRA_LIBS AFS_EXTRA_LD AFS_EXTRA_DEFS AIX_EXTRA_KAFS LIB_res_init COMERR_CPPFLAGS VNODE_IF_H ARLA_CONF_HIGHVNODES ARLA_CONF_LOWVNODES ARLA_CONF_HIGHBYTES ARLA_CONF_LOWBYTES LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -64568,6 +64568,7 @@
+ fi
+ 
+ DEFS=-DHAVE_CONFIG_H
++EXTRADEFS=-DHAVE_KRB4
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+@@ -65370,6 +65371,7 @@
+ s,@host_alias@,$host_alias,;t t
+ s,@target_alias@,$target_alias,;t t
+ s,@DEFS@,$DEFS,;t t
++s,@EXTRADEFS@,$EXTRADEFS,;t t
+ s,@ECHO_C@,$ECHO_C,;t t
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
diff --git a/net/arla/patches/patch-bp b/net/arla/patches/patch-bp
new file mode 100644
index 00000000000..edc9509665b
--- /dev/null
+++ b/net/arla/patches/patch-bp
@@ -0,0 +1,15 @@
+$NetBSD: patch-bp,v 1.4 2005/12/15 21:28:48 wennmach Exp $
+
+We need EXTRADEFS via configure.
+
+--- rxkad/Makefile.in.orig	2005-12-09 16:15:23.000000000 +0100
++++ rxkad/Makefile.in	2005-12-09 16:15:47.000000000 +0100
+@@ -197,7 +197,7 @@
+ DBLIB = @DBLIB@
+ DCE_FALSE = @DCE_FALSE@
+ DCE_TRUE = @DCE_TRUE@
+-DEFS = @DEFS@
++DEFS = @DEFS@ @EXTRADEFS@
+ DEPEND_sl = @DEPEND_sl@
+ DFLY_FALSE = @DFLY_FALSE@
+ DFLY_TRUE = @DFLY_TRUE@
diff --git a/net/arla/patches/patch-bq b/net/arla/patches/patch-bq
new file mode 100644
index 00000000000..80d3b3204db
--- /dev/null
+++ b/net/arla/patches/patch-bq
@@ -0,0 +1,18 @@
+$NetBSD: patch-bq,v 1.4 2005/12/15 21:28:48 wennmach Exp $
+
+But I do need HAVE_KRB4. I want it, want it, want it!
+
+--- rxkad/rxk_serv.c.orig	2005-12-12 17:25:17.000000000 +0100
++++ rxkad/rxk_serv.c	2005-12-12 17:25:28.000000000 +0100
+@@ -39,11 +39,7 @@
+ #include <krb5.h>
+ #endif
+ 
+-#undef HAVE_KRB4
+-
+ #ifdef HAVE_KRB4
+-#include <krb.h>
+-#else
+ #include <krb4.h>
+ #endif
+