18 files changed, 1129 insertions, 111 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 3be83388df96..4c48c73ba20f 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -21,14 +21,15 @@ LICENSE_NAME=	IBM Public License Version 1.0
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-AFS_DISTVERSION=1.6.7
+AFS_DISTVERSION=	1.6.9
 DBVERSION=	2013-01-28
 
-USES=		kmod
+USES=		kmod tar:bzip2
 USE_LDCONFIG=	yes
-PATCH_STRIP=	-p1
-USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	_XCFLAGS="${CFLAGS} -fPIC" \
+		_PAM_CFLAGS="${CFLAGS} -fPIC" \
+		_MT_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--localstatedir=/var \
 		--mandir=${MANPREFIX}/man \
@@ -40,11 +41,14 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--includedir=${PREFIX}/include/openafs \
 		${CONFIGURE_TARGET}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION}
+MAKE_ENV=	COMPILER_TYPE=${COMPILER_TYPE}
 USE_RC_SUBR=	afsd afsserver
 
 CONFLICTS=	coda-server-6.[0-9]* heimdal-[0-9]*
 ONLY_FOR_ARCHS=	i386 amd64
 
+MAKE_JOBS_UNSAFE=	yes
+
 AFSMNTDIR?=	/afs
 AFSSTATEDIR?=	/var/${PORTNAME}
 AFSCACHEDIR?=	${AFSSTATEDIR}/cache
@@ -67,6 +71,10 @@ FUSE_CONFIGURE_OFF=	--disable-fuse-client
 
 .include <bsd.port.pre.mk>
 
+.if ${COMPILER_TYPE} == clang
+CFLAGS+=	-mstackrealign
+.endif
+
 KERNCONF?=	GENERIC
 KERNCONFDIR?=	${SRC_BASE}/sys/${ARCH}/conf
 
@@ -89,12 +97,6 @@ post-extract:
 	cd ${KERNCONFDIR} && \
 	    /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null
 
-post-patch:
-.if ${COMPILER_TYPE} == clang
-	${REINPLACE_CMD} -e 's/XCFLAGS="-O2 -pipe -fPIC"/XCFLAGS="${CFLAGS} -fPIC -mstackrealign"/' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's/-mno-align-long-strings//' ${WRKSRC}/src/libafs/MakefileProto.FBSD.in
-.endif
-
 create-sample-files:
 	@${ECHO_CMD} openafs.org > ${WRKDIR}/ThisCell
 	@${ECHO_CMD} "${AFSMNTDIR}:${AFSCACHEDIR}:150000" > ${WRKDIR}/cacheinfo
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index 6bbd85b331f4..07246320490a 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openafs-1.6.7-src.tar.bz2) = 6b6745e365487c80084913a039b9d72f0ef9da4e7543c8c6f2318416bf8cb0e6
-SIZE (openafs-1.6.7-src.tar.bz2) = 14581985
-SHA256 (openafs-1.6.7-doc.tar.bz2) = 1db1e7cbebb2b276a5ea48d93b25f6dc703dfcea366e8f775cecad90b2c11e70
-SIZE (openafs-1.6.7-doc.tar.bz2) = 3520373
+SHA256 (openafs-1.6.9-src.tar.bz2) = 7b2ea3a1f77a5cc38f311963c7db0b6d89c0d69796453d72051c846bffe14fc7
+SIZE (openafs-1.6.9-src.tar.bz2) = 14598147
+SHA256 (openafs-1.6.9-doc.tar.bz2) = c1a4d325ca0403e8a909578df06ef3a9606015eaaa35a06520d495218b111e43
+SIZE (openafs-1.6.9-doc.tar.bz2) = 3521690
 SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17
 SIZE (CellServDB.2013-01-28) = 36787
diff --git a/net/openafs/files/patch-Makefile.in b/net/openafs/files/patch-Makefile.in
index 9f09e70d3f6b..f4df64ce4ccd 100644
--- a/net/openafs/files/patch-Makefile.in
+++ b/net/openafs/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- openafs-1.6.1/Makefile.in.orig	2012-03-27 08:03:34.000000000 +0900
-+++ openafs-1.6.1/Makefile.in	2012-06-24 06:37:47.000000000 +0900
+--- Makefile.in.orig	2012-03-27 08:03:34.000000000 +0900
++++ Makefile.in	2012-06-24 06:37:47.000000000 +0900
 @@ -338,6 +338,7 @@
 
  venus: cmd comerr volser ptserver libafscp
