From owner-svn-ports-head@FreeBSD.ORG Fri Jun 19 14:36:37 2015 Return-Path: Delivered-To: svn-ports-head@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B7BC5F1; Fri, 19 Jun 2015 14:36:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 68FFFD54; Fri, 19 Jun 2015 14:36:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JEabYF064722; Fri, 19 Jun 2015 14:36:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JEaaMW064720; Fri, 19 Jun 2015 14:36:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201506191436.t5JEaaMW064720@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 19 Jun 2015 14:36:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390118 - in head/sysutils/watchman: . files X-SVN-Group: ports-head 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.20 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: Fri, 19 Jun 2015 14:36:37 -0000 Author: amdmi3 Date: Fri Jun 19 14:36:36 2015 New Revision: 390118 URL: https://svnweb.freebsd.org/changeset/ports/390118 Log: - Fix build on amd64 (while not breaking build on i386) Since time_t size is unspecified, the only way to print it correctly is by using %ld while casting the value to long This is what upstream does for a long time: https://github.com/facebook/watchman/commit/f2ec20fb2d98bfc9f54df43431564317de60429c Approved by: portmgr blanket MFH: 2015Q2 Added: head/sysutils/watchman/files/ head/sysutils/watchman/files/patch-root.c (contents, props changed) Modified: head/sysutils/watchman/Makefile Modified: head/sysutils/watchman/Makefile ============================================================================== --- head/sysutils/watchman/Makefile Fri Jun 19 14:00:59 2015 (r390117) +++ head/sysutils/watchman/Makefile Fri Jun 19 14:36:36 2015 (r390118) @@ -32,6 +32,5 @@ PORTDOCS= README.markdown post-patch: @${REINPLACE_CMD} -e '/^docdir = /d' ${WRKSRC}/Makefile.am - @${REINPLACE_CMD} -e '/timestamp=/s,%ld,%d,' ${WRKSRC}/root.c .include Added: head/sysutils/watchman/files/patch-root.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/watchman/files/patch-root.c Fri Jun 19 14:36:36 2015 (r390118) @@ -0,0 +1,11 @@ +--- root.c.orig 2014-11-03 21:24:12 UTC ++++ root.c +@@ -1092,7 +1092,7 @@ void set_poison_state(w_root_t *root, st + "All requests will continue to fail with this message until you resolve\n" + "the underlying problem. You will find more information on fixing this at\n" + "https://facebook.github.io/watchman/docs/troubleshooting.html#poison-%s\n", +- now.tv_sec, ++ (long)now.tv_sec, + syscall, + dir->path->len, + dir->path->buf,