Index: head/devel/goprotobuf/Makefile
===================================================================
--- head/devel/goprotobuf/Makefile	(revision 447319)
+++ head/devel/goprotobuf/Makefile	(revision 447320)
@@ -1,23 +1,25 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	goprotobuf
-PORTVERSION=	20151207
-PORTREVISION=	1
+PORTVERSION=	20170527
 CATEGORIES=	devel
-MASTER_SITES=	http://www.c-s.li/ports/
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Go support for Google's protocol buffers
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	protoc:devel/protobuf
 
 USES=		go
 GO_PKGNAME=	github.com/golang/protobuf
 GO_TARGET=	${GO_PKGNAME}/proto \
 		${GO_PKGNAME}/protoc-gen-go \
 		${GO_PKGNAME}/jsonpb
+USE_GITHUB=	yes
+GH_ACCOUNT=	golang
+GH_PROJECT=	protobuf
+GH_TAGNAME=	9f174c9
 
 .include <bsd.port.mk>
Index: head/devel/goprotobuf/distinfo
===================================================================
--- head/devel/goprotobuf/distinfo	(revision 447319)
+++ head/devel/goprotobuf/distinfo	(revision 447320)
@@ -1,2 +1,3 @@
-SHA256 (goprotobuf-20151207.tar.gz) = 6b83cccaf719ab3716c3b886f2df5372a0390cc5058ace3613da0d2089b7f8ee
-SIZE (goprotobuf-20151207.tar.gz) = 178783
+TIMESTAMP = 1495867884
+SHA256 (golang-protobuf-20170527-9f174c9_GH0.tar.gz) = 150eb67cd2cf7d00e5cfc322c9d563843389716ab3713a61e8cc2c10289d50e2
+SIZE (golang-protobuf-20170527-9f174c9_GH0.tar.gz) = 252154
Index: head/devel/goprotobuf/pkg-plist
===================================================================
--- head/devel/goprotobuf/pkg-plist	(revision 447319)
+++ head/devel/goprotobuf/pkg-plist	(revision 447320)
@@ -1,39 +1,43 @@
 bin/protoc-gen-go
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/jsonpb.a
 %%GO_LIBDIR%%/%%GO_PKGNAME%%/proto.a
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/Makefile
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/more_test_objects.proto
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/test_objects.pb.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/test_objects.proto
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/Makefile
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/all_test.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/any_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/clone.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/clone_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/decode.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/decode_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/encode.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/encode_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/equal.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/equal_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/extensions.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/extensions_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/lib.go
+%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/map_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/message_set.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/message_set_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/pointer_reflect.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/pointer_unsafe.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/properties.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/proto3_proto/proto3.pb.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/proto3_proto/proto3.proto
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/proto3_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/size2_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/size_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/Makefile
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/golden_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/test.pb.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/test.proto
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text_parser.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text_parser_test.go
 %%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text_test.go