diff --git a/net/openafs/files/patch-acinclude.m4 b/net/openafs/files/patch-acinclude.m4
deleted file mode 100644
index e3e64cb424db..000000000000
--- a/net/openafs/files/patch-acinclude.m4
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./acinclude.m4.orig	2012-03-26 19:03:34.000000000 -0400
-+++ ./acinclude.m4	2012-12-30 21:23:20.000000000 -0500
-@@ -158,6 +158,14 @@
-     , 
-     [enable_transarc_paths="no"])
- 
-+dnl Deprecated crypto
-+AC_ARG_ENABLE([kauth],
-+    [AS_HELP_STRING([--disable-kauth],
-+        [do not install the deprecated kauth server and utilities (defaults to
-+         enabled)])],
-+    ,
-+    [enable_kauth="yes"])
-+
- dnl Optimization and debugging flags.
- AC_ARG_ENABLE([strip-binaries],
-     [AS_HELP_STRING([--disable-strip-binaries],
-@@ -1315,6 +1323,13 @@
- fi
- AC_SUBST(BUILD_LOGIN)
- 
-+if test "$enable_kauth" = yes; then
-+	INSTALL_KAUTH="yes"
-+else
-+	INSTALL_KAUTH="no"
-+fi
-+AC_SUBST(INSTALL_KAUTH)
-+
- AC_CHECK_FUNCS([ \
-	daemon \
-	flock \
diff --git a/net/openafs/files/patch-configure b/net/openafs/files/patch-configure
new file mode 100644
index 000000000000..e67f663a1e2e
--- /dev/null
+++ b/net/openafs/files/patch-configure
@@ -0,0 +1,41 @@
+--- configure.orig	2014-05-14 23:21:46.000000000 +0900
++++ configure	2014-05-22 08:44:37.000000000 +0900
+@@ -30264,13 +30264,15 @@
+ 		;;
+ 
+ 	i386_fbsd_*)
++		KERN_OPTMZ=
++		LWP_OPTMZ=
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+-		MT_LIBS="-pthread"
+-		PAM_OPTMZ=-O2
+-		PAM_CFLAGS="-pipe -fPIC"
++		MT_LIBS="${_MT_LIBS:--pthread}"
++		PAM_OPTMZ=
++		PAM_CFLAGS="${_PAM_CFLAGS:--pipe -fPIC}"
+ 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+ 		SHLIB_LINKER="${MT_CC} -shared"
+-		XCFLAGS="-pipe"
++		XCFLAGS="${_XCFLAGS:--pipe}"
+ 		;;
+ 
+ 	i386_dfbsd_*)
+@@ -30284,12 +30286,15 @@
+ 		;;
+ 
+ 	amd64_fbsd_*)
++		KERN_OPTMZ=
++		LWP_OPTMZ=
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+-		MT_LIBS="-pthread"
+-		PAM_CFLAGS="-O2 -pipe -fPIC"
++		MT_LIBS="${_MT_LIBS:--pthread}"
++		PAM_OPTMZ=
++		PAM_CFLAGS="${_PAM_CFLAGS:--O2 -pipe -fPIC}"
+ 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+ 		SHLIB_LINKER="${MT_CC} -shared"
+-		XCFLAGS="-O2 -pipe -fPIC"
++		XCFLAGS="${_XCFLAGS:--O2 -pipe -fPIC}"
+ 		;;
+ 
+ 	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
diff --git a/net/openafs/files/patch-doc-man-pages-Makefile.in b/net/openafs/files/patch-doc-man-pages-Makefile.in
new file mode 100644
index 000000000000..64fcccea5339
--- /dev/null
+++ b/net/openafs/files/patch-doc-man-pages-Makefile.in
@@ -0,0 +1,42 @@
+--- doc/man-pages/Makefile.in.orig	2014-06-12 17:30:48.000000000 +0900
++++ doc/man-pages/Makefile.in	2014-06-13 13:06:08.000000000 +0900
+@@ -2,6 +2,7 @@
+ 
+ srcdir=@srcdir@
+ include @TOP_OBJDIR@/src/config/Makefile.config
++include @TOP_OBJDIR@/src/packaging/FreeBSD/Makefile.man
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -34,16 +35,26 @@
+ 		|| ln -s afsd.8 $(DEST)/man/man8/afsd.fuse.8; \
+ 	fi
+ 
+-install: $(MAN1) $(MAN8)
++install: ${MAN1:S,^,man1/,} ${MAN5:S,^,man5/,} ${MAN8:S,^,man8/,}
+ 	chmod +x install-man
+ 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 \
+ 	    $(DESTDIR)$(mandir)/man8
+-	set -e; for M in man1/*.1 man5/*.5 man8/*.8 ; do \
++	set -e; for M in $> ; do \
+ 	    ./install-man $$M $(DESTDIR)$(mandir)/$$M ; \
+ 	done
+-	set -e; for M in ${LINKEDPAGES}; do \
+-	    test -h $(DESTDIR)$(mandir)/man1/$$M.krb.1 \
+-		|| ln -s $$M.1 $(DESTDIR)$(mandir)/man1/$$M.krb.1 ; \
++	set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
++	while : ; do \
++		case $$# in \
++		0)	break ;; \
++		[123])	echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
++		esac; \
++		name=$$1; shift; sect=$$1; shift; \
++		l=$$name; \
++		name=$$1; shift; sect=$$1; shift; \
++		t=$(DESTDIR)$(mandir)/man$${sect}/$$name; \
++		echo $$t -\> $$l; \
++		rm -f $$t; \
++		ln -s $$l $$t; \
+ 	done
+ 	test -h $(DESTDIR)/$(mandir)/man8/dafssync-debug.8 \
+ 	    || ln -s fssync-debug.8 $(DESTDIR)/$(mandir)/man8/dafssync-debug.8
diff --git a/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in b/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in
new file mode 100644
index 000000000000..62722865ebbb
--- /dev/null
+++ b/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in
@@ -0,0 +1,17 @@
+--- src/libafs/MakefileProto.FBSD.in.orig	2014-05-14 23:09:14.000000000 +0900
++++ src/libafs/MakefileProto.FBSD.in	2014-05-22 08:00:36.000000000 +0900
+@@ -41,10 +41,12 @@
+ <all>
+ 
+ KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
+-	-elf \
+ 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
+-	-mno-align-long-strings -fno-common -ffreestanding \
++	-fno-common -ffreestanding \
+ 	-I${KBLD} -include opt_global.h -fno-strict-aliasing
++.if ${COMPILER_TYPE} != clang
++KDEFS+=	-elf -mno-align-long-strings
++.endif
+ 
+ DBUG = -O2
+ #DBUG = -O -g
diff --git a/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
new file mode 100644
index 000000000000..e7668d5d624f
--- /dev/null
+++ b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
@@ -0,0 +1,76 @@
+--- src/packaging/FreeBSD/Makefile.man.orig	2014-06-12 17:30:48.000000000 +0900
++++ src/packaging/FreeBSD/Makefile.man	2014-06-13 11:49:29.000000000 +0900
+@@ -7,6 +7,7 @@
+ MAN1+=	dlog.1
+ MAN1+=	fs.1
+ MAN1+=	fs_apropos.1
++MAN1+=	fs_bypassthreshold.1
+ MAN1+=	fs_checkservers.1
+ MAN1+=	fs_checkvolumes.1
+ MAN1+=	fs_chgrp.1
+@@ -61,11 +62,7 @@
+ MAN1+=	fs_whereis.1
+ MAN1+=	fs_whichcell.1
+ MAN1+=	fs_wscell.1
+-MAN1+=	klog.1
+-MLINKS+=	klog.1 klog.krb.1
+ MAN1+=	klog.krb5.1
+-MAN1+=	knfs.1
+-MAN1+=	kpasswd.1
+ MAN1+=	livesys.1
+ MAN1+=	pagsh.1
+ MLINKS+=	pagsh.1 pagsh.krb.1
+@@ -177,8 +174,6 @@
+ MAN5+=	butc_logs.5
+ MAN5+=	cacheinfo.5
+ MAN5+=	fms.log.5
+-MAN5+=	kaserver.DB0.5
+-MAN5+=	kaserverauxdb.5
+ MAN5+=	krb.conf.5
+ MAN5+=	prdb.DB0.5
+ MAN5+=	salvage.lock.5
+@@ -188,6 +183,7 @@
+ MAN5+=	uss_bulk.5
+ MAN5+=	vldb.DB0.5
+ MAN8+=	afsd.8
++MAN8+=	aklog_dynamic_auth.8
+ MAN8+=	asetkey.8
+ MAN8+=	backup.8
+ MAN8+=	backup_adddump.8
+@@ -262,7 +258,6 @@
+ MAN8+=	davolserver.8
+ MAN8+=	dasalvager.8
+ MAN8+=	dafileserver.8
+-MAN8+=	dafssync-debug.8
+ MAN8+=	fileserver.8
+ MAN8+=	fms.8
+ MAN8+=	fssync-debug_volop.8
+@@ -295,28 +290,6 @@
+ MAN8+=	fstrace_lsset.8
+ MAN8+=	fstrace_setlog.8
+ MAN8+=	fstrace_setset.8
+-MAN8+=	ka-forwarder.8
+-MAN8+=	kadb_check.8
+-MAN8+=	kas.8
+-MAN8+=	kas_apropos.8
+-MAN8+=	kas_create.8
+-MAN8+=	kas_delete.8
+-MAN8+=	kas_examine.8
+-MAN8+=	kas_forgetticket.8
+-MAN8+=	kas_help.8
+-MAN8+=	kas_interactive.8
+-MAN8+=	kas_list.8
+-MAN8+=	kas_listtickets.8
+-MAN8+=	kas_noauthentication.8
+-MAN8+=	kas_quit.8
+-MAN8+=	kas_setfields.8
+-MAN8+=	kas_setpassword.8
+-MAN8+=	kas_statistics.8
+-MAN8+=	kdb.8
+-MAN8+=	kas_stringtokey.8
+-MAN8+=	kas_unlock.8
+-MAN8+=	kaserver.8
+-MAN8+=	kpwvalid.8
+ MAN8+=	prdb_check.8
+ MAN8+=	pt_util.8
+ MAN8+=	ptserver.8
diff --git a/net/openafs/files/patch-src-rx-rx_kernel.h b/net/openafs/files/patch-src-rx-rx_kernel.h
new file mode 100644
index 000000000000..44aa79e59f83
--- /dev/null
+++ b/net/openafs/files/patch-src-rx-rx_kernel.h
@@ -0,0 +1,16 @@
+--- src/rx/rx_kernel.h.orig	2014-09-11 17:20:18.000000000 +0900
++++ src/rx/rx_kernel.h	2014-09-11 17:23:52.000000000 +0900
+@@ -59,7 +59,13 @@
+ #else
+ #define rx_ifaddr_withnet(x) ifa_ifwithnet(x)
+ #endif
++#if defined(AFS_FBSD81_ENV)
++#if defined(if_metric)
+ #define rx_ifnet_metric(x) (x?(x)->if_data.ifi_metric:0)
++#else
++#define rx_ifnet_metric(x) (x?(x)->if_metric:0)
++#endif
++#endif
+ #define rx_ifaddr_ifnet(x) (x?(x)->ifa_ifp:0)
+ #define rx_ifaddr_address_family(x) (x)->ifa_addr->sa_family
+ #define rx_ifaddr_address(x, y, z) memcpy(y, (x)->ifa_addr, z)
diff --git a/net/openafs/files/patch-src__afs__sysincludes.h b/net/openafs/files/patch-src__afs__sysincludes.h
deleted file mode 100644
index 0d2b234dc438..000000000000
--- a/net/openafs/files/patch-src__afs__sysincludes.h
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
-index 3e3a172..10343b8 100644
---- a/src/afs/sysincludes.h
-+++ b/src/afs/sysincludes.h
-@@ -202,6 +202,12 @@ typedef unsigned short etap_event_t;
- # include "h/systm.h"
- # include "h/time.h"
- 
-+# ifdef AFS_FBSD_ENV
-+#  include <sys/socket.h>
-+#  include <net/if.h>
-+#  include <net/if_var.h>
-+# endif
-+
- # ifdef	AFS_AIX_ENV
- #  ifdef AFS_AIX41_ENV
- #   include "sys/statfs.h"
diff --git a/net/openafs/files/patch-src__config__afs_sysnames.h b/net/openafs/files/patch-src__config__afs_sysnames.h
new file mode 100644
index 000000000000..8f108696db0d
--- /dev/null
+++ b/net/openafs/files/patch-src__config__afs_sysnames.h
@@ -0,0 +1,24 @@
+diff --git src/config/afs_sysnames.h src/config/afs_sysnames.h
+index 62b18f3..8687a6c 100644
+--- src/config/afs_sysnames.h
++++ src/config/afs_sysnames.h
+@@ -213,7 +213,9 @@
+ #define SYS_NAME_ID_i386_fbsd_90        2120
+ #define SYS_NAME_ID_i386_fbsd_91        2122
+ #define SYS_NAME_ID_i386_fbsd_92        2124
++#define SYS_NAME_ID_i386_fbsd_93        2126
+ #define SYS_NAME_ID_i386_fbsd_100      2130
++#define SYS_NAME_ID_i386_fbsd_101      2131
+ #define SYS_NAME_ID_i386_fbsd_110      2140
+ 
+ #define SYS_NAME_ID_ia64_linux2		2200
+@@ -316,7 +318,9 @@
+ #define SYS_NAME_ID_amd64_fbsd_90       3020
+ #define SYS_NAME_ID_amd64_fbsd_91       3022
+ #define SYS_NAME_ID_amd64_fbsd_92       3023
++#define SYS_NAME_ID_amd64_fbsd_93       3024
+ #define SYS_NAME_ID_amd64_fbsd_100     3030
++#define SYS_NAME_ID_amd64_fbsd_101     3031
+ #define SYS_NAME_ID_amd64_fbsd_110     3040
+ 
+ #define SYS_NAME_ID_amd64_w2k           3400
diff --git a/net/openafs/files/patch-src__config__param.amd64_fbsd_101.h b/net/openafs/files/patch-src__config__param.amd64_fbsd_101.h
new file mode 100644
index 000000000000..6638714ec418
--- /dev/null
+++ b/net/openafs/files/patch-src__config__param.amd64_fbsd_101.h
@@ -0,0 +1,224 @@
+diff --git src/config/param.amd64_fbsd_101.h src/config/param.amd64_fbsd_101.h
+new file mode 100644
+index 0000000..73eda56
+--- /dev/null
++++ src/config/param.amd64_fbsd_101.h
+@@ -0,0 +1,218 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++#define SYS_NAME	"amd64_fbsd_101"
++#define SYS_NAME_ID	SYS_NAME_ID_amd64_fbsd_101
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV 1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BITPOINTER_ENV 1
++#define AFS_64BITUSERPOINTER_ENV	1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD100_ENV 1
++#define AFS_FBSD101_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD100_ENV 1
++#define AFS_X86_FBSD101_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#define FTRUNC O_TRUNC
++
++#define IUPD 0x0010
++#define IACC 0x0020
++#define ICHG 0x0040
++#define IMOD 0x0080
++
++#define IN_LOCK(ip)     lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
++                                NULL, curproc)
++#define IN_UNLOCK(ip)   lockmgr(&ip->i_lock, LK_RELEASE, \
++                                NULL, curproc)
++
++#include <afs/afs_sysnames.h>
++
++#define AFS_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_ENV 1
++#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
++#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
++
++/* Extra kernel definitions (from kdefs file) */
++#ifdef _KERNEL
++#define AFS_GLOBAL_SUNLOCK        1
++#define	AFS_VFS34	1	/* What is VFS34??? */
++#define	AFS_SHORTGID	0	/* are group id's short? */
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	UIO_SYSSPACE
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	CLBYTES
++#define	osi_GetTime(x)	microtime(x)
++#define AFS_KALLOC(x)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#define	v_count		v_usecount
++#define v_vfsp		v_mount
++#define vfs_bsize	mnt_stat.f_bsize
++#define vfs_fsid	mnt_stat.f_fsid
++#define va_nodeid	va_fileid
++#define vfs_vnodecovered mnt_vnodecovered
++#define direct		dirent
++#define vnode_t		struct vnode
++
++#ifndef MUTEX_DEFAULT
++#define MUTEX_DEFAULT   0
++#endif /* MUTEX_DEFAULT */
++
++#ifndef SSYS
++#define SSYS            0x00002
++#endif /* SSYS */
++
++#define p_rcred         p_ucred
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++enum vcexcl { NONEXCL, EXCL };
++
++#ifdef KERNEL
++#ifndef MIN
++#define MIN(A,B) ((A) < (B) ? (A) : (B))
++#endif
++#ifndef MAX
++#define MAX(A,B) ((A) > (B) ? (A) : (B))
++#endif
++#endif /* KERNEL */
++
++#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD100_ENV	1
++#define AFS_USR_FBSD101_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BITPOINTER_ENV  1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_fmode	uio_fmode
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	1
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	MCLBYTES
++#define	AFS_MINCHANGE	2
++#define	VATTR_NULL	usr_vattr_null
++
++#define AFS_DIRENT
++#ifndef CMSERVERPREF
++#define CMSERVERPREF
++#endif
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src__config__param.amd64_fbsd_93.h b/net/openafs/files/patch-src__config__param.amd64_fbsd_93.h
new file mode 100644
index 000000000000..8720d4fc5a2f
--- /dev/null
+++ b/net/openafs/files/patch-src__config__param.amd64_fbsd_93.h
@@ -0,0 +1,224 @@
+diff --git src/config/param.amd64_fbsd_93.h src/config/param.amd64_fbsd_93.h
+new file mode 100644
+index 0000000..18ebf30
+--- /dev/null
++++ src/config/param.amd64_fbsd_93.h
+@@ -0,0 +1,218 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++#define SYS_NAME	"amd64_fbsd_93"
++#define SYS_NAME_ID	SYS_NAME_ID_amd64_fbsd_93
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV     1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BITPOINTER_ENV 1
++#define AFS_64BITUSERPOINTER_ENV	1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD92_ENV 1
++#define AFS_FBSD93_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD92_ENV 1
++#define AFS_X86_FBSD93_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#define FTRUNC O_TRUNC
++
++#define IUPD 0x0010
++#define IACC 0x0020
++#define ICHG 0x0040
++#define IMOD 0x0080
++
++#define IN_LOCK(ip)     lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
++				NULL, curproc)
++#define IN_UNLOCK(ip)   lockmgr(&ip->i_lock, LK_RELEASE, \
++				NULL, curproc)
++
++#include <afs/afs_sysnames.h>
++
++#define AFS_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_ENV 1
++#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
++#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
++
++/* Extra kernel definitions (from kdefs file) */
++#ifdef _KERNEL
++#define AFS_GLOBAL_SUNLOCK        1
++#define	AFS_VFS34	1	/* What is VFS34??? */
++#define	AFS_SHORTGID	0	/* are group id's short? */
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	UIO_SYSSPACE
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	CLBYTES
++#define	osi_GetTime(x)	microtime(x)
++#define AFS_KALLOC(x)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#define	v_count		v_usecount
++#define v_vfsp		v_mount
++#define vfs_bsize	mnt_stat.f_bsize
++#define vfs_fsid	mnt_stat.f_fsid
++#define va_nodeid	va_fileid
++#define vfs_vnodecovered mnt_vnodecovered
++#define direct		dirent
++#define vnode_t		struct vnode
++
++#ifndef MUTEX_DEFAULT
++#define MUTEX_DEFAULT   0
++#endif /* MUTEX_DEFAULT */
++
++#ifndef SSYS
++#define SSYS            0x00002
++#endif /* SSYS */
++
++#define p_rcred         p_ucred
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++enum vcexcl { NONEXCL, EXCL };
++
++#ifdef KERNEL
++#ifndef MIN
++#define MIN(A,B) ((A) < (B) ? (A) : (B))
++#endif
++#ifndef MAX
++#define MAX(A,B) ((A) > (B) ? (A) : (B))
++#endif
++#endif /* KERNEL */
++
++#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD92_ENV	1
++#define AFS_USR_FBSD93_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BITPOINTER_ENV  1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_fmode	uio_fmode
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	1
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	MCLBYTES
++#define	AFS_MINCHANGE	2
++#define	VATTR_NULL	usr_vattr_null
++
++#define AFS_DIRENT
++#ifndef CMSERVERPREF
++#define CMSERVERPREF
++#endif
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src__config__param.i386_fbsd_101.h b/net/openafs/files/patch-src__config__param.i386_fbsd_101.h
new file mode 100644
index 000000000000..491fad62b559
--- /dev/null
+++ b/net/openafs/files/patch-src__config__param.i386_fbsd_101.h
@@ -0,0 +1,222 @@
+diff --git src/config/param.i386_fbsd_101.h src/config/param.i386_fbsd_101.h
+new file mode 100644
+index 0000000..dd89daf
+--- /dev/null
++++ src/config/param.i386_fbsd_101.h
+@@ -0,0 +1,216 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++#define SYS_NAME	"i386_fbsd_101"
++#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_101
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++#define AFS_FAKEOPEN_ENV    1   /* call afs_FakeOpen as if !AFS_VM_RDWR */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV 1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD100_ENV 1
++#define AFS_FBSD101_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD100_ENV 1
++#define AFS_X86_FBSD101_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#define FTRUNC O_TRUNC
++
++#define IUPD 0x0010
++#define IACC 0x0020
++#define ICHG 0x0040
++#define IMOD 0x0080
++
++#define IN_LOCK(ip)     lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
++                                NULL, curproc)
++#define IN_UNLOCK(ip)   lockmgr(&ip->i_lock, LK_RELEASE, \
++                                NULL, curproc)
++
++#include <afs/afs_sysnames.h>
++
++#define AFS_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_ENV 1
++#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
++#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
++
++/* Extra kernel definitions (from kdefs file) */
++#ifdef _KERNEL
++#define AFS_GLOBAL_SUNLOCK        1
++#define	AFS_VFS34	1	/* What is VFS34??? */
++#define	AFS_SHORTGID	0	/* are group id's short? */
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	UIO_SYSSPACE
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	CLBYTES
++#define	osi_GetTime(x)	microtime(x)
++#define AFS_KALLOC(x)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#define	v_count		v_usecount
++#define v_vfsp		v_mount
++#define vfs_bsize	mnt_stat.f_bsize
++#define vfs_fsid	mnt_stat.f_fsid
++#define va_nodeid	va_fileid
++#define vfs_vnodecovered mnt_vnodecovered
++#define direct		dirent
++#define vnode_t		struct vnode
++
++#ifndef MUTEX_DEFAULT
++#define MUTEX_DEFAULT   0
++#endif /* MUTEX_DEFAULT */
++
++#ifndef SSYS
++#define SSYS            0x00002
++#endif /* SSYS */
++
++#define p_rcred         p_ucred
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++enum vcexcl { NONEXCL, EXCL };
++
++#ifdef KERNEL
++#ifndef MIN
++#define MIN(A,B) ((A) < (B) ? (A) : (B))
++#endif
++#ifndef MAX
++#define MAX(A,B) ((A) > (B) ? (A) : (B))
++#endif
++#endif /* KERNEL */
++
++#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD100_ENV	1
++#define AFS_USR_FBSD101_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_fmode	uio_fmode
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	1
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	MCLBYTES
++#define	AFS_MINCHANGE	2
++#define	VATTR_NULL	usr_vattr_null
++
++#define AFS_DIRENT
++#ifndef CMSERVERPREF
++#define CMSERVERPREF
++#endif
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src__config__param.i386_fbsd_93.h b/net/openafs/files/patch-src__config__param.i386_fbsd_93.h
new file mode 100644
index 000000000000..ef057aa1870a
--- /dev/null
+++ b/net/openafs/files/patch-src__config__param.i386_fbsd_93.h
@@ -0,0 +1,222 @@
+diff --git src/config/param.i386_fbsd_93.h src/config/param.i386_fbsd_93.h
+new file mode 100644
+index 0000000..db67f92
+--- /dev/null
++++ src/config/param.i386_fbsd_93.h
+@@ -0,0 +1,216 @@
++#ifndef	AFS_PARAM_H
++#define	AFS_PARAM_H
++
++/* Machine / Operating system information */
++#define SYS_NAME	"i386_fbsd_93"
++#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_93
++
++#define AFSLITTLE_ENDIAN    1
++#define AFS_HAVE_FFS        1	/* Use system's ffs. */
++#define AFS_HAVE_STATVFS    1	/* System doesn't support statvfs */
++#define AFS_VM_RDWR_ENV	    1	/* read/write implemented via VM */
++#define AFS_FAKEOPEN_ENV    1   /* call afs_FakeOpen as if !AFS_VM_RDWR */
++
++
++#ifndef UKERNEL
++/* This section for kernel libafs compiles only */
++
++#ifndef IGNORE_STDS_H
++#include <sys/param.h>
++#endif
++
++#define AFS_XBSD_ENV 1		/* {Free,Open,Net}BSD */
++#define AFS_X86_XBSD_ENV 1
++
++#define AFS_NAMEI_ENV     1	/* User space interface to file system */
++#define AFS_64BIT_ENV     1
++#define AFS_64BIT_CLIENT 1
++#define AFS_64BIT_IOPS_ENV 1	/* Needed for NAMEI */
++#define AFS_FBSD_ENV 1
++#define AFS_FBSD50_ENV 1
++#define AFS_FBSD51_ENV 1
++#define AFS_FBSD52_ENV 1
++#define AFS_FBSD53_ENV 1
++#define AFS_FBSD60_ENV 1
++#define AFS_FBSD61_ENV 1
++#define AFS_FBSD62_ENV 1
++#define AFS_FBSD70_ENV 1
++#define AFS_FBSD71_ENV 1
++#define AFS_FBSD80_ENV 1
++#define AFS_FBSD81_ENV 1
++#define AFS_FBSD90_ENV 1
++#define AFS_FBSD91_ENV 1
++#define AFS_FBSD92_ENV 1
++#define	AFS_FBSD93_ENV 1
++#define AFS_X86_FBSD_ENV 1
++#define AFS_X86_FBSD50_ENV 1
++#define AFS_X86_FBSD60_ENV 1 /* added at 70--ie, some changes should port <-- */
++#define AFS_X86_FBSD62_ENV 1
++#define AFS_X86_FBSD70_ENV 1
++#define AFS_X86_FBSD71_ENV 1
++#define AFS_X86_FBSD80_ENV 1
++#define AFS_X86_FBSD81_ENV 1
++#define AFS_X86_FBSD90_ENV 1
++#define AFS_X86_FBSD91_ENV 1
++#define AFS_X86_FBSD92_ENV 1
++#define	AFS_X86_FBSD93_ENV 1
++#define AFS_X86_ENV 1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++#define FTRUNC O_TRUNC
++
++#define IUPD 0x0010
++#define IACC 0x0020
++#define ICHG 0x0040
++#define IMOD 0x0080
++
++#define IN_LOCK(ip)     lockmgr(&ip->i_lock, LK_EXCLUSIVE, \
++				NULL, curproc)
++#define IN_UNLOCK(ip)   lockmgr(&ip->i_lock, LK_RELEASE, \
++				NULL, curproc)
++
++#include <afs/afs_sysnames.h>
++
++#define AFS_VFS_ENV	1
++#define AFS_VFSINCL_ENV 1
++#define AFS_GREEDY43_ENV	1
++#define AFS_ENV  	1
++
++#define AFS_SYSCALL	339
++#define AFS_MOUNT_AFS	"afs"
++
++#ifndef MOUNT_UFS
++#define MOUNT_UFS "ufs"
++#endif
++
++#ifndef	MOUNT_AFS
++#define	MOUNT_AFS AFS_MOUNT_AFS
++#endif
++
++#define RXK_LISTENER_ENV 1
++#define AFS_GCPAGS	        0	/* if nonzero, garbage collect PAGs */
++#define AFS_USE_GETTIMEOFDAY    1	/* use gettimeofday to implement rx clock */
++
++/* Extra kernel definitions (from kdefs file) */
++#ifdef _KERNEL
++#define AFS_GLOBAL_SUNLOCK        1
++#define	AFS_VFS34	1	/* What is VFS34??? */
++#define	AFS_SHORTGID	0	/* are group id's short? */
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	UIO_SYSSPACE
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	CLBYTES
++#define	osi_GetTime(x)	microtime(x)
++#define AFS_KALLOC(x)   osi_fbsd_alloc((x), 1)
++#undef	AFS_KALLOC_NOSLEEP
++#define	AFS_KALLOC_NOSLEEP(x) osi_fbsd_alloc((x), 0)
++#define AFS_KFREE(x,y)  osi_fbsd_free((x))
++#define	v_count		v_usecount
++#define v_vfsp		v_mount
++#define vfs_bsize	mnt_stat.f_bsize
++#define vfs_fsid	mnt_stat.f_fsid
++#define va_nodeid	va_fileid
++#define vfs_vnodecovered mnt_vnodecovered
++#define direct		dirent
++#define vnode_t		struct vnode
++
++#ifndef MUTEX_DEFAULT
++#define MUTEX_DEFAULT   0
++#endif /* MUTEX_DEFAULT */
++
++#ifndef SSYS
++#define SSYS            0x00002
++#endif /* SSYS */
++
++#define p_rcred         p_ucred
++
++#if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__)
++enum vcexcl { NONEXCL, EXCL };
++
++#ifdef KERNEL
++#ifndef MIN
++#define MIN(A,B) ((A) < (B) ? (A) : (B))
++#endif
++#ifndef MAX
++#define MAX(A,B) ((A) > (B) ? (A) : (B))
++#endif
++#endif /* KERNEL */
++
++#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
++#endif /* _KERNEL */
++
++#else /* !defined(UKERNEL) */
++
++/* This section for user space compiles only */
++
++#define UKERNEL			1	/* user space kernel */
++#define AFS_ENV			1
++#define AFS_VFSINCL_ENV         1
++#define AFS_USR_FBSD50_ENV	1
++#define AFS_USR_FBSD51_ENV	1
++#define AFS_USR_FBSD52_ENV	1
++#define AFS_USR_FBSD53_ENV	1
++#define AFS_USR_FBSD60_ENV	1
++#define AFS_USR_FBSD61_ENV	1
++#define AFS_USR_FBSD70_ENV	1
++#define AFS_USR_FBSD71_ENV	1
++#define AFS_USR_FBSD80_ENV	1
++#define AFS_USR_FBSD81_ENV	1
++#define AFS_USR_FBSD90_ENV	1
++#define AFS_USR_FBSD91_ENV	1
++#define AFS_USR_FBSD92_ENV	1
++#define	AFS_USR_FBSD93_ENV	1
++#define AFS_USR_FBSD_ENV	1
++#undef  AFS_NONFSTRANS
++#define AFS_NONFSTRANS 1
++
++#define AFS_MOUNT_AFS "afs"	/* The name of the filesystem type. */
++#define AFS_SYSCALL 339
++#define AFS_NAMEI_ENV         1	/* User space interface to file system */
++#define AFS_64BIT_ENV         1
++#define AFS_64BIT_IOPS_ENV    1	/* Needed for NAMEI */
++#define AFS_USERSPACE_IP_ADDR 1
++#define RXK_LISTENER_ENV      1
++#define AFS_GCPAGS	      0	/* if nonzero, garbage collect PAGs */
++
++#include <afs/afs_sysnames.h>
++
++#define	afsio_iov	uio_iov
++#define	afsio_iovcnt	uio_iovcnt
++#define	afsio_offset	uio_offset
++#define	afsio_seg	uio_segflg
++#define	afsio_fmode	uio_fmode
++#define	afsio_resid	uio_resid
++#define	AFS_UIOSYS	1
++#define	AFS_UIOUSER	UIO_USERSPACE
++#define	AFS_CLBYTES	MCLBYTES
++#define	AFS_MINCHANGE	2
++#define	VATTR_NULL	usr_vattr_null
++
++#define AFS_DIRENT
++#ifndef CMSERVERPREF
++#define CMSERVERPREF
++#endif
++
++#include <sys/param.h>
++#include <sys/types.h>
++#include <sys/mount.h>
++#include <sys/fcntl.h>
++#include <sys/uio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <limits.h>
++
++#endif /* !defined(UKERNEL) */
++
++/* general user-space compiles */
++
++#if defined(UKERNEL) || !defined(KERNEL)
++#define STDLIB_HAS_MALLOC_PROTOS 1
++#endif
++
++#endif /* AFS_PARAM_H */
diff --git a/net/openafs/files/patch-src__kauth__Makefile.in b/net/openafs/files/patch-src__kauth__Makefile.in
index afe9bc81dbc8..2de5daef26c5 100644
--- a/net/openafs/files/patch-src__kauth__Makefile.in
+++ b/net/openafs/files/patch-src__kauth__Makefile.in
@@ -1,10 +1,10 @@
---- openafs-1.6.1/src/kauth/Makefile.in.orig
-+++ openafs-1.6.1/src/kauth/Makefile.in
+--- src/kauth/Makefile.in.orig
++++ src/kauth/Makefile.in
 @@ -24,6 +24,8 @@ LT_deps = $(top_builddir)/src/ubik/liboafs_ubik.la \
  	  $(top_builddir)/src/rxkad/liboafs_rxkad.la
  LT_libs =
  
