Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,13 +1,11 @@
 # Created by: Conrad Meyer <cem@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	lkl
+PORTNAME=		lkl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.8-493
-PORTREVISION=	4
-DISTVERSIONSUFFIX=	-g4b77c32b1a88
-CATEGORIES=	sysutils
-PKGNAMEPREFIX=	fusefs-
+DISTVERSION=		4.16.0
+CATEGORIES=		sysutils
+PKGNAMEPREFIX=		fusefs-
 
 MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Full-featured Linux BTRFS, Ext4, XFS as a FUSE module
@@ -14,26 +12,27 @@
 
 LICENSE=	GPLv2
 
-BROKEN=		inconsistent kallsyms data
+IGNORE_FreeBSD_10=	requires FreeBSD 11 or newer
+ONLY_FOR_ARCHS=		amd64
+ONLY_FOR_ARCHS_REASON=	No one has added other architecture ld formats yet
 
-BUILD_DEPENDS=	gnubc>0:math/gnubc
+BUILD_DEPENDS=	gnustat:sysutils/coreutils \
+		bc:math/gnubc \
+		gsed:textproc/gsed
 
-USES=		fuse gmake python:build shebangfix
+USES=		bison fuse gmake python:build shebangfix
 SHEBANG_FILES=	../../arch/lkl/scripts/headers_install.py
 USE_BINUTILS=	yes
 USE_GCC=	yes
+BINARY_ALIAS=	sed=gsed stat=gnustat
+
 USE_GITHUB=	yes
 GH_PROJECT=	linux
+GH_TAGNAME=	ab1164d9c4077de50849e59a4ea242e72a56e6b7
 
-ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=No one has added other architecture ld formats yet
-
-IGNORE_FreeBSD_10=	requires FreeBSD 11 or newer
-
-WRKSRC_SUBDIR=	tools/lkl
-ALL_TARGET=	lklfuse
-MAKE_JOBS_UNSAFE=yes
-MAKE_ARGS+=	V=1
+WRKSRC_SUBDIR=		tools/lkl
+MAKE_JOBS_UNSAFE=	yes
+MAKE_ARGS+=		V=1
 # Need ports versions of 'bc', 'ld' to build!
 MAKE_ARGS+=	PATH="${LOCALBASE}/bin:${PATH}" CC="${CC}" HOSTCC="${CC}"
 
Index: distinfo
===================================================================
--- distinfo
+++ distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476438518
-SHA256 (lkl-linux-v4.8-493-g4b77c32b1a88_GH0.tar.gz) = 3b1adae23f1419a8b5c93d9c03bdca7b70df0b15285ab608b76cddb9285fbbba
-SIZE (lkl-linux-v4.8-493-g4b77c32b1a88_GH0.tar.gz) = 143222799
+TIMESTAMP = 1527599305
+SHA256 (lkl-linux-v4.16.0-ab1164d9c4077de50849e59a4ea242e72a56e6b7_GH0.tar.gz) = 79c01366187b4c7e6b86311b077ce2c9220040fe2837431f74e8b6e661881f58
+SIZE (lkl-linux-v4.16.0-ab1164d9c4077de50849e59a4ea242e72a56e6b7_GH0.tar.gz) = 164256914
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile
+++ files/patch-Makefile
@@ -1,13 +1,15 @@
---- Makefile.orig	2016-08-16 21:09:03 UTC
+--- Makefile.orig	2018-05-29 13:16:28 UTC
 +++ Makefile
-@@ -121,8 +121,8 @@ endif
- 	$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*)
+@@ -59,10 +59,10 @@ endif
  
- lib/lkl.o:
+ # rule to build lkl.o
+ $(OUTPUT)lib/lkl.o: bin/stat
 -	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) defconfig
--	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(CURDIR)
 +	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) defconfig
-+	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(CURDIR)
+ # this workaround is for arm32 linker (ld.gold)
+ 	$(Q)export PATH=$(srctree)/tools/lkl/bin/:${PATH} ;\
+-	$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(OUTPUT)
++	$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(OUTPUT)
  
- liblkl.a: lib/lkl-in.o lib/lkl.o
- 	$(QUIET_AR)$(AR) -rc $@ $^
+ # rules to link libs
+ $(OUTPUT)%$(SOSUF): LDFLAGS += -shared
Index: files/patch-Makefile.autoconf
===================================================================
--- files/patch-Makefile.autoconf
+++ files/patch-Makefile.autoconf
@@ -0,0 +1,10 @@
+--- Makefile.autoconf.orig	2018-05-31 13:04:23 UTC
++++ Makefile.autoconf
+@@ -55,7 +55,6 @@ define posix_host
+   $(if $(filter yes,$(dpdk)),$(call virtio_net_dpdk))
+   $(if $(filter yes,$(vde)),$(call virtio_net_vde))
+   $(if $(strip $(call find_include,fuse.h)),$(call set_autoconf_var,FUSE,y))
+-  $(if $(strip $(call find_include,archive.h)),$(call set_autoconf_var,ARCHIVE,y))
+   $(if $(strip $(call find_include,linux/if_tun.h)),$(call set_autoconf_var,VIRTIO_NET_MACVTAP,y))
+   $(if $(filter $(1),elf64-x86-64-freebsd),$(call set_autoconf_var,NEEDS_LARGP,y))
+ endef
Index: files/patch-lib_Build
===================================================================
--- files/patch-lib_Build
+++ files/patch-lib_Build
@@ -1,11 +0,0 @@
---- lib/Build.orig	2016-08-16 21:09:03 UTC
-+++ lib/Build
-@@ -13,8 +13,5 @@ lkl-y += dbg.o
- lkl-y += dbg_handler.o
- lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net.o
- lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_fd.o
--lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_tap.o
--lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_raw.o
--lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_macvtap.o
- lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_DPDK) += virtio_net_dpdk.o
- lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_VDE) += virtio_net_vde.o