Update arla to 0.38. The update is necessary to support NetBSD-2.0.

The update during the pkgsrc freeze has been approved by <wiz>. Two patches have been provided by <christos>. Tested on NetBSD-1.6.1/i386 and NetBSD-2.0/i386. Closes PR pkg/20906.
author: wennmach <wennmach@pkgsrc.org> 2005-03-15 15:58:52 +0000
committer: wennmach <wennmach@pkgsrc.org> 2005-03-15 15:58:52 +0000
commit: 9f1c532d9b71873afe95eb95d0550d6c8fbe395a (patch)
tree: 8861d10442c9b9314085e82332ee85bc096292b1 /net
parent: 2043ed3d1c2a8ca0d55b71c7d5ecd8f47967db7b (diff)
download: pkgsrc-9f1c532d9b71873afe95eb95d0550d6c8fbe395a.tar.gz
48 files changed, 882 insertions, 1260 deletions
diff --git a/net/arla/DEINSTALL b/net/arla/DEINSTALL
index cd64ba39da8..3cf7210484b 100644
--- a/net/arla/DEINSTALL
+++ b/net/arla/DEINSTALL
@@ -1,11 +1,11 @@
-# $NetBSD: DEINSTALL,v 1.1 2002/09/25 00:06:33 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2005/03/15 15:58:52 wennmach Exp $
 
 ARLA_CACHE="@ARLA_CACHE@"
 
 case ${STAGE} in
 DEINSTALL)
 	${RM} -rf ${ARLA_CACHE}
-	${RM} -f ${PKG_PREFIX}/lkm/xfs_mod
-	${RM} -f /sbin/mount_xfs
+	${RM} -f ${PKG_PREFIX}/lkm/nnpfs_mod
+	${RM} -f /sbin/mount_nnpfs
 	;;
 esac
diff --git a/net/arla/INSTALL b/net/arla/INSTALL
index 3c38395d306..bbcccaa82d0 100644
--- a/net/arla/INSTALL
+++ b/net/arla/INSTALL
@@ -1,10 +1,10 @@
-# $NetBSD: INSTALL,v 1.1 2002/09/25 00:06:33 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2005/03/15 15:58:52 wennmach Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-	if [ ! -f /sbin/mount_xfs ]; then
-		${ECHO} "Creating /sbin/mount_xfs"
-		${LN} -s ${PKG_PREFIX}/sbin/mount_xfs /sbin/mount_xfs
+	if [ ! -f /sbin/mount_nnpfs ]; then
+		${ECHO} "Creating /sbin/mount_nnpfs"
+		${LN} -s ${PKG_PREFIX}/sbin/mount_nnpfs /sbin/mount_nnpfs
 	fi
 	if [ "${PKG_SYSCONFDIR}" != "${PKG_PREFIX}/etc" ]; then
 		if [ -f ${PREFIX}/etc/arla.conf ]; then
diff --git a/net/arla/MESSAGE b/net/arla/MESSAGE
index 0a9f649145a..689dea88b69 100644
--- a/net/arla/MESSAGE
+++ b/net/arla/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/01/14 12:00:08 wennmach Exp $
+$NetBSD: MESSAGE,v 1.5 2005/03/15 15:58:52 wennmach Exp $
 
 Arla now has been installed on your system.
 
@@ -24,16 +24,15 @@ At a minimum, to configure an arla client, copy:
 	${PREFIX}/share/examples/ThisCell
 	${PREFIX}/share/examples/arla.conf
 
-to ${PKG_SYSCONFDIR} and customize them, include an entry for xfs in your
-/etc/fstab (see ${PREFIX}/share/examples/arla/fstab), append (only on
-NetBSD releases prior to 1.6):
-
-	${PREFIX}/share/examples/arla/services
-
-to /etc/services and append:
+to ${PKG_SYSCONFDIR} and customize them, include an entry for nnpfs in your
+/etc/fstab (see ${PREFIX}/share/examples/arla/fstab), 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).
+
+NOTE: Please note that the name of the arla device changed from "xfs"
+      to "nnpfs". If you're upgrading arla from an older version, you
+      need to adjust /etc/fstab, /etc/lkm.conf, and /etc/rc.d/arlad. 
 ===========================================================================
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 9fce081a985..8782b856269 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.41 2005/03/15 15:58:52 wennmach Exp $
 
-DISTNAME=		arla-0.35.12
-PKGREVISION=	2
+DISTNAME=		arla-0.38
+#PKGREVISION=
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -13,41 +13,30 @@ CONFLICTS+=		lwp-[0-9]*
 CONFLICTS+=		rx-[0-9]*
 
 OSVERSION_SPECIFIC=	yes
-INFO_FILES=		arla.info
+INFO_FILES=		arla.info send-pr.info
 
 USE_BUILDLINK3=		yes
 USE_X11=		yes
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-
 USE_PKGINSTALL=		yes
+
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-.if exists(/usr/lib/libroken.a)
-CONFIGURE_ARGS+=	--with-krb4-lib=/usr/lib
-CONFIGURE_ARGS+=	--with-krb4-include=/usr/include/kerberosIV
-CONFIGURE_ARGS+=	--with-roken=/usr
-CONFIGURE_ARGS+=	--with-roken-include=/usr/include/krb5
-.else
-.  include "../../security/kth-krb4/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-krb4-lib=${BUILDLINK_PREFIX.kth-krb4}
-CONFIGURE_ARGS+=	--with-krb4-include=${BUILDLINK_PREFIX.kth-krb4}/include
-CONFIGURE_ARGS+=	--with-roken=${BUILDLINK_PREFIX.kth-krb4}
-CONFIGURE_ARGS+=	--with-roken-include=${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
-.if !exists(/sys/lib/libkern/libkern.h)
+.if !exists(/usr/src/sys/lib/libkern/libkern.h)
 .  if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
 CONFIGURE_ARGS+=	--with-sys=${BSDSRCDIR}/sys
 .  else
-PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or /sys)"
+PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or //usr/src/sys)"
 .  endif
 .endif
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-arlacachedir=${ARLA_CACHE}
+CONFIGURE_ARGS+=	--enable-shared=no
 MESSAGE_SUBST+=		ARLA_CACHE=${ARLA_CACHE}
 PLIST_SUBST+=		ARLA_CACHE=${ARLA_CACHE}
 FILES_SUBST+=		ARLA_CACHE=${ARLA_CACHE}
@@ -69,7 +58,6 @@ post-install:
 	${SED}	${FILES_SUBST_SED}					\
 		< ${FILESDIR}/lkm.conf > ${WRKDIR}/lkm.conf
 	${INSTALL_DATA} ${WRKDIR}/lkm.conf ${EGDIR}
-	${INSTALL_DATA} ${FILESDIR}/services ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/fstab ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/arla/PLIST b/net/arla/PLIST
index 2ebea37477a..7a0b5cd70e7 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,108 +1,125 @@
-@comment $NetBSD: PLIST,v 1.15 2004/04/23 22:07:55 reed Exp $
-bin/aklog
+@comment $NetBSD: PLIST,v 1.16 2005/03/15 15:58:52 wennmach Exp $
+bin/ydr
+bin/rxdebug
+bin/rxperf
 bin/amon
-bin/bos
 bin/fs
-bin/kalog
-bin/pts
-bin/rxdebug
 bin/tokens