-+INSTALL_KAUTH = @INSTALL_KAUTH@
++INSTALL_KAUTH = no
 +
  INCLS=${TOP_INCDIR}/ubik.h \
               ${TOP_INCDIR}/lwp.h \
diff --git a/net/openafs/files/patch-src__rx__rx_kcommon.h b/net/openafs/files/patch-src__rx__rx_kcommon.h
deleted file mode 100644
index 27c61fb862b1..000000000000
--- a/net/openafs/files/patch-src__rx__rx_kcommon.h
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
-index 9b04123..92752db 100644
---- a/src/rx/rx_kcommon.h
-+++ b/src/rx/rx_kcommon.h
-@@ -124,6 +124,11 @@ typedef unsigned short etap_event_t;
- #include "h/file.h"
- #endif
- #include "net/if.h"
-+# ifdef AFS_FBSD_ENV
-+#  include <sys/socket.h>
-+#  include <net/if.h>
-+#  include <net/if_var.h>
-+# endif
- #endif
- #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN_ENV)
- #include "netinet/in_var.h"
diff --git a/net/openafs/pkg-plist b/net/openafs/pkg-plist
index a7fd7aef9f5a..662252efbd4e 100644
--- a/net/openafs/pkg-plist
+++ b/net/openafs/pkg-plist
@@ -315,11 +315,7 @@ man/man1/fs_uuid.1.gz
 man/man1/fs_whereis.1.gz
 man/man1/fs_whichcell.1.gz
 man/man1/fs_wscell.1.gz
