Index: head/sysutils/nomad/Makefile
===================================================================
--- head/sysutils/nomad/Makefile	(revision 486096)
+++ head/sysutils/nomad/Makefile	(revision 486097)
@@ -1,48 +1,52 @@
 # $FreeBSD$
 
 PORTNAME=	nomad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.4
+DISTVERSION=	0.8.6
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	Cluster manager and scheduler
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		fails to build
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	On i386: go compiler crashes: https://github.com/golang/go/issues/23763
 
 BUILD_DEPENDS=	go:lang/go
 
 USES=		compiler
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp
+GH_ACCOUNT=	hashicorp golang:sys
+GH_PROJECT=	sys:sys
+GH_TAGNAME=	fa43e7bc11b:sys
 GH_SUBDIR=	src/github.com/hashicorp/nomad
 USE_RC_SUBR=	nomad
 
 USERS=		nomad
 GROUPS=		nomad
+
+post-patch:
+	${MV} ${WRKSRC_sys}/cpu ${WRKSRC}/vendor/golang.org/x/sys
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/hashicorp/nomad && \
 		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
 			-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/nomad
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/hashicorp/nomad/bin/nomad ${STAGEDIR}${PREFIX}/bin/nomad
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/nomad
 	${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/client.hcl \
 		${STAGEDIR}${PREFIX}/etc/nomad/client.hcl.sample
 	${INSTALL_DATA} ${WRKSRC}/src/github.com/hashicorp/nomad/dist/server.hcl \
 		${STAGEDIR}${PREFIX}/etc/nomad/server.hcl.sample
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 BUILD_ENV=	CC=clang
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/nomad/distinfo
===================================================================
--- head/sysutils/nomad/distinfo	(revision 486096)
+++ head/sysutils/nomad/distinfo	(revision 486097)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1528902197
-SHA256 (hashicorp-nomad-v0.8.4_GH0.tar.gz) = 8dfacd578f2be1ae6cc7af6b2749952f1646344cb95bde17f35eeb78faacd616
-SIZE (hashicorp-nomad-v0.8.4_GH0.tar.gz) = 69733288
+TIMESTAMP = 1539347602
+SHA256 (hashicorp-nomad-v0.8.6_GH0.tar.gz) = e69b447dcc2caeb3d5ecf904cf3c8f327a5185a84442ee4241a796d89f96e143
+SIZE (hashicorp-nomad-v0.8.6_GH0.tar.gz) = 69730280
+SHA256 (golang-sys-fa43e7bc11b_GH0.tar.gz) = 085dd1dbc2865751cea75649dd59608bd0d0873ae852fda587b7d089734266f9
+SIZE (golang-sys-fa43e7bc11b_GH0.tar.gz) = 1093021
Index: head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go
===================================================================
--- head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go	(nonexistent)
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go	(revision 486097)
@@ -0,0 +1,28 @@
+--- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go.orig	2018-10-12 12:40:06 UTC
++++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
+@@ -6,20 +6,13 @@
+ 
+ package blake2b
+ 
++import "golang.org/x/sys/cpu"
++
+ func init() {
+-	useAVX2 = supportsAVX2()
+-	useAVX = supportsAVX()
+-	useSSE4 = supportsSSE4()
++	useAVX2 = cpu.X86.HasAVX2
++	useAVX = cpu.X86.HasAVX
++	useSSE4 = cpu.X86.HasSSE41
+ }
+-
+-//go:noescape
+-func supportsSSE4() bool
+-
+-//go:noescape
+-func supportsAVX() bool
+-
+-//go:noescape
+-func supportsAVX2() bool
+ 
+ //go:noescape
+ func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)

Property changes on: head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go
___________________________________________________________________
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/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s
===================================================================
--- head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s	(nonexistent)
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s	(revision 486097)
@@ -0,0 +1,18 @@
+--- vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s.orig	2018-10-12 12:41:53 UTC
++++ vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
+@@ -748,15 +748,3 @@ noinc:
+ 
+ 	MOVQ BP, SP
+ 	RET
+-
+-// func supportsAVX2() bool
+-TEXT ·supportsAVX2(SB), 4, $0-1
+-	MOVQ runtime·support_avx2(SB), AX
+-	MOVB AX, ret+0(FP)
+-	RET
+-
+-// func supportsAVX() bool
+-TEXT ·supportsAVX(SB), 4, $0-1
+-	MOVQ runtime·support_avx(SB), AX
+-	MOVB AX, ret+0(FP)
+-	RET

