Update sysutils/watchman to 4.7.0.

Watchman 4.7.0 (2016-09-10)
- Reduced memory usage by 40%
- Queries can now run with a shared lock.
- Added new glob generator as a walking strategy for queries.
- Added "case_sensitive": true option to queries to force matches to happen
  in a case sensitive manner, even if the watched root is on a case
  insensitive filesystem.
- Fixed a race condition during subscription initiation that could emit
  incorrect clock values.
- Fixed spurious over-notification for parent directories of changed files
  on Mac.
- Fixed some reliability issues on Windows

Watchman 4.6.0 (2016-07-09)
- Improved I/O scheduling when processing recursive deletes and deep
  directory rename operations.
- Improved performance of the ignore_dirs configuration option on macOS and
  Windows systems.
- Added an optional recrawl recovery strategy for macOS that will attempt to
  resync from the fseventsd journal rather than performing a full filesystem
  walk.
- Fixed accidental exponential time complexity issue with recursive deletes
  and deep directory rename operations on case-insensitive filesystems (such
 as macOS).
- Added support for allowing non-owner access to a Watchman instance.
- Added support for inetd-style socket activation of the watchman service.
- Added the symlink_target field to the stored metadata for files.
- Fixed an issue where watchman may not reap child processes spawned by
  triggers.
- Fixed an issue where watchman may block forever during shutdown if there
  are other connected clients.
- Added hint_num_dirs configuration option.

Watchman 4.5.0 (2016-02-18)
- Fixed an inotify race condition for non-atomic directory replacements that
  was introduced in Watchman 4.4.

Watchman 4.4.0 (2016-02-02)
- Added state-enter and state-leave commands can allow subscribers to more
  intelligently settle/coalesce events around hg update or builds.
- Fixed an issue where subscriptions could double-notify for the same
  events.
- Fixed an issue where subscriptions that never match any files add
  O(all-observed-files) CPU cost to every subscription dispatch

Watchman 4.3.0 (2015-12-14)
- Improved handling of case insensitive renames; halved the memory usage and
  doubled crawl speed on OS X.

Watchman 4.2.0 (2015-12-08)
- Increased strictness of checks for symlinks; rather than just checking
  whether the leaf of a directory tree is a symlink, we now check each
  component down from the root of the watch.
- Increased priority of the watchman process on OS X.

Watchman 4.1.0 (2015-10-20)
- Fixed an issue where symlink size was always reported as 0 on OS X using
  the new bulkstat functionality

Watchman 4.0.0 (2015-10-19)
- Fixed an issue where a directory that was replaced by a symlink would
  cause a symlink traversal instead of correctly updating the type of the
  node and marking the children removed.
- Fixed a debugging log line that was emitted at the wrong log level on
  every directory traversal.

Watchman 3.9.0 (2015-10-12)
- Fixed an issue where dir renames on OS X could cause us to lose track of
  the files inside the renamed dir
- Fixed an issue where dir deletes and replacements on Linux could cause us
  to lose track of the files inside the replaced dir (similar to the OS X
  issue above in manifestation, but a different root cause).
- Improved (re)crawl speed for dirs with more than a couple of entries on
  average (improvement can be up to 5x for dirs with up to 64 entries on
  average).
- Improved (re)crawl speed on OS X 10.10 and later by using getattrlistbulk.
- Add optional sync_timeout to the clock command
- Avoid accidentally passing descriptors other than the stdio streams when
  we spawn the watchman service.
- Fixed a race condition where we could start two sets of watcher threads
  for the same dir if two clients issue a watch or watch-project at the same
  time
- Added a helpful error for a tmux + launchd issue on OS X

Watchman 3.8.0 (2015-09-14)
- Improved latency of processing kernel notifications.
- Improved idle behavior.
- Improved inotify move tracking.
- Hardened statedir and permissions.
- Fixed a possible deadlock in the idle watch reaper
- Fixed an issue where the watchman -p log-level debug could drop log
  notifications in the CLI
- Disabled the IO-throttling-during-crawl that we added in 3.7. It proved to
  be more harmful than beneficial.
- -j CLI option now accepts either JSON or BSER encoded command on stdin
- Added capabilities to the server, and added the capabilityCheck method to
  the python and node clients.

Watchman 3.7.0 (2015-08-05)
- Fixed bug where query match on foo*.java with wholename scope would
  incorrectly match foo/bar/baz.java.
- Added src/**/*.java recursive glob pattern support to query match.
- Added options dictionary to query's match operator.
- Added includedotfiles option to query match to include files whose names
  start with ..
