Index: head/net/geoipupdate/Makefile
===================================================================
--- head/net/geoipupdate/Makefile	(revision 503630)
+++ head/net/geoipupdate/Makefile	(revision 503631)
@@ -1,65 +1,71 @@
 # Created by: adamw
 # $FreeBSD$
 
 PORTNAME=	geoipupdate
-PORTVERSION=	4.0.2
+PORTVERSION=	4.0.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net geography
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Fetch the latest copies of the GeoIP2 databases
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	ca_root_nss>=3:security/ca_root_nss
 
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 
 MAKE_ENV+=	GOPATH=${WRKSRC} \
 		CONFFILE=${PREFIX}/etc/GeoIP.conf \
 		DATADIR=${PREFIX}/share/GeoIP
 
+GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
+# Not needed: go-spew, pretty, pty, text, go-difflib, objx, testify
+GH_TUPLE=	gofrs:flock:v0.7.1:flock/src/github.com/gofrs/flock \
+		pkg:errors:v0.8.1:pkg/src/github.com/pkg/errors \
+		spf13:pflag:v1.0.3:pflag/src/github.com/spf13/pflag \
+
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	lowdown:textproc/lowdown
 MANPAGES_PLIST_FILES=	man/man1/geoipupdate.1.gz \
 			man/man5/GeoIP.conf.5.gz
 
 PLIST_FILES=	bin/geoipupdate \
 		'@sample etc/GeoIP.conf.sample' \
 		'@dir share/GeoIP'
 PORTDOCS=	GeoIP.conf.md geoipupdate.md
 
-post-extract:
-	${MV} ${WRKSRC}/vendor ${WRKSRC}/src
+post-patch:
+	${RM} ${WRKSRC}/go.mod
 	${REINPLACE_CMD} -e '/make-man-pages.pl/d' ${WRKSRC}/Makefile
 
 do-build-MANPAGES-on:
 	{ ${PRINTF} "title: geoipupdate\n\n" && ${CAT} ${WRKSRC}/doc/geoipupdate.md; } \
 		| ${LOCALBASE}/bin/lowdown -s -Tman \
 		| ${SED} -e '1s/7/1/' > ${WRKSRC}/build/geoipupdate.1
 	{ ${PRINTF} "title: GeoIP.conf\n\n" && ${CAT} ${WRKSRC}/doc/GeoIP.conf.md; } \
 		| ${LOCALBASE}/bin/lowdown -s -Tman \
 		| ${SED} -e '1s/7/5/' > ${WRKSRC}/build/GeoIP.conf.5
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/GeoIP
 	${INSTALL_PROGRAM} ${WRKSRC}/build/geoipupdate ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/build/GeoIP.conf ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/build && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 do-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/build/geoipupdate.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/build/GeoIP.conf.5  ${STAGEDIR}${MANPREFIX}/man/man5
 
 .include <bsd.port.mk>
Index: head/net/geoipupdate/distinfo
===================================================================
--- head/net/geoipupdate/distinfo	(revision 503630)
+++ head/net/geoipupdate/distinfo	(revision 503631)
@@ -1,3 +1,23 @@
-TIMESTAMP = 1547842395
-SHA256 (maxmind-geoipupdate-v4.0.2_GH0.tar.gz) = 76a2bd8e75fbe1d88cfdf0ab7f00e90cfea7c87b8757d6f5147a3d4d2d9773b3
-SIZE (maxmind-geoipupdate-v4.0.2_GH0.tar.gz) = 106915
+TIMESTAMP = 1559921637
+SHA256 (maxmind-geoipupdate-v4.0.3_GH0.tar.gz) = d8257e53091cef5591745f2cf5c730a0431e3b8440903709f1707ae4e291bb4a
+SIZE (maxmind-geoipupdate-v4.0.3_GH0.tar.gz) = 107019
+SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
+SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (gofrs-flock-v0.7.1_GH0.tar.gz) = d4e33c3923e671fe6288a6dcb6618b7c46834c1a387653f482f5247c5a132dea
+SIZE (gofrs-flock-v0.7.1_GH0.tar.gz) = 7294
+SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
+SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
+SHA256 (kr-pty-v1.1.1_GH0.tar.gz) = 949d6e7f84f12482c0bc3e901cca92d26266ed645a1bdead3ffb2516e017ac47
+SIZE (kr-pty-v1.1.1_GH0.tar.gz) = 5668
+SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
+SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686
+SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
+SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
+SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
+SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
+SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
+SHA256 (stretchr-objx-v0.1.0_GH0.tar.gz) = 41b4e6679211d4b628df627013435b7d4e6e396d54b5b89e3a4d4eb54545e7f8
+SIZE (stretchr-objx-v0.1.0_GH0.tar.gz) = 109451
+SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5
+SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859