+bin/afstool
+bin/pts
 bin/udebug
-bin/unlog
-bin/up
+bin/afsfsperf
 bin/vos
-bin/ydr
-include/afs/cmd.h
-include/arlalib.h
+bin/bos
+bin/kalog
+bin/arla-send-pr
+bin/mk_cmds
 include/atypes.h
-include/auth.h
-include/bos.cs.h
-include/cb.cs.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/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/cellconfig.h
 include/fs.cs.h
-include/fs.h
 include/fs.ss.h
-include/fs_errors.h
-include/ka-procs.h
-include/lock.h
-include/lwp.h
-include/preempt.h
 include/pts.cs.h
-include/pts.h
 include/pts.ss.h
-include/rx/rx.h
-include/rx/rx_clock.h
-include/rx/rx_event.h
-include/rx/rx_globs.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_trace.h
-include/rx/rx_user.h
-include/rx/rxgencon.h
-include/rx/rxkad.h
-include/timer.h
 include/ubik.cs.h
 include/ubik.ss.h
-include/vldb.cs.h
-include/vldb.h
-include/vldb.ss.h
-lib/libarlalib.a
-lib/libbosclient.a
-lib/libbosserver.a
-lib/libbufdir.a
-lib/libcmd.a
-lib/libkaclient.a
-lib/libkaserver.a
-lib/libko.a
+include/bos.cs.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
 lib/liblwp.a
-lib/libptclient.a
-lib/libptserver.a
-lib/librx.a
 lib/librxdefclient.a
 lib/librxfsserver.a
-lib/librxkad.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/librx.la
+lib/libbufdir.a
+lib/libarlalib.la
+lib/libsl.la
+lib/libss.la
+lib/libarlautil.la
+lib/emacs/site-lisp/send-pr.el
 libexec/arlad
-lkm/xfs_mod.o
-man/man1/aklog.1
-man/man1/fs.1
-man/man1/kalog.1
-man/man1/pts.1
+man/cat3/getarg.0
+man/cat3/arg_printusage.0
 man/man1/rxdebug.1
 man/man1/tokens.1
+man/man1/afstool.1
+man/man1/pts.1
 man/man1/udebug.1
-man/man1/unlog.1
-man/man3/cmd.3
+man/man1/kalog.1
+man/man1/arla-send-pr.1
+man/man3/getarg.3
+man/man3/arg_printusage.3
+man/man3/log_log.3
+man/man3/log_vlog.3
+man/man3/log_open.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_mask2str.3
+man/man3/log_set_mask_str.3
+man/man4/nnpfs.4
+man/man5/AliasDB.5
 man/man5/CellServDB.5
 man/man5/DynRootDB.5
 man/man5/SuidCells.5
 man/man5/ThisCell.5
-man/man8/arla-cli.8
+man/man5/arla.conf.5
+man/man8/mount_nnpfs.8
+man/man8/umount_nnpfs.8
 man/man8/arlad.8
-man/man8/bos.8
-man/man8/mount_xfs.8
-man/man8/umount_xfs.8
+man/man8/arla-cli.8
 man/man8/vos.8
-sbin/arla-cli
-sbin/mount_xfs
-sbin/rxperf
+sbin/mount_nnpfs
+sbin/umount_nnpfs
+sbin/nnpfs_makedev
 sbin/startarla
-sbin/umount_xfs
-sbin/xfs_makedev
+sbin/arla-cli
+share/examples/arla/lkm.conf
 share/examples/arla/CellServDB
-share/examples/arla/SuidCells
 share/examples/arla/ThisCell
-share/examples/arla/arla.conf
 share/examples/arla/fstab
-share/examples/arla/lkm.conf
-share/examples/arla/services
+share/examples/arla/SuidCells
+share/examples/arla/arla.conf
 @dirrm share/examples/arla
-@dirrm include/rx
-@dirrm include/afs
+@comment share/examples/rc.d/arlad
+share/gnats/stacken
+lkm/nnpfs_mod.o
diff --git a/net/arla/distinfo b/net/arla/distinfo
index a016ed954a3..bc7830e28e6 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,27 +1,29 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 12:13:42 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/03/15 15:58:52 wennmach Exp $
 
-SHA1 (arla-0.35.12.tar.gz) = dda009ab21cf784f1f5561852b5b81a0170498f7
-RMD160 (arla-0.35.12.tar.gz) = 37102def997780212548b326b69342741f2a3569
-Size (arla-0.35.12.tar.gz) = 1334145 bytes
-SHA1 (patch-ac) = a1d725edea6aaf3711c0d62a5ab5acd84d5fe4b7
+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) = 95e2eddc13963d11340d72c4a43fb20fc658d9c3
+SHA1 (patch-ab) = e4e6a97b2fd206b0e6ecb8eae6fc10bcfcc4e588
+SHA1 (patch-ac) = d754d7add8b3581638178f30d5884cfda63488c9
 SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6
-SHA1 (patch-ae) = f9255bc814f38cb8309380a44c1942d3d2cb233e
-SHA1 (patch-af) = 90b230d2f462a01528c157352e257e3c3e58c7b5
-SHA1 (patch-ah) = 5d27207a6acd83be222d1d7b1df3a660e14de1a9
-SHA1 (patch-as) = 28d61906be25fc803882d4ccbe584f57e51dec63
-SHA1 (patch-at) = 190da9b9d9da90166845383856508187d9d1ca8f
-SHA1 (patch-bd) = b57dceb3e40b82c199c599152b5273cd2555dbe8
-SHA1 (patch-be) = 36c91dfa86c6c02a776719ce3dd82ec1f58bc115
-SHA1 (patch-bf) = 45bb388b29964bb32311253ac2d13d22b87a234a
-SHA1 (patch-bg) = dc9dcc97874b5bbc252c4e0003ac4e7b86c29023
-SHA1 (patch-bh) = 7985e6c49f40ca947213c47d37068792abdfb14f
-SHA1 (patch-bi) = 8c371c3ee33369df1b4dcf5418b5e5fba639d2cd
-SHA1 (patch-bj) = 2a2f499728ebd47c0c4550aee00d6334c497383e
-SHA1 (patch-bk) = 074fab7ad42a526568784efff4c0170c7c4960f3
-SHA1 (patch-bl) = 9d7c8b428a26301ae8c16c0c81d72401557b04db
-SHA1 (patch-bm) = 297fe31840acc356db084621a9dc9ee298ce1723
-SHA1 (patch-bn) = 1a38d4c64bf83496f8e93f19f2cb0d23f7df8a7f
-SHA1 (patch-bo) = 1043ac2eda88c7453036a69b79a2a68029f58470
-SHA1 (patch-bp) = 36da1e63e93c54be548c65a1ba79fd43f89c9df8
-SHA1 (patch-br) = 8862fc87d0aa5fa316f1c3a84dfc29e06cacb562
-SHA1 (patch-bs) = 93ecb3788f9d057ad7dd00864fcf049e222fd636
+SHA1 (patch-ae) = 5c1d67e7f94127d7ccf981245b52d56a3cb9bce0
+SHA1 (patch-af) = cf5a7e072278d79efa1e5e6377f83be4271868bb
+SHA1 (patch-ag) = 10b317c620ea8921e9ffcb33a33bd42357efacc2
+SHA1 (patch-ah) = c88e2f541d1a80a127af8e4defacc0605ee2a216
+SHA1 (patch-ai) = 11b9b3ba03b75527570f742ec1822133f8c33a39
+SHA1 (patch-aj) = 2caff7775dbd73a564958f50d6850d64cca90532
+SHA1 (patch-ak) = 482c2fd4d722bec908d0dff3c89bba8c59d1475b
+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) = 5ad0afcba7df4eef6c8080882950672440d1554b
+SHA1 (patch-at) = 94566c0016e686d29bc65a29b5047654759dec70
+SHA1 (patch-au) = 6c2786341dca064975dbca1a3b31110dfe395b48
+SHA1 (patch-av) = 513a80307d896cc43ecbd0f436bc070ca95f3901
+SHA1 (patch-aw) = d5c5f3321595c419f3873ba158fc228498dab4d5
+SHA1 (patch-ax) = bd21ea5951c7bf657a0ce830ec365bdadd472c2f
diff --git a/net/arla/files/arlad.sh b/net/arla/files/arlad.sh
index 1bd3cf7271e..d019305dba3 100644
--- a/net/arla/files/arlad.sh
+++ b/net/arla/files/arlad.sh
@@ -1,25 +1,18 @@
-#!/bin/sh
+#!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: arlad.sh,v 1.4 2002/09/25 00:06:34 jlam Exp $
+# $NetBSD: arlad.sh,v 1.5 2005/03/15 15:58:52 wennmach Exp $
 #
 # PROVIDE: arlad
 # REQUIRE: beforemountlkm
+# KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="arlad"
 rcvar=$name
-command="@PREFIX@/libexec/${name}"
-command_args="-z /dev/xfs0"
-required_files="/dev/xfs0"
+command="/usr/pkg/libexec/${name}"
+command_args="-z /dev/nnpfs0"
+required_files="/dev/nnpfs0"
 
-if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
-	load_rc_config $name
-	eval [ -z "\$${rcvar}" ] && eval ${rcvar}=NO
-	run_rc_command "$1"
-else
-	echo -n ' ${name}'
-	${command} ${arlad_flags} ${command_args}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/arla/files/fstab b/net/arla/files/fstab
index 36e3c2dc209..f4dfe71270d 100644
--- a/net/arla/files/fstab
+++ b/net/arla/files/fstab
@@ -1,2 +1,2 @@
-# $NetBSD: fstab,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
-/dev/xfs0		/afs	xfs	rw		0	0
+# $NetBSD: fstab,v 1.2 2005/03/15 15:58:52 wennmach Exp $
+/dev/nnpfs0		/afs	nnpfs	rw		0	0
diff --git a/net/arla/files/lkm.conf b/net/arla/files/lkm.conf
index bf09db5cf08..39213f13f0e 100644
--- a/net/arla/files/lkm.conf
+++ b/net/arla/files/lkm.conf
@@ -1,2 +1,2 @@
-# $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
+# $NetBSD: lkm.conf,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+@PREFIX@/lkm/nnpfs_mod.o	-	nnpfs_mod		@PREFIX@/sbin/nnpfs_makedev	/var/db/nnpfs_sym	BEFOREMOUNT
diff --git a/net/arla/files/services b/net/arla/files/services
deleted file mode 100644
index 9e0ce3a2bc8..00000000000
--- a/net/arla/files/services
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: services,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
-#
-# AFS Services
-#
-afs3-fileserver		7000/udp	# Fileserver
-afs3-callback		7001/udp	# Callback server
-afs3-prserver		7002/udp	# Protection server
-afs3-vlserver		7003/udp	# Volumelocation server
-afs3-kaserver		7004/udp	# Kerberos authenication server
-afs3-volser		7005/udp	# Volume server
-afs3-errors		7006/udp	# Error server ?
-afs3-bos		7007/udp	# Basic over-see server ?
-afs3-update		7008/udp	# ?
-afs3-rmtsys		7009/udp	# ?  
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
new file mode 100644
index 00000000000..3033e74c6fe
--- /dev/null
+++ b/net/arla/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2005/03/15 15:58:52 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
new file mode 100644
index 00000000000..e5e175c1595
--- /dev/null
+++ b/net/arla/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.5 2005/03/15 15:58:52 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-ac b/net/arla/patches/patch-ac
index c5152d6f7b0..0092f710a97 100644
--- a/net/arla/patches/patch-ac
+++ b/net/arla/patches/patch-ac
@@ -1,26 +1,14 @@
-$NetBSD: patch-ac,v 1.2 2001/08/09 13:48:59 wennmach Exp $
+$NetBSD: patch-ac,v 1.3 2005/03/15 15:58:52 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	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
--	$(INSTALL_DATA) $(srcdir)/ss.h $(DESTDIR)$(includedir)/ss/ss.h
--	$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
--	$(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(sl_LIB)
--	$(INSTALL) -m 555 $(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB)
--	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
--	$(INSTALL) -m 0555 $(PROGS) $(DESTDIR)$(bindir)/$(PROGS)
- 
- uninstall:
--	rm -f $(DESTDIR)$(includedir)/ss/ss.h
--	rm -f $(DESTDIR)$(libdir)/$(sl_LIB) $(DESTDIR)$(libdir)/$(ss_LIB)
--	rm -f $(DESTDIR)$(bindir)/$(PROGS)
+--- nnpfs/bsd/nnpfs_vnodeops-netbsd.c.orig	Mon Mar 14 15:13:51 2005
++++ nnpfs/bsd/nnpfs_vnodeops-netbsd.c	Mon Mar 14 15:35:55 2005
+@@ -416,7 +416,9 @@
+     {&vop_strategy_desc,	(vop_t *) nnpfs_netbsd_strategy },
+     {&vop_print_desc,		(vop_t *) nnpfs_print}, 
+     {&vop_advlock_desc,		(vop_t *) nnpfs_advlock },
++#if __NetBSD_Version__ >= 200000000
+     {&vop_kqfilter_desc,	(vop_t *) genfs_kqfilter },
++#endif
+     {(struct vnodeop_desc *) NULL, (int (*) (void *)) NULL}
+ };
  
- TAGS: $(SOURCES)
- 	etags $(SOURCES)
diff --git a/net/arla/patches/patch-ae b/net/arla/patches/patch-ae
index eea5fefc92d..963db9916c5 100644
--- a/net/arla/patches/patch-ae
+++ b/net/arla/patches/patch-ae
@@ -1,40 +1,15 @@
-$NetBSD: patch-ae,v 1.3 2001/08/09 13:48:59 wennmach Exp $
+$NetBSD: patch-ae,v 1.4 2005/03/15 15:58:52 wennmach Exp $
 
-Do not install libutil.a and the header files bool.h, hash.h, heap.h, list.h,
-and log.h, nor any of the man pages. There is a potential conflict with other
-libutils.
+Remove unneeded include file, else it won't compile under NetBSD-1.6.x
 
---- 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)
+--- 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,7 @@
  
