Update watchman to version 3.0.0.

Delete patches since they have been applied upstream.
Changelog is not available.

5 files changed, 7 insertions, 100 deletions

diff --git a/sysutils/watchman/Makefile b/sysutils/watchman/Makefile
index 61e4183bdd8..2db1049aa16 100644
--- a/sysutils/watchman/Makefile
+++ b/sysutils/watchman/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2014/08/23 20:13:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/02/14 22:36:53 nros Exp $
 
 DISTNAME=	watchman-${VERSION}
-PKGREVISION=	1
-VERSION=	2.9.8
+VERSION=	3.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	-https://github.com/facebook/watchman/archive/v${VERSION}.tar.gz
 
@@ -11,7 +10,7 @@ HOMEPAGE=	https://github.com/facebook/watchman/
 COMMENT=	Watches files and takes action when they change
 LICENSE=	apache-2.0
 
-USE_TOOLS+=	autoconf automake autoreconf
+USE_TOOLS+=	autoconf automake autoreconf gmake
 GNU_CONFIGURE=	yes
 # https://github.com/facebook/watchman/issues/50
 CONFIGURE_ARGS+=	--enable-lenient
diff --git a/sysutils/watchman/distinfo b/sysutils/watchman/distinfo
index f39997f44fd..b3706c73009 100644
--- a/sysutils/watchman/distinfo
+++ b/sysutils/watchman/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/08/23 20:13:59 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/02/14 22:36:53 nros Exp $
 
-SHA1 (watchman-2.9.8.tar.gz) = f2ddfb5d42dce32da71dd789f63b705526fc9758
-RMD160 (watchman-2.9.8.tar.gz) = f312d38f24ce87ca251753926f73c998895234c1
-Size (watchman-2.9.8.tar.gz) = 183007 bytes
-SHA1 (patch-configure.ac) = e6893b2258351714e10e3bcc120250dda4c7031a
-SHA1 (patch-fstype.c) = f5b99113e97a22fc340d347fbf5397165d20bcd8
-SHA1 (patch-watchman.h) = 833693d8cfd782cb0ba085a48bdf4848e3696bd3
+SHA1 (watchman-3.0.0.tar.gz) = cd62a0185401536455e3b6a67c3ee146e291ac9e
+RMD160 (watchman-3.0.0.tar.gz) = 288c8262375dd5166a22c96b643d9d7fdf170148
+Size (watchman-3.0.0.tar.gz) = 199034 bytes
diff --git a/sysutils/watchman/patches/patch-configure.ac b/sysutils/watchman/patches/patch-configure.ac
deleted file mode 100644
index 45959929114..00000000000
--- a/sysutils/watchman/patches/patch-configure.ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2014/08/23 20:13:59 wiz Exp $
-
-Fix unportable test(1) construct.
-https://github.com/facebook/watchman/issues/48
-https://github.com/facebook/watchman/pull/54
---- configure.ac.orig	2014-05-20 21:14:24.000000000 +0000
-+++ configure.ac
-@@ -88,7 +88,7 @@ AC_ARG_WITH(pcre, [
- ])
- 
- if test "$pcre_config" != "no" ; then
--  if test "$pcre_config" == "yes" ; then
-+  if test "$pcre_config" = "yes" ; then
-     pcre_config="pcre-config"
-   fi
- 
-@@ -183,15 +183,20 @@ AC_CHECK_HEADERS(CoreServices/CoreServic
- ])
- AC_CHECK_FUNCS(backtrace backtrace_symbols)
- 
-+if test -n "$ac_cv_header_sys_statvfs_h"; then
-+AC_CHECK_MEMBERS([struct statvfs.f_fstypename,struct statvfs.f_basetype],
-+  [AC_DEFINE([STATVFS_HAS_FSTYPE_AS_STRING], [1],[if statvfs holds fstype as string])],[],[[#include <sys/statvfs.h>]])
-+fi
-+
- # Do this after we've looked for functions
- if test -n "$GCC" ; then
-   CFLAGS="$CFLAGS -Wall -Wextra -Wdeclaration-after-statement -g -gdwarf-2 -fno-omit-frame-pointer"
- fi
--if test -n "$GCC" -a "$stack_protect" == "yes" ; then
-+if test -n "$GCC" -a "$stack_protect" = "yes" ; then
-   CFLAGS="$CFLAGS -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4"
- fi
- IRONMANCFLAGS=""
--if test -n "$GCC" -a "$lenient" == "no" ; then
-+if test -n "$GCC" -a "$lenient" = "no" ; then
-   IRONMANCFLAGS="-Werror"
- fi
- AC_SUBST(IRONMANCFLAGS)
diff --git a/sysutils/watchman/patches/patch-fstype.c b/sysutils/watchman/patches/patch-fstype.c
deleted file mode 100644
index 9f57909c0c0..00000000000
--- a/sysutils/watchman/patches/patch-fstype.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-fstype.c,v 1.3 2014/08/23 20:13:59 wiz Exp $
-
-NetBSD also supports statvfs, adapt checks.
-https://github.com/facebook/watchman/issues/49
-https://github.com/facebook/watchman/pull/54
-
---- fstype.c.orig	2014-05-20 21:14:24.000000000 +0000
-+++ fstype.c
-@@ -53,11 +53,16 @@ w_string_t *w_fstype(const char *path)
-   }
- 
-   return w_string_new(name);
--#elif defined(sun)
-+#elif STATVFS_HAS_FSTYPE_AS_STRING
-   struct statvfs sfs;
- 
-   if (statvfs(path, &sfs) == 0) {
-+#ifdef HAVE_STRUCT_STATVFS_F_FSTYPENAME
-+    return w_string_new(sfs.f_fstypename);
-+#endif
-+#ifdef HAVE_STRUCT_STATVFS_F_BASETYPE
-     return w_string_new(sfs.f_basetype);
-+#endif
-   }
- #elif HAVE_STATFS
-   struct statfs sfs;
diff --git a/sysutils/watchman/patches/patch-watchman.h b/sysutils/watchman/patches/patch-watchman.h
deleted file mode 100644
index af453b2659c..00000000000
--- a/sysutils/watchman/patches/patch-watchman.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-watchman.h,v 1.1 2014/08/23 20:13:59 wiz Exp $
-* NetBSD bfore 6.99 uses BSD-style subsecond timespec
-https://github.com/facebook/watchman/pull/54
---- watchman.h.orig	2014-05-20 21:14:24.000000000 +0000
-+++ watchman.h	2014-08-22 11:54:55.000000000 +0000
-@@ -62,6 +62,9 @@
- #include <sysexits.h>
- #include <spawn.h>
- #include <stddef.h>
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
- // Not explicitly exported on Darwin, so we get to define it.
- extern char **environ;
- 
-@@ -575,7 +578,7 @@
- #define WATCHMAN_NSEC_IN_SEC (1000 * 1000 * 1000)
- #define WATCHMAN_NSEC_IN_MSEC 1000000
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 6099000000))
- /* BSD-style subsecond timespec */
- #define WATCHMAN_ST_TIMESPEC(type) st_##type##timespec
- #else