Index: head/www/wuzz/Makefile
===================================================================
--- head/www/wuzz/Makefile	(revision 504841)
+++ head/www/wuzz/Makefile	(revision 504842)
@@ -1,45 +1,38 @@
 # $FreeBSD$
 
 PORTNAME=	wuzz
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0-9
-DISTVERSIONSUFFIX=	-g1b75b60
+DISTVERSION=	0.4.0-13
+DISTVERSIONSUFFIX=	-g4c6d320
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Interactive cli tool for HTTP inspection
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	go:lang/go
-
+USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	asciimoo
-GH_TUPLE=	alessio:shellescape:v1.2:shellescape/src/github.com/alessio/shellescape \
-		andybalholm:cascadia:v1.0.0:cascadia/src/github.com/andybalholm/cascadia \
-		BurntSushi:toml:v0.3.0:toml/src/github.com/BurntSushi/toml \
-		fatih:color:v1.7.0:color/src/github.com/fatih/color \
-		jroimartin:gocui:c055c87:gocui/src/github.com/jroimartin/gocui \
-		mattn:go-runewidth:v0.0.2:runewidth/src/github.com/mattn/go-runewidth \
-		mitchellh:go-homedir:5804607:homedir/src/github.com/mitchellh/go-homedir \
-		nsf:termbox-go:5c94acc:termbox/src/github.com/nsf/termbox-go \
-		nwidger:jsoncolor:75a6de4:jsoncolor/src/github.com/nwidger/jsoncolor \
-		PuerkitoBio:goquery:v1.4.1:goquery/src/github.com/PuerkitoBio/goquery \
-		tidwall:gjson:v1.1.3:gjson/src/github.com/tidwall/gjson \
-		tidwall:match:1731857:match/src/github.com/tidwall/match \
-		x86kernel:htmlcolor:cf1d377:htmlcolor/src/github.com/x86kernel/htmlcolor \
-		golang:net:0ed95ab:net/src/golang.org/x/net
+GH_TUPLE=	\
+		alessio:shellescape:v1.2:shellescape/vendor/github.com/alessio/shellescape \
+		andybalholm:cascadia:v1.0.0:cascadia/vendor/github.com/andybalholm/cascadia \
+		BurntSushi:toml:v0.3.0:toml/vendor/github.com/BurntSushi/toml \
+		fatih:color:v1.7.0:color/vendor/github.com/fatih/color \
+		jroimartin:gocui:c055c87:gocui/vendor/github.com/jroimartin/gocui \
+		mattn:go-runewidth:v0.0.2:runewidth/vendor/github.com/mattn/go-runewidth \
+		mitchellh:go-homedir:5804607:homedir/vendor/github.com/mitchellh/go-homedir \
+		nsf:termbox-go:5c94acc:termbox/vendor/github.com/nsf/termbox-go \
+		nwidger:jsoncolor:75a6de4:jsoncolor/vendor/github.com/nwidger/jsoncolor \
+		PuerkitoBio:goquery:v1.4.1:goquery/vendor/github.com/PuerkitoBio/goquery \
+		tidwall:gjson:v1.1.3:gjson/vendor/github.com/tidwall/gjson \
+		tidwall:match:1731857:match/vendor/github.com/tidwall/match \
+		x86kernel:htmlcolor:cf1d377:htmlcolor/vendor/github.com/x86kernel/htmlcolor \
+		golang:net:0ed95ab:net/vendor/golang.org/x/net
 
