Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 May 2020 21:17:19 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r536820 - in head/sysutils/watchman: . files
Message-ID:  <202005282117.04SLHJQU063691@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Thu May 28 21:17:18 2020
New Revision: 536820
URL: https://svnweb.freebsd.org/changeset/ports/536820

Log:
  sysutils/watchman: Update 4.5.0 -> 4.9.0-1115
  
  Maintainer refused of maintainership, so I am taking it.
  
  The latest version of watchman doesn't build with the
  port version of devel/folly, and the latest folly
  can't yet be ported due to build issues.
  Therefore, updating to the version that can be built.
  
  PR:		238766
  Approved by:	linpct@gmail.com (maintainer)

Added:
  head/sysutils/watchman/files/
  head/sysutils/watchman/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/sysutils/watchman/Makefile
  head/sysutils/watchman/distinfo

Modified: head/sysutils/watchman/Makefile
==============================================================================
--- head/sysutils/watchman/Makefile	Thu May 28 20:51:33 2020	(r536819)
+++ head/sysutils/watchman/Makefile	Thu May 28 21:17:18 2020	(r536820)
@@ -2,50 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	watchman
-PORTVERSION=	4.5.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	4.9.0-1115
+DISTVERSIONSUFFIX=	-gde3c5f68
 CATEGORIES=	sysutils
 
-MAINTAINER=	linpct@gmail.com
+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
 
-USES=		autoreconf gmake pkgconfig
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_prog_HAVE_ARC=false ac_cv_header_sys_inotify_h=no
-CONFIGURE_ARGS=	--without-python --without-ruby # in separate ports
+CMAKE_ON=	BUILD_SHARED_LIBS
+
 TEST_TARGET=	check
 
-PLIST_FILES=	bin/${PORTNAME} \
-		"@dir(,,2777) /var/run/${PORTNAME}"
-PORTDOCS=	README.markdown
-
-OPTIONS_DEFINE=	BACKTRACE PCRE DOCS
-OPTIONS_DEFAULT=BACKTRACE PCRE
-
-BACKTRACE_DESC=		Stack backtrace support via (lib)execinfo
-BACKTRACE_LIBS=		-lexecinfo
-
-PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
-PCRE_CONFIGURE_WITH=	pcre
-
-CPPFLAGS+=	-Wno-error
-
-post-patch:
-# https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
-	@${REINPLACE_CMD} -e 's,xprefix/var,localstatedir,' \
-		-e '\,/etc, { s//$$sysconfdir/; /=/s/^/eval /; }' \
-		${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e '/^docdir = /d' \
-		-e '/not-empty/d; /chmod g+s/d;' \
-		${WRKSRC}/Makefile.am
+PLIST_FILES=	bin/${PORTNAME}
 
 .include <bsd.port.mk>

Modified: head/sysutils/watchman/distinfo
==============================================================================
--- head/sysutils/watchman/distinfo	Thu May 28 20:51:33 2020	(r536819)
+++ head/sysutils/watchman/distinfo	Thu May 28 21:17:18 2020	(r536820)
@@ -1,2 +1,5 @@
-SHA256 (facebook-watchman-v4.5.0_GH0.tar.gz) = ef11ad11f3b79a09232a27d993331cc8b686fe06a8f0e7c777cb50cc198020f6
-SIZE (facebook-watchman-v4.5.0_GH0.tar.gz) = 412516
+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

Added: head/sysutils/watchman/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/watchman/files/patch-CMakeLists.txt	Thu May 28 21:17:18 2020	(r536820)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2020-05-28 21:04:15 UTC
++++ CMakeLists.txt
+@@ -309,7 +309,7 @@ if (ENABLE_EDEN_SUPPORT)
+   find_package(rsocket CONFIG REQUIRED)
+ endif()
+ 
+-find_package(PythonInterp REQUIRED)
++#find_package(PythonInterp REQUIRED)
+ message(STATUS "Found python ${PYTHON_VERSION_STRING}")
+ 
+ if(PYTHONINTERP_FOUND)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005282117.04SLHJQU063691>