Attachment #219827 for bug #251268

View | Details | Raw Unified | Return to bug 251268
Collapse All | Expand All





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 \
		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

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
	{ ${PRINTF} "title: geoipupdate\n\n" && ${CAT} ${WRKSRC}/doc/geoipupdate.md; } \

Lines 1-9 Link Here

(-)net/geoipupdate/distinfo (-1 / +17 lines)
1	TIMESTAMP = 1603972538	1	TIMESTAMP = 1605726088
2	SHA256 (maxmind-geoipupdate-v4.5.0_GH0.tar.gz) = dfa3ecebebe23923735612fc442388c5d8e02991b316012ab7d2738b3a48e9d4	2	SHA256 (maxmind-geoipupdate-v4.5.0_GH0.tar.gz) = dfa3ecebebe23923735612fc442388c5d8e02991b316012ab7d2738b3a48e9d4
3	SIZE (maxmind-geoipupdate-v4.5.0_GH0.tar.gz) = 31860	3	SIZE (maxmind-geoipupdate-v4.5.0_GH0.tar.gz) = 31860
		4	SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
		5	SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
		6	SHA256 (go-check-check-038fdea0a05b_GH0.tar.gz) = 34397249e49a9b3fa268b3517acde4505e3c98ac6aaa765f9d6b4d4a67e26e04
		7	SIZE (go-check-check-038fdea0a05b_GH0.tar.gz) = 31645
		8	SHA256 (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 77e421545f853bf0b0431ed5026f10ebeeadd436334ac156169b78f82e86bdf5
		9	SIZE (go-yaml-yaml-eeeca48fe776_GH0.tar.gz) = 88787
4	SHA256 (gofrs-flock-v0.8.0_GH0.tar.gz) = 64aa198aee88a6b560e2eb9a87794594e0b57c08a784dcb4bd8a0825b9ec5de6	10	SHA256 (gofrs-flock-v0.8.0_GH0.tar.gz) = 64aa198aee88a6b560e2eb9a87794594e0b57c08a784dcb4bd8a0825b9ec5de6
5	SIZE (gofrs-flock-v0.8.0_GH0.tar.gz) = 8978	11	SIZE (gofrs-flock-v0.8.0_GH0.tar.gz) = 8978
		12	SHA256 (golang-sys-119d4633e4d1_GH0.tar.gz) = 1b3f6844c1959886e1cfa24ebad9b93a9f2900ee62ffcb857989dfa28e030cdc
		13	SIZE (golang-sys-119d4633e4d1_GH0.tar.gz) = 1072694
		14	SHA256 (kr-text-v0.2.0_GH0.tar.gz) = 59b5e4a7fd4097be87fad0edcaf342fdc971d0c8fdfb4f2d7424561471992e7c
		15	SIZE (kr-text-v0.2.0_GH0.tar.gz) = 8699
		16	SHA256 (niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 2a81e75bdd5341bd0fac76a90bb024ed2ac6c8a5d31d70cd715eef75224601e1
		17	SIZE (niemeyer-pretty-a10e7caefd8e_GH0.tar.gz) = 9399
6	SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608	18	SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
7	SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415	19	SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
		20	SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
		21	SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
8	SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808	22	SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
9	SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796	23	SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
		24	SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
		25	SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215

Lines 1-6 Link Here

(-)net/geoipupdate/files/patch-Makefile (-2 / +11 lines)
1	--- Makefile.orig 2019-11-07 20:59:07 UTC	1	--- Makefile.orig 2020-10-28 21:03:38 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -57,7 +54,6 @@ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdat	3	@@ -41,7 +41,7 @@ $(BUILDDIR):
		4	mkdir -p $(BUILDDIR)
		5
		6	$(BUILDDIR)/geoipupdate: $(BUILDDIR)
		7	- (cd cmd/geoipupdate && go build -ldflags '-X main.defaultConfigFile=$(CONFFILE) -X main.defaultDatabaseDirectory=$(DATADIR) -X "main.version=$(VERSION)"')
		8	+ (cd cmd/geoipupdate && go build -mod=vendor -ldflags '-X main.defaultConfigFile=$(CONFFILE) -X main.defaultDatabaseDirectory=$(DATADIR) -X "main.version=$(VERSION)"')
		9	cp cmd/geoipupdate/geoipupdate $(BUILDDIR)
		10
		11	$(BUILDDIR)/GeoIP.conf: $(BUILDDIR) conf/GeoIP.conf.default
		12	@@ -54,7 +54,6 @@ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdat
4	sed -e 's\|CONFFILE\|$(CONFFILE)\|g' -e 's\|DATADIR\|$(DATADIR)\|g' -e 's\|$$\|$(MAYBE_CR)\|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md	13	sed -e 's\|CONFFILE\|$(CONFFILE)\|g' -e 's\|DATADIR\|$(DATADIR)\|g' -e 's\|$$\|$(MAYBE_CR)\|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
5		14
6	$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md $(BUILDDIR)/geoipupdate.md	15	$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md $(BUILDDIR)/geoipupdate.md

Return to bug 251268

Lines 16-34 Link Here

(-)net/geoipupdate/Makefile (-9 / +14 lines)
16		16
17	RUN_DEPENDS= ca_root_nss>=3:security/ca_root_nss	17	RUN_DEPENDS= ca_root_nss>=3:security/ca_root_nss
18		18
19	USES= gmake go:no_targets	19	USES= gmake go:modules,no_targets
20	USE_GITHUB= yes	20	USE_GITHUB= yes
21	GH_ACCOUNT= maxmind	21	GH_ACCOUNT= maxmind
22		22
23	MAKE_ENV+= GOPATH=${WRKSRC} \	23	MAKE_ENV+= ${GO_ENV} \
24	CONFFILE=${PREFIX}/etc/GeoIP.conf \	24	CONFFILE=${PREFIX}/etc/GeoIP.conf \
25	DATADIR=${PREFIX}/share/GeoIP \	25	DATADIR=${PREFIX}/share/GeoIP \
26	VERSION=${DISTVERSIONFULL}	26	VERSION=${DISTVERSIONFULL}
27		27
28	GH_SUBDIR= src/github.com/maxmind/geoipupdate/v4	28	GH_TUPLE= \
29	GH_TUPLE= gofrs:flock:v0.8.0:flock/src/github.com/gofrs/flock \	29	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
30	pkg:errors:v0.9.1:pkg/src/github.com/pkg/errors \	30	go-check:check:038fdea0a05b:go_check_check/vendor/gopkg.in/check.v1 \
31	spf13:pflag:v1.0.5:pflag/src/github.com/spf13/pflag	31	go-yaml:yaml:eeeca48fe776:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
		32	gofrs:flock:v0.8.0:gofrs_flock/vendor/github.com/gofrs/flock \
		33	golang:sys:119d4633e4d1:golang_sys/vendor/golang.org/x/sys \
		34	kr:text:v0.2.0:kr_text/vendor/github.com/kr/text \
		35	niemeyer:pretty:a10e7caefd8e:niemeyer_pretty/vendor/github.com/niemeyer/pretty \
		36	pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
		37	pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
		38	spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
		39	stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify
32		40
33	OPTIONS_DEFINE= DOCS MANPAGES	41	OPTIONS_DEFINE= DOCS MANPAGES
34	OPTIONS_DEFAULT=MANPAGES	42	OPTIONS_DEFAULT=MANPAGES
Lines 43-51 Link Here
43	PORTDOCS= GeoIP.conf.md geoipupdate.md	51	PORTDOCS= GeoIP.conf.md geoipupdate.md
44	SUB_FILES= pkg-message	52	SUB_FILES= pkg-message
45		53
46	post-extract:
47	${RM} ${WRKSRC}/go.mod
48
49	do-build-MANPAGES-on:	54	do-build-MANPAGES-on:
50	# lowdown generates everything as section 7	55	# lowdown generates everything as section 7
51	{ ${PRINTF} "title: geoipupdate\n\n" && ${CAT} ${WRKSRC}/doc/geoipupdate.md; } \	56	{ ${PRINTF} "title: geoipupdate\n\n" && ${CAT} ${WRKSRC}/doc/geoipupdate.md; } \