git: 934f5b4ae2fa - main - net/ipinfo-cli: fix build on riscv64

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Fri, 03 Mar 2023 21:31:25 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=934f5b4ae2fa65afdd1cc19cae52ece6fdb10eee

commit 934f5b4ae2fa65afdd1cc19cae52ece6fdb10eee
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-02 01:00:12 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-03 21:31:08 +0000

    net/ipinfo-cli: fix build on riscv64
    
     - bump golang.org/x/sys dependency to version supporting
       riscv64-freebsd
     - remove useless GH_TUPLE entries; these were already found in
       the main distfile.
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    portmgr (build fix blanket)
    Approved by:    eduardo (mentor)
    Differential Revision: https://reviews.freebsd.org/D38869
---
 net/ipinfo-cli/Makefile | 28 +++++++---------------------
 net/ipinfo-cli/distinfo | 42 +++---------------------------------------
 2 files changed, 10 insertions(+), 60 deletions(-)

diff --git a/net/ipinfo-cli/Makefile b/net/ipinfo-cli/Makefile
index da152948fdb2..fb64ba0b43ea 100644
--- a/net/ipinfo-cli/Makefile
+++ b/net/ipinfo-cli/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	ipinfo
 DISTVERSIONPREFIX=	ipinfo-
 DISTVERSION=	2.10.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	0xdutra@gmail.com
@@ -15,29 +15,15 @@ USES=	go:modules
 
 USE_GITHUB=	yes
 GH_PROJECT=	cli
-GH_TUPLE=	\
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		etcd-io:bbolt:v1.3.6:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
-		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
-		go-yaml:yaml:496545a6307b:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
-		golang:sync:0976fa681c29:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:2c5d950f24ef:golang_sys/vendor/golang.org/x/sys \
-		golang:term:2321bbc49cbf:golang_term/vendor/golang.org/x/term \
-		hashicorp:errwrap:v1.1.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
-		hashicorp:go-multierror:v1.1.1:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
-		ipinfo:go:v2.9.0:ipinfo_go_v2/vendor/github.com/ipinfo/go/v2 \
-		jszwec:csvutil:v1.4.0:jszwec_csvutil/vendor/github.com/jszwec/csvutil \
-		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
-		pkg:browser:ce105d075bb4:pkg_browser/vendor/github.com/pkg/browser \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		posener:script:v1.1.5:posener_script/vendor/github.com/posener/script \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify
+GH_TUPLE=	golang:sys:v0.5.0:golang_sys \
 
 GO_TARGET=	./ipinfo
 
 PLIST_FILES=	bin/${PORTNAME}
 
+pre-patch:
+	${RM} ${WRKSRC}/vendor/modules.txt
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 .include <bsd.port.mk>
diff --git a/net/ipinfo-cli/distinfo b/net/ipinfo-cli/distinfo
index 7a771e58d873..400cdd8757eb 100644
--- a/net/ipinfo-cli/distinfo
+++ b/net/ipinfo-cli/distinfo
@@ -1,41 +1,5 @@
-TIMESTAMP = 1675301461
+TIMESTAMP = 1677718540
 SHA256 (ipinfo-cli-ipinfo-2.10.1_GH0.tar.gz) = fda456830956367b04a8467e58983a25847f9b32b4c06e05e6f417eb4adfd553
 SIZE (ipinfo-cli-ipinfo-2.10.1_GH0.tar.gz) = 3591386
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = a2e524f7f32c44fa0765de192ac0789c585010cadd2c2ddcf9518e858a96ec1f
-SIZE (etcd-io-bbolt-v1.3.6_GH0.tar.gz) = 98025
-SHA256 (fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e
-SIZE (fatih-color-v1.10.0_GH0.tar.gz) = 1267532
-SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
-SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
-SHA256 (golang-sync-0976fa681c29_GH0.tar.gz) = 3c59014610e6000bfc570fb551865ab20fed5df4e97721cc7125bbf84d79df70
-SIZE (golang-sync-0976fa681c29_GH0.tar.gz) = 19503
-SHA256 (golang-sys-2c5d950f24ef_GH0.tar.gz) = 101113d3039297a2ffdf4324f8ec1baa860b10a63ab4ac451fd456a9b20e56e7
-SIZE (golang-sys-2c5d950f24ef_GH0.tar.gz) = 1216186
-SHA256 (golang-term-2321bbc49cbf_GH0.tar.gz) = 72896f6aa3deb053da5b597ab072ba5c3540b29d0fb56f350397b7f94c010e21
-SIZE (golang-term-2321bbc49cbf_GH0.tar.gz) = 15281
-SHA256 (hashicorp-errwrap-v1.1.0_GH0.tar.gz) = 0d73891a7a179e50a142ac8832db97b17c792d29ae205b0e6aeedde4c43d51a4
-SIZE (hashicorp-errwrap-v1.1.0_GH0.tar.gz) = 8581
-SHA256 (hashicorp-go-multierror-v1.1.1_GH0.tar.gz) = 8d1bb3377310e8ffe4c7b5672c5de1eaed153402aebd15d6e5b9673c356a065f
-SIZE (hashicorp-go-multierror-v1.1.1_GH0.tar.gz) = 13803
-SHA256 (ipinfo-go-v2.9.0_GH0.tar.gz) = 77de01a35fefb825e467838073d33f65c2485929fea1ea990bf7746b110fee3e
-SIZE (ipinfo-go-v2.9.0_GH0.tar.gz) = 26912
-SHA256 (jszwec-csvutil-v1.4.0_GH0.tar.gz) = 984948ff98648adabbcf8579851f2b39ea9b28fa8ee5a101a7600195ea3b444e
-SIZE (jszwec-csvutil-v1.4.0_GH0.tar.gz) = 47069
-SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
-SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be
-SIZE (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 13572
-SHA256 (pkg-browser-ce105d075bb4_GH0.tar.gz) = 796b05c5a0f081994403ad19158188a153ea2e72cdb14a458678fd5a7c34dbed
-SIZE (pkg-browser-ce105d075bb4_GH0.tar.gz) = 4194
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (posener-script-v1.1.5_GH0.tar.gz) = 37aa5cc92a60219b60bafdf3bc7ebe0cbab692c977134f40c00ca18d9a45223f
-SIZE (posener-script-v1.1.5_GH0.tar.gz) = 17104
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
-SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723