Property changes on: head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s
___________________________________________________________________
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/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.go
===================================================================
--- head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.go	(nonexistent)
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.go	(revision 486097)
@@ -0,0 +1,18 @@
+--- vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go.orig	2018-10-12 12:39:07 UTC
++++ vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go
+@@ -6,12 +6,11 @@
+ 
+ package blake2b
+ 
++import "golang.org/x/sys/cpu"
++
+ func init() {
+-	useSSE4 = supportsSSE4()
++	useSSE4 = cpu.X86.HasSSE41
+ }
+-
+-//go:noescape
+-func supportsSSE4() bool
+ 
+ //go:noescape
+ func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)

Property changes on: head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.go
___________________________________________________________________
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/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.s
===================================================================
--- head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.s	(nonexistent)
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.s	(revision 486097)
@@ -0,0 +1,15 @@
+--- vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s.orig	2018-10-12 12:43:05 UTC
++++ vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
+@@ -279,12 +279,3 @@ noinc:
+ 
+ 	MOVQ BP, SP
+ 	RET
+-
+-// func supportsSSE4() bool
+-TEXT ·supportsSSE4(SB), 4, $0-1
+-	MOVL $1, AX
+-	CPUID
+-	SHRL $19, CX  // Bit 19 indicates SSE4 support
+-	ANDL $1, CX  // CX != 0 if support SSE4
+-	MOVB CX, ret+0(FP)
+-	RET

Property changes on: head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.s
___________________________________________________________________
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/sysutils/nomad/files/patch-vendor_vendor.json
===================================================================
--- head/sysutils/nomad/files/patch-vendor_vendor.json	(nonexistent)
+++ head/sysutils/nomad/files/patch-vendor_vendor.json	(revision 486097)
@@ -0,0 +1,10 @@
+--- vendor/vendor.json.orig	2018-10-12 12:46:48 UTC
++++ vendor/vendor.json
+@@ -316,6 +316,7 @@
+ 		{"path":"golang.org/x/net/lex/httplex","checksumSHA1":"3xyuaSNmClqG4YWC7g0isQIbUTc=","revision":"ab5485076ff3407ad2d02db054635913f017b0ed","revisionTime":"2017-07-19T21:11:51Z"},
+ 		{"path":"golang.org/x/net/trace","checksumSHA1":"u/r66lwYfgg682u5hZG7/E7+VCY=","revision":"ab5485076ff3407ad2d02db054635913f017b0ed","revisionTime":"2017-07-19T21:11:51Z"},
+ 		{"path":"golang.org/x/sync/errgroup","checksumSHA1":"S0DP7Pn7sZUmXc55IzZnNvERu6s=","revision":"316e794f7b5e3df4e95175a45a5fb8b12f85cb4f","revisionTime":"2016-07-15T18:54:39Z"},
++		{"path":"golang.org/x/sys/cpu","revision":"fa43e7bc11baaae89f3f902b2b4d832b68234844"},
+ 		{"path":"golang.org/x/sys/unix","checksumSHA1":"SIhhNXud9FKua0s3WlGPRRkDKRg=","revision":"8b4580aae2a0dd0c231a45d3ccb8434ff533b840","revisionTime":"2017-11-30T16:26:51Z"},
+ 		{"path":"golang.org/x/sys/windows","checksumSHA1":"riTVymIu2BFphV6UlA73Fn9tmmU=","revision":"8b4580aae2a0dd0c231a45d3ccb8434ff533b840","revisionTime":"2017-11-30T16:26:51Z"},
+ 		{"path":"golang.org/x/text/encoding","checksumSHA1":"Mr4ur60bgQJnQFfJY0dGtwWwMPE=","revision":"e113a52b01bdd1744681b6ce70c2e3d26b58d389","revisionTime":"2017-08-30T18:54:29Z"},

Property changes on: head/sysutils/nomad/files/patch-vendor_vendor.json
___________________________________________________________________
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