git: 5ec89ced4ca2 - main - devel/gitty: fix build on riscv64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Mar 2023 11:27:42 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ec89ced4ca22579c2a98f4ab01df8ef7ddcb1f4 commit 5ec89ced4ca22579c2a98f4ab01df8ef7ddcb1f4 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-03-26 22:38:27 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-03-27 11:25:02 +0000 devel/gitty: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Remove Makefile.deps, a remnant of a previous USE_GITHUB=yes style build. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- devel/gitty/Makefile | 11 +- devel/gitty/Makefile.deps | 45 ------- devel/gitty/distinfo | 4 +- devel/gitty/files/patch-go.mod | 53 ++++++++ devel/gitty/files/patch-go.sum | 19 +++ devel/gitty/files/patch-vendor_modules.txt | 187 +++++++++++++++++++++++++++++ 6 files changed, 270 insertions(+), 49 deletions(-) diff --git a/devel/gitty/Makefile b/devel/gitty/Makefile index dc7e707174ab..7cccfac933cd 100644 --- a/devel/gitty/Makefile +++ b/devel/gitty/Makefile @@ -1,7 +1,7 @@ PORTNAME= gitty DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MAINTAINER= dch@FreeBSD.org @@ -12,10 +12,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules -GO_MODULE= github.com/muesli/${PORTNAME} +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys -.include "${.CURDIR}/Makefile.deps" +GO_MODULE= github.com/muesli/${PORTNAME} PLIST_FILES= bin/${PORTNAME} +pre-build: + ${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/devel/gitty/Makefile.deps b/devel/gitty/Makefile.deps deleted file mode 100644 index 42c40d62cf56..000000000000 --- a/devel/gitty/Makefile.deps +++ /dev/null @@ -1,45 +0,0 @@ -GH_TUPLE= \ - Microsoft:go-winio:v0.4.16:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \ - ProtonMail:go-crypto:04723f9f07d7:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \ - acomagu:bufpipe:v1.0.3:acomagu_bufpipe/vendor/github.com/acomagu/bufpipe \ - charmbracelet:lipgloss:v0.4.0:charmbracelet_lipgloss/vendor/github.com/charmbracelet/lipgloss \ - dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ - emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \ - go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \ - go-git:go-billy:v5.3.1:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \ - go-git:go-git:v5.4.2:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \ - go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \ - golang:appengine:v1.6.6:golang_appengine/vendor/google.golang.org/appengine \ - golang:crypto:83a5a9bb288b:golang_crypto/vendor/golang.org/x/crypto \ - golang:freetype:e2365dfdc4a0:golang_freetype/vendor/github.com/golang/freetype \ - golang:image:e162460cd6b5:golang_image/vendor/golang.org/x/image \ - golang:net:6b1517762897:golang_net/vendor/golang.org/x/net \ - golang:oauth2:d3ed0bb246c8:golang_oauth2/vendor/golang.org/x/oauth2 \ - golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:71e4cd670f79:golang_sys/vendor/golang.org/x/sys \ - golang:time:555d28b269f0:golang_time/vendor/golang.org/x/time \ - google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \ - hashicorp:go-cleanhttp:v0.5.1:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \ - hashicorp:go-retryablehttp:v0.6.8:hashicorp_go_retryablehttp/vendor/github.com/hashicorp/go-retryablehttp \ - imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \ - jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \ - kevinburke:ssh_config:4977a11b4351:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \ - lucasb-eyer:go-colorful:v1.2.0:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \ - mattn:go-isatty:v0.0.13:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ - mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ - mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \ - muesli:clusters:2700303c1762:muesli_clusters/vendor/github.com/muesli/clusters \ - muesli:gamut:daa621f1be71:muesli_gamut/vendor/github.com/muesli/gamut \ - muesli:kmeans:v0.2.1:muesli_kmeans/vendor/github.com/muesli/kmeans \ - muesli:reflow:v0.3.0:muesli_reflow/vendor/github.com/muesli/reflow \ - muesli:termenv:v0.9.0:muesli_termenv/vendor/github.com/muesli/termenv \ - protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ - rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \ - sergi:go-diff:v1.1.0:sergi_go_diff/vendor/github.com/sergi/go-diff \ - shurcooL:githubv4:5800b9de5b8b:shurcool_githubv4/vendor/github.com/shurcooL/githubv4 \ - shurcooL:graphql:18c5c3165e3a:shurcool_graphql/vendor/github.com/shurcooL/graphql \ - skratchdot:open-golang:eef842397966:skratchdot_open_golang/vendor/github.com/skratchdot/open-golang \ - wcharczuk:go-chart:v2.1.0:wcharczuk_go_chart_v2/vendor/github.com/wcharczuk/go-chart/v2 \ - xanzy:go-gitlab:v0.52.2:xanzy_go_gitlab/vendor/github.com/xanzy/go-gitlab \ - xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \ - xrash:smetrics:89a2a8a1fb0b:xrash_smetrics/vendor/github.com/xrash/smetrics diff --git a/devel/gitty/distinfo b/devel/gitty/distinfo index d26e159ea619..72e132e11479 100644 --- a/devel/gitty/distinfo +++ b/devel/gitty/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1668610613 +TIMESTAMP = 1679869853 SHA256 (go/devel_gitty/gitty-v0.7.0/v0.7.0.mod) = 261999d5275b443e4f047bdca65908bda31ff32b375fca5d7add08169b307657 SIZE (go/devel_gitty/gitty-v0.7.0/v0.7.0.mod) = 676 SHA256 (go/devel_gitty/gitty-v0.7.0/v0.7.0.zip) = d657ebaef893494987a05a660232d5e65de375b2d9cc7680e79c427c13b1f57d SIZE (go/devel_gitty/gitty-v0.7.0/v0.7.0.zip) = 327332 +SHA256 (go/devel_gitty/gitty-v0.7.0/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/devel_gitty/gitty-v0.7.0/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/devel/gitty/files/patch-go.mod b/devel/gitty/files/patch-go.mod new file mode 100644 index 000000000000..d4813acda5d8 --- /dev/null +++ b/devel/gitty/files/patch-go.mod @@ -0,0 +1,53 @@ +--- go.mod.orig 2023-03-26 22:32:34 UTC ++++ go.mod +@@ -1,6 +1,6 @@ + module github.com/muesli/gitty + +-go 1.15 ++go 1.17 + + require ( + code.gitea.io/sdk/gitea v0.15.1 +@@ -12,8 +12,41 @@ require ( + github.com/muesli/reflow v0.3.0 + github.com/muesli/termenv v0.11.0 + github.com/shurcooL/githubv4 v0.0.0-20211117020012-5800b9de5b8b +- github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect + github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 + github.com/xanzy/go-gitlab v0.54.3 + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 ++) ++ ++require ( ++ github.com/Microsoft/go-winio v0.5.0 // indirect ++ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect ++ github.com/acomagu/bufpipe v1.0.3 // indirect ++ github.com/emirpasic/gods v1.12.0 // indirect ++ github.com/go-git/gcfg v1.5.0 // indirect ++ github.com/go-git/go-billy/v5 v5.3.1 // indirect ++ github.com/golang/protobuf v1.4.2 // indirect ++ github.com/google/go-querystring v1.1.0 // indirect ++ github.com/hashicorp/go-cleanhttp v0.5.1 // indirect ++ github.com/hashicorp/go-retryablehttp v0.6.8 // indirect ++ github.com/hashicorp/go-version v1.2.1 // indirect ++ github.com/imdario/mergo v0.3.12 // indirect ++ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect ++ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect ++ github.com/mattn/go-isatty v0.0.14 // indirect ++ github.com/mattn/go-runewidth v0.0.13 // indirect ++ github.com/mitchellh/go-homedir v1.1.0 // indirect ++ github.com/muesli/clusters v0.0.0-20200529215643-2700303c1762 // indirect ++ github.com/muesli/kmeans v0.3.0 // indirect ++ github.com/rivo/uniseg v0.2.0 // indirect ++ github.com/sergi/go-diff v1.1.0 // indirect ++ github.com/shurcooL/graphql v0.0.0-20200928012149-18c5c3165e3a // indirect ++ github.com/xanzy/ssh-agent v0.3.1 // indirect ++ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect ++ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect ++ golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++ golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect ++ google.golang.org/appengine v1.6.6 // indirect ++ google.golang.org/protobuf v1.25.0 // indirect ++ gopkg.in/warnings.v0 v0.1.2 // indirect + ) diff --git a/devel/gitty/files/patch-go.sum b/devel/gitty/files/patch-go.sum new file mode 100644 index 000000000000..ea79f5a4c1b4 --- /dev/null +++ b/devel/gitty/files/patch-go.sum @@ -0,0 +1,19 @@ +--- go.sum.orig 2023-03-26 22:32:37 UTC ++++ go.sum +@@ -67,7 +67,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h + github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= + github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= + github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= + github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= + github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= + github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +@@ -350,6 +349,8 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go + golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/devel/gitty/files/patch-vendor_modules.txt b/devel/gitty/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..2cbd5d0c1efe --- /dev/null +++ b/devel/gitty/files/patch-vendor_modules.txt @@ -0,0 +1,187 @@ +--- vendor/modules.txt.orig 2023-03-26 22:33:59 UTC ++++ vendor/modules.txt +@@ -1,10 +1,12 @@ + # code.gitea.io/sdk/gitea v0.15.1 +-## explicit ++## explicit; go 1.13 + code.gitea.io/sdk/gitea + # github.com/Microsoft/go-winio v0.5.0 ++## explicit; go 1.12 + github.com/Microsoft/go-winio + github.com/Microsoft/go-winio/pkg/guid + # github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 ++## explicit; go 1.13 + github.com/ProtonMail/go-crypto/bitcurves + github.com/ProtonMail/go-crypto/brainpool + github.com/ProtonMail/go-crypto/eax +@@ -22,14 +24,16 @@ github.com/ProtonMail/go-crypto/openpgp/internal/encod + github.com/ProtonMail/go-crypto/openpgp/packet + github.com/ProtonMail/go-crypto/openpgp/s2k + # github.com/acomagu/bufpipe v1.0.3 ++## explicit; go 1.12 + github.com/acomagu/bufpipe + # github.com/charmbracelet/lipgloss v0.4.0 +-## explicit ++## explicit; go 1.15 + github.com/charmbracelet/lipgloss + # github.com/dustin/go-humanize v1.0.0 + ## explicit + github.com/dustin/go-humanize + # github.com/emirpasic/gods v1.12.0 ++## explicit + github.com/emirpasic/gods/containers + github.com/emirpasic/gods/lists + github.com/emirpasic/gods/lists/arraylist +@@ -37,11 +41,13 @@ github.com/emirpasic/gods/trees + github.com/emirpasic/gods/trees/binaryheap + github.com/emirpasic/gods/utils + # github.com/go-git/gcfg v1.5.0 ++## explicit + github.com/go-git/gcfg + github.com/go-git/gcfg/scanner + github.com/go-git/gcfg/token + github.com/go-git/gcfg/types + # github.com/go-git/go-billy/v5 v5.3.1 ++## explicit; go 1.13 + github.com/go-git/go-billy/v5 + github.com/go-git/go-billy/v5/helper/chroot + github.com/go-git/go-billy/v5/helper/polyfill +@@ -49,7 +55,7 @@ github.com/go-git/go-billy/v5/memfs + github.com/go-git/go-billy/v5/osfs + github.com/go-git/go-billy/v5/util + # github.com/go-git/go-git/v5 v5.4.3-0.20220119145113-935af59cf64f +-## explicit ++## explicit; go 1.13 + github.com/go-git/go-git/v5 + github.com/go-git/go-git/v5/config + github.com/go-git/go-git/v5/internal/revision +@@ -93,49 +99,64 @@ github.com/go-git/go-git/v5/utils/merkletrie/index + github.com/go-git/go-git/v5/utils/merkletrie/internal/frame + github.com/go-git/go-git/v5/utils/merkletrie/noder + # github.com/golang/protobuf v1.4.2 ++## explicit; go 1.9 + github.com/golang/protobuf/proto + # github.com/google/go-querystring v1.1.0 ++## explicit; go 1.10 + github.com/google/go-querystring/query + # github.com/hashicorp/go-cleanhttp v0.5.1 ++## explicit + github.com/hashicorp/go-cleanhttp + # github.com/hashicorp/go-retryablehttp v0.6.8 ++## explicit; go 1.13 + github.com/hashicorp/go-retryablehttp + # github.com/hashicorp/go-version v1.2.1 ++## explicit + github.com/hashicorp/go-version + # github.com/imdario/mergo v0.3.12 ++## explicit; go 1.13 + github.com/imdario/mergo + # github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 ++## explicit + github.com/jbenet/go-context/io + # github.com/kevinburke/ssh_config v1.1.0 + ## explicit + github.com/kevinburke/ssh_config + # github.com/lucasb-eyer/go-colorful v1.2.0 ++## explicit; go 1.12 + github.com/lucasb-eyer/go-colorful + # github.com/mattn/go-isatty v0.0.14 ++## explicit; go 1.12 + github.com/mattn/go-isatty + # github.com/mattn/go-runewidth v0.0.13 ++## explicit; go 1.9 + github.com/mattn/go-runewidth + # github.com/mitchellh/go-homedir v1.1.0 ++## explicit + github.com/mitchellh/go-homedir + # github.com/muesli/clusters v0.0.0-20200529215643-2700303c1762 ++## explicit + github.com/muesli/clusters + # github.com/muesli/gamut v0.3.0 +-## explicit ++## explicit; go 1.15 + github.com/muesli/gamut + # github.com/muesli/kmeans v0.3.0 ++## explicit; go 1.12 + github.com/muesli/kmeans + # github.com/muesli/reflow v0.3.0 +-## explicit ++## explicit; go 1.13 + github.com/muesli/reflow/ansi + github.com/muesli/reflow/truncate + github.com/muesli/reflow/wordwrap + github.com/muesli/reflow/wrap + # github.com/muesli/termenv v0.11.0 +-## explicit ++## explicit; go 1.13 + github.com/muesli/termenv + # github.com/rivo/uniseg v0.2.0 ++## explicit; go 1.12 + github.com/rivo/uniseg + # github.com/sergi/go-diff v1.1.0 ++## explicit; go 1.12 + github.com/sergi/go-diff/diffmatchpatch + # github.com/shurcooL/githubv4 v0.0.0-20211117020012-5800b9de5b8b + ## explicit +@@ -149,13 +170,16 @@ github.com/shurcooL/graphql/internal/jsonutil + ## explicit + github.com/skratchdot/open-golang/open + # github.com/xanzy/go-gitlab v0.54.3 +-## explicit ++## explicit; go 1.17 + github.com/xanzy/go-gitlab + # github.com/xanzy/ssh-agent v0.3.1 ++## explicit; go 1.16 + github.com/xanzy/ssh-agent + # github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 ++## explicit + github.com/xrash/smetrics + # golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 ++## explicit; go 1.17 + golang.org/x/crypto/blowfish + golang.org/x/crypto/cast5 + golang.org/x/crypto/chacha20 +@@ -170,23 +194,27 @@ golang.org/x/crypto/ssh/agent + golang.org/x/crypto/ssh/internal/bcrypt_pbkdf + golang.org/x/crypto/ssh/knownhosts + # golang.org/x/net v0.0.0-20210326060303-6b1517762897 ++## explicit; go 1.11 + golang.org/x/net/context + golang.org/x/net/context/ctxhttp + golang.org/x/net/internal/socks + golang.org/x/net/proxy + # golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 +-## explicit ++## explicit; go 1.11 + golang.org/x/oauth2 + golang.org/x/oauth2/internal +-# golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/cpu + golang.org/x/sys/execabs + golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/unix + golang.org/x/sys/windows + # golang.org/x/time v0.0.0-20191024005414-555d28b269f0 ++## explicit + golang.org/x/time/rate + # google.golang.org/appengine v1.6.6 ++## explicit; go 1.11 + google.golang.org/appengine/internal + google.golang.org/appengine/internal/base + google.golang.org/appengine/internal/datastore +@@ -195,6 +223,7 @@ google.golang.org/appengine/internal/remote_api + google.golang.org/appengine/internal/urlfetch + google.golang.org/appengine/urlfetch + # google.golang.org/protobuf v1.25.0 ++## explicit; go 1.9 + google.golang.org/protobuf/encoding/prototext + google.golang.org/protobuf/encoding/protowire + google.golang.org/protobuf/internal/descfmt +@@ -222,4 +251,5 @@ google.golang.org/protobuf/reflect/protoregistry + google.golang.org/protobuf/runtime/protoiface + google.golang.org/protobuf/runtime/protoimpl + # gopkg.in/warnings.v0 v0.1.2 ++## explicit + gopkg.in/warnings.v0