From e1ed8df3c5a46a5ba2b9a505c2dd67876b1f1693 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Fri, 9 Apr 2021 07:45:05 +0200 Subject: [PATCH] devel/samurai: Update to 1.2-15-gaff2085 This allows samurai to accept stray indented but otherwise empty lines and we can drop the fluxengine workaround. https://github.com/michaelforney/samurai/issues/70 --- devel/samurai/Makefile | 4 ++-- devel/samurai/distinfo | 6 +++--- sysutils/fluxengine/files/patch-mkninja.sh | 17 ----------------- 3 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 sysutils/fluxengine/files/patch-mkninja.sh diff --git a/devel/samurai/Makefile b/devel/samurai/Makefile index d589587f85ffa..eb081ccf231f8 100644 --- a/devel/samurai/Makefile +++ b/devel/samurai/Makefile @@ -1,6 +1,6 @@ PORTNAME= samurai -DISTVERSION= 1.2-9 -DISTVERSIONSUFFIX= -g27dde2e +DISTVERSION= 1.2-15 +DISTVERSIONSUFFIX= -gaff2085 CATEGORIES= devel #MASTER_SITES= https://github.com/michaelforney/samurai/releases/download/${DISTVERSION}/ diff --git a/devel/samurai/distinfo b/devel/samurai/distinfo index d240da1922253..32ef394efd136 100644 --- a/devel/samurai/distinfo +++ b/devel/samurai/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617529134 -SHA256 (michaelforney-samurai-1.2-9-g27dde2e_GH0.tar.gz) = 10035b9d39241db4bc48095ed318895b5e427d8d62ae39871b165619e5068338 -SIZE (michaelforney-samurai-1.2-9-g27dde2e_GH0.tar.gz) = 32285 +TIMESTAMP = 1617945575 +SHA256 (michaelforney-samurai-1.2-15-gaff2085_GH0.tar.gz) = 7ce2118ec727ed1246d049c0ac436bb7e6cdc92c405bd468073b9190c3542dd8 +SIZE (michaelforney-samurai-1.2-15-gaff2085_GH0.tar.gz) = 32046 diff --git a/sysutils/fluxengine/files/patch-mkninja.sh b/sysutils/fluxengine/files/patch-mkninja.sh deleted file mode 100644 index 41cdc6e254b3a..0000000000000 --- a/sysutils/fluxengine/files/patch-mkninja.sh +++ /dev/null @@ -1,17 +0,0 @@ -Fix ninja generator - -devel/samurai does not like the extra whitespace: - -ninja: .obj/build.ninja:6:5: expected name - ---- mkninja.sh.orig 2021-03-31 12:47:37 UTC -+++ mkninja.sh -@@ -7,7 +7,7 @@ rule cxx - description = CXX \$in - depfile = \$out.d - deps = gcc -- -+ - rule library - command = $AR \$out \$in - description = AR \$in