Index: Makefile
===================================================================
--- Makefile	(revision 534836)
+++ Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webhook
-PORTVERSION=	2.6.9
-PORTREVISION=	2
+PORTVERSION=	2.7.0
 CATEGORIES=	www
 
 MAINTAINER=	stb@lassitu.de
@@ -11,11 +10,21 @@
 LICENSE=	APACHE20 BSD3CLAUSE MIT
 LICENSE_COMB=	multi
 
-USES=		go
+USES=		gmake go:modules
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	adnanh
-GH_TUPLE=	golang:sys:fead79001313:golang_sys/vendor/golang.org/x/sys_fead79001313
+GH_TUPLE=	\
+		clbanning:mxj:v1.8.4:clbanning_mxj/vendor/github.com/clbanning/mxj \
+		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
+		fsnotify:fsnotify:v1.4.2:fsnotify_fsnotify/vendor/gopkg.in/fsnotify.v1 \
+		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
+		go-chi:chi:v4.0.2:go_chi_chi/vendor/github.com/go-chi/chi \
+		go-yaml:yaml:eb3733d160e7:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		gofrs:uuid:v3.2.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
+		golang:sys:04cbcbbfeed8:golang_sys/vendor/golang.org/x/sys \
+		gorilla:mux:v1.7.3:gorilla_mux/vendor/github.com/gorilla/mux
+
 USE_RC_SUBR=	webhook
 
 GO_TARGET=	:${PREFIX}/sbin/webhook
@@ -32,10 +41,6 @@
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
-pre-build:
-	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
-	${MV} ${WRKSRC}/vendor/golang.org/x/sys_fead79001313 ${WRKSRC}/vendor/golang.org/x/sys
-
 post-install:
 	${INSTALL_DATA}  ${FILESDIR}/webhook.yaml ${STAGEDIR}${PREFIX}/etc/webhook.yaml.sample
 
Index: distinfo
===================================================================
--- distinfo	(revision 534836)
+++ distinfo	(working copy)
@@ -1,5 +1,21 @@
-TIMESTAMP = 1580646488
-SHA256 (adnanh-webhook-2.6.9_GH0.tar.gz) = 8a419a9796e0d7368dc52c53125d51aa1d28974269fe614eb7a91886fa41eb40
-SIZE (adnanh-webhook-2.6.9_GH0.tar.gz) = 824653
-SHA256 (golang-sys-fead79001313_GH0.tar.gz) = c8e102db152c51438f426a92b338f924827b960e75bd9d871ae9438135366073
-SIZE (golang-sys-fead79001313_GH0.tar.gz) = 1258330
+TIMESTAMP = 1589916073
+SHA256 (adnanh-webhook-2.7.0_GH0.tar.gz) = 2ae866294e9ef4a3ecbcad06355b00a8fb2bcdd674644ce69ebfbfc6c75fdbd5
+SIZE (adnanh-webhook-2.7.0_GH0.tar.gz) = 1652898
+SHA256 (clbanning-mxj-v1.8.4_GH0.tar.gz) = 335fa9d17855c8540eca83fd8ecacc5979570fe15be04f7c1154f0b71f2c39c7
+SIZE (clbanning-mxj-v1.8.4_GH0.tar.gz) = 1091271
+SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
+SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
+SHA256 (fsnotify-fsnotify-v1.4.2_GH0.tar.gz) = 4a1fd9beeb0496b9cf6084ac83654ece19188e9b2ffa041652d1071d4b225415
+SIZE (fsnotify-fsnotify-v1.4.2_GH0.tar.gz) = 29552
+SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec16794c839252808392097de44
+SIZE (ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772
+SHA256 (go-chi-chi-v4.0.2_GH0.tar.gz) = 7713a5afd18c440f38e67f853f5ded4f039f08f239dc6a29ed2788be5caaae99
+SIZE (go-chi-chi-v4.0.2_GH0.tar.gz) = 67748
+SHA256 (go-yaml-yaml-eb3733d160e7_GH0.tar.gz) = af7d1783112db839a6d2719701b1f4965bfd9749dbffe3f0f8ce1cf5e46be201
+SIZE (go-yaml-yaml-eb3733d160e7_GH0.tar.gz) = 64708
+SHA256 (gofrs-uuid-v3.2.0_GH0.tar.gz) = 77d6e7d793bbc8835e082b590d0512ed177d6eba898bffb202d76ef97db57677
+SIZE (gofrs-uuid-v3.2.0_GH0.tar.gz) = 17064
+SHA256 (golang-sys-04cbcbbfeed8_GH0.tar.gz) = 8f194ecf5ac4834ba7e3543f38f67a8972ede9fee67e2142eb72644213335824
+SIZE (golang-sys-04cbcbbfeed8_GH0.tar.gz) = 1535773
+SHA256 (gorilla-mux-v1.7.3_GH0.tar.gz) = 92adb9aea022f8b35686b75be50ba1206c4457c2f8a0e2a9d10d8721f35b3f11
+SIZE (gorilla-mux-v1.7.3_GH0.tar.gz) = 42495