diff -ruN watchman.orig/Makefile watchman/Makefile
--- watchman.orig/Makefile	2015-06-22 12:13:08.000000000 +0800
+++ watchman/Makefile	2015-10-23 11:23:54.350850000 +0800
@@ -2,7 +2,7 @@
 # $FreeBSD: head/sysutils/watchman/Makefile 390118 2015-06-19 14:36:36Z amdmi3 $
 
 PORTNAME=	watchman
-PORTVERSION=	3.0.0
+PORTVERSION=	4.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -16,10 +16,10 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
-USES=		autoreconf gmake pkgconfig
+USES=		autoreconf gmake pkgconfig python:2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_HAVE_ARC=false
-CONFIGURE_ARGS=	--with-pcre
+CONFIGURE_ARGS=	--with-pcre --localstatedir=/var
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--disable-silent-rules
@@ -27,10 +27,14 @@
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-PLIST_FILES=	bin/watchman
+RUN_DIR= 	/var/run/watchman
+
 PORTDOCS=	README.markdown
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^docdir = /d' ${WRKSRC}/Makefile.am
 
+post-install:
+	${MKDIR} -m 0777 ${STAGEDIR}${RUN_DIR}
+
 .include <bsd.port.mk>
diff -ruN watchman.orig/distinfo watchman/distinfo
--- watchman.orig/distinfo	2015-06-22 12:13:08.000000000 +0800
+++ watchman/distinfo	2015-10-23 11:14:51.015521000 +0800
@@ -1,2 +1,2 @@
-SHA256 (facebook-watchman-v3.0.0_GH0.tar.gz) = 9481c801b848acaa2783e511faaeae8d276e624e2703bd53f4e33cc9d0c0f12f
-SIZE (facebook-watchman-v3.0.0_GH0.tar.gz) = 199034
+SHA256 (facebook-watchman-v4.1.0_GH0.tar.gz) = 5bc579475a8a26f5e1af58abbf848a7c3067524b9be448f98feba9e455284eeb
+SIZE (facebook-watchman-v4.1.0_GH0.tar.gz) = 401398
diff -ruN watchman.orig/files/patch-root.c watchman/files/patch-root.c
--- watchman.orig/files/patch-root.c	2015-06-22 12:13:20.000000000 +0800
+++ watchman/files/patch-root.c	1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- 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,
diff -ruN watchman.orig/pkg-plist watchman/pkg-plist
--- watchman.orig/pkg-plist	1970-01-01 08:00:00.000000000 +0800
+++ watchman/pkg-plist	2015-10-23 11:30:36.181575000 +0800
@@ -0,0 +1,18 @@
+bin/watchman
+bin/watchman-make
+bin/watchman-wait
+%%PYTHON_SITELIBDIR%%/pywatchman-1.2.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pywatchman-1.2.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pywatchman-1.2.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pywatchman-1.2.0-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/pywatchman-1.2.0-py%%PYTHON_VER%%.egg-info/zip-safe
+%%PYTHON_SITELIBDIR%%/pywatchman/__init__.py
+%%PYTHON_SITELIBDIR%%/pywatchman/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pywatchman/bser.so
+%%PYTHON_SITELIBDIR%%/pywatchman/capabilities.py
+%%PYTHON_SITELIBDIR%%/pywatchman/capabilities.pyc
+%%PYTHON_SITELIBDIR%%/pywatchman/pybser.py
+%%PYTHON_SITELIBDIR%%/pywatchman/pybser.pyc
+%%PORTDOCS%%%%DOCSDIR%%/README.markdown
+var/run/watchman/.not-empty
+@dir /var/run/watchman