Index: head/net/openafs/Makefile
===================================================================
--- head/net/openafs/Makefile	(revision 455920)
+++ head/net/openafs/Makefile	(revision 455921)
@@ -1,127 +1,127 @@
 # $FreeBSD$
 
 PORTNAME=	openafs
 DISTVERSION=	${AFS_DISTVERSION}.${DBVERSION:S/-//g}
 CATEGORIES=	net
 MASTER_SITES=	http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
 		http://dl.openafs.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
 		http://dl.central.org/dl/cellservdb/:gco \
 		http://grand.central.org/dl/cellservdb/:gco
 DISTFILES=	${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2:openafs \
 		${PORTNAME}-${AFS_DISTVERSION}-doc.tar.bz2:openafs \
 		CellServDB.${DBVERSION}:gco
 EXTRACT_ONLY=	${PORTNAME}-${AFS_DISTVERSION}-src.tar.bz2 \
 		${PORTNAME}-${AFS_DISTVERSION}-doc.tar.bz2
 
 MAINTAINER=	bjk@FreeBSD.org
 COMMENT=	AFS implementation from openafs.org
 
 LICENSE=	IPLv1
 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
 
-BROKEN_FreeBSD_12=	does not build (don't know how to make ./param.amd64_fbsd_120.h. Stop)
+BROKEN_FreeBSD_12=	does not build (use of undeclared identifier 'ROOTINO')
+ONLY_FOR_ARCHS=	i386 amd64
 
-AFS_DISTVERSION=	1.6.20.1
+AFS_DISTVERSION=	1.6.22
 DBVERSION=	2016-01-01
 
 USES=		cpe kmod tar:bzip2
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	_XCFLAGS="${CFLAGS} -fPIC" \
 		_PAM_CFLAGS="${CFLAGS} -fPIC" \
 		_MT_LIBS="-lpthread"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--localstatedir=/var \
 		--mandir=${MANPREFIX}/man \
 		--with-bsd-kernel-headers=${SRC_BASE}/sys \
 		--with-bsd-kernel-build=${WRKDIR}/conf \
 		--enable-debug \
 		--enable-debug-kernel \
 		--enable-debug-lwp \
 		--includedir=${PREFIX}/include/openafs \
 		${CONFIGURE_TARGET}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION}
 MAKE_ENV=	COMPILER_TYPE=${COMPILER_TYPE}
 USE_RC_SUBR=	afsserver
 
 CPE_VERSION=	${AFS_DISTVERSION}
 
 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
 PLIST_SUB+=	AFSMNTDIR=${AFSMNTDIR:C,^/,,} \
 		AFSSTATEDIR=${AFSSTATEDIR:C,^/,,} \
 		AFSCACHEDIR=${AFSCACHEDIR:C,^/,,}
 
 # clang (the base system compiler in __FreeBSD_version 1000024 and later)
 # is pickier about stack alignment than gcc; OpenAFS uses its own
 # lightweight process "threading" library which will produce a misaligned
 # stack under clang; we need to pass -mstackrealign to avoid SIGBUS at
 # runtime.  gcc does not understand this flag, so we use compiler.mk to
 # figure out what type of compiler is in use.
 USES+=		compiler
 
 OPTIONS_DEFINE=	FUSE
 FUSE_USES=	fuse
 OPTIONS_SUB=	yes
 FUSE_CONFIGURE_OFF=	--disable-fuse-client
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 CFLAGS+=	-mstackrealign
 .endif
 
-.if ${OSREL} == "11.0" || ${OSREL} == "12.0"
+.if ${OSREL} == "11.0" || ${OSREL} == "11.1" || ${OSREL} == "12.0"
 # Upstream does not support the client on 11 and newer
 CONFIGURE_ARGS += --disable-kernel-module
 PLIST_SUB+=	KMOD="@comment "
 .else
 CONFIGURE_ARGS += --enable-kernel-module
 PLIST_SUB+=	KMOD=
 USE_RC_SUBR+= afsd
 
 KERNCONF?=	GENERIC
 KERNCONFDIR?=	${SRC_BASE}/sys/${ARCH}/conf
 
 # Use the first component of ${KERNCONF}.
 .for K in ${KERNCONF}
 _KERNCONF?=$K
 .endfor
 
 .if !exists(${KERNCONFDIR}/${_KERNCONF})
 IGNORE=	requires kernel configuration file ${_KERNCONF} to build
 .endif
 
 # Do not show users the reminder about cleandepend and depend
 post-extract:
 	${MKDIR} ${WRKDIR}/conf
 	cd ${KERNCONFDIR} && \
 	    /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null
 
 create-sample-files:
 	@${ECHO_CMD} openafs.org > ${WRKDIR}/ThisCell
 	@${ECHO_CMD} "${AFSMNTDIR}:${AFSCACHEDIR}:150000" > ${WRKDIR}/cacheinfo
 	${INSTALL_DATA} ${DISTDIR}/CellServDB.${DBVERSION} ${WRKDIR}/CellServDB
 
 post-install: create-sample-files
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 .for F in CellServDB ThisCell cacheinfo
 	${INSTALL_DATA} ${WRKDIR}/${F} ${STAGEDIR}${ETCDIR}/${F}.sample
 .endfor
 	${INSTALL_KLD} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko \
 	    ${STAGEDIR}${KMODDIR}
 	@${RM} ${STAGEDIR}${PREFIX}/lib/openafs/libafs.ko
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/openafs
 	@${MKDIR} ${STAGEDIR}${AFSMNTDIR} \
 	    ${STAGEDIR}${AFSSTATEDIR} ${STAGEDIR}${AFSCACHEDIR}
 .endif # ${OSREL} blacklist
 
 .include <bsd.port.post.mk>
Index: head/net/openafs/distinfo
===================================================================
--- head/net/openafs/distinfo	(revision 455920)
+++ head/net/openafs/distinfo	(revision 455921)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1487798814
-SHA256 (openafs-1.6.20.1-src.tar.bz2) = dc869eecf6c81949d3dd2021eaf87118ef9b90ec5012a35f64836a02a58a8826
-SIZE (openafs-1.6.20.1-src.tar.bz2) = 14672548
-SHA256 (openafs-1.6.20.1-doc.tar.bz2) = 2c4bf6f53030e8a9cf3460d9c9292bcdbfea356930ed1d436506e8dc60db0f1c
-SIZE (openafs-1.6.20.1-doc.tar.bz2) = 3533007
+TIMESTAMP = 1512851739
+SHA256 (openafs-1.6.22-src.tar.bz2) = 835410b75d14aec1ac6a1138d8194897f1badeffa3a0c282963ad51996712347
+SIZE (openafs-1.6.22-src.tar.bz2) = 14606745
+SHA256 (openafs-1.6.22-doc.tar.bz2) = 0e177e007ea802891d23bcecd5a836f7c768e9af0d70aab4259233cd2d474a0f
+SIZE (openafs-1.6.22-doc.tar.bz2) = 3567926
 SHA256 (CellServDB.2016-01-01) = ef37a1cc73c90619e9b6a0ab0fa8602c57c9da8ae5e65aab96cb17e2bc1bf70e
 SIZE (CellServDB.2016-01-01) = 37058
Index: head/net/openafs/files/patch-configure
===================================================================
--- head/net/openafs/files/patch-configure	(revision 455920)
+++ head/net/openafs/files/patch-configure	(revision 455921)
@@ -1,41 +1,41 @@
---- configure.orig	2016-12-15 13:48:00 UTC
+--- configure.orig	2017-12-05 15:02:11 UTC
 +++ configure
-@@ -34144,13 +34144,15 @@ case $AFS_SYSNAME in
+@@ -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_*)
-@@ -34164,12 +34166,15 @@ case $AFS_SYSNAME in
+@@ -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*)
Index: head/net/openafs/files/patch-doc-man-pages-Makefile.in
===================================================================
--- head/net/openafs/files/patch-doc-man-pages-Makefile.in	(revision 455920)
+++ head/net/openafs/files/patch-doc-man-pages-Makefile.in	(revision 455921)
@@ -1,42 +1,42 @@
---- doc/man-pages/Makefile.in.orig	2016-12-14 18:28:29 UTC
+--- 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
Index: head/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
===================================================================
--- head/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man	(revision 455920)
+++ head/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man	(revision 455921)
@@ -1,76 +1,76 @@
---- src/packaging/FreeBSD/Makefile.man.orig	2016-12-14 18:28:29 UTC
+--- 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
Index: head/net/openafs/files/patch-src-rx-rx_kernel.h
===================================================================
--- head/net/openafs/files/patch-src-rx-rx_kernel.h	(revision 455920)
+++ head/net/openafs/files/patch-src-rx-rx_kernel.h	(revision 455921)
@@ -1,24 +1,24 @@
---- src/rx/rx_kernel.h.orig	2016-12-14 18:28:29 UTC
+--- 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 le
+@@ -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)
Index: head/net/openafs/files/patch-src__kauth__Makefile.in
===================================================================
--- head/net/openafs/files/patch-src__kauth__Makefile.in	(revision 455920)
+++ head/net/openafs/files/patch-src__kauth__Makefile.in	(revision 455921)
@@ -1,130 +1,130 @@
---- src/kauth/Makefile.in.orig	2016-12-14 18:28:29 UTC
+--- 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
Index: head/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h
===================================================================
--- head/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h	(nonexistent)
+++ head/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h	(revision 455921)
@@ -0,0 +1,225 @@
+--- /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 */