-man/man1/klog.1.gz
-man/man1/klog.krb.1.gz
 man/man1/klog.krb5.1.gz
-man/man1/knfs.1.gz
-man/man1/kpasswd.1.gz
 man/man1/livesys.1.gz
 man/man1/pagsh.1.gz
 man/man1/pagsh.krb.1.gz
@@ -430,8 +426,6 @@ man/man5/butc.5.gz
 man/man5/butc_logs.5.gz
 man/man5/cacheinfo.5.gz
 man/man5/fms.log.5.gz
-man/man5/kaserver.DB0.5.gz
-man/man5/kaserverauxdb.5.gz
 man/man5/krb.conf.5.gz
 man/man5/krb.excl.5.gz
 man/man5/prdb.DB0.5.gz
@@ -551,28 +545,6 @@ man/man8/fstrace_lslog.8.gz
 man/man8/fstrace_lsset.8.gz
 man/man8/fstrace_setlog.8.gz
 man/man8/fstrace_setset.8.gz
-man/man8/ka-forwarder.8.gz
-man/man8/kadb_check.8.gz
-man/man8/kas.8.gz
-man/man8/kas_apropos.8.gz
-man/man8/kas_create.8.gz
-man/man8/kas_delete.8.gz
-man/man8/kas_examine.8.gz
-man/man8/kas_forgetticket.8.gz
-man/man8/kas_help.8.gz
-man/man8/kas_interactive.8.gz
-man/man8/kas_list.8.gz
-man/man8/kas_listtickets.8.gz
-man/man8/kas_noauthentication.8.gz
-man/man8/kas_quit.8.gz
-man/man8/kas_setfields.8.gz
-man/man8/kas_setpassword.8.gz
-man/man8/kas_statistics.8.gz
-man/man8/kas_stringtokey.8.gz
-man/man8/kas_unlock.8.gz
-man/man8/kaserver.8.gz
-man/man8/kdb.8.gz
-man/man8/kpwvalid.8.gz
 man/man8/prdb_check.8.gz
 man/man8/pt_util.8.gz
 man/man8/ptserver.8.gz