-GH_SUBDIR:=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
-
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build -o ${PORTNAME}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/www/wuzz/distinfo
===================================================================
--- head/www/wuzz/distinfo	(revision 504841)
+++ head/www/wuzz/distinfo	(revision 504842)
@@ -1,31 +1,31 @@
-TIMESTAMP = 1534060120
-SHA256 (asciimoo-wuzz-v0.4.0-9-g1b75b60_GH0.tar.gz) = d86e7c90b6fd7144898ac0e8c555a2bab48a6f9d84223cd604610168228e38bd
-SIZE (asciimoo-wuzz-v0.4.0-9-g1b75b60_GH0.tar.gz) = 124106
+TIMESTAMP = 1561173631
+SHA256 (asciimoo-wuzz-v0.4.0-13-g4c6d320_GH0.tar.gz) = 67625b81087f9fcac23e170d8f20494266cf795317660033f64466bc72735d52
+SIZE (asciimoo-wuzz-v0.4.0-13-g4c6d320_GH0.tar.gz) = 124208
 SHA256 (alessio-shellescape-v1.2_GH0.tar.gz) = 9edd29a26e8b4c2ebd895ba231dff492b1fe7ba1e19876a0535ff40b63854ea6
 SIZE (alessio-shellescape-v1.2_GH0.tar.gz) = 2967
 SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52
 SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232
 SHA256 (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 2c49390424cfb043f803977bce80b1504495bada54f9e845ff8b30a05fab9a36
 SIZE (BurntSushi-toml-v0.3.0_GH0.tar.gz) = 41554
 SHA256 (fatih-color-v1.7.0_GH0.tar.gz) = 4650d7aa3feed266fc85d91dc34ca9cffdf7ee03ea29bf2cbf84bbecc75fb755
 SIZE (fatih-color-v1.7.0_GH0.tar.gz) = 816449
 SHA256 (jroimartin-gocui-c055c87_GH0.tar.gz) = 8895f0a06753f8a73b1fd537dba9d252fc07ff62df2a3537fcd2e660f45fbf41
 SIZE (jroimartin-gocui-c055c87_GH0.tar.gz) = 28385
 SHA256 (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 6c7734401fdf829af4f35a5af21a54548f7d3a68336940fb550178ddfe95b076
 SIZE (mattn-go-runewidth-v0.0.2_GH0.tar.gz) = 22367
 SHA256 (mitchellh-go-homedir-5804607_GH0.tar.gz) = bf1f44f1b61cc3406a2cd714105150251da97bc1260cd44f46d69746e5a965d4
 SIZE (mitchellh-go-homedir-5804607_GH0.tar.gz) = 3178
 SHA256 (nsf-termbox-go-5c94acc_GH0.tar.gz) = 5a5560d521d05cbc6938ab58f5501ac185e943fe370f6744cff3a7a889edd7f9
 SIZE (nsf-termbox-go-5c94acc_GH0.tar.gz) = 31677
 SHA256 (nwidger-jsoncolor-75a6de4_GH0.tar.gz) = 53ee90557b48eecdbc4ac1b835f4d761a821b94f5ca9b7e65c3c01fe0eae242c
 SIZE (nwidger-jsoncolor-75a6de4_GH0.tar.gz) = 4372
 SHA256 (PuerkitoBio-goquery-v1.4.1_GH0.tar.gz) = 49962be8afaef664079868699c98b770728005df70c6751b91c55c86a1b3a86c
 SIZE (PuerkitoBio-goquery-v1.4.1_GH0.tar.gz) = 100484
 SHA256 (tidwall-gjson-v1.1.3_GH0.tar.gz) = 5b2620a91fdb64feb18842c940e507b8c2739c15946b105e56971f5c5e55ec8d
 SIZE (tidwall-gjson-v1.1.3_GH0.tar.gz) = 40870
 SHA256 (tidwall-match-1731857_GH0.tar.gz) = e331b585187933030daa6d79da92052170c47ea37f1ebb947675ec14f586702a
 SIZE (tidwall-match-1731857_GH0.tar.gz) = 4274
 SHA256 (x86kernel-htmlcolor-cf1d377_GH0.tar.gz) = e3f7de1515108d8e97e869c6110bd9cf211975cc19311ae60e0284344303da86
 SIZE (x86kernel-htmlcolor-cf1d377_GH0.tar.gz) = 1177
 SHA256 (golang-net-0ed95ab_GH0.tar.gz) = c47997a853b9e9accfb3192498e1b3333f6d000b6674fdfc9e22bd3675c4ff0f
 SIZE (golang-net-0ed95ab_GH0.tar.gz) = 929664