Property changes on: head/net/openafs/files/patch-src_config_param.amd64__fbsd__111.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h
===================================================================
--- head/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h	(nonexistent)
+++ head/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h	(revision 455921)
@@ -0,0 +1,228 @@
+--- /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 */

Property changes on: head/net/openafs/files/patch-src_config_param.amd64__fbsd__120.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/openafs/files/patch-src_config_param.i386__fbsd__111.h
===================================================================
--- head/net/openafs/files/patch-src_config_param.i386__fbsd__111.h	(nonexistent)
+++ head/net/openafs/files/patch-src_config_param.i386__fbsd__111.h	(revision 455921)
@@ -0,0 +1,222 @@
+--- /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 temporarilyuse 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 */

Property changes on: head/net/openafs/files/patch-src_config_param.i386__fbsd__111.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/openafs/files/patch-src_config_param.i386__fbsd__120.h
===================================================================
--- head/net/openafs/files/patch-src_config_param.i386__fbsd__120.h	(nonexistent)
+++ head/net/openafs/files/patch-src_config_param.i386__fbsd__120.h	(revision 455921)
@@ -0,0 +1,224 @@
+--- /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 temporarilyuse 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 */

Property changes on: head/net/openafs/files/patch-src_config_param.i386__fbsd__120.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property