diff --git a/textproc/minify/Makefile b/textproc/minify/Makefile index ccf14c66358f..a415433f4f22 100644 --- a/textproc/minify/Makefile +++ b/textproc/minify/Makefile @@ -1,21 +1,27 @@ PORTNAME= minify PORTVERSION= 2.12.4 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONPREFIX= v CATEGORIES= textproc www MAINTAINER= sunpoet@FreeBSD.org COMMENT= Go minifiers for web formats WWW= https://github.com/tdewolff/minify 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