svn commit: r390118 - in head/sysutils/watchman: . files

[Dmitry Marakasov]

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 <bsd.port.mk>

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,