8 files changed, 47 insertions, 39 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index f62e978c9093..aeeebf8287d8 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -21,11 +21,9 @@ 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_10=	does not build (error: use of undeclared identifier 'SYS_NAME_ID_amd64_fbsd_103')
-BROKEN_FreeBSD_11=	does not build (error: no member named 'b_saveaddr' in 'struct buf')
 BROKEN_FreeBSD_12=	does not build (don't know how to make ./param.amd64_fbsd_120.h. Stop)
 
-AFS_DISTVERSION=	1.6.18
+AFS_DISTVERSION=	1.6.20.1
 DBVERSION=	2016-01-01
 
 USES=		cpe kmod tar:bzip2
@@ -46,7 +44,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		${CONFIGURE_TARGET}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${AFS_DISTVERSION}
 MAKE_ENV=	COMPILER_TYPE=${COMPILER_TYPE}
-USE_RC_SUBR=	afsd afsserver
+USE_RC_SUBR=	afsserver
 
 CPE_VERSION=	${AFS_DISTVERSION}
 
@@ -81,6 +79,15 @@ FUSE_CONFIGURE_OFF=	--disable-fuse-client
 CFLAGS+=	-mstackrealign
 .endif
 
+.if ${OSREL} == "11.0" || ${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
 
@@ -115,5 +122,6 @@ post-install: create-sample-files
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/openafs
 	@${MKDIR} ${STAGEDIR}${AFSMNTDIR} \
 	    ${STAGEDIR}${AFSSTATEDIR} ${STAGEDIR}${AFSCACHEDIR}
+.endif # ${OSREL} blacklist
 
 .include <bsd.port.post.mk>
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index fcaad6cb736a..e156c5ae487b 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1464147602
-SHA256 (openafs-1.6.18-src.tar.bz2) = b3c35e7be6b6c86b91e7c699fd015f53c87bc19d1ae8ec3ec9cda6b97327d3b6
-SIZE (openafs-1.6.18-src.tar.bz2) = 14645551
-SHA256 (openafs-1.6.18-doc.tar.bz2) = c6a72f5a8c6982202f4b19b038e76abe439f3ce2f867f39ebb6dcce943bf0a84
-SIZE (openafs-1.6.18-doc.tar.bz2) = 3533400
+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
 SHA256 (CellServDB.2016-01-01) = ef37a1cc73c90619e9b6a0ab0fa8602c57c9da8ae5e65aab96cb17e2bc1bf70e
 SIZE (CellServDB.2016-01-01) = 37058
diff --git a/net/openafs/files/patch-configure b/net/openafs/files/patch-configure
index e67f663a1e2e..c06de4203b2e 100644
--- a/net/openafs/files/patch-configure
+++ b/net/openafs/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2014-05-14 23:21:46.000000000 +0900
-+++ configure	2014-05-22 08:44:37.000000000 +0900
-@@ -30264,13 +30264,15 @@
+--- configure.orig	2016-12-15 13:48:00 UTC
++++ configure
+@@ -34144,13 +34144,15 @@ case $AFS_SYSNAME in
  		;;
  
  	i386_fbsd_*)
@@ -20,7 +20,7 @@
  		;;
  
  	i386_dfbsd_*)
-@@ -30284,12 +30286,15 @@
+@@ -34164,12 +34166,15 @@ case $AFS_SYSNAME in
  		;;
  
  	amd64_fbsd_*)
diff --git a/net/openafs/files/patch-doc-man-pages-Makefile.in b/net/openafs/files/patch-doc-man-pages-Makefile.in
index 64fcccea5339..1f98744d5129 100644
--- a/net/openafs/files/patch-doc-man-pages-Makefile.in
+++ b/net/openafs/files/patch-doc-man-pages-Makefile.in
@@ -1,5 +1,5 @@
---- 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
+--- doc/man-pages/Makefile.in.orig	2016-12-14 18:28:29 UTC
++++ doc/man-pages/Makefile.in
 @@ -2,6 +2,7 @@
  
  srcdir=@srcdir@
@@ -8,7 +8,7 @@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -34,16 +35,26 @@
+@@ -34,16 +35,26 @@ dest:
  		|| ln -s afsd.8 $(DEST)/man/man8/afsd.fuse.8; \
  	fi
  
diff --git a/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
index e7668d5d624f..fe80d1eb573e 100644
--- a/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
+++ b/net/openafs/files/patch-src-packaging-FreeBSD-Makefile.man
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/packaging/FreeBSD/Makefile.man.orig	2016-12-14 18:28:29 UTC
++++ src/packaging/FreeBSD/Makefile.man
+@@ -7,6 +7,7 @@ MAN1+=	copyauth.1
  MAN1+=	dlog.1
  MAN1+=	fs.1
  MAN1+=	fs_apropos.1
@@ -8,7 +8,7 @@
  MAN1+=	fs_checkservers.1
  MAN1+=	fs_checkvolumes.1
  MAN1+=	fs_chgrp.1
