From owner-svn-ports-all@freebsd.org Fri May 29 03:01:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0072D32D2E1; Fri, 29 May 2020 03:01:49 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49Y8VN6Hzjz3WDR; Fri, 29 May 2020 03:01:48 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D365410AD9; Fri, 29 May 2020 03:01:48 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04T31mW1081290; Fri, 29 May 2020 03:01:48 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04T31m5i081287; Fri, 29 May 2020 03:01:48 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202005290301.04T31m5i081287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 29 May 2020 03:01:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536878 - in head/sysutils/watchman: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/sysutils/watchman: . files X-SVN-Commit-Revision: 536878 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2020 03:01:49 -0000 Author: yuri Date: Fri May 29 03:01:47 2020 New Revision: 536878 URL: https://svnweb.freebsd.org/changeset/ports/536878 Log: sysutils/watchman: Update 4.9.0-1115 -> 2020.05.25.00 Modified: head/sysutils/watchman/Makefile head/sysutils/watchman/distinfo head/sysutils/watchman/files/patch-CMakeLists.txt Modified: head/sysutils/watchman/Makefile ============================================================================== --- head/sysutils/watchman/Makefile Fri May 29 03:00:35 2020 (r536877) +++ head/sysutils/watchman/Makefile Fri May 29 03:01:47 2020 (r536878) @@ -3,13 +3,9 @@ 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 @@ -37,6 +33,7 @@ USE_GITHUB= yes GH_ACCOUNT= facebook CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_OFF= FREEBSD_ENABLE_TESTING TEST_TARGET= check Modified: head/sysutils/watchman/distinfo ============================================================================== --- head/sysutils/watchman/distinfo Fri May 29 03:00:35 2020 (r536877) +++ head/sysutils/watchman/distinfo Fri May 29 03:01:47 2020 (r536878) @@ -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 Modified: head/sysutils/watchman/files/patch-CMakeLists.txt ============================================================================== --- head/sysutils/watchman/files/patch-CMakeLists.txt Fri May 29 03:00:35 2020 (r536877) +++ head/sysutils/watchman/files/patch-CMakeLists.txt Fri May 29 03:01:47 2020 (r536878) @@ -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()