Index: head/net/v2ray/Makefile
===================================================================
--- head/net/v2ray/Makefile
+++ head/net/v2ray/Makefile
@@ -1,25 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	v2ray
-PORTVERSION=	4.14.0
+DISTVERSIONPREFIX=	v
+DISTVERSION=	4.20.0
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/v2ray/v2ray-core/releases/download/v${PORTVERSION}/
-DISTNAME=	src_all
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shen.elf@gmail.com
 COMMENT=	Platform for building proxies to bypass network restrictions
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/v2ray.com/core/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go zip
+USES=		go
+USE_GITHUB=	yes
+USE_RC_SUBR=	v2ray
 
-NO_WRKSUBDIR=	yes
-WRKSRC=		${WRKDIR}/src
+GH_ACCOUNT=	v2ray
+GH_PROJECT=	v2ray-core
+GH_SUBDIR=	src/v2ray.com/core
+GH_TUPLE=	golang:crypto:193df9c0f06f:golang_crypto/vendor/golang.org/x/crypto \
+		golang:mock:v1.2.0:golang_mock/vendor/github.com/golang/mock \
+		golang:net:65e2d4e15006:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:c823c79ea157:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:1d60e4601c6f:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:49385e6e1522:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
+		google:go-cmp:v0.2.0:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-genproto:11092d34479b:google_go_genproto/vendor/google.golang.org/genproto \
+		google:starlark-go:1174b2613e82:google_starlark_go/vendor/go.starlark.net \
+		grpc:grpc-go:v1.18.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		h12w:socks:v1.0.0:h12w_socks/vendor/h12.io/socks \
+		miekg:dns:v1.1.4:miekg_dns/vendor/github.com/miekg/dns
+
 GO_BUILDFLAGS=	--ldflags '-s -w'
 
-USE_RC_SUBR=	v2ray
 USERS=		v2ray
 GROUPS=		v2ray
 
@@ -27,19 +41,23 @@
 		GROUP="${GROUPS}"
 
 do-build:
-	@cd ${WRKSRC} && \
+	@cd ${GO_WRKSRC} && \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ray v2ray.com/core/main && \
-	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ctl v2ray.com/ext/tools/control/main
+	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build ${GO_BUILDFLAGS} -o ${GO_WRKDIR_BIN}/v2ctl v2ray.com/core/infra/control/main
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/v2ray ${STAGEDIR}${PREFIX}/bin/v2ray
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/v2ctl ${STAGEDIR}${PREFIX}/bin/v2ctl
-	${INSTALL_DATA} ${WRKSRC}/v2ray.com/core/release/config/config.json ${STAGEDIR}${ETCDIR}/config.json.sample
-	${INSTALL_DATA} ${WRKSRC}/v2ray.com/core/release/config/vpoint_socks_vmess.json ${STAGEDIR}${ETCDIR}/vpoint_socks_vmess.json
-	${INSTALL_DATA} ${WRKSRC}/v2ray.com/core/release/config/vpoint_vmess_freedom.json ${STAGEDIR}${ETCDIR}/vpoint_vmess_freedom.json
-	${INSTALL_DATA} ${WRKSRC}/v2ray.com/core/release/config/geoip.dat ${STAGEDIR}${DATADIR}/geoip.dat
-	${INSTALL_DATA} ${WRKSRC}/v2ray.com/core/release/config/geosite.dat ${STAGEDIR}${DATADIR}/geosite.dat
+	${INSTALL_DATA} ${WRKSRC}/release/config/config.json ${STAGEDIR}${ETCDIR}/config.json.sample
+	${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_socks_vmess.json ${STAGEDIR}${ETCDIR}/vpoint_socks_vmess.json
+	${INSTALL_DATA} ${WRKSRC}/release/config/vpoint_vmess_freedom.json ${STAGEDIR}${ETCDIR}/vpoint_vmess_freedom.json
+	${INSTALL_DATA} ${WRKSRC}/release/config/geoip.dat ${STAGEDIR}${DATADIR}/geoip.dat
+	${INSTALL_DATA} ${WRKSRC}/release/config/geosite.dat ${STAGEDIR}${DATADIR}/geosite.dat
+
+do-test:
+	@cd ${GO_WRKSRC} && \
+	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test -p 1 -tags json -v -timeout 30m ./...
 
 .include <bsd.port.mk>
Index: head/net/v2ray/distinfo
===================================================================
--- head/net/v2ray/distinfo
+++ head/net/v2ray/distinfo
@@ -1,3 +1,29 @@
-TIMESTAMP = 1549167902
-SHA256 (v2ray-4.14.0/src_all.zip) = 842a8bf2a2f5787ca854b61697a444e86928650def5bae512b99c52e95230648
-SIZE (v2ray-4.14.0/src_all.zip) = 31614054
+TIMESTAMP = 1563040894
+SHA256 (v2ray-v2ray-core-v4.20.0_GH0.tar.gz) = 579a7098b8f6cc68c3f94c5453fa274299f8b072736f364654298bd4cf57d24e
+SIZE (v2ray-v2ray-core-v4.20.0_GH0.tar.gz) = 6943858
+SHA256 (golang-crypto-193df9c0f06f_GH0.tar.gz) = 9bb154cf1a19f5073b3b75f6854562a30c7457b2e2b0d456c39bbc47d799c39e
+SIZE (golang-crypto-193df9c0f06f_GH0.tar.gz) = 1646699
+SHA256 (golang-mock-v1.2.0_GH0.tar.gz) = b7278e2d81b4ea2b849da7a20aedafd627748e188b2118bb536b8a2e3b95a821
+SIZE (golang-mock-v1.2.0_GH0.tar.gz) = 46488
+SHA256 (golang-net-65e2d4e15006_GH0.tar.gz) = 855876f41d4affc4295cbffd43561a173f75b6f3dd4099e864cb0c287236287a
+SIZE (golang-net-65e2d4e15006_GH0.tar.gz) = 962569
+SHA256 (golang-protobuf-c823c79ea157_GH0.tar.gz) = ebcd65a5530637b64b93dc8e9644011ffa9bdb8e3b0aa75198d0af871c078006
+SIZE (golang-protobuf-c823c79ea157_GH0.tar.gz) = 329185
+SHA256 (golang-sync-1d60e4601c6f_GH0.tar.gz) = e03c0637f9813516a244e075b234792e58df3a31457c3f7c29a5e32950b1ab33
+SIZE (golang-sync-1d60e4601c6f_GH0.tar.gz) = 16319
+SHA256 (golang-sys-49385e6e1522_GH0.tar.gz) = 346932455425020a633390b7b123cd4851f63cbd86ac26be3aad732727579a26
+SIZE (golang-sys-49385e6e1522_GH0.tar.gz) = 1032798
+SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
+SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
+SHA256 (google-go-cmp-v0.2.0_GH0.tar.gz) = 3c4e5aca9a707eb19f5ef54b13171f3d36466f4cab73918d111bd93c88b62eed
+SIZE (google-go-cmp-v0.2.0_GH0.tar.gz) = 57862
+SHA256 (google-go-genproto-11092d34479b_GH0.tar.gz) = b853fb93631852becc8f2d915fa036e396521a194177d6dd91682ca7d70efc87
+SIZE (google-go-genproto-11092d34479b_GH0.tar.gz) = 2222157
+SHA256 (grpc-grpc-go-v1.18.0_GH0.tar.gz) = 078b44a673860ffda7a366f9e6a05415eb5126b54bd6cde921f2403283f95a1f
+SIZE (grpc-grpc-go-v1.18.0_GH0.tar.gz) = 589845
+SHA256 (miekg-dns-v1.1.4_GH0.tar.gz) = eb5a2460ed75938dc4268bb80f0c65179b81792864abad3b4be1d4f1d6d52f1d
+SIZE (miekg-dns-v1.1.4_GH0.tar.gz) = 3882057
+SHA256 (h12w-socks-v1.0.0_GH0.tar.gz) = 338e331b4859fee7656ced8ed8546f803da7f4bc5c9504b6e2ece3e71e6297e5
+SIZE (h12w-socks-v1.0.0_GH0.tar.gz) = 11603
+SHA256 (google-starlark-go-1174b2613e82_GH0.tar.gz) = 7e4ba6eabe1fd9df8b03b06211176f65151842d969378975ce02c80073ed4185
+SIZE (google-starlark-go-1174b2613e82_GH0.tar.gz) = 207473