- Added noescape option to query match to make \ match literal \.
- We'll now automatically age out and stop watches.
- watch-project will now try harder to re-use an existing watch and avoid
  creating an overlapping watch.
- Reduce I/O priority during crawling on systems that support this
- Fixed issue with the long long data type in the python BSER module

Watchman 3.5.0 (2015-06-29)
- Fix the version number reported by watchman.

Watchman 3.4.0 (2015-06-29)
- trigger now supports an optional relative_root argument.

Watchman 3.3.0 (2015-06-22)
- query and subscribe now support an optional relative_root argument.

3 files changed, 18 insertions, 12 deletions

diff --git a/sysutils/watchman/Makefile b/sysutils/watchman/Makefile
index c0b0d02da25..70ac238029f 100644
--- a/sysutils/watchman/Makefile
+++ b/sysutils/watchman/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2016/10/29 20:14:42 fhajny Exp $
+# $NetBSD: Makefile,v 1.9 2016/11/01 14:54:01 fhajny Exp $
 
-DISTNAME=	watchman-3.1
-PKGREVISION=	1
+DISTNAME=	watchman-4.7.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=facebook/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/facebook/watchman/
+HOMEPAGE=	https://facebook.github.io/watchman/
 COMMENT=	Watches files and takes action when they change
 LICENSE=	apache-2.0
 
@@ -15,15 +14,22 @@ GITHUB_TAG=	v${PKGVERSION_NOREV}
 USE_TOOLS+=	autoconf automake autoreconf gmake
 GNU_CONFIGURE=	yes
 
+# As of 4.7.0, SunOS port is broken and unmaintained
+# https://github.com/facebook/watchman/issues/322
+BROKEN_ON_PLATFORM=	SunOS-*-*
+
+CHECK_PORTABILITY_SKIP+=	travis/run.sh
+
 # https://github.com/facebook/watchman/issues/50
 CONFIGURE_ARGS+=	--enable-lenient
 CONFIGURE_ARGS+=	--enable-conffile=${PKG_SYSCONFDIR}/watchman.json
 CONFIGURE_ARGS+=	--enable-statedir=${VARBASE}/run/watchman
 CONFIGURE_ARGS+=	--with-pcre
+CONFIGURE_ARGS+=	--without-python
 
 BUILD_DEFS+=		VARBASE
 
-PLIST_SUBST+=		API_VERSION=${PKGNAME_NOREV}.0
+OWN_DIRS+=		${VARBASE}/run/watchman
 
 pre-configure:
 	cd ${WRKSRC} && ${SH} autogen.sh
diff --git a/sysutils/watchman/PLIST b/sysutils/watchman/PLIST
index ab5020bed35..d63cf6024ce 100644
--- a/sysutils/watchman/PLIST
+++ b/sysutils/watchman/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2015/04/26 05:38:18 mef Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/11/01 14:54:01 fhajny Exp $
 bin/watchman
-share/doc/${API_VERSION}/README.markdown
+share/doc/${PKGNAME}/README.markdown
diff --git a/sysutils/watchman/distinfo b/sysutils/watchman/distinfo
index 28388ce7a4a..49c6ca18ee7 100644
--- a/sysutils/watchman/distinfo
+++ b/sysutils/watchman/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:32:35 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/11/01 14:54:01 fhajny Exp $
 
-SHA1 (watchman-3.1.tar.gz) = eb5572cd9cf4ce2b8e31d51ed22d5ec8cc6301ae
-RMD160 (watchman-3.1.tar.gz) = a97176d48fe81a8c187836d1ef87646d3f3cbe1d
-SHA512 (watchman-3.1.tar.gz) = ed71ea1dcd2cab510ccbf861dbd7336fee5acf470678f5e107cee7f06085eaafc99a2ee45b33d22df843ca7eab69722fd87fbf32f35f2fa82c7623b964449d3b
-Size (watchman-3.1.tar.gz) = 210849 bytes
+SHA1 (watchman-4.7.0.tar.gz) = 7f10c7f70b5f9095f3981d38cf221c0b8f9f0af3
+RMD160 (watchman-4.7.0.tar.gz) = d2398aba63074636c73466183dd09521c0ddcdc2
+SHA512 (watchman-4.7.0.tar.gz) = 1b0729bfba28948619ab910e0d21b8ff1392c3a4d1b39b77241e5465337d76ea54c51ad4a4b1458dd25ad231a3f4eb5c9fa68b3d6b0941f95f89ab80e8a4c0cb
+Size (watchman-4.7.0.tar.gz) = 3412446 bytes