Fix a number of issues:

	- LP64 and other portability issues
	- Find the correct <kafs.h> in order to get the right prototype for
	  kafs_settoken_rxkad.
	- Find the correct <com_err.h>
	- Add support for -DMULTIPROCESSOR and other kernel compile options

Bump PKGREVISION.

25 files changed, 379 insertions, 41 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 8782b856269..9921bc38704 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2005/03/15 15:58:52 wennmach Exp $
+# $NetBSD: Makefile,v 1.42 2005/03/25 17:40:25 wennmach Exp $
 
 DISTNAME=		arla-0.38
-#PKGREVISION=
+PKGREVISION=		1
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -37,6 +37,11 @@ PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDI
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-arlacachedir=${ARLA_CACHE}
 CONFIGURE_ARGS+=	--enable-shared=no
+
+# Enable one or more of the following kernel compile options as required:
+# (these options must match the compile options of the kernel)
+#CONFIGURE_ENV+=	KERNEL_CPPFLAGS="-DMULTIPROCESSOR -DDEBUG -DDIAGNOSTIC"
+
 MESSAGE_SUBST+=		ARLA_CACHE=${ARLA_CACHE}
 PLIST_SUBST+=		ARLA_CACHE=${ARLA_CACHE}
 FILES_SUBST+=		ARLA_CACHE=${ARLA_CACHE}
diff --git a/net/arla/distinfo b/net/arla/distinfo
index bc7830e28e6..5fd925dbc70 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.13 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: distinfo,v 1.14 2005/03/25 17:40:25 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) = 95e2eddc13963d11340d72c4a43fb20fc658d9c3
-SHA1 (patch-ab) = e4e6a97b2fd206b0e6ecb8eae6fc10bcfcc4e588
-SHA1 (patch-ac) = d754d7add8b3581638178f30d5884cfda63488c9
-SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6
-SHA1 (patch-ae) = 5c1d67e7f94127d7ccf981245b52d56a3cb9bce0
+SHA1 (patch-aa) = 3f2393932d2b764293c26a6f8ef588e248c7bf1f
+SHA1 (patch-ab) = fc896369ba3e346f4fcb3dd1f82592db4fb2d45c
+SHA1 (patch-ac) = abee32015e06033a22eebcd914463a3776db7127
+SHA1 (patch-ad) = bc38ab53f9584d137d182fd086b4148a841b2f7d
+SHA1 (patch-ae) = 581235cc7b29840a4889f7c0700add1b7d739864
 SHA1 (patch-af) = cf5a7e072278d79efa1e5e6377f83be4271868bb
-SHA1 (patch-ag) = 10b317c620ea8921e9ffcb33a33bd42357efacc2
+SHA1 (patch-ag) = ccd26378143f7193ad669543e1085358fa9305dd
 SHA1 (patch-ah) = c88e2f541d1a80a127af8e4defacc0605ee2a216
-SHA1 (patch-ai) = 11b9b3ba03b75527570f742ec1822133f8c33a39
-SHA1 (patch-aj) = 2caff7775dbd73a564958f50d6850d64cca90532
-SHA1 (patch-ak) = 482c2fd4d722bec908d0dff3c89bba8c59d1475b
+SHA1 (patch-ai) = fc9f72982d5174b5d8ce695ef8040cb14a479183
+SHA1 (patch-aj) = 252b106cabfa498059156dc685d1b358fe8d1a8a
+SHA1 (patch-ak) = 7cf6a36acc9107458c8165a4c5ff4821fc8a946f
 SHA1 (patch-al) = 5c2f0283bdacbddc6a6632df1c758150e12953ef
 SHA1 (patch-am) = 1efe1b5b9fddf023fbc7a9cead28c607a0ada2e0
 SHA1 (patch-an) = 9b07bd7036b2e674a9ea5330cd348b5883eabdf9
@@ -21,9 +21,22 @@ SHA1 (patch-ao) = 780a129d1d998b3234b2475f9018d18736ffa34c
 SHA1 (patch-ap) = 78d28a8a3f7b70c0a8900319288168117ede2a77
 SHA1 (patch-aq) = 17266907f3f3fb09441cd2a548cc65138e0457b4
 SHA1 (patch-ar) = af5f9d365262d66ae71a9115dc257e1d42ddc0d0
