From nobody Mon Mar 13 23:07:18 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 4PbC3V38zgz3yKnP; Mon, 13 Mar 2023 23:07:18 +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 4PbC3V2jvmz3P5J; Mon, 13 Mar 2023 23:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678748838; 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=4kWiVGQJnMMoq2gcg8SZxvaCnwHpzlORSvgPBZnsDgY=; b=Isi+b3BE8a9XmmJeT8r691YUjWwWgG/GT0WiefAIfEYtBGlrILtgt2+F8s8h6MhFLFwfV/ Txk21+ClmCiL7NLcirCTwED+N/RjZAZhzdyaqQgbH8Kv1iRWSpNAmEiLB3VBZenxWCq+S1 MLxmMR5Yyi28F4yWq99Rsu9fNt6Rw933pN5YLSZgSEedYsFWPB8KKuRzWzzBXMIpyaDfSO LZkAbfaTITCALYH7MPE0vKCtHE0wSaZtZby5RA0CiNWv8B+Eh7QxC4asZ4bsxV+w2iBcHE vDnG/89+8hwyL5Q7EaYbSazLzIhNLTMrjI8ZxRGDx/dw23YtB00yhP7O0sxGnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678748838; 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=4kWiVGQJnMMoq2gcg8SZxvaCnwHpzlORSvgPBZnsDgY=; b=h6znpHLgTKUa+i+A4zKISygYNOkRVtS2NLIQzxgtjIAcVMCr1+A1Gf6xYktOqPAnnArx/J j3WLPN2+nTQAJJBba7mdxXSySaFV5a617GTNZyALGPp+0mnghucZ39lIBU0mwOcLmCLACc H36yZIVDzuaHvIYgMjCI/C3pfpPKq0eYEwpJ83SmRNmloMOZoek9tf8Qu44ZrEfjcio5+t ebJB6qNb/kOOhi0S/aW5/LXOZfxgCCdt13gx1hqDQdihf3bvyTDgcugcdrLKsziQpQh+AE MP2WcxWJZWwNtym0Phxe6HNBH3PxYuiWfsdE3llzval+wWSn98PhtQjgXfQ2+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678748838; a=rsa-sha256; cv=none; b=vxgkjVckn2EzrZznn3bHNkqTZ8nm3vs4Kg5oNZGVBUqT2AmVITjZ8Xbg4TQmkmdOR5U3as fgC5tTrdCdS3RzUvCW/PIJxU4cKjFt3HqANQuUAx+SZkE7kbpAUm76l6/JkTr6LT5ig/Jt 1vIbeMDFhH29QlRhiSxa7VbOaQZWXTRODiSPEAyU0nAD0oAElUVltQH0bhvcl5rihwPmYF EsolmAfcJn7OdAKDr0+gB59NPiMdVfEbNLyvpFFppuNOP8MFoFf7IfLFNEaH9uuOyBpMTI taC5E4Fgz5T0l6DAQ7qixF4g0q6uevJN3cTXY0SVCc21DnhkkqK4zWjNggD76g== 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 4PbC3V1c05z1Bl8; Mon, 13 Mar 2023 23:07:18 +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 32DN7I4o048589; Mon, 13 Mar 2023 23:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DN7IvD048588; Mon, 13 Mar 2023 23:07:18 GMT (envelope-from git) Date: Mon, 13 Mar 2023 23:07:18 GMT Message-Id: <202303132307.32DN7IvD048588@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: c3ec50a697c6 - main - textproc/git-chglog: 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: c3ec50a697c6804433e781ed1ae96c3ce0e56b40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3ec50a697c6804433e781ed1ae96c3ce0e56b40 commit c3ec50a697c6804433e781ed1ae96c3ce0e56b40 Author: Robert Clausecker AuthorDate: 2023-03-13 09:35:52 +0000 Commit: Robert Clausecker CommitDate: 2023-03-13 23:06:31 +0000 textproc/git-chglog: 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/D39045 --- textproc/git-chglog/Makefile | 8 +- textproc/git-chglog/distinfo | 4 +- textproc/git-chglog/files/patch-go.mod | 44 +++++++ textproc/git-chglog/files/patch-go.sum | 11 ++ textproc/git-chglog/files/patch-vendor_modules.txt | 138 +++++++++++++++++++++ 5 files changed, 203 insertions(+), 2 deletions(-) diff --git a/textproc/git-chglog/Makefile b/textproc/git-chglog/Makefile index 60b721d9bcdd..4d0e59e701d6 100644 --- a/textproc/git-chglog/Makefile +++ b/textproc/git-chglog/Makefile @@ -1,7 +1,7 @@ PORTNAME= git-chglog DISTVERSIONPREFIX= v DISTVERSION= 0.15.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc MAINTAINER= lcook@FreeBSD.org @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys _BUILD_VERSION= ${DISTVERSIONFULL} @@ -31,6 +33,10 @@ PORTEXAMPLES= ${_EXAMPLES:T} OPTIONS_DEFINE= DOCS EXAMPLES EXAMPLES_DESC= Install example template format and configuration +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}/|} \ diff --git a/textproc/git-chglog/distinfo b/textproc/git-chglog/distinfo index ec3a4687c8a6..b3aa162bd924 100644 --- a/textproc/git-chglog/distinfo +++ b/textproc/git-chglog/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1639785519 +TIMESTAMP = 1678699552 SHA256 (go/textproc_git-chglog/git-chglog-v0.15.1/v0.15.1.mod) = 594a406eb636d0ab5149fabd7e6e8a031a306169413a3ed955a587a1f480de68 SIZE (go/textproc_git-chglog/git-chglog-v0.15.1/v0.15.1.mod) = 525 SHA256 (go/textproc_git-chglog/git-chglog-v0.15.1/v0.15.1.zip) = 48c0aefef7b227aa476a14c5eb95cccc7e00a9f0edd159bae684dacd8f6e6c95 SIZE (go/textproc_git-chglog/git-chglog-v0.15.1/v0.15.1.zip) = 579345 +SHA256 (go/textproc_git-chglog/git-chglog-v0.15.1/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/textproc_git-chglog/git-chglog-v0.15.1/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/textproc/git-chglog/files/patch-go.mod b/textproc/git-chglog/files/patch-go.mod new file mode 100644 index 000000000000..6f000f735e58 --- /dev/null +++ b/textproc/git-chglog/files/patch-go.mod @@ -0,0 +1,44 @@ +--- go.mod.orig 2023-03-13 09:27:46 UTC ++++ go.mod +@@ -1,6 +1,6 @@ + module github.com/git-chglog/git-chglog + +-go 1.16 ++go 1.17 + + require ( + github.com/AlecAivazis/survey/v2 v2.3.2 +@@ -15,4 +15,33 @@ require ( + github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df + github.com/urfave/cli/v2 v2.3.0 + gopkg.in/yaml.v2 v2.4.0 ++) ++ ++require ( ++ github.com/Masterminds/goutils v1.1.1 // indirect ++ github.com/Masterminds/semver/v3 v3.1.1 // indirect ++ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect ++ github.com/davecgh/go-spew v1.1.1 // indirect ++ github.com/fatih/structs v1.1.0 // indirect ++ github.com/golang-jwt/jwt v3.2.1+incompatible // indirect ++ github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect ++ github.com/google/uuid v1.1.1 // indirect ++ github.com/huandu/xstrings v1.3.1 // indirect ++ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect ++ github.com/mattn/go-isatty v0.0.14 // indirect ++ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect ++ github.com/mitchellh/copystructure v1.0.0 // indirect ++ github.com/mitchellh/reflectwalk v1.0.0 // indirect ++ github.com/pkg/errors v0.9.1 // indirect ++ github.com/pmezard/go-difflib v1.0.0 // indirect ++ github.com/russross/blackfriday/v2 v2.0.1 // indirect ++ github.com/shopspring/decimal v1.2.0 // indirect ++ github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect ++ github.com/spf13/cast v1.3.1 // indirect ++ github.com/trivago/tgo v1.0.7 // indirect ++ golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++ golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect ++ golang.org/x/text v0.3.3 // indirect ++ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + ) diff --git a/textproc/git-chglog/files/patch-go.sum b/textproc/git-chglog/files/patch-go.sum new file mode 100644 index 000000000000..7b37bacabebf --- /dev/null +++ b/textproc/git-chglog/files/patch-go.sum @@ -0,0 +1,11 @@ +--- go.sum.orig 2023-03-13 09:27:49 UTC ++++ go.sum +@@ -95,6 +95,8 @@ 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-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-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/term v0.0.0-20210503060354-a79de5458b56 h1:b8jxX3zqjpqb2LklXPzKSGJhzyxCOZSz8ncv8Nv+y7w= + golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= diff --git a/textproc/git-chglog/files/patch-vendor_modules.txt b/textproc/git-chglog/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..3885b29cbd6f --- /dev/null +++ b/textproc/git-chglog/files/patch-vendor_modules.txt @@ -0,0 +1,138 @@ +--- vendor/modules.txt.orig 2023-03-13 09:28:26 UTC ++++ vendor/modules.txt +@@ -1,98 +1,124 @@ + # github.com/AlecAivazis/survey/v2 v2.3.2 +-## explicit ++## explicit; go 1.13 + github.com/AlecAivazis/survey/v2 + github.com/AlecAivazis/survey/v2/core + github.com/AlecAivazis/survey/v2/terminal + # github.com/Masterminds/goutils v1.1.1 ++## explicit + github.com/Masterminds/goutils + # github.com/Masterminds/semver/v3 v3.1.1 ++## explicit; go 1.12 + github.com/Masterminds/semver/v3 + # github.com/Masterminds/sprig/v3 v3.2.2 +-## explicit ++## explicit; go 1.13 + github.com/Masterminds/sprig/v3 + # github.com/andygrunwald/go-jira v1.14.0 +-## explicit ++## explicit; go 1.12 + github.com/andygrunwald/go-jira + # github.com/coreos/go-semver v0.3.0 + ## explicit + github.com/coreos/go-semver/semver + # github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d ++## explicit; go 1.12 + github.com/cpuguy83/go-md2man/v2/md2man + # github.com/davecgh/go-spew v1.1.1 ++## explicit + github.com/davecgh/go-spew/spew + # github.com/fatih/color v1.13.0 +-## explicit ++## explicit; go 1.13 + github.com/fatih/color + # github.com/fatih/structs v1.1.0 ++## explicit + github.com/fatih/structs + # github.com/golang-jwt/jwt v3.2.1+incompatible ++## explicit + github.com/golang-jwt/jwt + # github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 ++## explicit + github.com/google/go-querystring/query + # github.com/google/uuid v1.1.1 ++## explicit + github.com/google/uuid + # github.com/huandu/xstrings v1.3.1 ++## explicit; go 1.12 + github.com/huandu/xstrings + # github.com/imdario/mergo v0.3.12 +-## explicit ++## explicit; go 1.13 + github.com/imdario/mergo + # github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 ++## explicit + github.com/kballard/go-shellquote + # github.com/kyokomi/emoji/v2 v2.2.8 +-## explicit ++## explicit; go 1.14 + github.com/kyokomi/emoji/v2 + # 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/mgutz/ansi v0.0.0-20170206155736-9520e82c474b ++## explicit + github.com/mgutz/ansi + # github.com/mitchellh/copystructure v1.0.0 ++## explicit + github.com/mitchellh/copystructure + # github.com/mitchellh/reflectwalk v1.0.0 ++## explicit + github.com/mitchellh/reflectwalk + # github.com/pkg/errors v0.9.1 ++## explicit + github.com/pkg/errors + # github.com/pmezard/go-difflib v1.0.0 ++## explicit + github.com/pmezard/go-difflib/difflib + # github.com/russross/blackfriday/v2 v2.0.1 ++## explicit + github.com/russross/blackfriday/v2 + # github.com/shopspring/decimal v1.2.0 ++## explicit; go 1.13 + github.com/shopspring/decimal + # github.com/shurcooL/sanitized_anchor_name v1.0.0 ++## explicit + github.com/shurcooL/sanitized_anchor_name + # github.com/spf13/cast v1.3.1 ++## explicit + github.com/spf13/cast + # github.com/stretchr/testify v1.7.0 +-## explicit ++## explicit; go 1.13 + github.com/stretchr/testify/assert + # github.com/trivago/tgo v1.0.7 ++## explicit + github.com/trivago/tgo/tcontainer + github.com/trivago/tgo/treflect + # github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df + ## explicit + github.com/tsuyoshiwada/go-gitcmd + # github.com/urfave/cli/v2 v2.3.0 +-## explicit ++## explicit; go 1.11 + github.com/urfave/cli/v2 + # golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 ++## explicit; go 1.11 + golang.org/x/crypto/bcrypt + golang.org/x/crypto/blowfish + golang.org/x/crypto/pbkdf2 + golang.org/x/crypto/scrypt +-# 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-20210503060354-a79de5458b56 ++## explicit; go 1.17 + golang.org/x/term + # golang.org/x/text v0.3.3 ++## explicit; go 1.11 + golang.org/x/text/transform + golang.org/x/text/width + # gopkg.in/yaml.v2 v2.4.0 +-## explicit ++## explicit; go 1.15 + gopkg.in/yaml.v2 + # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c ++## explicit + gopkg.in/yaml.v3