diff --git a/net/geoipupdate/Makefile b/net/geoipupdate/Makefile
index 0abd30f35e93..ded68ad82dc1 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -1,74 +1,66 @@
 # Created by: adamw
 
 PORTNAME=	geoipupdate
-PORTVERSION=	4.6.0
+PORTVERSION=	4.7.0
 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
 
 RUN_DEPENDS=	ca_root_nss>=3:security/ca_root_nss
 
 USES=		gmake go:modules,no_targets
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 
 MAKE_ENV+=	${GO_ENV} \
 		CONFFILE=${PREFIX}/etc/GeoIP.conf \
 		DATADIR=${PREFIX}/share/GeoIP \
 		VERSION=${DISTVERSIONFULL}
 
-GH_TUPLE=	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		go-check:check:038fdea0a05b:go_check_check/vendor/gopkg.in/check.v1 \
-		go-yaml:yaml:eeeca48fe776:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
-		gofrs:flock:v0.8.0:gofrs_flock/vendor/github.com/gofrs/flock \
-		golang:sys:119d4633e4d1:golang_sys/vendor/golang.org/x/sys \
-		kr:text:v0.2.0:kr_text/vendor/github.com/kr/text \
-		niemeyer:pretty:a10e7caefd8e:niemeyer_pretty/vendor/github.com/niemeyer/pretty \
+GH_TUPLE=	gofrs:flock:v0.8.0:gofrs_flock/vendor/github.com/gofrs/flock \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify
+		spf13:pflag:v1.0.5:spf13_pflag/vendor/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
 SUB_FILES=	pkg-message
 
 do-build-MANPAGES-on:
 	# lowdown generates everything as section 7
 	{ ${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>
diff --git a/net/geoipupdate/distinfo b/net/geoipupdate/distinfo
index 24e7a4a00f2e..2796e4c6f109 100644
--- a/net/geoipupdate/distinfo
+++ b/net/geoipupdate/distinfo
@@ -1,25 +1,9 @@
-TIMESTAMP = 1608004692
-SHA256 (maxmind-geoipupdate-v4.6.0_GH0.tar.gz) = e64c3cb6f2c999e11e8401814305cbd7676c9d78a0131e06ed9dd950606dffcd
-SIZE (maxmind-geoipupdate-v4.6.0_GH0.tar.gz) = 32119
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (go-check-check-038fdea0a05b_GH0.tar.gz) = 34397249e49a9b3fa268b3517acde4505e3c98ac6aaa765f9d6b4d4a67e26e04
-SIZE (go-check-check-038fdea0a05b_GH0.tar.gz) = 31645
-SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
-SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
+TIMESTAMP = 1618593374
+SHA256 (maxmind-geoipupdate-v4.7.0_GH0.tar.gz) = 5ce7dfd6ca99339dd8cb42ef5a2ba2070df8c4e5ae6b9bc1e9cbccca1fb94cf7
+SIZE (maxmind-geoipupdate-v4.7.0_GH0.tar.gz) = 33270
 SHA256 (gofrs-flock-v0.8.0_GH0.tar.gz) = 64aa198aee88a6b560e2eb9a87794594e0b57c08a784dcb4bd8a0825b9ec5de6
 SIZE (gofrs-flock-v0.8.0_GH0.tar.gz) = 8978
-SHA256 (golang-sys-119d4633e4d1_GH0.tar.gz) = 1b3f6844c1959886e1cfa24ebad9b93a9f2900ee62ffcb857989dfa28e030cdc
-SIZE (golang-sys-119d4633e4d1_GH0.tar.gz) = 1072694
-SHA256 (kr-text-v0.2.0_GH0.tar.gz) = 59b5e4a7fd4097be87fad0edcaf342fdc971d0c8fdfb4f2d7424561471992e7c
-SIZE (kr-text-v0.2.0_GH0.tar.gz) = 8699
-SHA256 (niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 2a81e75bdd5341bd0fac76a90bb024ed2ac6c8a5d31d70cd715eef75224601e1
-SIZE (niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 9399
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-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.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
 SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
-SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215