From nobody Fri Mar 17 09:03:01 2023 X-Original-To: dev-commits-ports-main@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 4PdJ7V3kKbz3y5xJ; Fri, 17 Mar 2023 09:03:02 +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 4PdJ7V2JpLz4NMh; Fri, 17 Mar 2023 09:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679043782; 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=rrEp5YSts4vXt6HRzo0yUt2+qXd/rseMkDGXAEkBFNY=; b=SmT+aP/pppftzK2tYbZP+TcAfBmtObC6kxxDAIIpFXRk6n/vxAKFTIoahqOvcgmusRqgFC pmFo+V6aQnRrfppGebbRjQMelxnhjsClUhdDvtEwFHYQT+tgiPQOLLO4cqSFkRTjl2WBAT rGa7Wormj7oTX/ZmdL1srkaUpRP+vC99DJg1/9nItvu6Znn/HYIVsk4tS4Iny77Quv8/4g VVP7x7Y5tG/OxS4UBUS5aQQOlKavT4F2Jmuo16H1bV1jU6tbbdxNYDHMsUbr8zv4jKMClb VgTZqBHbx+MoOjEI5QxCcfhlyjdHfv5ZgJFmy9mssjpXf1obWLtcN+wiACpKIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679043782; 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=rrEp5YSts4vXt6HRzo0yUt2+qXd/rseMkDGXAEkBFNY=; b=F2HkfnmMIOyODVPdL2JgPRCektTufnsgH3Vcchnb+wpT5LLT3cSg/1Dfc1QudkatdlZ3NO oUeXyR4Zmr0+eiN53cHXy+dgVKHLL1uZBypIHnehBwERW7DoNgdCBeDW8zp7XHmMaJ+Yvp 6tKK06eCsUzEeAUsPg1X53XIPh62e49H6wQ1hMpqJnt2UhVoKCQ3LwvM4SCjNHz4OMCJww 8lP4yGZYtrRImtZvWcjwXTJRQxuZ/DYqsn4qBlbhW3YXyWVesF/LOJQG7ys4AMhnqlBz4J glPwFym55fqiTs3aKEkwZpa7tzMSP4+g+Z8TYCSpG7QdS0KlIqkqSo1g13Ic3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679043782; a=rsa-sha256; cv=none; b=WLXbUdB7PCyoUM8HP89OjTDuc3ZzFS7Rw1Qn6xx5jgKhCP6kPQpckD/lLZytvG3bs3UxEA NdWv0pnrmCNFBZgB3Hg209heVEWXhWovlS8KLW9t/Jh6mUMBVhkf+8Qp0R2gKa6I617N2R v8zpOFRvZrVdIlKEhY2HCye8Ntkd/l00c+hc4M7VHZ0JmwHFTp+KWLWD/kS4tkhmvK0SoA G5VXNFVtaMdOmXFH9UExtA4QZ8dyRadskJ2YoaGivHjXPeyMfc3/cpJICsCT3t4RBacLt7 XIVz+MrevIifQ0i6lVvIN594rXIHraH2aBBmrSNJsVRagmyjUb4IMZgZWaCQJw== 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 4PdJ7V0LxQzKBB; Fri, 17 Mar 2023 09:03:02 +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 32H931US034597; Fri, 17 Mar 2023 09:03:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32H931fM034596; Fri, 17 Mar 2023 09:03:01 GMT (envelope-from git) Date: Fri, 17 Mar 2023 09:03:01 GMT Message-Id: <202303170903.32H931fM034596@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: 89c1330f3166 - main - sysutils/duff: fix build on riscv64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 89c1330f3166dc4768e32e40c1820a414e4d4844 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=89c1330f3166dc4768e32e40c1820a414e4d4844 commit 89c1330f3166dc4768e32e40c1820a414e4d4844 Author: Robert Clausecker AuthorDate: 2023-03-15 01:08:30 +0000 Commit: Robert Clausecker CommitDate: 2023-03-17 09:02:18 +0000 sysutils/duff: 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) Differential Revision: https://reviews.freebsd.org/D39105 --- sysutils/duf/Makefile | 8 +++- sysutils/duf/distinfo | 4 +- sysutils/duf/files/patch-go.mod | 28 ++++++++++++++ sysutils/duf/files/patch-go.sum | 28 ++++++++++++++ sysutils/duf/files/patch-vendor_modules.txt | 57 +++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 2 deletions(-) diff --git a/sysutils/duf/Makefile b/sysutils/duf/Makefile index bfd816fa652e..56d1eb6d01d9 100644 --- a/sysutils/duf/Makefile +++ b/sysutils/duf/Makefile @@ -1,7 +1,7 @@ PORTNAME= duf DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils MAINTAINER= lcook@FreeBSD.org @@ -12,6 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys _BUILD_VERSION= ${DISTVERSION} _BUILD_SHA= 3c55411 @@ -27,6 +29,10 @@ PORTDOCS= README.md OPTIONS_DEFINE= 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} ${WRKSRC}/${PORTDOCS} \ diff --git a/sysutils/duf/distinfo b/sysutils/duf/distinfo index ee66f1ccd490..4ae624a56d16 100644 --- a/sysutils/duf/distinfo +++ b/sysutils/duf/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1644683621 +TIMESTAMP = 1678842332 SHA256 (go/sysutils_duf/duf-v0.8.1/v0.8.1.mod) = ba45158060302f03255903b5537af089be9f7741fd34980f6f5e75d92220330c SIZE (go/sysutils_duf/duf-v0.8.1/v0.8.1.mod) = 547 SHA256 (go/sysutils_duf/duf-v0.8.1/v0.8.1.zip) = 1624fd135cf1ea628dd9228a7bf25abc66ad2423e0fba80822acd7ef1893f56c SIZE (go/sysutils_duf/duf-v0.8.1/v0.8.1.zip) = 149949 +SHA256 (go/sysutils_duf/duf-v0.8.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/sysutils_duf/duf-v0.8.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/sysutils/duf/files/patch-go.mod b/sysutils/duf/files/patch-go.mod new file mode 100644 index 000000000000..5f57fd8ab3b8 --- /dev/null +++ b/sysutils/duf/files/patch-go.mod @@ -0,0 +1,28 @@ +--- go.mod.orig 2023-03-15 01:06:55 UTC ++++ go.mod +@@ -1,17 +1,21 @@ + module github.com/muesli/duf + +-go 1.15 ++go 1.17 + + require ( + github.com/IGLOU-EU/go-wildcard v1.0.3 + github.com/jedib0t/go-pretty/v6 v6.2.5 +- github.com/kr/pretty v0.2.0 // indirect + github.com/mattn/go-runewidth v0.0.13 + github.com/muesli/mango v0.1.0 + github.com/muesli/roff v0.1.0 + github.com/muesli/termenv v0.11.0 +- golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 ++ golang.org/x/sys v0.6.0 + golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 +- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect ++) ++ ++require ( ++ github.com/lucasb-eyer/go-colorful v1.2.0 // indirect ++ github.com/mattn/go-isatty v0.0.14 // indirect ++ github.com/rivo/uniseg v0.2.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + ) diff --git a/sysutils/duf/files/patch-go.sum b/sysutils/duf/files/patch-go.sum new file mode 100644 index 000000000000..ded592c1a25c --- /dev/null +++ b/sysutils/duf/files/patch-go.sum @@ -0,0 +1,28 @@ +--- go.sum.orig 2023-03-15 01:06:58 UTC ++++ go.sum +@@ -5,11 +5,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOw + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/jedib0t/go-pretty/v6 v6.2.5 h1:4faq6Fne+0du3qZAPOJcBFpAnt4AlxUJAKa1vAdvfrQ= + github.com/jedib0t/go-pretty/v6 v6.2.5/go.mod h1:FMkOpgGD3EZ91cW8g/96RfxoV7bdeJyzXPYgz1L1ln0= +-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= +-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= + github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= + github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +@@ -35,11 +30,11 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/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-20210406210042-72f3dc4e9b72 h1:VqE9gduFZ4dbR7XoL77lHFp0/DyDUBKSXK7CMFkVcV0= + golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/sysutils/duf/files/patch-vendor_modules.txt b/sysutils/duf/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..c340ad392648 --- /dev/null +++ b/sysutils/duf/files/patch-vendor_modules.txt @@ -0,0 +1,57 @@ +--- vendor/modules.txt.orig 2023-03-15 01:07:07 UTC ++++ vendor/modules.txt +@@ -1,42 +1,41 @@ + # github.com/IGLOU-EU/go-wildcard v1.0.3 +-## explicit ++## explicit; go 1.16 + github.com/IGLOU-EU/go-wildcard + # github.com/jedib0t/go-pretty/v6 v6.2.5 +-## explicit ++## explicit; go 1.16 + github.com/jedib0t/go-pretty/v6/table + github.com/jedib0t/go-pretty/v6/text +-# github.com/kr/pretty v0.2.0 +-## explicit + # 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 ++## explicit; go 1.9 + github.com/mattn/go-runewidth + # github.com/muesli/mango v0.1.0 +-## explicit ++## explicit; go 1.17 + github.com/muesli/mango + github.com/muesli/mango/mflag + # github.com/muesli/roff v0.1.0 +-## explicit ++## explicit; go 1.17 + github.com/muesli/roff + # 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 +-# golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 +-## explicit ++# 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/sys/windows/registry + # golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72 +-## explicit ++## explicit; go 1.11 + golang.org/x/term +-# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 +-## explicit + # gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + ## explicit