diff --git a/www/go-minify/Makefile b/www/go-minify/Makefile index bf3b50a5af08..8cf99d4dd16f 100644 --- a/www/go-minify/Makefile +++ b/www/go-minify/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2020/04/12 11:01:50 bsiegert Exp $ +# $NetBSD: Makefile,v 1.16 2020/04/18 14:56:06 nikita Exp $ -DISTNAME= minify-2.3.8 +DISTNAME= minify-2.7.3 PKGNAME= go-${DISTNAME} -PKGREVISION= 14 MASTER_SITES= ${MASTER_SITE_GITHUB:=tdewolff/} CATEGORIES= www GITHUB_PROJECT= minify @@ -16,6 +15,9 @@ LICENSE= mit GO_DIST_BASE= ${DISTNAME} GO_SRCPATH= github.com/tdewolff/minify +post-configure: + cd ${WRKSRC} && rm cmd/minify/install.sh.orig + .include "../../www/go-parse/buildlink3.mk" .include "../../devel/go-humanize/buildlink3.mk" .include "../../devel/go-fsnotify/buildlink3.mk" diff --git a/www/go-minify/PLIST b/www/go-minify/PLIST index 71657757235f..5c4f991d6170 100644 --- a/www/go-minify/PLIST +++ b/www/go-minify/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2018/11/18 08:40:17 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/04/18 14:56:06 nikita Exp $ bin/minify gopkg/pkg/${GO_PLATFORM}/github.com/tdewolff/minify.a gopkg/pkg/${GO_PLATFORM}/github.com/tdewolff/minify/css.a @@ -21,6 +21,7 @@ gopkg/src/github.com/tdewolff/minify/benchmarks/sample_bbc.html gopkg/src/github.com/tdewolff/minify/benchmarks/sample_blogpost.html gopkg/src/github.com/tdewolff/minify/benchmarks/sample_books.xml gopkg/src/github.com/tdewolff/minify/benchmarks/sample_bootstrap.css +gopkg/src/github.com/tdewolff/minify/benchmarks/sample_car.svg gopkg/src/github.com/tdewolff/minify/benchmarks/sample_catalog.xml gopkg/src/github.com/tdewolff/minify/benchmarks/sample_dot.js gopkg/src/github.com/tdewolff/minify/benchmarks/sample_es6.html @@ -35,12 +36,14 @@ gopkg/src/github.com/tdewolff/minify/benchmarks/sample_normalize.css gopkg/src/github.com/tdewolff/minify/benchmarks/sample_omg.xml gopkg/src/github.com/tdewolff/minify/benchmarks/sample_stackoverflow.html gopkg/src/github.com/tdewolff/minify/benchmarks/sample_testsuite.json +gopkg/src/github.com/tdewolff/minify/benchmarks/sample_tiger.svg gopkg/src/github.com/tdewolff/minify/benchmarks/sample_twitter.json gopkg/src/github.com/tdewolff/minify/benchmarks/sample_usa.svg gopkg/src/github.com/tdewolff/minify/benchmarks/sample_wikipedia.html gopkg/src/github.com/tdewolff/minify/benchmarks/svg_test.go gopkg/src/github.com/tdewolff/minify/benchmarks/xml_test.go gopkg/src/github.com/tdewolff/minify/cmd/minify/README.md +gopkg/src/github.com/tdewolff/minify/cmd/minify/install.sh gopkg/src/github.com/tdewolff/minify/cmd/minify/main.go gopkg/src/github.com/tdewolff/minify/cmd/minify/minify_bash_tab_completion gopkg/src/github.com/tdewolff/minify/cmd/minify/util.go @@ -50,11 +53,14 @@ gopkg/src/github.com/tdewolff/minify/common.go gopkg/src/github.com/tdewolff/minify/common_test.go gopkg/src/github.com/tdewolff/minify/css/css.go gopkg/src/github.com/tdewolff/minify/css/css_test.go +gopkg/src/github.com/tdewolff/minify/css/hash.go gopkg/src/github.com/tdewolff/minify/css/table.go +gopkg/src/github.com/tdewolff/minify/css/util.go gopkg/src/github.com/tdewolff/minify/go.mod gopkg/src/github.com/tdewolff/minify/go.sum gopkg/src/github.com/tdewolff/minify/html/buffer.go gopkg/src/github.com/tdewolff/minify/html/buffer_test.go +gopkg/src/github.com/tdewolff/minify/html/hash.go gopkg/src/github.com/tdewolff/minify/html/html.go gopkg/src/github.com/tdewolff/minify/html/html_test.go gopkg/src/github.com/tdewolff/minify/html/table.go @@ -66,6 +72,7 @@ gopkg/src/github.com/tdewolff/minify/minify.go gopkg/src/github.com/tdewolff/minify/minify_test.go gopkg/src/github.com/tdewolff/minify/svg/buffer.go gopkg/src/github.com/tdewolff/minify/svg/buffer_test.go +gopkg/src/github.com/tdewolff/minify/svg/hash.go gopkg/src/github.com/tdewolff/minify/svg/pathdata.go gopkg/src/github.com/tdewolff/minify/svg/pathdata_test.go gopkg/src/github.com/tdewolff/minify/svg/svg.go @@ -73,5 +80,6 @@ gopkg/src/github.com/tdewolff/minify/svg/svg_test.go gopkg/src/github.com/tdewolff/minify/svg/table.go gopkg/src/github.com/tdewolff/minify/xml/buffer.go gopkg/src/github.com/tdewolff/minify/xml/buffer_test.go +gopkg/src/github.com/tdewolff/minify/xml/table.go gopkg/src/github.com/tdewolff/minify/xml/xml.go gopkg/src/github.com/tdewolff/minify/xml/xml_test.go diff --git a/www/go-minify/distinfo b/www/go-minify/distinfo index 253a8bdf3945..2c0c70c6a778 100644 --- a/www/go-minify/distinfo +++ b/www/go-minify/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2018/11/18 08:40:17 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2020/04/18 14:56:06 nikita Exp $ -SHA1 (minify-2.3.8.tar.gz) = ca6c3e5820b83f32dc0d06ce32c27a4252f4d142 -RMD160 (minify-2.3.8.tar.gz) = 2b84a1aa4ca19e0065bda932096bfca497b3b582 -SHA512 (minify-2.3.8.tar.gz) = dced371cb18a7b69048a5c2fbb6df4bd9143e11f7d346c8378c819a8dd6dc810e2090c340a7d26ddaae0208578c92a307d534170a57fd9ff36093c19576803dd -Size (minify-2.3.8.tar.gz) = 2125614 bytes +SHA1 (minify-2.7.3.tar.gz) = 266e56c21360e7d241faf4b3e7f21ffda375d83b +RMD160 (minify-2.7.3.tar.gz) = 8134758cbfabe43ed8abcb942917edb246b8b0dc +SHA512 (minify-2.7.3.tar.gz) = 4796981cf7e9425cee618b5cdeebcdb6dcb96010772cca639f887a691acb63f36fd3c0089efa2a053d46472a96564ba7f7b59df83f463dbe9e73ebe2e4e0818f +Size (minify-2.7.3.tar.gz) = 2303638 bytes +SHA1 (patch-cmd_minify_install.sh) = bff4d4223f80acbbf820ba06e4eb3d5daba6a872 diff --git a/www/go-minify/patches/patch-cmd_minify_install.sh b/www/go-minify/patches/patch-cmd_minify_install.sh new file mode 100644 index 000000000000..74fc8ddf5a68 --- /dev/null +++ b/www/go-minify/patches/patch-cmd_minify_install.sh @@ -0,0 +1,19 @@ +$NetBSD: patch-cmd_minify_install.sh,v 1.1 2020/04/18 14:56:06 nikita Exp $ + +Upstreamed at https://github.com/tdewolff/minify/pull/298 +Avoid usage of bash, this is no bash script. + +--- cmd/minify/install.sh~ ++++ cmd/minify/install.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + if command -v git >/dev/null 2>&1 && git rev-parse --git-dir >/dev/null 2>&1; then + go install -ldflags "-s -w -X 'main.Version=$(git describe --tags)'" -trimpath +@@ -6,4 +6,4 @@ else + go install -ldflags "-s -w" -trimpath + fi + +-source minify_bash_tab_completion ++. minify_bash_tab_completion