git: e1ed8df3c5a4 - main - devel/samurai: Update to 1.2-15-gaff2085

[Tobias Kortkamp]

The branch main has been updated by tobik:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e1ed8df3c5a46a5ba2b9a505c2dd67876b1f1693

commit e1ed8df3c5a46a5ba2b9a505c2dd67876b1f1693
Author:     Tobias Kortkamp <tobik at FreeBSD.org>
AuthorDate: 2021-04-09 05:45:05 +0000
Commit:     Tobias Kortkamp <tobik at FreeBSD.org>
CommitDate: 2021-04-09 05:48:52 +0000

    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(-)

diff --git a/devel/samurai/Makefile b/devel/samurai/Makefile
index d589587f85ff..eb081ccf231f 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 d240da192225..32ef394efd13 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 41cdc6e254b3..000000000000
--- 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