svn commit: r556077 - in head/net/geoipupdate: . files

Sun Nov 22 22:39:03 UTC 2020

Author: dmgk
Date: Sun Nov 22 22:39:02 2020
New Revision: 556077
URL: https://svnweb.freebsd.org/changeset/ports/556077

Log:
  net/geoipupdate: switch to USES=go:modules
  
  Switch to USES=go:modules and pass GO_ENV down to make in preparation for the
  upcoming go1.16 release.
  
  PR:		251268
  Approved by:	adamw (maintainer)

Modified:
  head/net/geoipupdate/Makefile
  head/net/geoipupdate/distinfo
  head/net/geoipupdate/files/patch-Makefile

Modified: head/net/geoipupdate/Makefile
==============================================================================

--- head/net/geoipupdate/Makefile	Sun Nov 22 22:08:38 2020	(r556076)
+++ head/net/geoipupdate/Makefile	Sun Nov 22 22:39:02 2020	(r556077)
@@ -16,19 +16,27 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 RUN_DEPENDS=	ca_root_nss>=3:security/ca_root_nss
 
-USES=		gmake go:no_targets
+USES=		gmake go:modules,no_targets
 USE_GITHUB=	yes
 GH_ACCOUNT=	maxmind
 
-MAKE_ENV+=	GOPATH=${WRKSRC} \
+MAKE_ENV+=	${GO_ENV} \
 		CONFFILE=${PREFIX}/etc/GeoIP.conf \
 		DATADIR=${PREFIX}/share/GeoIP \
 		VERSION=${DISTVERSIONFULL}
 
-GH_SUBDIR=	src/github.com/maxmind/geoipupdate/v4
-GH_TUPLE=	gofrs:flock:v0.8.0:flock/src/github.com/gofrs/flock \
-		pkg:errors:v0.9.1:pkg/src/github.com/pkg/errors \
-		spf13:pflag:v1.0.5:pflag/src/github.com/spf13/pflag
+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 \
+		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
 
 OPTIONS_DEFINE=	DOCS MANPAGES
 OPTIONS_DEFAULT=MANPAGES
@@ -42,9 +50,6 @@ PLIST_FILES=	bin/geoipupdate \
 		'@dir share/GeoIP'
 PORTDOCS=	GeoIP.conf.md geoipupdate.md
 SUB_FILES=	pkg-message
-
-post-extract:
-	${RM} ${WRKSRC}/go.mod
 
 do-build-MANPAGES-on:
 	# lowdown generates everything as section 7

Modified: head/net/geoipupdate/distinfo
==============================================================================
--- head/net/geoipupdate/distinfo	Sun Nov 22 22:08:38 2020	(r556076)
+++ head/net/geoipupdate/distinfo	Sun Nov 22 22:39:02 2020	(r556077)
@@ -1,9 +1,25 @@
-TIMESTAMP = 1603972538
+TIMESTAMP = 1605726088
 SHA256 (maxmind-geoipupdate-v4.5.0_GH0.tar.gz) = dfa3ecebebe23923735612fc442388c5d8e02991b316012ab7d2738b3a48e9d4
 SIZE (maxmind-geoipupdate-v4.5.0_GH0.tar.gz) = 31860
+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
 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

Modified: head/net/geoipupdate/files/patch-Makefile
==============================================================================
--- head/net/geoipupdate/files/patch-Makefile	Sun Nov 22 22:08:38 2020	(r556076)
+++ head/net/geoipupdate/files/patch-Makefile	Sun Nov 22 22:39:02 2020	(r556077)
@@ -1,6 +1,15 @@
---- Makefile.orig	2019-11-07 20:59:07 UTC
+--- Makefile.orig	2020-10-28 21:03:38 UTC
 +++ Makefile
-@@ -57,7 +54,6 @@ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdat
+@@ -41,7 +41,7 @@ $(BUILDDIR):
+ 	mkdir -p $(BUILDDIR)
+ 
+ $(BUILDDIR)/geoipupdate: $(BUILDDIR)
+-	(cd cmd/geoipupdate && go build -ldflags '-X main.defaultConfigFile=$(CONFFILE) -X main.defaultDatabaseDirectory=$(DATADIR) -X "main.version=$(VERSION)"')
++	(cd cmd/geoipupdate && go build -mod=vendor -ldflags '-X main.defaultConfigFile=$(CONFFILE) -X main.defaultDatabaseDirectory=$(DATADIR) -X "main.version=$(VERSION)"')
+ 	cp cmd/geoipupdate/geoipupdate $(BUILDDIR)
+ 
+ $(BUILDDIR)/GeoIP.conf: $(BUILDDIR) conf/GeoIP.conf.default
+@@ -54,7 +54,6 @@ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdat
  	sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
  
  $(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md  $(BUILDDIR)/geoipupdate.md