-@@ -61,11 +62,7 @@
+@@ -61,11 +62,7 @@ MAN1+=	fs_uuid.1
  MAN1+=	fs_whereis.1
  MAN1+=	fs_whichcell.1
  MAN1+=	fs_wscell.1
@@ -20,7 +20,7 @@
  MAN1+=	livesys.1
  MAN1+=	pagsh.1
  MLINKS+=	pagsh.1 pagsh.krb.1
-@@ -177,8 +174,6 @@
+@@ -177,8 +174,6 @@ MAN5+=	butc.5
  MAN5+=	butc_logs.5
  MAN5+=	cacheinfo.5
  MAN5+=	fms.log.5
@@ -29,7 +29,7 @@
  MAN5+=	krb.conf.5
  MAN5+=	prdb.DB0.5
  MAN5+=	salvage.lock.5
-@@ -188,6 +183,7 @@
+@@ -188,6 +183,7 @@ MAN5+=	uss.5
  MAN5+=	uss_bulk.5
  MAN5+=	vldb.DB0.5
  MAN8+=	afsd.8
@@ -37,7 +37,7 @@
  MAN8+=	asetkey.8
  MAN8+=	backup.8
  MAN8+=	backup_adddump.8
-@@ -262,7 +258,6 @@
+@@ -262,7 +258,6 @@ MAN8+=	butc.8
  MAN8+=	davolserver.8
  MAN8+=	dasalvager.8
  MAN8+=	dafileserver.8
@@ -45,7 +45,7 @@
  MAN8+=	fileserver.8
  MAN8+=	fms.8
  MAN8+=	fssync-debug_volop.8
-@@ -295,28 +290,6 @@
+@@ -295,28 +290,6 @@ MAN8+=	fstrace_lslog.8
  MAN8+=	fstrace_lsset.8
  MAN8+=	fstrace_setlog.8
  MAN8+=	fstrace_setset.8
diff --git a/net/openafs/files/patch-src-rx-rx_kernel.h b/net/openafs/files/patch-src-rx-rx_kernel.h
index 16027c8e40c4..b5c1e57f4431 100644
--- a/net/openafs/files/patch-src-rx-rx_kernel.h
+++ b/net/openafs/files/patch-src-rx-rx_kernel.h
@@ -1,6 +1,6 @@
---- src/rx/rx_kernel.h.orig	2014-09-24 10:17:09.000000000 -0400
-+++ src/rx/rx_kernel.h	2014-09-28 20:37:20.000000000 -0400
-@@ -54,12 +54,20 @@
+--- src/rx/rx_kernel.h.orig	2016-12-14 18:28:29 UTC
++++ src/rx/rx_kernel.h
+@@ -58,12 +58,20 @@ extern int osi_utoa(char *buf, size_t le
  #endif
  #define rx_ifnet_mtu(x) (x)->if_mtu
  #define rx_ifnet_flags(x) (x?(x)->if_flags:0)
diff --git a/net/openafs/files/patch-src__kauth__Makefile.in b/net/openafs/files/patch-src__kauth__Makefile.in
index 2de5daef26c5..849be353b3be 100644
--- a/net/openafs/files/patch-src__kauth__Makefile.in
+++ b/net/openafs/files/patch-src__kauth__Makefile.in
@@ -1,15 +1,15 @@
---- src/kauth/Makefile.in.orig
+--- src/kauth/Makefile.in.orig	2016-12-14 18:28:29 UTC
 +++ 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 =
+@@ -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  \
-@@ -248,62 +250,66 @@ rebuild: rebuild.o $(LIBS) libkauth.a
+@@ -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
diff --git a/net/openafs/pkg-plist b/net/openafs/pkg-plist
index 9ca09b31d219..6d62af54c438 100644
--- a/net/openafs/pkg-plist
+++ b/net/openafs/pkg-plist
@@ -23,9 +23,9 @@ bin/unlog
 bin/up
 bin/xstat_cm_test
 bin/xstat_fs_test
-@sample etc/openafs/CellServDB.sample
-@sample etc/openafs/ThisCell.sample
-@sample etc/openafs/cacheinfo.sample
+%%KMOD%%@sample etc/openafs/CellServDB.sample
+%%KMOD%%@sample etc/openafs/ThisCell.sample
+%%KMOD%%@sample etc/openafs/cacheinfo.sample
 include/openafs/afs/acl.h
 include/openafs/afs/afs.h
 include/openafs/afs/afs_args.h
@@ -574,7 +574,7 @@ sbin/vsys
 %%DATADIR%%/C/afszcm.cat
 %%FUSE%%man/man8/afsd.fuse.8.gz
 %%FUSE%%sbin/afsd.fuse
-/%%KMODDIR%%/libafs.ko
-@dir /%%AFSCACHEDIR%%
-@dir /%%AFSMNTDIR%%
-@dir /%%AFSSTATEDIR%%
+%%KMOD%%/%%KMODDIR%%/libafs.ko
+%%KMOD%%@dir /%%AFSCACHEDIR%%
+%%KMOD%%@dir /%%AFSMNTDIR%%
+%%KMOD%%@dir /%%AFSSTATEDIR%%