git: 06dc77203cee - main - www/vultr-cli: fix build on riscv64

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=06dc77203cee59add6e01715581dbc24e52dda1b

commit 06dc77203cee59add6e01715581dbc24e52dda1b
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-22 17:46:01 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-24 20:54:42 +0000

    www/vultr-cli: fix build on riscv64
    
    Bump golang.org/x/sys dependency to a version new enough to
    support riscv64-freebsd.  While we are at it, remove useless
    dependencies: these are already vendored in upstream's repository.
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    portmgr (build fix blanket)
---
 www/vultr-cli/Makefile | 37 +++++-------------------------
 www/vultr-cli/distinfo | 62 +++-----------------------------------------------
 2 files changed, 9 insertions(+), 90 deletions(-)

diff --git a/www/vultr-cli/Makefile b/www/vultr-cli/Makefile
index 80b49c7d1108..8985a7319fae 100644
--- a/www/vultr-cli/Makefile
+++ b/www/vultr-cli/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vultr-cli
 PORTVERSION=	2.14.2
-PORTREVISION=	9
+PORTREVISION=	10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
@@ -14,36 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	vultr
-GH_TUPLE=	\
-		fsnotify:fsnotify:v1.5.4:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
-		go-check:check:41f04d3bba15:go_check_check/vendor/gopkg.in/check.v1 \
-		go-ini:ini:v1.66.4:go_ini_ini/vendor/gopkg.in/ini.v1 \
-		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		go-yaml:yaml:v3.0.0:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
-		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
-		golang:net:2e3eb7b945c2:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:9780585627b5:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:bc2c85ada10a:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
-		google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \
-		hashicorp:go-cleanhttp:v0.5.2:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
-		hashicorp:go-retryablehttp:v0.7.1:hashicorp_go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		magiconair:properties:v1.8.6:magiconair_properties/vendor/github.com/magiconair/properties \
-		mitchellh:mapstructure:v1.5.0:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		pelletier:go-toml:v1.9.5:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
-		pelletier:go-toml:v2.0.1:pelletier_go_toml_v2/vendor/github.com/pelletier/go-toml/v2 \
-		protocolbuffers:protobuf-go:v1.28.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		spf13:afero:v1.8.2:spf13_afero/vendor/github.com/spf13/afero \
-		spf13:cast:v1.5.0:spf13_cast/vendor/github.com/spf13/cast \
-		spf13:cobra:v1.4.0:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:jwalterweatherman:v1.1.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
-		spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
-		spf13:viper:v1.12.0:spf13_viper/vendor/github.com/spf13/viper \
-		subosito:gotenv:v1.3.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
-		vultr:govultr:v2.17.2:vultr_govultr_v2/vendor/github.com/vultr/govultr/v2
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	CHANGELOG.md README.md
@@ -51,6 +22,10 @@ PORTDOCS=	CHANGELOG.md README.md
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	DOCS
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/www/vultr-cli/distinfo b/www/vultr-cli/distinfo
index 0733fca97adb..dc00c11c1aac 100644
--- a/www/vultr-cli/distinfo
+++ b/www/vultr-cli/distinfo
@@ -1,61 +1,5 @@
-TIMESTAMP = 1655728647
+TIMESTAMP = 1679506932
 SHA256 (vultr-vultr-cli-v2.14.2_GH0.tar.gz) = 5971378e60249d274e3712ca17d3dbdb7b1a70e1c5ea424e21592eadb5880c3b
 SIZE (vultr-vultr-cli-v2.14.2_GH0.tar.gz) = 2247349
