From owner-svn-ports-head@freebsd.org Tue May 1 09:21:25 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2C0CFBF886; Tue, 1 May 2018 09:21:25 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 503CC6FC5F; Tue, 1 May 2018 09:21:25 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 329D520362; Tue, 1 May 2018 09:21:25 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w419LPRg097779; Tue, 1 May 2018 09:21:25 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w419LOtt097776; Tue, 1 May 2018 09:21:24 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201805010921.w419LOtt097776@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 1 May 2018 09:21:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468759 - in head/devel/samurai: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/devel/samurai: . files X-SVN-Commit-Revision: 468759 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 May 2018 09:21:25 -0000 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