git: 5715fccedbde - main - www/reproxy: fix build on riscv64

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=5715fccedbdec5f5bcb21de29b2f7dfd3c12ac6c

commit 5715fccedbdec5f5bcb21de29b2f7dfd3c12ac6c
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-18 10:40:23 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-21 12:53:50 +0000

    www/reproxy: 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
    GH_TUPLE entries---the main distfile already has these vendored.
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    portmgr (build fix blanket)
    Differential Revision: https://reviews.freebsd.org/D39159
---
 www/reproxy/Makefile | 36 ++++++-------------------------
 www/reproxy/distinfo | 60 +++-------------------------------------------------
 2 files changed, 9 insertions(+), 87 deletions(-)

diff --git a/www/reproxy/Makefile b/www/reproxy/Makefile
index 2a3449c2270f..2c25f5a05007 100644
--- a/www/reproxy/Makefile
+++ b/www/reproxy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	reproxy
 PORTVERSION=	0.11.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -14,39 +14,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	umputun
-GH_TUPLE=	\
-		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		cespare:xxhash:v2.1.2:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		didip:tollbooth:v6.1.1:didip_tollbooth/vendor/github.com/didip/tollbooth/v6 \
-		felixge:httpsnoop:v1.0.2:felixge_httpsnoop/vendor/github.com/felixge/httpsnoop \
-		go-pkgz:expirable-cache:v0.0.3:go_pkgz_expirable_cache/vendor/github.com/go-pkgz/expirable-cache \
-		go-pkgz:lgr:v0.10.4:go_pkgz_lgr/vendor/github.com/go-pkgz/lgr \
-		go-pkgz:repeater:v1.1.3:go_pkgz_repeater/vendor/github.com/go-pkgz/repeater \
-		go-pkgz:rest:v1.11.0:go_pkgz_rest/vendor/github.com/go-pkgz/rest \
-		go-yaml:yaml:496545a6307b:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
-		golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:a5e095526f91:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:751e447fb3d0:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
-		golang:time:1f47c861a9ac:golang_time/vendor/golang.org/x/time \
-		gorilla:handlers:v1.5.1:gorilla_handlers/vendor/github.com/gorilla/handlers \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
-		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 \
-		prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.30.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
-		umputun:go-flags:v1.5.1:umputun_go_flags/vendor/github.com/umputun/go-flags
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
 BUILD_WRKSRC=	${WRKSRC}/app
 PLIST_FILES=	bin/reproxy
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 post-patch:
 	@${REINPLACE_CMD} -e '/var revision/s,unknown,${PORTVERSION},' \
 		${BUILD_WRKSRC}/main.go
