summaryrefslogtreecommitdiff
path: root/net/openafs/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/openafs/files')
-rw-r--r--net/openafs/files/afsd.in79
-rw-r--r--net/openafs/files/afsserver.in36
-rw-r--r--net/openafs/files/patch-configure41
-rw-r--r--net/openafs/files/patch-doc-man-pages-Makefile.in42
-rw-r--r--net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man76
-rw-r--r--net/openafs/files/patch-src-rx-rx_kernel.h24
-rw-r--r--net/openafs/files/patch-src__kauth__Makefile.in130
-rw-r--r--net/openafs/files/patch-src_config_param.amd64__fbsd__111.h225
-rw-r--r--net/openafs/files/patch-src_config_param.amd64__fbsd__120.h228
-rw-r--r--net/openafs/files/patch-src_config_param.i386__fbsd__111.h222
-rw-r--r--net/openafs/files/patch-src_config_param.i386__fbsd__120.h224
11 files changed, 0 insertions, 1327 deletions
diff --git a/net/openafs/files/afsd.in b/net/openafs/files/afsd.in
deleted file mode 100644
index e9d6b6923d43..000000000000
--- a/net/openafs/files/afsd.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: afsd
-# REQUIRE: afsserver named
-# KEYWORD: shutdown
-#
-# We require afsserver for the (rare, untested) case when a client
-# and server are running on the same machine -- the client must not
-# start until the server is running.
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# afsd_enable (bool): Set to NO by default.
-# Set it to YES to enable afsd.
-#
-# Suggested values for a "large" configuration:
-# afsd_flags="-stat 2800 -daemons 5 -volumes 128"
-#
-# Suggested values for a "medium" configuration:
-# afsd_flags="-stat 2000 -daemons 3 -volumes 70"
-#
-# Suggested values for a "small" configuration:
-# afsd_flags="-stat 300 -daemons 2 -volumes 50"
-
-. /etc/rc.subr
-
-name="afsd"
-rcvar=afsd_enable
-
-command="%%PREFIX%%/sbin/${name}"
-command_args="-dynroot -fakestat-all -afsdb -memcache"
-
-start_precmd="afsd_prestart"
-start_postcmd="afsd_poststart"
-stop_cmd="afsd_stop"
-
-kmod="libafs"
-vicedir="%%PREFIX%%/etc/openafs"
-required_modules="libafs:afs"
-required_files="${vicedir}/cacheinfo ${vicedir}/ThisCell ${vicedir}/CellServDB"
-
-load_rc_config "$name"
-
-: ${afsd_enable:="NO"}
-: ${afsd_flags:="-stat 2800 -daemons 6 -volumes 128"}
-
-afsd_prestart()
-{
- local dir
-
- # need a mountpoint and a cache dir (well, if we have a disk cache)
- # Should use required_dirs, but no good way to extract from cacheinfo
- for dir in $(awk -F: '{print $1, $2}' ${vicedir}/cacheinfo); do
- if [ ! -d "${dir}" ]; then
- err 1 "Directory ${dir} does not exist. Not starting AFS client."
- fi
- done
-}
-
-afsd_poststart()
-{
- %%PREFIX%%/bin/fs setcrypt -crypt on
-}
-
-afsd_stop()
-{
- local afsdir
-
- afsdir=$(awk -F: '{print $1}' ${vicedir}/cacheinfo)
- if ! umount $afsdir; then
- [ -n "${rc_force}" ] && umount -f ${afsdir}
- fi
- kldunload ${kmod}
-}
-
-run_rc_command "$1"
diff --git a/net/openafs/files/afsserver.in b/net/openafs/files/afsserver.in
deleted file mode 100644
index e8fab14e0240..000000000000
--- a/net/openafs/files/afsserver.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: afsserver
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# afsserver_enable (bool): Set to NO by default.
-# Set it to YES to enable AFS server activities.
-
-. /etc/rc.subr
-
-name="afsserver"
-rcvar="afsserver_enable"
-
-command="%%PREFIX%%/sbin/bosserver"
-
-stop_precmd="afsserver_prestop"
-
-vicedir="%%PREFIX%%/etc/openafs/server"
-required_files="${vicedir}/CellServDB ${vicedir}/KeyFile ${vicedir}/ThisCell ${vicedir}/UserList"
-
-load_rc_config "$name"
-
-: ${afsserver_enable:="NO"}
-
-afsserver_prestop()
-{
- %%PREFIX%%/bin/bos shutdown -localauth -server localhost
-}
-
-run_rc_command "$1"
diff --git a/net/openafs/files/patch-configure b/net/openafs/files/patch-configure
deleted file mode 100644
index d43fa932f67f..000000000000
--- a/net/openafs/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig 2017-12-05 15:02:11 UTC
-+++ configure
-@@ -25273,13 +25273,15 @@ case $AFS_SYSNAME in
- ;;
-
- 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_*)
-@@ -25293,12 +25295,15 @@ case $AFS_SYSNAME in
- ;;
-
- 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
deleted file mode 100644
index cdd8372e3db2..000000000000
--- a/net/openafs/files/patch-doc-man-pages-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- doc/man-pages/Makefile.in.orig 2017-12-05 14:52:48 UTC
-+++ doc/man-pages/Makefile.in
-@@ -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 @@ dest:
- || 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-packaging-FreeBSD-Makefile.man b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
deleted file mode 100644
index 0debb70c5250..000000000000
--- a/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/packaging/FreeBSD/Makefile.man.orig 2017-12-05 14:52:48 UTC
-+++ src/packaging/FreeBSD/Makefile.man
-@@ -7,6 +7,7 @@ MAN1+= copyauth.1
- 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_uuid.1
- 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.5
- 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.5
- 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+= butc.8
- 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_lslog.8
- 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
deleted file mode 100644
index 2ed99640f113..000000000000
--- a/net/openafs/files/patch-src-rx-rx_kernel.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/rx/rx_kernel.h.orig 2017-12-05 14:52:48 UTC
-+++ src/rx/rx_kernel.h
-@@ -58,12 +58,20 @@ extern int osi_utoa(char *buf, size_t len, unsigned lo
- #endif
- #define rx_ifnet_mtu(x) (x)->if_mtu
- #define rx_ifnet_flags(x) (x?(x)->if_flags:0)
--#if defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV)
-+#if __FreeBSD_version >= 1100032
-+#define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0, RT_ALL_FIBS)
-+#elif defined(AFS_OBSD46_ENV) || defined(AFS_FBSD81_ENV)
- #define rx_ifaddr_withnet(x) ifa_ifwithnet(x, 0)
- #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__kauth__Makefile.in b/net/openafs/files/patch-src__kauth__Makefile.in
deleted file mode 100644
index 24edce218eeb..000000000000
--- a/net/openafs/files/patch-src__kauth__Makefile.in
+++ /dev/null
@@ -1,130 +0,0 @@
---- src/kauth/Makefile.in.orig 2017-12-05 14:52:48 UTC
-+++ src/kauth/Makefile.in
-@@ -12,6 +12,8 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-+INSTALL_KAUTH = no
-+
- INCLS=${TOP_INCDIR}/ubik.h \
- ${TOP_INCDIR}/lwp.h \
- ${TOP_INCDIR}/lock.h \
-@@ -266,62 +268,66 @@ rebuild: rebuild.o kautils.o $(LIBS)
- install: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
- libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
- kaport.h
-- ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-- ${INSTALL} -d ${DESTDIR}${bindir}
-- ${INSTALL} -d ${DESTDIR}${sbindir}
-- ${INSTALL} -d ${DESTDIR}${afssrvbindir}
-- ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
-- ${INSTALL} -d ${DESTDIR}${libdir}/afs
-- ${INSTALL} -d ${DESTDIR}${includedir}/afs
-- ${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver
-- ${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas
-- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid
-- ${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas
-- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid
-- ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog
-- ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb
-- ${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog
-- ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb
-- ${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs
-- ${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd
-- ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid
-- ${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a
-- ${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a
-- ${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check
-- ${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb
-- ${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder
-- ${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h
-- ${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h
-- ${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h
-+ if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \
-+ ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}; \
-+ ${INSTALL} -d ${DESTDIR}${bindir}; \
-+ ${INSTALL} -d ${DESTDIR}${sbindir}; \
-+ ${INSTALL} -d ${DESTDIR}${afssrvbindir}; \
-+ ${INSTALL} -d ${DESTDIR}${afssrvsbindir}; \
-+ ${INSTALL} -d ${DESTDIR}${libdir}/afs; \
-+ ${INSTALL} -d ${DESTDIR}${includedir}/afs; \
-+ ${INSTALL_PROGRAM} kaserver ${DESTDIR}${afssrvlibexecdir}/kaserver; \
-+ ${INSTALL_PROGRAM} kas ${DESTDIR}${sbindir}/kas; \
-+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${sbindir}/kpwvalid; \
-+ ${INSTALL_PROGRAM} kas ${DESTDIR}${afssrvsbindir}/kas; \
-+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${afssrvsbindir}/kpwvalid; \
-+ ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog; \
-+ ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${bindir}/klog.krb; \
-+ ${INSTALL_PROGRAM} klog ${DESTDIR}${afssrvbindir}/klog; \
-+ ${INSTALL_PROGRAM} klog.krb ${DESTDIR}${afssrvbindir}/klog.krb; \
-+ ${INSTALL_PROGRAM} knfs ${DESTDIR}${bindir}/knfs; \
-+ ${INSTALL_PROGRAM} kpasswd ${DESTDIR}${bindir}/kpasswd; \
-+ ${INSTALL_PROGRAM} kpwvalid ${DESTDIR}${bindir}/kpwvalid; \
-+ ${INSTALL_DATA} libkauth.a ${DESTDIR}${libdir}/afs/libkauth.a; \
-+ ${INSTALL_DATA} libkauth.krb.a ${DESTDIR}${libdir}/afs/libkauth.krb.a; \
-+ ${INSTALL_PROGRAM} rebuild ${DESTDIR}${afssrvsbindir}/kadb_check; \
-+ ${INSTALL_PROGRAM} kdb ${DESTDIR}${afssrvsbindir}/kdb; \
-+ ${INSTALL_PROGRAM} ka-forwarder ${DESTDIR}${afssrvsbindir}/ka-forwarder; \
-+ ${INSTALL_DATA} kautils.h ${DESTDIR}${includedir}/afs/kautils.h; \
-+ ${INSTALL_DATA} kauth.h ${DESTDIR}${includedir}/afs/kauth.h; \
-+ ${INSTALL_DATA} ${srcdir}/kaport.h ${DESTDIR}${includedir}/afs/kaport.h; \
-+ fi
-
- dest: kaserver kas kpwvalid kas klog klog.krb knfs kpasswd libkauth.a \
- libkauth.krb.a rebuild kdb ka-forwarder kautils.h kauth.h \
- kaport.h
-- ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
-- ${INSTALL} -d ${DEST}/etc
-- ${INSTALL} -d ${DEST}/bin
-- ${INSTALL} -d ${DEST}/lib/afs
-- ${INSTALL} -d ${DEST}/include/afs
-- ${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver
-- ${INSTALL_PROGRAM} kas ${DEST}/etc/kas
-- ${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid
-- ${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas
-- ${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid
-- ${INSTALL_PROGRAM} klog ${DEST}/bin/klog
-- ${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb
-- ${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog
-- ${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb
-- ${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs
-- ${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd
-- ${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid
-- ${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a
-- ${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a
-- ${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb
-- ${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check
-- ${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder
-- ${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h
-- ${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h
-- ${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h
-+ if [ "x${INSTALL_KAUTH}" = "xyes" ]; then \
-+ ${INSTALL} -d ${DEST}/root.server/usr/afs/bin; \
-+ ${INSTALL} -d ${DEST}/etc; \
-+ ${INSTALL} -d ${DEST}/bin; \
-+ ${INSTALL} -d ${DEST}/lib/afs; \
-+ ${INSTALL} -d ${DEST}/include/afs; \
-+ ${INSTALL_PROGRAM} kaserver ${DEST}/root.server/usr/afs/bin/kaserver; \
-+ ${INSTALL_PROGRAM} kas ${DEST}/etc/kas; \
-+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/etc/kpwvalid; \
-+ ${INSTALL_PROGRAM} kas ${DEST}/root.server/usr/afs/bin/kas; \
-+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/root.server/usr/afs/bin/kpwvalid; \
-+ ${INSTALL_PROGRAM} klog ${DEST}/bin/klog; \
-+ ${INSTALL_PROGRAM} klog.krb ${DEST}/bin/klog.krb; \
-+ ${INSTALL_PROGRAM} klog ${DEST}/root.server/usr/afs/bin/klog; \
-+ ${INSTALL_PROGRAM} klog.krb ${DEST}/root.server/usr/afs/bin/klog.krb; \
-+ ${INSTALL_PROGRAM} knfs ${DEST}/bin/knfs; \
-+ ${INSTALL_PROGRAM} kpasswd ${DEST}/bin/kpasswd; \
-+ ${INSTALL_PROGRAM} kpwvalid ${DEST}/bin/kpwvalid; \
-+ ${INSTALL_DATA} libkauth.a ${DEST}/lib/afs/libkauth.a; \
-+ ${INSTALL_DATA} libkauth.krb.a ${DEST}/lib/afs/libkauth.krb.a; \
-+ ${INSTALL_PROGRAM} kdb ${DEST}/etc/kdb; \
-+ ${INSTALL_PROGRAM} rebuild ${DEST}/etc/kadb_check; \
-+ ${INSTALL_PROGRAM} ka-forwarder ${DEST}/root.server/usr/afs/bin/ka-forwarder; \
-+ ${INSTALL_DATA} kautils.h ${DEST}/include/afs/kautils.h; \
-+ ${INSTALL_DATA} kauth.h ${DEST}/include/afs/kauth.h; \
-+ ${INSTALL_DATA} ${srcdir}/kaport.h ${DEST}/include/afs/kaport.h; \
-+ fi
-
- #
- # Misc. targets
diff --git a/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h b/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h
deleted file mode 100644
index 94f128f276f1..000000000000
--- a/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h
+++ /dev/null
@@ -1,225 +0,0 @@
---- /dev/null
-+++ src/config/param.amd64_fbsd_111.h
-@@ -0,0 +1,222 @@
-+#ifndef AFS_PARAM_H
-+#define AFS_PARAM_H
-+
-+/* Machine / Operating system information */
-+/* XXX temporarily use old sysname until new one is assigned */
-+#define SYS_NAME "amd64_fbsd_110"
-+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_110
-+
-+#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_FBSD110_ENV 1
-+#define AFS_FBSD111_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_FBSD110_ENV 1
-+#define AFS_X86_FBSD111_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_FBSD110_ENV 1
-+#define AFS_USR_FBSD111_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__120.h b/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h
deleted file mode 100644
index 14ef26d0cd54..000000000000
--- a/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h
+++ /dev/null
@@ -1,228 +0,0 @@
---- /dev/null
-+++ src/config/param.amd64_fbsd_120.h
-@@ -0,0 +1,225 @@
-+#ifndef AFS_PARAM_H
-+#define AFS_PARAM_H
-+
-+/* Machine / Operating system information */
-+/* XXX temporarily use old sysname until new one is assigned */
-+#define SYS_NAME "amd64_fbsd_110"
-+#define SYS_NAME_ID SYS_NAME_ID_amd64_fbsd_110
-+
-+#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_FBSD110_ENV 1
-+#define AFS_FBSD111_ENV 1
-+#define AFS_FBSD120_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_FBSD110_ENV 1
-+#define AFS_X86_FBSD111_ENV 1
-+#define AFS_X86_FBSD120_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_FBSD110_ENV 1
-+#define AFS_USR_FBSD111_ENV 1
-+#define AFS_USR_FBSD120_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__111.h b/net/openafs/files/patch-src_config_param.i386__fbsd__111.h
deleted file mode 100644
index afc2c1f08d07..000000000000
--- a/net/openafs/files/patch-src_config_param.i386__fbsd__111.h
+++ /dev/null
@@ -1,222 +0,0 @@
---- /dev/null
-+++ src/config/param.i386_fbsd_111.h
-@@ -0,0 +1,219 @@
-+#ifndef AFS_PARAM_H
-+#define AFS_PARAM_H
-+
-+/* Machine / Operating system information */
-+/* XXX temporarily use old sysname until new one is assigned */
-+#define SYS_NAME "i386_fbsd_110"
-+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_110
-+
-+#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_FBSD110_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_FBSD110_ENV 1
-+#define AFS_X86_FBSD111_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_FBSD110_ENV 1
-+#define AFS_USR_FBSD111_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__120.h b/net/openafs/files/patch-src_config_param.i386__fbsd__120.h
deleted file mode 100644
index dd67da5d64e8..000000000000
--- a/net/openafs/files/patch-src_config_param.i386__fbsd__120.h
+++ /dev/null
@@ -1,224 +0,0 @@
---- /dev/null
-+++ src/config/param.i386_fbsd_120.h
-@@ -0,0 +1,221 @@
-+#ifndef AFS_PARAM_H
-+#define AFS_PARAM_H
-+
-+/* Machine / Operating system information */
-+/* XXX temporarily use old sysname until new one is assigned */
-+#define SYS_NAME "i386_fbsd_110"
-+#define SYS_NAME_ID SYS_NAME_ID_i386_fbsd_110
-+
-+#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_FBSD110_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_FBSD110_ENV 1
-+#define AFS_X86_FBSD111_ENV 1
-+#define AFS_X86_FBSD120_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_FBSD110_ENV 1
-+#define AFS_USR_FBSD111_ENV 1
-+#define AFS_USR_FBSD120_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 */