-SHA256 (fsnotify-fsnotify-v1.5.4_GH0.tar.gz) = cb5f0105cb651186795c275271eea30ea151c9f6d4c8d8d9b25b819050531de7
-SIZE (fsnotify-fsnotify-v1.5.4_GH0.tar.gz) = 33771
-SHA256 (go-check-check-41f04d3bba15_GH0.tar.gz) = 2d5b1036909b241e44f0d6a7cfa936cf9f875efb4f0af077cd61585c6d0c0432
-SIZE (go-check-check-41f04d3bba15_GH0.tar.gz) = 31614
-SHA256 (go-ini-ini-v1.66.4_GH0.tar.gz) = 6b64578fd951b1654ec09893ba7bf2cb8517c1a6905258aa0e5a85fff3fa3a91
-SIZE (go-ini-ini-v1.66.4_GH0.tar.gz) = 53337
-SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
-SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
-SHA256 (go-yaml-yaml-v3.0.0_GH0.tar.gz) = 6777f98a913c60ba2a1980665883898168674da018bb7447fc55bb33460e4bed
-SIZE (go-yaml-yaml-v3.0.0_GH0.tar.gz) = 91138
-SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
-SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
-SHA256 (golang-net-2e3eb7b945c2_GH0.tar.gz) = ac3e046eedce310d35945df0dab926f325ed047780528b2be1f034c782f8b0d2
-SIZE (golang-net-2e3eb7b945c2_GH0.tar.gz) = 1230418
-SHA256 (golang-oauth2-9780585627b5_GH0.tar.gz) = 1c811dfb03781324c5a8bcd9124e437ed15253139fecbfe9f4106363bbe3b5c5
-SIZE (golang-oauth2-9780585627b5_GH0.tar.gz) = 88428
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-bc2c85ada10a_GH0.tar.gz) = f4a4b0839211cec4a8520bdc7e1004aba8cd0fa1a480a7158d1276efeb890e9a
-SIZE (golang-sys-bc2c85ada10a_GH0.tar.gz) = 1303050
-SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
-SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
-SHA256 (google-go-querystring-v1.1.0_GH0.tar.gz) = a5641dee688eb2c733608ce5a88d8181c93ad9f5083fd97fadbccb91afad9a56
-SIZE (google-go-querystring-v1.1.0_GH0.tar.gz) = 10423
-SHA256 (hashicorp-go-cleanhttp-v0.5.2_GH0.tar.gz) = 091d90c479401bc9047454c25f91a97a6707e6a279ce778e4881cf6b0191a47f
-SIZE (hashicorp-go-cleanhttp-v0.5.2_GH0.tar.gz) = 8094
-SHA256 (hashicorp-go-retryablehttp-v0.7.1_GH0.tar.gz) = 8c74fe089dcb27345142ed5ff8964bfb20b8454f0a793f3bb4d237c0eaf9b31c
-SIZE (hashicorp-go-retryablehttp-v0.7.1_GH0.tar.gz) = 21462
-SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
-SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (magiconair-properties-v1.8.6_GH0.tar.gz) = 59b7e9184d83405c09af4ec23ebd20737cce34fa79244ff1f6314085244b9907
-SIZE (magiconair-properties-v1.8.6_GH0.tar.gz) = 30241
-SHA256 (mitchellh-mapstructure-v1.5.0_GH0.tar.gz) = 81106cbac93000812c194b4a2069dd32913ec18819b1e99e8436595ce4939413
-SIZE (mitchellh-mapstructure-v1.5.0_GH0.tar.gz) = 30123
-SHA256 (pelletier-go-toml-v1.9.5_GH0.tar.gz) = 7ee5ee9344a5c18eebf9487782e00b2dbeaaf19be64b447a1e1d90f8aed710e8
-SIZE (pelletier-go-toml-v1.9.5_GH0.tar.gz) = 106932
-SHA256 (pelletier-go-toml-v2.0.1_GH0.tar.gz) = 3ba7ff6cf4098a7bb5f50783ac12ec7b811ce7ee145e60b8dfcdebaf7f0d310a
-SIZE (pelletier-go-toml-v2.0.1_GH0.tar.gz) = 888067
-SHA256 (protocolbuffers-protobuf-go-v1.28.0_GH0.tar.gz) = e59ae9ace31c3a84bddf1bc3f04a04c498adb9ea7f9fcde60db91bba33d55171
-SIZE (protocolbuffers-protobuf-go-v1.28.0_GH0.tar.gz) = 1279757
-SHA256 (spf13-afero-v1.8.2_GH0.tar.gz) = a42e97857af6e66fed79ac636daf79c0c083e55b460adee47b580c07dfb3f9b5
-SIZE (spf13-afero-v1.8.2_GH0.tar.gz) = 91568
-SHA256 (spf13-cast-v1.5.0_GH0.tar.gz) = b5bf72b468a9a9a0509b7d87c984a9b2e653c9b87e9842da385f81c43bd05b9a
-SIZE (spf13-cast-v1.5.0_GH0.tar.gz) = 15287
-SHA256 (spf13-cobra-v1.4.0_GH0.tar.gz) = de32a9d3f94c55ddc433aa4eefe05fc85ae621d182114b6e628258753fc03148
-SIZE (spf13-cobra-v1.4.0_GH0.tar.gz) = 94547
-SHA256 (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 4fd850a792c5738954c4801cf549d8d0bf53edd17139cd39d179aa5abf7ec68d
-SIZE (spf13-jwalterweatherman-v1.1.0_GH0.tar.gz) = 6871
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (spf13-viper-v1.12.0_GH0.tar.gz) = 54b97b03ab6b666771a42ffd3bd0cd6672af87443ffd234a78a3e1c09c2061a1
-SIZE (spf13-viper-v1.12.0_GH0.tar.gz) = 114620
-SHA256 (subosito-gotenv-v1.3.0_GH0.tar.gz) = 04bf4a91fe8c2dba5bcb2a8d89a80d51f914c81bcf42a29e733c0405f99ced3c
-SIZE (subosito-gotenv-v1.3.0_GH0.tar.gz) = 8967
-SHA256 (vultr-govultr-v2.17.2_GH0.tar.gz) = 11562ed5024463ee81af8a63a5be422a2b6cb6e5ddf1c0d5b17d6a6bb4eb571a
-SIZE (vultr-govultr-v2.17.2_GH0.tar.gz) = 57193
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234