-SHA1 (patch-as) = 5ad0afcba7df4eef6c8080882950672440d1554b
+SHA1 (patch-as) = 3572389f4bf2449a2ee0a6b5180b0f46db7d3745
 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-az) = 072c2d9c8a2fea61fc04bff5d0d9fb211bbb67d6
+SHA1 (patch-ba) = 831df6c18039bab2160faca2a601e0a575d23507
+SHA1 (patch-bb) = 94cc830efcd70dbd1bddded7955b06373f56ea3c
+SHA1 (patch-bc) = 61374abb7d0a60bf1dfcef78e88a5eae9d3bc1dd
+SHA1 (patch-bd) = 8f7028ef8dad43cb7689efae8e0bdc759938a019
+SHA1 (patch-be) = 21c32c1ced42fab706c9744637bc9a0275f5625a
+SHA1 (patch-bf) = a85c5cceb564366bb553d5d9edaa7dfb12dfd184
+SHA1 (patch-bg) = 2fcb2460e063145c699cfc9dcb6fadf996778383
+SHA1 (patch-bh) = 5789f72078c906ec1bd160783e04cd6b21a5c16f
+SHA1 (patch-bi) = 2e8201964c64b128025a752ee7354f0cc8305b1b
+SHA1 (patch-bj) = a3492740bd57855ef3c2fdd88399ff1e18a73813
+SHA1 (patch-bk) = 2187430d4afcf7dc9a29b5b7a4cc7da4f7ab4078
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
index 3033e74c6fe..619b080c9b5 100644
--- a/net/arla/patches/patch-aa
+++ b/net/arla/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-aa,v 1.6 2005/03/25 17:40:25 wennmach Exp $
 
-from christos
+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
diff --git a/net/arla/patches/patch-ab b/net/arla/patches/patch-ab
index e5e175c1595..259cb65c685 100644
--- a/net/arla/patches/patch-ab
+++ b/net/arla/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ab,v 1.6 2005/03/25 17:40:25 wennmach Exp $
 
-reorder libs.
+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
diff --git a/net/arla/patches/patch-ac b/net/arla/patches/patch-ac
index 0092f710a97..36b5fa6e621 100644
--- a/net/arla/patches/patch-ac
+++ b/net/arla/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ac,v 1.4 2005/03/25 17:40:25 wennmach Exp $
+
+NetBSD-1.6.x doesn't have kqfilter.
 
 --- 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
diff --git a/net/arla/patches/patch-ad b/net/arla/patches/patch-ad
index 32fe2ecfc21..ff67db0376e 100644
--- a/net/arla/patches/patch-ad
+++ b/net/arla/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-ad,v 1.2 2005/03/25 17:40:25 wennmach Exp $
 
-Do not install libacl.a. Conflicts with libacl.a from kth-krb4.
+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
diff --git a/net/arla/patches/patch-ae b/net/arla/patches/patch-ae
index 963db9916c5..6d684962926 100644
--- a/net/arla/patches/patch-ae
+++ b/net/arla/patches/patch-ae
@@ -1,15 +1,29 @@
-$NetBSD: patch-ae,v 1.4 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ae,v 1.5 2005/03/25 17:40:25 wennmach Exp $
 
-Remove unneeded include file, else it won't compile under NetBSD-1.6.x
+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,7 @@
+@@ -53,7 +53,9 @@
  
  #ifdef HAVE_OPENSSL
  #include <openssl/des.h>
