Index: head/sysutils/watchman/Makefile
===================================================================
--- head/sysutils/watchman/Makefile	(revision 536877)
+++ head/sysutils/watchman/Makefile	(revision 536878)
@@ -1,45 +1,42 @@
 # Created by: Jin-Sih, Lin <linpct@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	watchman
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.9.0-1115
-DISTVERSIONSUFFIX=	-gde3c5f68
+DISTVERSION=	2020.05.25.00
 CATEGORIES=	sysutils
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES=	7bbea1f8e75337d135815da440835a701fb26379.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	File alteration monitoring service
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_mips=		fails to build: watchman.h:169: undefined reference to '__sync_add_and_fetch_8'
 BROKEN_mips64=		fails to build: watchman.h:169: undefined reference to '__sync_add_and_fetch_8'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		liblz4.so:archivers/liblz4 \
 		libpcre.so:devel/pcre \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	FREEBSD_ENABLE_TESTING
 
 TEST_TARGET=	check
 
 PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/sysutils/watchman/distinfo
===================================================================
--- head/sysutils/watchman/distinfo	(revision 536877)
+++ head/sysutils/watchman/distinfo	(revision 536878)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1590699687
-SHA256 (facebook-watchman-v4.9.0-1115-gde3c5f68_GH0.tar.gz) = eb226deca69942bf22ddd36cf0e8a967fcd57ebdf5250c0b6567676e7346b2d5
-SIZE (facebook-watchman-v4.9.0-1115-gde3c5f68_GH0.tar.gz) = 3617955
-SHA256 (7bbea1f8e75337d135815da440835a701fb26379.patch) = 35a325c5aa408f104bc708964215e40f5cda27c08b660c0cbdc07da5f4a8d49f
-SIZE (7bbea1f8e75337d135815da440835a701fb26379.patch) = 934
+TIMESTAMP = 1590720120
+SHA256 (facebook-watchman-v2020.05.25.00_GH0.tar.gz) = 271009a9c5d39c33a87c9cde8fc8b4b8018b3030f1a7afb92c61c48e3481400f
+SIZE (facebook-watchman-v2020.05.25.00_GH0.tar.gz) = 4163035
Index: head/sysutils/watchman/files/patch-CMakeLists.txt
===================================================================
--- head/sysutils/watchman/files/patch-CMakeLists.txt	(revision 536877)
+++ head/sysutils/watchman/files/patch-CMakeLists.txt	(revision 536878)
@@ -1,11 +1,37 @@
---- CMakeLists.txt.orig	2020-05-28 21:04:15 UTC
+--- CMakeLists.txt.orig	2020-05-24 21:23:07 UTC
 +++ CMakeLists.txt
-@@ -309,7 +309,7 @@ if (ENABLE_EDEN_SUPPORT)
-   find_package(rsocket CONFIG REQUIRED)
- endif()
+@@ -114,10 +114,12 @@ set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSI
+ set(PACKAGE_BUGREPORT "https://github.com/facebook/watchman/issues")
+ project(${PACKAGE_NAME} CXX C)
  
--find_package(PythonInterp REQUIRED)
-+#find_package(PythonInterp REQUIRED)
- message(STATUS "Found python ${PYTHON_VERSION_STRING}")
++if (FREEBSD_ENABLE_TESTING)
+ find_package(GMock MODULE REQUIRED)
+ include_directories(${GMOCK_INCLUDEDIR} ${LIBGMOCK_INCLUDE_DIR})
+ include(GoogleTest)
+ enable_testing()
++endif()
  
- if(PYTHONINTERP_FOUND)
+ include(FBThriftCppLibrary)
+ include(CheckFunctionExists)
+@@ -363,7 +365,7 @@ endif()
+ # python3, python3.6 and python3.7 that will select 3.7,
+ # even though python3 -> python3.6.  On such a system we
+ # want the python3/python3.6 selection, not the 3.7 selection
+-find_program(PYTHON3 python3)
++#find_program(PYTHON3 python3)
+ if(PYTHON3)
+   set(PYOUT "${CMAKE_CURRENT_BINARY_DIR}/build/pytimestamp")
+   set(SETUP_PY "${CMAKE_CURRENT_SOURCE_DIR}/python/setup.py")
+@@ -724,6 +726,7 @@ if(PYTHON3)
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ endif()
+ 
++if (FREEBSD_ENABLE_TESTING)
+ t_test(art tests/art_test.cpp)
+ t_test(ignore tests/ignore_test.cpp)
+ t_test(pending tests/pending_test.cpp)
+@@ -735,3 +738,4 @@ t_test(childproc tests/childproc.cpp)
+ t_test(result tests/ResultTest.cpp)
+ t_test(cache tests/CacheTest.cpp)
+ t_test(MapUtilTest tests/MapUtilTest.cpp)
++endif()