Date: Tue, 1 May 2018 09:21:24 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468759 - in head/devel/samurai: . files Message-ID: <201805010921.w419LOtt097776@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue May 1 09:21:24 2018 New Revision: 468759 URL: https://svnweb.freebsd.org/changeset/ports/468759 Log: devel/samurai: Move to latest commit This adds --version support to samurai which CMake and Meson expect to be available. This fixes the build of many ports when using samurai as ninja replacement. Added: head/devel/samurai/files/ head/devel/samurai/files/patch-samurai.c (contents, props changed) Modified: head/devel/samurai/Makefile head/devel/samurai/distinfo Modified: head/devel/samurai/Makefile ============================================================================== --- head/devel/samurai/Makefile Tue May 1 09:03:56 2018 (r468758) +++ head/devel/samurai/Makefile Tue May 1 09:21:24 2018 (r468759) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= samurai -DISTVERSION= 0.3 +DISTVERSION= 0.3-21 +DISTVERSIONSUFFIX= -g6ec14ce CATEGORIES= devel -MASTER_SITES= https://github.com/michaelforney/samurai/releases/download/${DISTVERSION}/ MAINTAINER= tobik@FreeBSD.org COMMENT= Ninja-compatible build tool written in C @@ -12,6 +12,9 @@ LICENSE= APACHE20 MIT LICENSE_COMB= multi LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE + +USE_GITHUB= yes +GH_ACCOUNT= michaelforney ALL_TARGET= samu PLIST_FILES= bin/samu man/man1/samu.1.gz Modified: head/devel/samurai/distinfo ============================================================================== --- head/devel/samurai/distinfo Tue May 1 09:03:56 2018 (r468758) +++ head/devel/samurai/distinfo Tue May 1 09:21:24 2018 (r468759) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524823953 -SHA256 (samurai-0.3.tar.gz) = 2a93d09a2dc97a9930d2757f2829c599d7ca339c7df61b048210c6be18d318b0 -SIZE (samurai-0.3.tar.gz) = 26450 +TIMESTAMP = 1525128825 +SHA256 (michaelforney-samurai-0.3-21-g6ec14ce_GH0.tar.gz) = 5c8c54046f3f54918e41f897fe535aa6e199f928084c5d8afc7933fbb3074069 +SIZE (michaelforney-samurai-0.3-21-g6ec14ce_GH0.tar.gz) = 26569 Added: head/devel/samurai/files/patch-samurai.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/samurai/files/patch-samurai.c Tue May 1 09:21:24 2018 (r468759) @@ -0,0 +1,18 @@ +Stub out -w which is used by gyp when building Chromium to pass +dupbuild=err to ninja. + +samuari treats multiple build lines for a target and cycles as an error +by default. + +--- samurai.c.orig 2018-04-30 05:02:22 UTC ++++ samurai.c +@@ -133,6 +133,9 @@ main(int argc, char *argv[]) + case 'v': + buildopts.verbose = true; + break; ++ case 'w': ++ EARGF(usage()); ++ break; + default: + usage(); + } ARGEND
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805010921.w419LOtt097776>