--#include <openssl/ui.h>
-+/* #include <openssl/ui.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-ag b/net/arla/patches/patch-ag
index 4484da3048a..9f13c09ca69 100644
--- a/net/arla/patches/patch-ag
+++ b/net/arla/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ag,v 1.4 2005/03/25 17:40:25 wennmach Exp $
 
-from christos
+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
diff --git a/net/arla/patches/patch-ai b/net/arla/patches/patch-ai
index 69365f32e99..9e0743297b3 100644
--- a/net/arla/patches/patch-ai
+++ b/net/arla/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ai,v 1.4 2005/03/25 17:40:25 wennmach Exp $
 
-Define $(LIB_crypt)
+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
diff --git a/net/arla/patches/patch-aj b/net/arla/patches/patch-aj
index 8567747ebca..0db184533b5 100644
--- a/net/arla/patches/patch-aj
+++ b/net/arla/patches/patch-aj
@@ -1,10 +1,27 @@
-$NetBSD: patch-aj,v 1.3 2005/03/15 15:58:52 wennmach Exp $
+$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
-492c492
-< test_rx_clock_LDADD = librx.la $(LIBS)
----
-> test_rx_clock_LDADD = librx.la -L../lwp -llwp $(LIBS)
+@@ -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-ak b/net/arla/patches/patch-ak
index 6ab6539b9be..50bae8e91c3 100644
--- a/net/arla/patches/patch-ak
+++ b/net/arla/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.6 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-ak,v 1.7 2005/03/25 17:40:25 wennmach Exp $
 
 Building afsdir_check exposes a buildlink3 bug. Since we don't
-install afsdir_check, the simples work-around is not to build
+install afsdir_check, the simple work-around is not to build
 afsdir_check at all.
 
 Reorder libs: move libroken to the end.
diff --git a/net/arla/patches/patch-as b/net/arla/patches/patch-as
index 60a391b1c63..89e08ef60d0 100644
--- a/net/arla/patches/patch-as
+++ b/net/arla/patches/patch-as
@@ -1,10 +1,21 @@
-$NetBSD: patch-as,v 1.2 2005/03/15 15:58:52 wennmach Exp $
+$NetBSD: patch-as,v 1.3 2005/03/25 17:40:25 wennmach Exp $
 
-Make arla compile on pmax. 
+Make arla compile on pmax.
+Make configure find com_err.h.
+Define LIB_com_err.
 
---- configure.orig	2004-11-15 11:13:02.000000000 -0500
-+++ configure	2004-12-22 20:35:37.000000000 -0500
-@@ -6558,10 +6558,19 @@
+--- 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
@@ -25,3 +36,20 @@ Make arla compile on pmax.
    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-ay b/net/arla/patches/patch-ay
new file mode 100644
index 00000000000..08249b188f5
--- /dev/null
+++ b/net/arla/patches/patch-ay
@@ -0,0 +1,13 @@
+$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-az b/net/arla/patches/patch-az
new file mode 100644
index 00000000000..29681aff859
--- /dev/null
+++ b/net/arla/patches/patch-az
@@ -0,0 +1,23 @@
+$NetBSD: patch-az,v 1.3 2005/03/25 17:40:25 wennmach Exp $
+
+Provide prototypes for the test_... functions.
+
+--- lib/roken/snprintf-test.h.orig	2005-03-22 10:03:03.000000000 +0100
++++ lib/roken/snprintf-test.h	2005-03-22 10:09:16.000000000 +0100
+@@ -49,4 +49,16 @@
+ #define vasnprintf test_vasnprintf
+ #define vsnprintf test_vsnprintf
+ 
++/* provide prototypes for the test_... functions */
++
++#include <sys/types.h>
++#include <stdarg.h>
++
++int test_snprintf(char *, size_t, const char *, ...);
++int test_asprintf(char **, const char *, ...);
++int test_asnprintf(char **, size_t, const char *, ...);
++int test_vasprintf(char **, const char *, va_list);
++int test_vasnprintf(char **, size_t, const char *, va_list);
++int test_vsnprintf(char *, size_t, const char *, va_list);
++
+ #endif /* __SNPRINTF_TEST_H__ */
diff --git a/net/arla/patches/patch-ba b/net/arla/patches/patch-ba
new file mode 100644
index 00000000000..8e07634949e
--- /dev/null
+++ b/net/arla/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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,7 +140,7 @@
+ 	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), "", 
+ 	    "$Id: bits.c,v 1.7 2002/02/07 17:59:15 lha Exp $");
+     fprintf(f, "#ifndef %s\n", hb);
+     fprintf(f, "#define %s\n", hb);
diff --git a/net/arla/patches/patch-bb b/net/arla/patches/patch-bb
new file mode 100644
index 00000000000..bc07c2129cb
--- /dev/null
+++ b/net/arla/patches/patch-bb
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 00000000000..5aa330d36ba
--- /dev/null
+++ b/net/arla/patches/patch-bc
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 00000000000..32fd1a80f65
--- /dev/null
+++ b/net/arla/patches/patch-bd
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..0a3b83072f4
--- /dev/null
+++ b/net/arla/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.4 2005/03/25 17:40:25 wennmach Exp $
+
+Shut up gcc.
+
+--- 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, 0, "[sysname]", 0);
+     exit(1);
+     
+ }
diff --git a/net/arla/patches/patch-bf b/net/arla/patches/patch-bf
new file mode 100644
index 00000000000..8338262011c
--- /dev/null
+++ b/net/arla/patches/patch-bf
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..f24a86f2c26
--- /dev/null
+++ b/net/arla/patches/patch-bg
@@ -0,0 +1,15 @@
+$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
new file mode 100644
index 00000000000..51a1fc67a27
--- /dev/null
+++ b/net/arla/patches/patch-bh
@@ -0,0 +1,50 @@
+$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-bi b/net/arla/patches/patch-bi
new file mode 100644
index 00000000000..10334307459
--- /dev/null
+++ b/net/arla/patches/patch-bi
@@ -0,0 +1,21 @@
+$NetBSD: patch-bi,v 1.4 2005/03/25 17:40:25 wennmach Exp $
+
+Shut up gcc on NetBSD/amd64.
+
+--- appl/fs/fs_statistics.c.orig	2005-03-23 10:06:17.000000000 +0100
++++ appl/fs/fs_statistics.c	2005-03-23 10:07:04.000000000 +0100
+@@ -104,10 +104,10 @@
+ 	printsizeslot(sizeslot);
+ 
+     printf("%6lld %8lld %8lld %8lld %8lld\n",
+-	   count, items_total,
+-	   total_time,
+-	   total_time/count,
+-	   items_total*1000LL/total_time);
++	   (long long)count, (long long)items_total,
++	   (long long)total_time,
++	   (long long)(total_time/count),
++	   (long long)(items_total*1000LL/total_time));
+ }
+ 
+ struct stat_type {
diff --git a/net/arla/patches/patch-bj b/net/arla/patches/patch-bj
new file mode 100644
index 00000000000..25498c69a58
--- /dev/null
+++ b/net/arla/patches/patch-bj
@@ -0,0 +1,25 @@
+$NetBSD: patch-bj,v 1.4 2005/03/25 17:40:25 wennmach Exp $
+
+Fix gcc warnings on NetBSD-2.0/amd64.
+NB: it seems 'size' is used inconsistently.
+
+--- 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
+@@ -79,7 +79,7 @@
+     int bufsz = 512;
+     int i, skip = 0, rec = 0;
+     struct posix_header *p;
+-    uint64_t size;
++    uint64_t size = 0;
+     unsigned long cksum, hcksum;
+     int verbose = 0;
+ 
+@@ -118,7 +118,7 @@
+ 	    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);
+ 	}
+ 
+ 	hcksum = estrntoll(p->chksum, 8, 8);
diff --git a/net/arla/patches/patch-bk b/net/arla/patches/patch-bk
new file mode 100644
index 00000000000..32049de2192
--- /dev/null
+++ b/net/arla/patches/patch-bk
@@ -0,0 +1,21 @@
+$NetBSD: patch-bk,v 1.4 2005/03/25 17:40:25 wennmach Exp $
+
+Fix LP64 issue.
+Fix gcc warning.
+
+--- 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
+@@ -98,11 +98,11 @@
+     if (isdigit(volume[0])) {
+ 	char *end;
+ 	vol_id = strtoul(volume, &end, 10);
+-	if (vol_id != ULONG_MAX && *end == '\0')
++	if (vol_id != UINT_MAX && *end == '\0')
+ 	    have_volid = 1;
+     }
+     if (!have_volid) {
+-	int type = volname_canonicalize(volume);
++	int type = volname_canonicalize((char *)volume);
+ 	vol_id = the_vlentry.volumeId[type];
+     }
+