Index: head/security/meek/Makefile
===================================================================
--- head/security/meek/Makefile
+++ head/security/meek/Makefile
@@ -1,23 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	meek
-PORTVERSION=	0.21
+DISTVERSION=	0.31
 CATEGORIES=	security
-MASTER_SITES=	http://c-s.li/ports/
+MASTER_SITES=	https://gitweb.torproject.org/pluggable-transports/meek.git/snapshot/ \
+		https://gitweb.torproject.org/pluggable-transports/goptlib.git/snapshot/:goptlib
+DISTFILES=	${PORTNAME}-${DISTVERSION}.tar.gz \
+		goptlib-${GOPTLIBVERSION}.tar.gz:goptlib
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Pluggable transport proxy that relays through third-party server
 
-BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/git.torproject.org/pluggable-transports/goptlib.git.a:security/goptlib
+LICENSE=	CC0-1.0
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		go
-PLIST_FILES=	bin/meek-client bin/meek-server man/man1/meek-client.1.gz man/man1/meek-server.1.gz
+BUILD_DEPENDS=	go:lang/go
+
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:crypto:c126467:crypto/src/golang.org/x/crypto \
+		golang:net:a680a1e:net/src/golang.org/x/net \
+		golang:text:0605a83:text/src/golang.org/x/text
+
+GOPTLIBVERSION=	0.7
+
+PLIST_FILES=	bin/meek-client \
+		bin/meek-server \
+		man/man1/meek-client.1.gz \
+		man/man1/meek-server.1.gz
+
 SUB_FILES=	pkg-message
-GO_PKGNAME=	git.torproject.org/pluggable-transports/${PORTNAME}.git
-GO_TARGET=	${GO_PKGNAME}/${PORTNAME}-server \
-		${GO_PKGNAME}/${PORTNAME}-client
 
-post-install:
+post-extract:
+	@${MKDIR} ${WRKSRC}/src/git.torproject.org/pluggable-transports
+	@${LN} -s ${WRKDIR}/${PORTNAME}-${PORTVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/${PORTNAME}
+	@${LN} -s ${WRKDIR}/goptlib-${GOPTLIBVERSION} ${WRKSRC}/src/git.torproject.org/pluggable-transports/goptlib.git
+
+do-build:
+	@cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
+	@cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
+
+do-test:
+	@cd ${WRKSRC}/meek-client && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test
+	@cd ${WRKSRC}/meek-server && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/meek-client/meek-client ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/meek-server/meek-server ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/meek-server.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/meek-client.1 ${STAGEDIR}${PREFIX}/man/man1
 
Index: head/security/meek/distinfo
===================================================================
--- head/security/meek/distinfo
+++ head/security/meek/distinfo
@@ -1,2 +1,11 @@
-SHA256 (meek-0.21.tar.gz) = 9b08e53b86f49dfc56e971c39948bf953bf2391d5e9e36852935e8174df6bf32
-SIZE (meek-0.21.tar.gz) = 37413
+TIMESTAMP = 1532381797
+SHA256 (meek-0.31.tar.gz) = 4d5c9bf5d7e7b4f54d32cf5b41e90db3c3c6d981296da1066b8e9574ab82c048
+SIZE (meek-0.31.tar.gz) = 43279
+SHA256 (goptlib-0.7.tar.gz) = 71f29f7bb7a989e23533bab6544879c7ca9370b695aba891c1e9c91a10ae5c02
+SIZE (goptlib-0.7.tar.gz) = 25835
+SHA256 (golang-crypto-c126467_GH0.tar.gz) = af4ccc970d8ad62b042a0dcfa54d00c3b059840e61cd9023b059f848964b7b17
+SIZE (golang-crypto-c126467_GH0.tar.gz) = 1624160
+SHA256 (golang-net-a680a1e_GH0.tar.gz) = 719c3242af47fce2893f8d31fc9b53204bc00048f35990e56f1513d8db6fbf1b
+SIZE (golang-net-a680a1e_GH0.tar.gz) = 963677
+SHA256 (golang-text-0605a83_GH0.tar.gz) = 1c1d738849344300ad1321ff2d7f81226570249ed82517247136d62766277ac1
+SIZE (golang-text-0605a83_GH0.tar.gz) = 6567793