From nobody Fri Mar 24 20:56:40 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pjvdj1jpgz417Gn; Fri, 24 Mar 2023 20:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pjvdh3b3Rz3Q3Q; Fri, 24 Mar 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679691400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YD22YB78LxohmaBAznLzT4l8BRav+5BMS5lZxSmmhsE=; b=UZ+ZBREruO6JQfcR4+fDs2Uo0YPloy7BJ6yG/o20hSHTcEkMIi0kk5Xi4n1Uk5By4CnL7/ OTNgcxHB1JduwJ0roa4cCncvZo0LMLU8BWerVQkdAJv40RQ69OunercxGtWha4NK7V2aB0 0dpotyBGJseDoolM8lulixR08m/2/6upWH+TQMIu6oSV+00pbHC4zQXVh1BdiTNp7uNlWh 0QMdFrf6kkigKoewobUZJMOoV4yOqoFXA3jKBS6/CAAV++Qv+cKP6VpAj52yCfkRShqGb6 1Xy4Z2JJYz/koAfldXz5zbuTiu/MuvV1GMB2RZuiOHugc8Nn3nGgNnpPOj2dGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679691400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YD22YB78LxohmaBAznLzT4l8BRav+5BMS5lZxSmmhsE=; b=SC3T0MU4bL2xwK22rKQVRDTtCFLD49PQsnWa0XaSW+XUruzH0Ylo//DJIe+MO32rKBNWEG L0sOW6da/VuTwW3rtKsbhg7X/XgefIcR4EYWshJIC8sl/EkeVpGivxUkmwviYiGk8TCXmr 4dWpsUrJEB3Gze90nQhD35BJbL2jfJ7wSFCSkNwdJ1/SYlOHJI2i5YLzUmG6ZCtfUZBZxf jx2M3VNBsdXF960AGIUx555v4b5ywhAy5gQPGqsCAtgKHEcFXf6wW1+ROAWzfFSANFLfDe mrfRp0sPzJ0pl/3ptFkluQJVfoE//zMWJ3R7D1udyPv+bgxpIcIBxq0qTc71Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679691400; a=rsa-sha256; cv=none; b=DZ8bqYuTPM91LjCYgsXgIZ3HtAd6Hi5eFonogcbBoPXjUuL0Z3X8ULUh5BtELyo33PBVwC QD2E/DD2RQJgy/HLBkf0JW71FTkywl+67QRaSmY/tWrNdbv1HDUrh3uP5DI38CauKmv9uL wIUQIaWzd/GHJUqs5OdIFKF+bDNx5g6nW/AekGdGAQ+x7HAYo2S5TrEAjzGfHeWzXHXv5O zl+LexTbX0XZT17/9hY6LJQMCMopd1u24kSZR41v33ubBRoI3js4Dzcg5UmzzMkIzD3faW OfyeHfLZhC4c9EjbOIw3upK0MbIEhia/S9BXBRgm7gr0hHHR9H+QVg74XvwJag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pjvdh2hmCzY9M; Fri, 24 Mar 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32OKuend088407; Fri, 24 Mar 2023 20:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OKuepa088406; Fri, 24 Mar 2023 20:56:40 GMT (envelope-from git) Date: Fri, 24 Mar 2023 20:56:40 GMT Message-Id: <202303242056.32OKuepa088406@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a157dd4db706 - main - games/neo-cowsay: fix build on riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a157dd4db70675f5e7baf8dd813e72235ab9df03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a157dd4db70675f5e7baf8dd813e72235ab9df03 commit a157dd4db70675f5e7baf8dd813e72235ab9df03 Author: Robert Clausecker AuthorDate: 2023-03-22 20:09:22 +0000 Commit: Robert Clausecker CommitDate: 2023-03-24 20:54:44 +0000 games/neo-cowsay: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- games/neo-cowsay/Makefile | 8 ++- games/neo-cowsay/distinfo | 4 +- games/neo-cowsay/files/patch-go.mod | 27 +++++++++ games/neo-cowsay/files/patch-go.sum | 11 ++++ games/neo-cowsay/files/patch-vendor_modules.txt | 76 +++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 2 deletions(-) diff --git a/games/neo-cowsay/Makefile b/games/neo-cowsay/Makefile index eb18b9a95073..c18c891078ec 100644 --- a/games/neo-cowsay/Makefile +++ b/games/neo-cowsay/Makefile @@ -1,7 +1,7 @@ PORTNAME= neo-cowsay DISTVERSIONPREFIX= v DISTVERSION= 2.0.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MAINTAINER= eduardo@FreeBSD.org @@ -13,6 +13,8 @@ LICENSE_COMB= dual LICENSE_FILE_GPLv1+ = ${WRKSRC}/LICENSE USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys GO_MODULE= github.com/Code-Hex/Neo-cowsay/cmd/v2 @@ -21,4 +23,8 @@ GO_TARGET= ./cowsay:neo-cowsay ./cowthink:neo-cowthink PLIST_FILES= bin/neo-cowsay \ bin/neo-cowthink +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + .include diff --git a/games/neo-cowsay/distinfo b/games/neo-cowsay/distinfo index 48d0b9dfed07..0bf5e013b17e 100644 --- a/games/neo-cowsay/distinfo +++ b/games/neo-cowsay/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1655345926 +TIMESTAMP = 1679515500 SHA256 (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.mod) = ba6dcf06f216832cbc41c1d07154d3cb498a89159c43e2b52fead061a695eaed SIZE (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.mod) = 393 SHA256 (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.zip) = dc64392f992730452d0d2006ada0baec106a3173afaa6a5abc93c5f98759d23a SIZE (go/games_neo-cowsay/neo-cowsay-v2.0.4/v2.0.4.zip) = 24115 +SHA256 (go/games_neo-cowsay/neo-cowsay-v2.0.4/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/games_neo-cowsay/neo-cowsay-v2.0.4/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/games/neo-cowsay/files/patch-go.mod b/games/neo-cowsay/files/patch-go.mod new file mode 100644 index 000000000000..4e0bd4e314d8 --- /dev/null +++ b/games/neo-cowsay/files/patch-go.mod @@ -0,0 +1,27 @@ +--- go.mod.orig 2023-03-22 20:07:09 UTC ++++ go.mod +@@ -1,6 +1,6 @@ + module github.com/Code-Hex/Neo-cowsay/cmd/v2 + +-go 1.16 ++go 1.17 + + require ( + github.com/Code-Hex/Neo-cowsay/v2 v2.0.3 +@@ -11,4 +11,16 @@ require ( + github.com/mattn/go-runewidth v0.0.13 + github.com/rivo/uniseg v0.2.0 + golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa ++) ++ ++require ( ++ github.com/gdamore/encoding v1.0.0 // indirect ++ github.com/gdamore/tcell/v2 v2.4.0 // indirect ++ github.com/lucasb-eyer/go-colorful v1.0.3 // indirect ++ github.com/mattn/go-isatty v0.0.14 // indirect ++ github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 // indirect ++ github.com/pkg/errors v0.9.1 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++ golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect ++ golang.org/x/text v0.3.6 // indirect + ) diff --git a/games/neo-cowsay/files/patch-go.sum b/games/neo-cowsay/files/patch-go.sum new file mode 100644 index 000000000000..635209c97cb0 --- /dev/null +++ b/games/neo-cowsay/files/patch-go.sum @@ -0,0 +1,11 @@ +--- go.sum.orig 2023-03-22 20:07:14 UTC ++++ go.sum +@@ -41,6 +41,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 h1:foEbQz/B0Oz6YIqu/69kfXPYeFQAuuMYFkjaqXzl5Wo= + golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/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/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= + golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= diff --git a/games/neo-cowsay/files/patch-vendor_modules.txt b/games/neo-cowsay/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..8745403d6153 --- /dev/null +++ b/games/neo-cowsay/files/patch-vendor_modules.txt @@ -0,0 +1,76 @@ +--- vendor/modules.txt.orig 2023-03-22 20:08:05 UTC ++++ vendor/modules.txt +@@ -1,13 +1,15 @@ + # github.com/Code-Hex/Neo-cowsay/v2 v2.0.3 +-## explicit ++## explicit; go 1.16 + github.com/Code-Hex/Neo-cowsay/v2 + github.com/Code-Hex/Neo-cowsay/v2/decoration + # github.com/Code-Hex/go-wordwrap v1.0.0 +-## explicit ++## explicit; go 1.13 + github.com/Code-Hex/go-wordwrap + # github.com/gdamore/encoding v1.0.0 ++## explicit; go 1.9 + github.com/gdamore/encoding + # github.com/gdamore/tcell/v2 v2.4.0 ++## explicit; go 1.12 + github.com/gdamore/tcell/v2 + github.com/gdamore/tcell/v2/terminfo + github.com/gdamore/tcell/v2/terminfo/a/aixterm +@@ -48,41 +50,48 @@ github.com/gdamore/tcell/v2/terminfo/x/xterm + github.com/gdamore/tcell/v2/terminfo/x/xterm_kitty + github.com/gdamore/tcell/v2/terminfo/x/xterm_termite + # github.com/jessevdk/go-flags v1.5.0 +-## explicit ++## explicit; go 1.15 + github.com/jessevdk/go-flags + # github.com/ktr0731/go-fuzzyfinder v0.5.1 +-## explicit ++## explicit; go 1.13 + github.com/ktr0731/go-fuzzyfinder + github.com/ktr0731/go-fuzzyfinder/matching + github.com/ktr0731/go-fuzzyfinder/scoring + # github.com/lucasb-eyer/go-colorful v1.0.3 ++## explicit; go 1.12 + github.com/lucasb-eyer/go-colorful + # github.com/mattn/go-colorable v0.1.11 +-## explicit ++## explicit; go 1.13 + github.com/mattn/go-colorable + # 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 ++## explicit; go 1.9 + github.com/mattn/go-runewidth + # github.com/nsf/termbox-go v0.0.0-20201124104050-ed494de23a00 ++## explicit; go 1.15 + github.com/nsf/termbox-go + # github.com/pkg/errors v0.9.1 ++## explicit + github.com/pkg/errors + # github.com/rivo/uniseg v0.2.0 +-## explicit ++## explicit; go 1.12 + github.com/rivo/uniseg + # golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa +-## explicit ++## explicit; go 1.17 + golang.org/x/crypto/ssh/terminal +-# golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6 ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/plan9 + golang.org/x/sys/unix + golang.org/x/sys/windows + # golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf ++## explicit; go 1.11 + golang.org/x/term + # golang.org/x/text v0.3.6 ++## explicit; go 1.11 + golang.org/x/text/encoding + golang.org/x/text/encoding/internal/identifier + golang.org/x/text/transform