From nobody Fri Mar 24 20:57:03 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 4Pjvf73Clsz4175v; Fri, 24 Mar 2023 20:57:03 +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 4Pjvf725MPz3h3x; Fri, 24 Mar 2023 20:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679691423; 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=opNvV3Fz4BJyA7AjFqbptzmGeK/LYKaOB3mxKWSLDm0=; b=SjBg02lCvJWFvATgjrPXoKGnUcxDEy5FROrRzh9KfzuRXq0tKTnQx+L2HYx5vkqWWxwP8j bgQ00+WXwWHhZr+0DVir9M//T2O9TCwtFxoA9DWOwfs3dDYHEEmUVeFOko6R7/GU7HNXJO x5x5MMP0Dvo5pgGI3Z737C4PAPz6WYx+AfcgwXL0vaiNFwHQAnBOP6Zk9adyepLNw3PGcO WSAc9yhG77tPijF3Bu55x8IzN8Gb7MSPTp1eCMdbCC+8BIZmKVop2Cbxt94v8ygZFs+0WX 1zbfGqjqcx7fHxo64T1ckqgNOY/e4dvTbyDKjjNvEur52rc7YzaGYsq//7jrDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679691423; 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=opNvV3Fz4BJyA7AjFqbptzmGeK/LYKaOB3mxKWSLDm0=; b=v7ZZJeG6gAMFEKsp0/CGJ6BpdxZ4QZqjKcsGyBmAkBd7VFQNLaaSh2Ij4T70epFO12DuhU B9Z2xmH0yqWwA/VIUhpC1AbnuuPmjpS6h/0xwwiLDVRa4Svbnre8HvsvoIWUJGgheH3r1C +Ga46uwVHnGLwUu5DimgqLbDtMHAPZZsshtwr1cwE6xMoKTEd2rDNYWoa9RFevPYe21veP 4M0j5t4mHtt1/dWI9hhTw7eRB1OrZ+CMCnqzE+2eU9OImwNf1ozErzYzsUZk3i0u7Rba5d n4ZCVw5qax05xQ3aGoozNHLnh+VVAqzhTseisExuvo24gmJWaSWEq7VTHbHX8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679691423; a=rsa-sha256; cv=none; b=Ca0sqp462EX0QIfmMiV64gdBb0QNfkIEb0O/ZPn+8tdrqjN3VFG+KDz/nx4GbIDLPy6hXV JqnvnZqop4mwrXW+osRkCBIwMR/1+t8xzVGmK5jOoBquqHb10Hspof/xTB6COkVhXDveTF 7vogcKg4dj7pr8W+5J0BnuNQvKKKC5XdvsZscKF3pwg9NvVm66Zwq6WLVecdxlFjUhpPUb ppzNO3dHAKUgvjJSyjBnnwWJY1aRoprxqSrr4AzPEA9AYTCakTFrb73mdpbGmCPdn4NF8c zYVKF+5nNIXTZ6Ssu/kdb71PiwZcyWHE2jHA3PssxAd6evBXgOW2q1FQ6ptFrg== 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 4Pjvf71CTMzYCv; Fri, 24 Mar 2023 20:57:03 +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 32OKv3Jv088824; Fri, 24 Mar 2023 20:57:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OKv3jx088823; Fri, 24 Mar 2023 20:57:03 GMT (envelope-from git) Date: Fri, 24 Mar 2023 20:57:03 GMT Message-Id: <202303242057.32OKv3jx088823@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: 0b8a364cd65e - main - textproc/minify: 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: 0b8a364cd65e263ff9891c83664c4d1b582845bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b8a364cd65e263ff9891c83664c4d1b582845bf commit 0b8a364cd65e263ff9891c83664c4d1b582845bf Author: Robert Clausecker AuthorDate: 2023-03-24 17:16:59 +0000 Commit: Robert Clausecker CommitDate: 2023-03-24 20:54:55 +0000 textproc/minify: 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) --- textproc/minify/Makefile | 8 +++++- textproc/minify/distinfo | 4 ++- textproc/minify/files/patch-go.mod | 23 ++++++++++++++++ textproc/minify/files/patch-go.sum | 8 ++++++ textproc/minify/files/patch-vendor_modules.txt | 36 ++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 2 deletions(-) diff --git a/textproc/minify/Makefile b/textproc/minify/Makefile index ccf14c66358f..a415433f4f22 100644 --- a/textproc/minify/Makefile +++ b/textproc/minify/Makefile @@ -1,6 +1,6 @@ PORTNAME= minify PORTVERSION= 2.12.4 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONPREFIX= v CATEGORIES= textproc www @@ -12,10 +12,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys GO_MODULE= github.com/tdewolff/minify/v2 GO_TARGET= ./cmd/minify PLIST_FILES= bin/minify +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + .include diff --git a/textproc/minify/distinfo b/textproc/minify/distinfo index b8c825bfec50..0412ddab59f8 100644 --- a/textproc/minify/distinfo +++ b/textproc/minify/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1665073096 +TIMESTAMP = 1679677770 SHA256 (go/textproc_minify/minify-v2.12.4/v2.12.4.mod) = fe00f21802a89a1cd961e26bd58a95fc9c9833adfd640b1bd9923b99a6f560a4 SIZE (go/textproc_minify/minify-v2.12.4/v2.12.4.mod) = 401 SHA256 (go/textproc_minify/minify-v2.12.4/v2.12.4.zip) = 6f76f152c15fee3a36b0496175d7e075046c3b47b50327428b10d32af6549f5f SIZE (go/textproc_minify/minify-v2.12.4/v2.12.4.zip) = 7090880 +SHA256 (go/textproc_minify/minify-v2.12.4/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/textproc_minify/minify-v2.12.4/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/textproc/minify/files/patch-go.mod b/textproc/minify/files/patch-go.mod new file mode 100644 index 000000000000..d5bfd4cdecbf --- /dev/null +++ b/textproc/minify/files/patch-go.mod @@ -0,0 +1,23 @@ +--- go.mod.orig 2023-03-24 17:14:16 UTC ++++ go.mod +@@ -1,9 +1,8 @@ + module github.com/tdewolff/minify/v2 + +-go 1.13 ++go 1.17 + + require ( +- github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect + github.com/djherbis/atime v1.1.0 + github.com/dustin/go-humanize v1.0.0 + github.com/fsnotify/fsnotify v1.5.4 +@@ -11,4 +10,9 @@ require ( + github.com/spf13/pflag v1.0.5 + github.com/tdewolff/parse/v2 v2.6.4 + github.com/tdewolff/test v1.0.7 ++) ++ ++require ( ++ github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 // indirect ++ golang.org/x/sys v0.6.0 // indirect + ) diff --git a/textproc/minify/files/patch-go.sum b/textproc/minify/files/patch-go.sum new file mode 100644 index 000000000000..00a884d9fb03 --- /dev/null +++ b/textproc/minify/files/patch-go.sum @@ -0,0 +1,8 @@ +--- go.sum.orig 2023-03-24 17:14:19 UTC ++++ go.sum +@@ -16,3 +16,5 @@ github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP + github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= + golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= + golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/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= diff --git a/textproc/minify/files/patch-vendor_modules.txt b/textproc/minify/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..9b092b797873 --- /dev/null +++ b/textproc/minify/files/patch-vendor_modules.txt @@ -0,0 +1,36 @@ +--- vendor/modules.txt.orig 2023-03-24 17:15:58 UTC ++++ vendor/modules.txt +@@ -1,14 +1,22 @@ ++# github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927 ++## explicit + # github.com/djherbis/atime v1.1.0 ++## explicit; go 1.16 + github.com/djherbis/atime + # github.com/dustin/go-humanize v1.0.0 ++## explicit + github.com/dustin/go-humanize + # github.com/fsnotify/fsnotify v1.5.4 ++## explicit; go 1.16 + github.com/fsnotify/fsnotify + # github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2 ++## explicit + github.com/matryer/try + # github.com/spf13/pflag v1.0.5 ++## explicit; go 1.12 + github.com/spf13/pflag + # github.com/tdewolff/parse/v2 v2.6.4 ++## explicit; go 1.13 + github.com/tdewolff/parse/v2 + github.com/tdewolff/parse/v2/buffer + github.com/tdewolff/parse/v2/css +@@ -18,7 +26,8 @@ github.com/tdewolff/parse/v2/json + github.com/tdewolff/parse/v2/strconv + github.com/tdewolff/parse/v2/xml + # github.com/tdewolff/test v1.0.7 ++## explicit; go 1.12 + github.com/tdewolff/test +-# golang.org/x/sys v0.0.0-20220412211240-33da011f77ad +-golang.org/x/sys/internal/unsafeheader ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/unix