Index: head/sysutils/nomad/Makefile
===================================================================
--- head/sysutils/nomad/Makefile
+++ head/sysutils/nomad/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	nomad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.7
+DISTVERSION=	0.9.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
@@ -11,8 +11,6 @@
 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
 
@@ -20,17 +18,12 @@
 
 USES=		compiler
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp golang:sys
-GH_PROJECT=	sys:sys
-GH_TAGNAME=	fa43e7bc11b:sys
+GH_ACCOUNT=	hashicorp
 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 && \
Index: head/sysutils/nomad/distinfo
===================================================================
--- head/sysutils/nomad/distinfo
+++ head/sysutils/nomad/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1548448653
-SHA256 (hashicorp-nomad-v0.8.7_GH0.tar.gz) = f74eac627de69190e586358b1956573a0ae1a40d0755ecdee163016949f9c7fe
-SIZE (hashicorp-nomad-v0.8.7_GH0.tar.gz) = 69782860
+TIMESTAMP = 1556410895
+SHA256 (hashicorp-nomad-v0.9.0_GH0.tar.gz) = fb6a0afd6895540dd5e18c878421c39e2a2759e90af8eb771c84802d082475df
+SIZE (hashicorp-nomad-v0.9.0_GH0.tar.gz) = 31846577
 SHA256 (golang-sys-fa43e7bc11b_GH0.tar.gz) = 085dd1dbc2865751cea75649dd59608bd0d0873ae852fda587b7d089734266f9
 SIZE (golang-sys-fa43e7bc11b_GH0.tar.gz) = 1093021
Index: head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
===================================================================
--- head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
+++ head/sysutils/nomad/files/patch-vendor_github.com_docker_docker_pkg_mount_mountinfo__freebsd.go
@@ -0,0 +1,11 @@
+--- vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go.orig	2019-04-09 15:51:37 UTC
++++ vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
+@@ -37,7 +37,7 @@ func parseMountTable(filter FilterFunc) ([]*Info, erro
+ 
+ 		if filter != nil {
+ 			// filter out entries we're not interested in
+-			skip, stop = filter(p)
++			//skip, stop = filter(p)
+ 			if skip {
+ 				continue
+ 			}
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
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.go
@@ -1,28 +0,0 @@
---- 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)
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
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2bAVX2__amd64.s
@@ -1,18 +0,0 @@
---- 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
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
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.go
@@ -1,18 +0,0 @@
---- 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)
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
+++ head/sysutils/nomad/files/patch-vendor_golang.org_x_crypto_blake2b_blake2b__amd64.s
@@ -1,15 +0,0 @@
---- 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
Index: head/sysutils/nomad/files/patch-vendor_vendor.json
===================================================================
--- head/sysutils/nomad/files/patch-vendor_vendor.json
+++ head/sysutils/nomad/files/patch-vendor_vendor.json
@@ -1,10 +0,0 @@
---- 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"},