From nobody Tue Dec 20 20:09:44 2022 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 4Nc72x0kVTz1Grty; Tue, 20 Dec 2022 20:09:45 +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 4Nc72x0F5dz4FSL; Tue, 20 Dec 2022 20:09:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671566985; 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=B9qnrwQznAIi0k3GRk55m5Q4RCA4rCfFPBaMrQM4gnc=; b=Z7xCXIkdiJRHKPv+svtAAXzB+MROQtpVrR0h4PQPSZv7FTS1I6iVg+NsqgjN7DNFxg2HIB 8UBNF/spVbO3uPlU2Fk81+r+MmG7ZNYhcFwvJVFHtaomEExXxoyeDJ/jBGZil2BB4laaQ7 eC2cfMF5fs3605zA/XjBkWiR3iandn+HhV2iByFhV/k4HhzU/Hnpv1g4gcgmyHCt+Ont0o +rB9nNfl1uGQQ2NolDBYF5RWFLsUhbyXwCZZXlEIm6QPG7WR0JwngD0vcRlCSsE1MUDjh7 9NbLz/ygvQInaNdqCSFGPZWEgZVXnPwj57OdiKCqKJmgt58VMWV845rAqfTHNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671566985; 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=B9qnrwQznAIi0k3GRk55m5Q4RCA4rCfFPBaMrQM4gnc=; b=PXvaEtXlCnRIWq6idc7hmS9i/JvhNIfBvj63PcwbQslqKDFs/iOfRs+yxd7lDc/OLrmcp/ PXk9Lp+byH1mXf4WvEvDwH3sXmGd4L1bKW+dg2L2oaya+eowBqhwSrx70ItNrXxv4qUFXf Y3EaNx7p4Ya4lAFaLM+XAobTD8zfCFCmRNL8R9kLHeHhrtCkfW/J17OEBl2+5bUsSY3VHW 9WmLEevlyEPsGaP1etPcDOlf5cn4oMUNdQVC0FRsGi5YYSQbOJkHqjIR/lOGRTU+EIg3vE 9rtIVxSC9lQHxCajSUkfuO26BMPIcQyQTnnRPnzh4v5X1APOlNosa7JVnPqLjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671566985; a=rsa-sha256; cv=none; b=K7Kkx26s2vAAvi8CJgmS+kxeMcsmmBzipnK5lE+1XEj68XuuB7hYB2lYnrPE9gbRJyufmF 5RvbjFuHJgJ2PW+a4k38hD09OicGEhpXx+wzGdlFmD/zY0OESiDjWfrHDacQSP0oYHb4Wt 7gQIHhIAd+Nt/ZTXOHZSJ/sGgSfjtT+pCg7IAui2jQmpaM3yzdHMQUvCOqu1dssAIX1138 qqhWti/JLHbrAApih9ooUIIuFNCThL3Q3nc1i8sGSLV6DdEbSLgoGqEW9VMTH8oyzvrds9 ZZ0ol7dpFMRjPnIjzGerki9LMshIXb33B/gh4r6ulePHW0RjcyOYf7GK+ib2mg== 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 4Nc72w6GjQznD7; Tue, 20 Dec 2022 20:09:44 +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 2BKK9iWd038143; Tue, 20 Dec 2022 20:09:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BKK9iRB038142; Tue, 20 Dec 2022 20:09:44 GMT (envelope-from git) Date: Tue, 20 Dec 2022 20:09:44 GMT Message-Id: <202212202009.2BKK9iRB038142@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitri Goutnik Subject: git: 8a20ef010ab2 - main - lang/gomacro: Update to 2.7-601, unbreak with go1.20rc1 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: dmgk X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a20ef010ab20b75c49fbab71d8f3cbdcca9aa06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dmgk: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a20ef010ab20b75c49fbab71d8f3cbdcca9aa06 commit 8a20ef010ab20b75c49fbab71d8f3cbdcca9aa06 Author: Dmitri Goutnik AuthorDate: 2022-12-20 19:44:47 +0000 Commit: Dmitri Goutnik CommitDate: 2022-12-20 20:09:10 +0000 lang/gomacro: Update to 2.7-601, unbreak with go1.20rc1 FreeBSD 11 compat was removed in go1.20, unbreak build by removing obsolete syscalls. --- lang/gomacro/Makefile | 14 ++++-------- lang/gomacro/distinfo | 14 +++++------- .../patch-imports_syscall_syscall__freebsd__386.go | 26 ++++++++++++++++++++++ ...atch-imports_syscall_syscall__freebsd__amd64.go | 18 +++++++++++++++ 4 files changed, 53 insertions(+), 19 deletions(-) diff --git a/lang/gomacro/Makefile b/lang/gomacro/Makefile index dfc4cf9e2240..fb8b864cafe3 100644 --- a/lang/gomacro/Makefile +++ b/lang/gomacro/Makefile @@ -1,8 +1,7 @@ PORTNAME= gomacro DISTVERSIONPREFIX= v -DISTVERSION= 2.7-304 -DISTVERSIONSUFFIX= -g2f4dc7c -PORTREVISION= 8 +DISTVERSION= 2.7-601 +DISTVERSIONSUFFIX= -g9aafa23 CATEGORIES= lang MAINTAINER= dmgk@FreeBSD.org @@ -12,13 +11,8 @@ WWW= https://github.com/cosmos72/gomacro LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go -GO_PKGNAME= github.com/cosmos72/gomacro -USE_GITHUB= yes -GH_ACCOUNT= cosmos72 -GH_TUPLE= golang:sys:b294cbc:golang_sys/vendor/golang.org/x/sys \ - mattn:go-runewidth:v0.0.3:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ - peterh:liner:6f820f8:peterh_liner/vendor/github.com/peterh/liner +USES= go:modules +GO_MODULE= github.com/cosmos72/gomacro@v0.0.0-20221020183653-9aafa23692e7 PLIST_FILES= bin/gomacro diff --git a/lang/gomacro/distinfo b/lang/gomacro/distinfo index 10f94f849598..d4c480f5925a 100644 --- a/lang/gomacro/distinfo +++ b/lang/gomacro/distinfo @@ -1,9 +1,5 @@ -TIMESTAMP = 1551966942 -SHA256 (cosmos72-gomacro-v2.7-304-g2f4dc7c_GH0.tar.gz) = d4d94a43c292be8ea57f2b8f8bfd1d2b06d1fb6e785e277aae6499ae9aa95688 -SIZE (cosmos72-gomacro-v2.7-304-g2f4dc7c_GH0.tar.gz) = 1117257 -SHA256 (peterh-liner-6f820f8_GH0.tar.gz) = 5a059343ae5ba6ced33fcd9f6eccd5b78a221dde8c59b3b4500c58531605aa58 -SIZE (peterh-liner-6f820f8_GH0.tar.gz) = 21100 -SHA256 (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 398ec709b006664e527040770056156cb225233d8b44b5a59ba2f5f5f3fa885e -SIZE (mattn-go-runewidth-v0.0.3_GH0.tar.gz) = 22961 -SHA256 (golang-sys-b294cbc_GH0.tar.gz) = 0e2ef3e4313f73449a107fe9dc61cd49acf0f3c61587f2681096237a05197728 -SIZE (golang-sys-b294cbc_GH0.tar.gz) = 1254744 +TIMESTAMP = 1671560202 +SHA256 (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.mod) = b5b9d2e36fcd33955d64c6e71d16919cf97f8f7aed3a2dba87b4db3a3dcd74d1 +SIZE (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.mod) = 156 +SHA256 (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.zip) = 5573f593e43e3905d26cd23d987353f06aad80ba79cd0acf5ab6febf52d62b95 +SIZE (go/lang_gomacro/gomacro-v2.7-601-g9aafa23/v0.0.0-20221020183653-9aafa23692e7.zip) = 6700329 diff --git a/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__386.go b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__386.go new file mode 100644 index 000000000000..854d45a6fb93 --- /dev/null +++ b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__386.go @@ -0,0 +1,26 @@ +--- imports/syscall/syscall_freebsd_386.go.orig 2022-12-20 19:25:38 UTC ++++ imports/syscall/syscall_freebsd_386.go +@@ -1724,7 +1724,6 @@ func init() { + "SYS_LISTEN": ValueOf(syscall.SYS_LISTEN), + "SYS_LPATHCONF": ValueOf(syscall.SYS_LPATHCONF), + "SYS_LSEEK": ValueOf(syscall.SYS_LSEEK), +- "SYS_LSTAT": ValueOf(syscall.SYS_LSTAT), + "SYS_LUTIMES": ValueOf(syscall.SYS_LUTIMES), + "SYS_MAC_SYSCALL": ValueOf(syscall.SYS_MAC_SYSCALL), + "SYS_MADVISE": ValueOf(syscall.SYS_MADVISE), +@@ -1855,7 +1854,6 @@ func init() { + "SYS_SOCKET": ValueOf(syscall.SYS_SOCKET), + "SYS_SOCKETPAIR": ValueOf(syscall.SYS_SOCKETPAIR), + "SYS_SSTK": ValueOf(syscall.SYS_SSTK), +- "SYS_STAT": ValueOf(syscall.SYS_STAT), + "SYS_STATFS": ValueOf(syscall.SYS_STATFS), + "SYS_SWAPCONTEXT": ValueOf(syscall.SYS_SWAPCONTEXT), + "SYS_SWAPOFF": ValueOf(syscall.SYS_SWAPOFF), +@@ -3672,7 +3670,6 @@ func init() { + "SYS_LISTEN": "int:106", + "SYS_LPATHCONF": "int:513", + "SYS_LSEEK": "int:478", +- "SYS_LSTAT": "int:190", + "SYS_LUTIMES": "int:276", + "SYS_MAC_SYSCALL": "int:394", + "SYS_MADVISE": "int:75", diff --git a/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__amd64.go b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__amd64.go new file mode 100644 index 000000000000..f1ffab0403cf --- /dev/null +++ b/lang/gomacro/files/patch-imports_syscall_syscall__freebsd__amd64.go @@ -0,0 +1,18 @@ +--- imports/syscall/syscall_freebsd_amd64.go.orig 2022-12-20 19:25:43 UTC ++++ imports/syscall/syscall_freebsd_amd64.go +@@ -1725,7 +1725,6 @@ func init() { + "SYS_LISTEN": ValueOf(syscall.SYS_LISTEN), + "SYS_LPATHCONF": ValueOf(syscall.SYS_LPATHCONF), + "SYS_LSEEK": ValueOf(syscall.SYS_LSEEK), +- "SYS_LSTAT": ValueOf(syscall.SYS_LSTAT), + "SYS_LUTIMES": ValueOf(syscall.SYS_LUTIMES), + "SYS_MAC_SYSCALL": ValueOf(syscall.SYS_MAC_SYSCALL), + "SYS_MADVISE": ValueOf(syscall.SYS_MADVISE), +@@ -1856,7 +1855,6 @@ func init() { + "SYS_SOCKET": ValueOf(syscall.SYS_SOCKET), + "SYS_SOCKETPAIR": ValueOf(syscall.SYS_SOCKETPAIR), + "SYS_SSTK": ValueOf(syscall.SYS_SSTK), +- "SYS_STAT": ValueOf(syscall.SYS_STAT), + "SYS_STATFS": ValueOf(syscall.SYS_STATFS), + "SYS_SWAPCONTEXT": ValueOf(syscall.SYS_SWAPCONTEXT), + "SYS_SWAPOFF": ValueOf(syscall.SYS_SWAPOFF),