- install:	all
--		$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
--		$(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
+ #ifdef HAVE_OPENSSL
+ #include <openssl/des.h>
+-#include <openssl/ui.h>
++/* #include <openssl/ui.h> */
+ #include <openssl/opensslv.h>
+ #endif
  
- uninstall:
--		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-af b/net/arla/patches/patch-af
index 432ff37ae72..4a4af9fb97a 100644
--- a/net/arla/patches/patch-af
+++ b/net/arla/patches/patch-af
@@ -1,14 +1,17 @@
-$NetBSD: patch-af,v 1.3 2002/09/25 00:06:34 jlam Exp $
+$NetBSD: patch-af,v 1.4 2005/03/15 15:58:52 wennmach Exp $
 
---- conf/Makefile.in.orig	Sat Oct  7 23:20:42 2000
-+++ conf/Makefile.in
-@@ -13,7 +13,8 @@ ARLACACHEDIR	= @ARLACACHEDIR@
+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 @@
  CHMOD		= @chmod@
  
  prefix 		= @prefix@
 -sysconfdir	= @sysconfdir@
++#sysconfdir	= @sysconfdir@
 +exampledir	= $(prefix)/share/examples/arla
 +sysconfdir	= $(exampledir)
  
- CONF_FILES	= CellServDB ThisCell arla.conf SuidCells
+ CONF_FILES	= CellServDB ThisCell SuidCells
  
diff --git a/net/arla/patches/patch-ag b/net/arla/patches/patch-ag
new file mode 100644
index 00000000000..4484da3048a
--- /dev/null
+++ b/net/arla/patches/patch-ag
@@ -0,0 +1,51 @@
+$NetBSD: patch-ag,v 1.3 2005/03/15 15:58:52 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 4c136a83603..d74bbe148e8 100644
--- a/net/arla/patches/patch-ah
+++ b/net/arla/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.3 2003/01/14 12:00:09 wennmach Exp $
+$NetBSD: patch-ah,v 1.4 2005/03/15 15:58:52 wennmach Exp $
 
-Install xfs_mod.o into $(lkmdir), not $(bindir).
-Do not strip xfs_mod.o while installing it.
+Install nnpfs_mod.o into $(lkmdir), not $(bindir).
+Do not strip nnpfs_mod.o while installing it.
 
---- xfs/bsd/Makefile.in.orig	Fri Jan 10 14:18:09 2003
-+++ xfs/bsd/Makefile.in	Fri Jan 10 14:22:48 2003
-@@ -19,6 +19,7 @@
+--- 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 @@
  
  INSTALL		= @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -13,24 +13,21 @@ Do not strip xfs_mod.o while installing it.
  INSTALL_DATA	= @INSTALL_DATA@
  MKINSTALLDIRS 	= @top_srcdir@/mkinstalldirs
  
-@@ -27,6 +28,7 @@
+@@ -28,7 +29,7 @@
  libdir 		= @libdir@
  libexecdir 	= @libexecdir@
  bindir 		= @bindir@
-+lkmdir         = $(exec_prefix)/lkm
+-lkmdir 		= @bindir@
++lkmdir		= $(exec_prefix)/lkm
  transform	= @program_transform_name@
  EXECSUFFIX	= @EXECSUFFIX@
- 
-@@ -117,10 +119,10 @@
- 	$(INSTALL_DATA) Info.plist $(KEXTDIR)/Contents
- 
+ VARDB		= /var/db
+@@ -136,7 +137,7 @@
  install-bsd:
--	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(lkmdir)
- 	PROG_BIN='$(XFS_BIN)'; for x in $$PROG_BIN; do \
- 		f=`echo $$x | sed '$(transform)'`; \
--		$(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
-+		$(INSTALL_LKMD) $$x $(DESTDIR)$(lkmdir)/$$f; \
+ 	$(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
new file mode 100644
index 00000000000..69365f32e99
--- /dev/null
+++ b/net/arla/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.3 2005/03/15 15:58:52 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
new file mode 100644
index 00000000000..8567747ebca
--- /dev/null
+++ b/net/arla/patches/patch-aj
@@ -0,0 +1,10 @@
+$NetBSD: patch-aj,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+
+test_rx_clock needs -llwp.
+
+--- rx/Makefile.in.orig	2005-03-09 16:44:39.000000000 +0100
++++ rx/Makefile.in	2005-03-09 16:46:18.000000000 +0100
+492c492
+< test_rx_clock_LDADD = librx.la $(LIBS)
+---
+> test_rx_clock_LDADD = librx.la -L../lwp -llwp $(LIBS)
diff --git a/net/arla/patches/patch-ak b/net/arla/patches/patch-ak
new file mode 100644
index 00000000000..6ab6539b9be
--- /dev/null
+++ b/net/arla/patches/patch-ak
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.6 2005/03/15 15:58:52 wennmach Exp $
+
+Building afsdir_check exposes a buildlink3 bug. Since we don't
+install afsdir_check, the simples work-around is not to build
+afsdir_check at all.
+
+Reorder libs: move libroken to the end.
+
+
+--- arlad/Makefile.in.orig	2005-03-10 12:58:35.000000000 +0100
++++ arlad/Makefile.in	2005-03-10 13:00:21.000000000 +0100
+@@ -25,7 +25,7 @@
+ 
+ ARLA_SBIN	= arla-cli
+ ARLA_LIBEXEC	= arlad
+-NOINST_BIN	= afsdir_check dump_state play_disco
++NOINST_BIN	= dump_state play_disco
+ 
+ MANPAGES	= \
+ 		AliasDB.5 \
+@@ -78,7 +78,7 @@
+ 
+ LIBS_common_post= ../lib/ko/libko.la ../util/libarlautil.la \
+ 		  ../lib/vers/libvers.la \
+-		   @LIB_roken@ $(RXKADLIB) $(KAFS_LIBS) @LIBS@
++		   $(RXKADLIB) $(KAFS_LIBS) @LIBS@ @LIB_roken@
+ 
+ LIBS_arla-cli	= $(LIBS_common) \
+ 		  $(LIB_sl) @LIB_readline@ \
+@@ -245,8 +245,8 @@
+ arla-cli:	$(arla-cli_OBJS) $(LIBDEPENDS)
+ 		$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(arla-cli_OBJS) $(LIBS_arla-cli)
+ 
+-afsdir_check:	$(afsdir_check_OBJS)
+-		$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(afsdir_check_OBJS) $(LIBS_afsdir_check)
++#afsdir_check:	$(afsdir_check_OBJS)
++#		$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(afsdir_check_OBJS) $(LIBS_afsdir_check)
+ 
+ dump_state:	$(dump_state_OBJS)
+ 		$(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(dump_state_OBJS) $(LIBS_dump_state)
diff --git a/net/arla/patches/patch-al b/net/arla/patches/patch-al
new file mode 100644
index 00000000000..235125b162a
--- /dev/null
+++ b/net/arla/patches/patch-al
@@ -0,0 +1,20 @@
+$NetBSD: patch-al,v 1.3 2005/03/15 15:58:52 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 @@
+ 
+ amon_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 \
diff --git a/net/arla/patches/patch-am b/net/arla/patches/patch-am
new file mode 100644
index 00000000000..afa5daefe4a
--- /dev/null
+++ b/net/arla/patches/patch-am
@@ -0,0 +1,37 @@
+$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
new file mode 100644
index 00000000000..a9345608d78
--- /dev/null
+++ b/net/arla/patches/patch-an
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..d6e43f2ab3d
--- /dev/null
+++ b/net/arla/patches/patch-ao
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..a608831744b
--- /dev/null
+++ b/net/arla/patches/patch-ap
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..22f5a78f20b
--- /dev/null
+++ b/net/arla/patches/patch-aq
@@ -0,0 +1,30 @@
+$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
new file mode 100644
index 00000000000..74051a0ba8d
--- /dev/null
+++ b/net/arla/patches/patch-ar
@@ -0,0 +1,30 @@
+$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
index 196dcd2181f..60a391b1c63 100644
--- a/net/arla/patches/patch-as
+++ b/net/arla/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.1 2000/10/13 17:31:12 wennmach Exp $
+$NetBSD: patch-as,v 1.2 2005/03/15 15:58:52 wennmach Exp $
 
 Make arla compile on pmax. 
 
---- configure.orig	Sat Aug 19 22:54:10 2000
-+++ configure	Fri Oct 13 15:49:09 2000
-@@ -2998,9 +2998,18 @@
+--- configure.orig	2004-11-15 11:13:02.000000000 -0500
++++ configure	2004-12-22 20:35:37.000000000 -0500
+@@ -6558,10 +6558,19 @@
    then
  	flags="$flags${flags:+ }-mno-fp-regs"
    fi
@@ -13,6 +13,7 @@ Make arla compile on pmax.
 +	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'
@@ -21,6 +22,6 @@ Make arla compile on pmax.
 +  then
 +      ac_kernel_ld='${KERNEL_LD} ${KERNEL_LDFLAGS} -o conftest $LDFLAGS -R $KERNEL conftest.o -e _foo 1>&5'
 +  fi
-   XFS_SRCS='xfs_wrap-bsd.c xfs_common-bsd.c xfs_dev-common.c xfs_dev-bsd.c xfs_syscalls-common.c xfs_syscalls-wrap-bsd.c xfs_node-bsd.c xfs_vfsops-common.c xfs_vfsops-bsd.c xfs_vfsops-netbsd.c xfs_vnodeops-common.c xfs_vnodeops-bsd.c'
-   XFS_SUBDIR=bsd
-   KERNEL=/netbsd
+   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
diff --git a/net/arla/patches/patch-at b/net/arla/patches/patch-at
index 3c1fa103edd..38a9c192f6f 100644
--- a/net/arla/patches/patch-at
+++ b/net/arla/patches/patch-at
@@ -1,26 +1,15 @@
-$NetBSD: patch-at,v 1.2 2001/08/09 13:49:00 wennmach Exp $
+$NetBSD: patch-at,v 1.3 2005/03/15 15:58:52 wennmach Exp $
 
 Set up proper path to the LKM for startarla.
 
---- 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@
+--- nnpfs/bsd/bin/Makefile.in.orig	2002-09-17 14:54:49.000000000 -0400
++++ nnpfs/bsd/bin/Makefile.in	2004-12-22 20:39:04.000000000 -0500
+@@ -21,7 +21,7 @@
  libexecdir 	= @libexecdir@
  bindir 		= @bindir@
-+lkmdir          = @prefix@/lkm
  sbindir 	= @sbindir@
+-lkmdir		= @bindir@
++lkmdir		= @prefix@/lkm
  mandir		= @mandir@
  transform	= @program_transform_name@
-@@ -58,7 +59,10 @@
- 	$(RM) -f $(PROGRAMS) startarla *.o *~
- 
- startarla: startarla.in
--	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 $@
- 
+ ARLACACHEDIR	= @ARLACACHEDIR@
diff --git a/net/arla/patches/patch-au b/net/arla/patches/patch-au
new file mode 100644
index 00000000000..a4c56462e69
--- /dev/null
+++ b/net/arla/patches/patch-au
@@ -0,0 +1,30 @@
+$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
new file mode 100644
index 00000000000..548e3c435da
--- /dev/null
+++ b/net/arla/patches/patch-av
@@ -0,0 +1,29 @@
+$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
new file mode 100644
index 00000000000..770c0a2508c
--- /dev/null
+++ b/net/arla/patches/patch-aw
@@ -0,0 +1,287 @@
+$NetBSD: patch-aw,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+
+Don't build tests that won't compile (they're not installed anyway).
+Reorder libs: put libroken at the end.
+
+--- tests/Makefile.in.orig	2005-03-11 10:03:00.000000000 +0100
++++ tests/Makefile.in	2005-03-11 10:06:47.000000000 +0100
+@@ -15,10 +15,10 @@
+ DEFS		= @DEFS@
+ LDFLAGS		= @LDFLAGS@
+ LIBS		= @LIBS@
+-ROKEN_LIBS	= @LIB_roken@
++ROKEN_LIBS	= @LIB_roken@ @LIB_crypt@
+ KAFS_LIBS	= @AFS_EXTRA_LIBS@ @KAFS_LIBS@
+ KRB_LIBS	= @KRB5_LIB_FLAGS@
+-APPL_LIB	= -L../appl/lib -larlalib \
++APPL_LIB	= ../appl/lib/libarlalib.la \
+ 		  ../lib/ko/libko.la ../util/libarlautil.la
+ 
+ 
+@@ -30,15 +30,14 @@
+ 		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 \
++		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	 \
+-		rename5 rename-under-feet write-closed write-closed2	 \
+-		truncate fchmod fhbench make-page utime-file		 \
+-		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 \
+ 		read-past-eof						 \
+ 		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) $<
diff --git a/net/arla/patches/patch-ax b/net/arla/patches/patch-ax
new file mode 100644
index 00000000000..bc10eb12b52
--- /dev/null
+++ b/net/arla/patches/patch-ax
@@ -0,0 +1,14 @@
+$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-bd b/net/arla/patches/patch-bd
deleted file mode 100644
index 8226e9e3577..00000000000
--- a/net/arla/patches/patch-bd
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- lib/sl/make_cmds.c.orig	Tue Aug 20 16:52:43 2002
-+++ lib/sl/make_cmds.c	Tue Aug 20 16:58:20 2002
-@@ -213,7 +213,16 @@
- {
-     int optind = 0;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__)
-     setprogname(argv[0]);
-+#endif
-     if(getarg(args, sizeof(args)/sizeof(*args), argc, argv, &optind))
- 	usage(1);
-     if(help_flag)
diff --git a/net/arla/patches/patch-be b/net/arla/patches/patch-be
deleted file mode 100644
index f9cf1747062..00000000000
--- a/net/arla/patches/patch-be
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-be,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- lib/cmd/testc.c.orig	Tue Aug 20 17:11:59 2002
-+++ lib/cmd/testc.c	Tue Aug 20 17:12:37 2002
-@@ -103,7 +103,16 @@
-     struct cmd_syndesc *ts;
-     int ret;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__)   
-     setprogname (argv[0]);
-+#endif
- 
-     ts = cmd_CreateSyntax (NULL, MainProc, NULL, "foo");
- 
diff --git a/net/arla/patches/patch-bf b/net/arla/patches/patch-bf
deleted file mode 100644
index 0b14c34b168..00000000000
--- a/net/arla/patches/patch-bf
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bf,v 1.3 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- lib/ko/gensysname.c.orig	Tue Aug 20 17:17:51 2002
-+++ lib/ko/gensysname.c	Tue Aug 20 17:18:26 2002
-@@ -249,7 +249,16 @@
-     int found = 0;
-     int optind = 0;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (agetarg (args, argc, argv, &optind, AARG_GNUSTYLE)) 
- 	usage();
diff --git a/net/arla/patches/patch-bg b/net/arla/patches/patch-bg
deleted file mode 100644
index b2dc82de230..00000000000
--- a/net/arla/patches/patch-bg
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bg,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname(). 
-
---- lib/ko/kotest.c.orig	Tue Aug 20 17:23:43 2002
-+++ lib/ko/kotest.c	Tue Aug 20 17:27:36 2002
-@@ -56,9 +56,20 @@
-     int ret = 0;
-     Log_method *method;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname(argv[0]);
--
-     method = log_open(getprogname(), "/dev/stderr");
-+#else
-+    method = log_open("kotest", "/dev/stderr");
-+#endif  
-+
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
diff --git a/net/arla/patches/patch-bh b/net/arla/patches/patch-bh
deleted file mode 100644
index a1c2ffe6902..00000000000
--- a/net/arla/patches/patch-bh
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bh,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- xfs/bsd/bin/mount_xfs.c.orig	Tue Aug 20 17:34:04 2002
-+++ xfs/bsd/bin/mount_xfs.c	Tue Aug 20 17:34:52 2002
-@@ -62,7 +62,16 @@
- #ifdef HAVE_OPTRESET
-     optreset = 1;
- #endif
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname(argv[0]);
-+#endif
-     while ((ch = getopt(argc, argv, "o:F:")) != -1)
- 	switch (ch) {
- 	case 'o':
diff --git a/net/arla/patches/patch-bi b/net/arla/patches/patch-bi
deleted file mode 100644
index bd663951496..00000000000
--- a/net/arla/patches/patch-bi
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- xfs/bsd/bin/umount_xfs.c.orig	Tue Aug 20 17:40:34 2002
-+++ xfs/bsd/bin/umount_xfs.c	Tue Aug 20 17:41:20 2002
-@@ -47,7 +47,16 @@
- {
-     int force = 0;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname (argv[0]);
-+#endif
-     if (argc != 2 && argc != 3)
- 	usage();
- 
diff --git a/net/arla/patches/patch-bj b/net/arla/patches/patch-bj
deleted file mode 100644
index ac189d0b0b6..00000000000
--- a/net/arla/patches/patch-bj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- arlad/arla-cli.c.orig	Tue Aug 20 17:48:16 2002
-+++ arlad/arla-cli.c	Tue Aug 20 17:49:03 2002
-@@ -687,7 +687,16 @@
-     int optind = 0;
-     int ret;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname (argv[0]);
-+#endif
- 
-     if (getarg (args, sizeof(args)/sizeof(*args), argc, argv, &optind))
- 	usage (1);
diff --git a/net/arla/patches/patch-bk b/net/arla/patches/patch-bk
deleted file mode 100644
index d07956bdecc..00000000000
--- a/net/arla/patches/patch-bk
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bk,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- arlad/arlad.c.orig	Tue Aug 20 17:56:40 2002
-+++ arlad/arlad.c	Tue Aug 20 17:57:08 2002
-@@ -240,7 +240,16 @@
-     int optind = 0;
-     int ret;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (getarg (args, sizeof(args)/sizeof(*args), argc, argv, &optind))
- 	usage (1);
diff --git a/net/arla/patches/patch-bl b/net/arla/patches/patch-bl
deleted file mode 100644
index f4d67a1a361..00000000000
--- a/net/arla/patches/patch-bl
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-bl,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- appl/afsutils/aklog.c.orig	Tue Aug 20 18:03:35 2002
-+++ appl/afsutils/aklog.c	Tue Aug 20 18:06:19 2002
-@@ -286,10 +286,24 @@
-     int optind = 0;
-     int rc;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname(argv[0]);
-+#endif
- 
-     ports_init();
-+
-+#if !defined(__NetBSD__)
-     method = log_open (getprogname(), "/dev/stderr:notime");
-+#else
-+    method = log_open ("aklog", "/dev/stderr:notime");
-+#endif
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
diff --git a/net/arla/patches/patch-bm b/net/arla/patches/patch-bm
deleted file mode 100644
index 6e0b24bf40d..00000000000
--- a/net/arla/patches/patch-bm
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-bm,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- appl/afsutils/klog.c.orig	Tue Aug 20 18:07:46 2002
-+++ appl/afsutils/klog.c	Tue Aug 20 18:09:32 2002
-@@ -498,9 +498,19 @@
- 
-     char pwbuf[PASSWD_MAX];
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname (argv[0]);
--
-     method = log_open (getprogname(), "/dev/stderr:notime");
-+#else
-+    method = log_open ("klog", "/dev/stderr:notime");
-+#endif
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
diff --git a/net/arla/patches/patch-bn b/net/arla/patches/patch-bn
deleted file mode 100644
index 8dc21061733..00000000000
--- a/net/arla/patches/patch-bn
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-bn,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
- 
---- appl/kalog/kalog.c.orig	Tue Aug 20 18:17:04 2002
-+++ appl/kalog/kalog.c	Tue Aug 20 18:20:52 2002
-@@ -88,9 +88,19 @@
-     const char *cellname;
-     const char *user;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */                     
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
--
-     method = log_open (getprogname(), "/dev/stderr:notime");
-+#else
-+    method = log_open ("kalog", "/dev/stderr:notime");
-+#endif
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
-@@ -104,7 +114,11 @@
- 	parse_user (argv[1], &user, &cellname);
-     else {
- 	fprintf (stderr, "usage: %s [username[@cell]]\n",
-+#if !defined(__NetBSD__)
- 		 getprogname());
-+#else
-+		"kalog");
-+#endif
- 	exit (1);
-     }
- 
diff --git a/net/arla/patches/patch-bo b/net/arla/patches/patch-bo
deleted file mode 100644
index 715eb1333cd..00000000000
--- a/net/arla/patches/patch-bo
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-bo,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- appl/bos/bos.c.orig	Tue Aug 20 18:23:16 2002
-+++ appl/bos/bos.c	Tue Aug 20 18:24:24 2002
-@@ -145,9 +145,19 @@
-     Log_method *method;
-     int ret = 0;
-     
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__) 
-     setprogname(argv[0]);
--
-     method = log_open (getprogname(), "/dev/stderr:notime");
-+#else
-+    method = log_open ("bos", "/dev/stderr:notime");
-+#endif
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
diff --git a/net/arla/patches/patch-bp b/net/arla/patches/patch-bp
deleted file mode 100644
index 94a6bdeff16..00000000000
--- a/net/arla/patches/patch-bp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-bp,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- appl/pts/pts.c.orig	Tue Aug 20 18:25:47 2002
-+++ appl/pts/pts.c	Tue Aug 20 18:26:56 2002
-@@ -1525,10 +1525,23 @@
-     int pos = 0;
-     int i;
- 
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__)
-     setprogname(argv[0]);
-+#endif
-     tzset();
- 
-+#if !defined(__NetBSD__)
-     method = log_open (getprogname(), "/dev/stderr:notime");
-+#else
-+    method = log_open ("pts", "/dev/stderr:notime");
-+#endif
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
diff --git a/net/arla/patches/patch-br b/net/arla/patches/patch-br
deleted file mode 100644
index f99bb3d5bcd..00000000000
--- a/net/arla/patches/patch-br
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-br,v 1.2 2002/12/23 18:28:20 cjep Exp $
-
-On NetBSD, comment out call to setgetprogname().
-
---- appl/vos/vos.c.orig	Tue Aug 20 18:30:28 2002
-+++ appl/vos/vos.c	Tue Aug 20 18:31:24 2002
-@@ -147,10 +147,23 @@
-     Log_method *method;
-     int ret = 0;
-     
-+/*
-+ * The setprogname(3) function was introduced in NetBSD 1.6.
-+ * It is a function provided for compatibility, and in NetBSD,
-+ * calling setprogname() from main() has no effect.
-+ * In order to for this to work on older NetBSD systems,
-+ * we just comment the call to setprogname() out.
-+ */
-+#if !defined(__NetBSD__)
-     setprogname(argv[0]);
-+#endif
-     tzset();
- 
-+#if !defined(__NetBSD__)
-     method = log_open (getprogname(), "/dev/stderr:notime");
-+#else
-+    method = log_open ("vos", "/dev/stderr:notime");
-+#endif
-     if (method == NULL)
- 	errx (1, "log_open failed");
-     cell_init(0, method);
diff --git a/net/arla/patches/patch-bs b/net/arla/patches/patch-bs
deleted file mode 100644
index 958466a7b67..00000000000
--- a/net/arla/patches/patch-bs
+++ /dev/null
@@ -1,610 +0,0 @@
-$NetBSD: patch-bs,v 1.3 2002/12/23 18:28:20 cjep Exp $
-
-Eradicate setprogname() on NetBSD.
-Kill me for doing this for many programs in one patch, but I've got
-RSI now in both hands, dammit.
-
---- tests/append-over-page.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/append-over-page.c	Tue Aug 20 18:45:32 2002
-@@ -971,7 +971,9 @@
- {
-     const char *file = "blaha";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
-     if (argc != 1 && argc != 2)
- 	errx (1, "usage: %s [file]", argv[0]);
-     if (argc == 2)
---- tests/apwd.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/apwd.c	Tue Aug 20 18:45:55 2002
-@@ -432,7 +432,9 @@
-     int ret = 0;
-     int optind = 0;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     verbose_flag = getenv ("VERBOSE") != NULL;
- 
---- tests/create-dirs.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/create-dirs.c	Tue Aug 20 18:46:15 2002
-@@ -82,7 +82,9 @@
-     char *ptr;
-     int count;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 2)
- 	usage (1);
---- tests/create-files.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/create-files.c	Tue Aug 20 18:46:29 2002
-@@ -101,7 +101,9 @@
-     int count;
-     long size;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 3)
- 	usage (1);
---- tests/create-remove.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/create-remove.c	Tue Aug 20 18:46:45 2002
-@@ -118,7 +118,9 @@
-     char *ptr;
-     int count;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 3)
- 	usage (1);
---- tests/create-stat.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/create-stat.c	Tue Aug 20 18:58:18 2002
-@@ -79,7 +79,9 @@
-     char *filename;
-     ino_t afsfileid;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (!k_hasafs())
- 	errx (1, "!k_hasafs");
-@@ -161,7 +163,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     errx (1, "no kafs");
- }
---- tests/create-symlinks.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/create-symlinks.c	Tue Aug 20 18:47:13 2002
-@@ -115,7 +115,9 @@
-     char *ptr;
-     int count;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 2)
- 	usage (1);
---- tests/dup2-and-unlog.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/dup2-and-unlog.c	Tue Aug 20 18:59:01 2002
-@@ -18,7 +18,9 @@
- {
-     int fd;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (!k_hasafs())
- 	errx (1, "no afs");
-@@ -45,7 +47,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     errx (1, "no kafs");
- }
---- tests/exit-wo-close.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/exit-wo-close.c	Tue Aug 20 18:47:40 2002
-@@ -119,7 +119,9 @@
- {
-     const char *file = "foo";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 2 && argc != 1)
- 	errx (1, "usage: %s [file]", argv[0]);
---- tests/fchmod.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/fchmod.c	Tue Aug 20 18:47:50 2002
-@@ -52,7 +52,9 @@
-     int fd, ret;
-     struct stat sb;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     fd = open ("deps", O_WRONLY|O_CREAT|O_TRUNC, 0666);
-     if (fd < 0)
---- tests/fhbench.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/fhbench.c	Tue Aug 20 18:48:00 2002
-@@ -327,7 +327,9 @@
-     int i;
-     struct fhb_handle *handles;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (agetarg (args, argc, argv, &optind, AARG_GNUSTYLE))
- 	usage (1);
---- tests/ga-test.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/ga-test.c	Tue Aug 20 18:48:10 2002
-@@ -316,7 +316,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     test_simple_string();
-     test_simple_strings();
---- tests/hardlink1.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/hardlink1.c	Tue Aug 20 18:48:21 2002
-@@ -55,7 +55,9 @@
-     int ret;
-     struct stat sb1, sb2;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     fd1 = open("foo", O_RDWR|O_CREAT, 0666);
-     if (fd1 < 0)
---- tests/hardlink2.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/hardlink2.c	Tue Aug 20 18:48:30 2002
-@@ -55,7 +55,9 @@
-     int ret;
-     struct stat sb1;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     ret = mkdir ("1", 0777);
-     if (ret < 0)
---- tests/invalidate-file.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/invalidate-file.c	Tue Aug 20 18:48:40 2002
-@@ -167,7 +167,9 @@
- {
-     char *filename = "foo";
-     
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (!k_hasafs())
- 	exit (1);
---- tests/kill-softer.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/kill-softer.c	Tue Aug 20 18:48:53 2002
-@@ -177,7 +177,9 @@
- int
- main(int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     verbose = fdopen (4, "w");
-     if (verbose == NULL) {
---- tests/kill-softly.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/kill-softly.c	Tue Aug 20 18:49:03 2002
-@@ -154,7 +154,9 @@
- int
- main(int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 2)
- 	errx (1, "usage: %s directory", argv[0]);
---- tests/large-dir.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/large-dir.c	Tue Aug 20 18:49:16 2002
-@@ -146,7 +146,9 @@
-     char *ptr;
-     int count;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 3)
- 	usage (1);
---- tests/large-dir2.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/large-dir2.c	Tue Aug 20 18:49:42 2002
-@@ -125,7 +125,9 @@
-     char *ptr;
-     int count;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 3)
- 	usage (1);
---- tests/large-dir3.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/large-dir3.c	Tue Aug 20 18:49:53 2002
-@@ -113,7 +113,9 @@
-     char *ptr;
-     int count;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 3)
- 	usage (1);
---- tests/mkdir2.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/mkdir2.c	Tue Aug 20 18:50:09 2002
-@@ -54,7 +54,9 @@
-     int ret;
-     struct stat dot_sb, sb;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     ret = mkdir ("foo", 0777);
-     if (ret < 0)
---- tests/mmap-and-read.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/mmap-and-read.c	Tue Aug 20 18:50:20 2002
-@@ -150,7 +150,9 @@
- main (int argc, char **argv)
- {
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     srand (time(NULL));
- 
---- tests/mmap-cat.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/mmap-cat.c	Tue Aug 20 18:50:30 2002
-@@ -134,7 +134,9 @@
- {
-     int optind = 0;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (agetarg (args, argc, argv, &optind, AARG_AFSSTYLE))
- 	usage (1);
---- tests/mmap-shared-write.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/mmap-shared-write.c	Tue Aug 20 18:50:39 2002
-@@ -91,7 +91,9 @@
- {
-     const char *filename = "foo";
- 
-+#if !defined(__NetBSD__)
-     setprogname(argv[0]);
-+#endif
- 
-     if (argc != 1 && argc != 2)
- 	usage ();
---- tests/mmap-vs-read.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/mmap-vs-read.c	Tue Aug 20 18:50:50 2002
-@@ -154,7 +154,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 1)
- 	debug = 1;
---- tests/mmap-vs-read2.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/mmap-vs-read2.c	Tue Aug 20 18:50:59 2002
-@@ -154,7 +154,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 1)
- 	debug = 1;
---- tests/pine.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/pine.c	Tue Aug 20 18:51:08 2002
-@@ -57,7 +57,9 @@
-     char unique[1024];
-     int retrycount = 0;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     snprintf (unique, sizeof(unique), LOCK ".%d.%d",
- 	      getpid(), (int)time(NULL));
---- tests/read-vs-mmap.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/read-vs-mmap.c	Tue Aug 20 18:51:17 2002
-@@ -154,7 +154,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 1)
- 	debug = 1;
---- tests/read-vs-mmap2.c.orig	Tue Aug 20 18:44:47 2002
-+++ tests/read-vs-mmap2.c	Tue Aug 20 18:51:26 2002
-@@ -113,7 +113,9 @@
-     void *mmap_buf;
-     int fd;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     srand (time(NULL));
- 
---- tests/read-write.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/read-write.c	Tue Aug 20 18:51:38 2002
-@@ -116,7 +116,9 @@
-     char *read_buf2;
-     int fd;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     srand (time(NULL));
- 
---- tests/readdir-vs-lstat.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/readdir-vs-lstat.c	Tue Aug 20 18:51:51 2002
-@@ -92,7 +92,9 @@
- {
-     char *name = ".";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc > 2)
- 	usage (1);
---- tests/rename-under-feet.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/rename-under-feet.c	Tue Aug 20 18:52:04 2002
-@@ -129,7 +129,9 @@
-     char buf[1];
-     int status;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     emkdir ("one", 0777);
-     emkdir ("two", 0777);
---- tests/rename5.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/rename5.c	Tue Aug 20 18:52:15 2002
-@@ -87,7 +87,9 @@
-     int ret;
-     struct stat old_sb, new_sb, dot_sb;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
-     emkdir ("old_parent", 0777);
-     emkdir ("new_parent", 0777);
-     emkdir ("old_parent/victim", 0777);
---- tests/rm-rf.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/rm-rf.c	Tue Aug 20 18:52:25 2002
-@@ -128,7 +128,9 @@
- int
- main(int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
- #ifdef KERBEROS
-     has_afs = k_hasafs();
---- tests/still-there-p.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/still-there-p.c	Tue Aug 20 18:52:36 2002
-@@ -61,7 +61,9 @@
-     char buf[TEST_BUFFER_SZ];
-     int fd;
- 	
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     fd = open (file, O_RDWR|O_TRUNC|O_CREAT, 0644);
-     if (fd < 0)
---- tests/strange-characters-c.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/strange-characters-c.c	Tue Aug 20 18:52:45 2002
-@@ -84,7 +84,9 @@
- {
-     char *file = "���";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 1)
- 	usage (1);
---- tests/symlink.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/symlink.c	Tue Aug 20 18:52:54 2002
-@@ -57,7 +57,9 @@
-     int ret;
-     struct stat sb;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     ret = symlink ("foo", "bar");
-     if (ret < 0)
---- tests/test-parallel1.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/test-parallel1.c	Tue Aug 20 18:53:02 2002
-@@ -80,7 +80,9 @@
- {
-     int i, ret;
-     
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     for (i = 0; i < NUM_WORKER ; i++) {
- 	int ret;
---- tests/test-parallel2.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/test-parallel2.c	Tue Aug 20 18:53:11 2002
-@@ -162,7 +162,9 @@
- {
-     int i, ret;
-     
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     for (i = 0; i < NUM_WORKER ; i++) {
- 	int ret;
---- tests/test-setgroups.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/test-setgroups.c	Tue Aug 20 18:53:40 2002
-@@ -80,7 +80,9 @@
-     int ngroups;
-     gid_t pag0, pag1, pag2;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 2)
- 	errx (1, "Usage: %s user", argv[0]);
-@@ -138,7 +140,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     errx (1, "no kafs");
- }
---- tests/test-setpag.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/test-setpag.c	Tue Aug 20 18:54:04 2002
-@@ -79,7 +79,9 @@
-     gid_t pag1, pag2;
-     pid_t pid;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (argc != 1)
- 	errx (1, "Usage: %s", argv[0]);
-@@ -131,7 +133,9 @@
- int
- main (int argc, char **argv)
- {
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     errx (1, "no kafs");
- }
---- tests/truncate.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/truncate.c	Tue Aug 20 18:54:16 2002
-@@ -82,7 +82,9 @@
- {
-     int ret;
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     create_and_write ("foo", "hej\n");
- 
---- tests/utime-dir.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/utime-dir.c	Tue Aug 20 18:54:27 2002
-@@ -71,7 +71,9 @@
- {
-     const char *file = "blaha";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
-     if (argc != 1 && argc != 2)
- 	errx (1, "usage: %s [file]", argv[0]);
-     if (argc == 2)
---- tests/write-closed.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/write-closed.c	Tue Aug 20 18:54:41 2002
-@@ -89,7 +89,9 @@
- {
-     const char *file = "foo";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
-     if (argc != 1 && argc != 2)
- 	errx (1, "usage: %s [file]", argv[0]);
-     if (argc == 2)
---- tests/write-closed2.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/write-closed2.c	Tue Aug 20 18:55:00 2002
-@@ -120,7 +120,9 @@
- {
-     const char *file = "foo";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
- 
-     if (!k_hasafs())
- 	errx (1, "!k_hasafs");
---- tests/write-ro-file.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/write-ro-file.c	Tue Aug 20 18:55:13 2002
-@@ -52,7 +52,9 @@
-   int fd;
-   int ret;
- 
-+#if !defined(__NetBSD__)
-   setprogname (argv[0]);
-+#endif
- 
-   fd = open("foo", O_RDWR|O_CREAT, 0);
-   if (fd < 0)
---- tests/write-ucc.c.orig	Tue Aug 20 18:44:48 2002
-+++ tests/write-ucc.c	Tue Aug 20 18:55:22 2002
-@@ -95,7 +95,9 @@
- {
-     const char *file = "blaha";
- 
-+#if !defined(__NetBSD__)
-     setprogname (argv[0]);
-+#endif
-     if (argc != 1 && argc != 2)
- 	errx (1, "usage: %s [file]", argv[0]);
-     if (argc == 2)
author	wennmach <wennmach@pkgsrc.org>	2005-03-15 15:58:52 +0000
committer	wennmach <wennmach@pkgsrc.org>	2005-03-15 15:58:52 +0000
commit	9f1c532d9b71873afe95eb95d0550d6c8fbe395a (patch)
tree	8861d10442c9b9314085e82332ee85bc096292b1 /net
parent	2043ed3d1c2a8ca0d55b71c7d5ecd8f47967db7b (diff)
download	pkgsrc-9f1c532d9b71873afe95eb95d0550d6c8fbe395a.tar.gz