diff --git a/www/reproxy/distinfo b/www/reproxy/distinfo
index e4bdd0120d29..653d072a1870 100644
--- a/www/reproxy/distinfo
+++ b/www/reproxy/distinfo
@@ -1,59 +1,5 @@
-TIMESTAMP = 1636483661
+TIMESTAMP = 1679135608
 SHA256 (umputun-reproxy-v0.11.0_GH0.tar.gz) = fa8ae8eb2f92c6c49fa68dcce08cad50a37d8eb424a9765e0c43629ae111743b
 SIZE (umputun-reproxy-v0.11.0_GH0.tar.gz) = 2893531
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (cespare-xxhash-v2.1.2_GH0.tar.gz) = 471399cfcf0b1bd188add8d34435b91e7011cedbfe76e29687803a9d74320352
-SIZE (cespare-xxhash-v2.1.2_GH0.tar.gz) = 11244
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (didip-tollbooth-v6.1.1_GH0.tar.gz) = 0fa59f63ed1256f10ee0ff3d78503bf89430d6105708ddab135644d92b21408c
-SIZE (didip-tollbooth-v6.1.1_GH0.tar.gz) = 15612
-SHA256 (felixge-httpsnoop-v1.0.2_GH0.tar.gz) = 6490e28de62538036db58ad062395cc780fafebd87c0bf761f9b581fc3449d6c
-SIZE (felixge-httpsnoop-v1.0.2_GH0.tar.gz) = 11600
-SHA256 (go-pkgz-expirable-cache-v0.0.3_GH0.tar.gz) = 25c7830c5c2c901fd0add379b1f72ce0b7ccbea99030c3b8d14acd06d5529b6e
-SIZE (go-pkgz-expirable-cache-v0.0.3_GH0.tar.gz) = 7249
-SHA256 (go-pkgz-lgr-v0.10.4_GH0.tar.gz) = c55109e8c62706e210bc960e5f18ffa020af362c6b17ac39cfefc4a88b387351
-SIZE (go-pkgz-lgr-v0.10.4_GH0.tar.gz) = 14722
-SHA256 (go-pkgz-repeater-v1.1.3_GH0.tar.gz) = d3c6bdece4cd305e33efc64369aaab9ebf0452dffb7bd841b9e5a8e861607f43
-SIZE (go-pkgz-repeater-v1.1.3_GH0.tar.gz) = 6059
-SHA256 (go-pkgz-rest-v1.11.0_GH0.tar.gz) = 5d115558d8af1d983fcebb7db487a14bf6f47b163f7af1cb3283e11500949fb8
-SIZE (go-pkgz-rest-v1.11.0_GH0.tar.gz) = 22206
-SHA256 (go-yaml-yaml-496545a6307b_GH0.tar.gz) = ed0e11dc14bbbd4127031d7e8b9e58dad885e2c44a16359d2f64b71d1d1f692a
-SIZE (go-yaml-yaml-496545a6307b_GH0.tar.gz) = 90156
-SHA256 (golang-crypto-32db794688a5_GH0.tar.gz) = c971927593630ecfa6531da54a579bf04186c354e365975cd86ea0e4c2c82fb7
-SIZE (golang-crypto-32db794688a5_GH0.tar.gz) = 1732714
-SHA256 (golang-net-a5e095526f91_GH0.tar.gz) = 5a161ad02a6c26e3297b5dff889890e1893f9937e01b5ce3a0bcd196e4c69cc4
-SIZE (golang-net-a5e095526f91_GH0.tar.gz) = 1254701
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-751e447fb3d0_GH0.tar.gz) = d75e6c18ec9433e8ca5105b586709030b4f8a3eb67f9fdedcac74bc0c36d8d56
-SIZE (golang-sys-751e447fb3d0_GH0.tar.gz) = 1211377
-SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
-SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
-SHA256 (golang-time-1f47c861a9ac_GH0.tar.gz) = 2548d6d6813621c77fa36a5783e36939d3f4427d962ba58415645f89fcb70925
-SIZE (golang-time-1f47c861a9ac_GH0.tar.gz) = 9533
-SHA256 (gorilla-handlers-v1.5.1_GH0.tar.gz) = be22eafc7020cba749c8638d0051c326f1b31b5a76a98d86beafc595079f6b09
-SIZE (gorilla-handlers-v1.5.1_GH0.tar.gz) = 20963
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd
-SIZE (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631
-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 (prometheus-client_golang-v1.11.0_GH0.tar.gz) = a3bc3312bde4182e507042ca0e7ca88aac6656bbf8d516d732e34c3f14bb612a
-SIZE (prometheus-client_golang-v1.11.0_GH0.tar.gz) = 168706
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.30.0_GH0.tar.gz) = 867c17dbef42eae180d959ca67f7534051939ffe187ad46c2a80397deb849f50
-SIZE (prometheus-common-v0.30.0_GH0.tar.gz) = 145566
-SHA256 (prometheus-procfs-v0.7.3_GH0.tar.gz) = 5514e8b18c38b6376a84c623d59735d4eefb61fb3a14eb1f45e0a4c848f14a2b
-SIZE (prometheus-procfs-v0.7.3_GH0.tar.gz) = 178957
-SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
-SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
-SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
-SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
-SHA256 (umputun-go-flags-v1.5.1_GH0.tar.gz) = ec8a1090690678856faa1eec2f55321bde53087b5de0ef95a2d48255706d4481
-SIZE (umputun-go-flags-v1.5.1_GH0.tar.gz) = 58201
+SHA256 (golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (golang-sys-v0.6.0_GH0.tar.gz) = 1434234