Index: head/net/zerotier/Makefile
===================================================================
--- head/net/zerotier/Makefile	(revision 470434)
+++ head/net/zerotier/Makefile	(revision 470435)
@@ -1,35 +1,38 @@
 # Created by: Corey Smith <corsmith@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	zerotier
-PORTVERSION=	1.2.4
-PORTREVISION=	2
+DISTVERSION=	1.2.8
 CATEGORIES=	net
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Network virtualization everywhere
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.GPL-3
 
 BROKEN_armv6=		fails to link: Source object ext/arm32-neon-salsa2012-asm/salsa2012.o has EABI version 0, but target zerotier-one has EABI version 5
 BROKEN_armv7=		fails to link: Source object ext/arm32-neon-salsa2012-asm/salsa2012.o has EABI version 0, but target zerotier-one has EABI version 5
 BROKEN_powerpc64=	fails to compile: clang: not found
 
 USES=		gmake compiler:c11
 USE_RC_SUBR=	zerotier
 
 USE_GITHUB=	yes
 GH_PROJECT=	ZeroTierOne
 
 CFLAGS+=	-flax-vector-conversions
+
+OPTIONS_DEFINE=	DBG
+DBG_DESC=	Enable foreground debugging for zerotier-one daemon
+DBG_ALL_TARGET=	debug
 
 PLIST_FILES=	bin/zerotier-cli bin/zerotier-idtool sbin/zerotier-one
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zerotier-one ${STAGEDIR}${PREFIX}/sbin/
 .for l in zerotier-cli zerotier-idtool
 	${LN} -sf ../sbin/zerotier-one ${STAGEDIR}${PREFIX}/bin/${l}
 .endfor
 
 .include <bsd.port.mk>
Index: head/net/zerotier/distinfo
===================================================================
--- head/net/zerotier/distinfo	(revision 470434)
+++ head/net/zerotier/distinfo	(revision 470435)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493361909
-SHA256 (zerotier-ZeroTierOne-1.2.4_GH0.tar.gz) = 9f275b3732b721f02cc4b8df75b51e6a8fb56dfe1a542a7bd681538d852b0358
-SIZE (zerotier-ZeroTierOne-1.2.4_GH0.tar.gz) = 7963254
+TIMESTAMP = 1525679369
+SHA256 (zerotier-ZeroTierOne-1.2.8_GH0.tar.gz) = 08e2df34550d6bb68e106eaac48babb481160046818b0944ec41f1e158548a47
+SIZE (zerotier-ZeroTierOne-1.2.8_GH0.tar.gz) = 6009764
Index: head/net/zerotier/files/patch-make-bsd.mk
===================================================================
--- head/net/zerotier/files/patch-make-bsd.mk	(nonexistent)
+++ head/net/zerotier/files/patch-make-bsd.mk	(revision 470435)
@@ -0,0 +1,11 @@
+--- make-bsd.mk.orig	2018-05-18 08:50:17 UTC
++++ make-bsd.mk
+@@ -159,7 +159,7 @@ clean:
+ 	rm -rf *.a *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o build-* zerotier-one zerotier-idtool zerotier-selftest zerotier-cli $(ONE_OBJS) $(CORE_OBJS)
+ 
+ debug:	FORCE
+-	gmake -j 4 ZT_DEBUG=1
++	$(MAKE) -j ZT_DEBUG=1
+ 
+ install:	one
+ 	rm -f /usr/local/sbin/zerotier-one

Property changes on: head/net/zerotier/files/patch-make-bsd.mk
___________________________________________________________________
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/zerotier/files/patch-node_Packet.cpp
===================================================================
--- head/net/zerotier/files/patch-node_Packet.cpp	(nonexistent)
+++ head/net/zerotier/files/patch-node_Packet.cpp	(revision 470435)
@@ -0,0 +1,11 @@
+--- node/Packet.cpp.orig	2018-05-18 09:03:14 UTC
++++ node/Packet.cpp
+@@ -332,7 +332,7 @@ static const int LZ4_minLength = (MFLIMIT+1);
+ 
+ #define LZ4_STATIC_ASSERT(c)    { enum { LZ4_static_assert = 1/(int)(!!(c)) }; }   /* use only *after* variable declarations */
+ 
+-static inline unsigned LZ4_NbCommonBytes (register reg_t val)
++static inline unsigned LZ4_NbCommonBytes (reg_t val)
+ {
+ 	if (LZ4_isLittleEndian()) {
+ 	    if (sizeof(val)==8) {

Property changes on: head/net/zerotier/files/patch-node_Packet.cpp
___________________________________________________________________
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/zerotier/files/zerotier.in
===================================================================
--- head/net/zerotier/files/zerotier.in	(revision 470434)
+++ head/net/zerotier/files/zerotier.in	(revision 470435)
@@ -1,29 +1,29 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: zerotier
 # REQUIRE: FILESYSTEMS netif
-# BEFORE:  pf ipfw
+# BEFORE:  pf ipfw ipfilter
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # zerotier_enable (bool):	Set to NO by default.
 #				Set it to YES to enable zerotier.
 
 . /etc/rc.subr
 
 name=zerotier
 rcvar=zerotier_enable
 
 load_rc_config $name
 
 : ${zerotier_enable:="NO"}
 
 command=%%PREFIX%%/sbin/${name}-one
 
 command_args="-d"
 
 run_rc_command "$1"