aboutsummaryrefslogtreecommitdiff
path: root/sysutils/watchman
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-12-09 03:19:16 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-12-09 03:19:16 +0000
commita1ea14395481e99d078399d1c34fee7c74ee0a02 (patch)
treeac608cbe0a0e2972d4e0fb07376a101f4665dfd1 /sysutils/watchman
parent776f213b7c5bb9484333050b2af3e22fea13d3d5 (diff)
downloadports-a1ea14395481e99d078399d1c34fee7c74ee0a02.tar.gz
ports-a1ea14395481e99d078399d1c34fee7c74ee0a02.zip
Notes
Diffstat (limited to 'sysutils/watchman')
-rw-r--r--sysutils/watchman/Makefile34
-rw-r--r--sysutils/watchman/distinfo4
-rw-r--r--sysutils/watchman/files/patch-root.c11
3 files changed, 27 insertions, 22 deletions
diff --git a/sysutils/watchman/Makefile b/sysutils/watchman/Makefile
index 9453d80d83b1..5829ee0b8b2d 100644
--- a/sysutils/watchman/Makefile
+++ b/sysutils/watchman/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= watchman
-PORTVERSION= 3.0.0
+PORTVERSION= 4.2.0
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
@@ -11,26 +11,42 @@ COMMENT= File alteration monitoring service
LICENSE= APACHE20
-LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
-
USE_GITHUB= yes
GH_ACCOUNT= facebook
USES= autoreconf gmake pkgconfig
GNU_CONFIGURE= yes
-CONFIGURE_ENV= ac_cv_prog_HAVE_ARC=false
-CONFIGURE_ARGS= --with-pcre
+CONFIGURE_ENV= ac_cv_prog_HAVE_ARC=false ac_cv_header_sys_inotify_h=no
+CONFIGURE_ARGS= --without-python --without-ruby # in separate ports
+TEST_TARGET= check
.if defined(BATCH) || defined(PACKAGE_BUILDING)
CONFIGURE_ARGS+= --disable-silent-rules
.endif
-CPPFLAGS+= -I${LOCALBASE}/include
-
-PLIST_FILES= bin/watchman
+PLIST_FILES= bin/${PORTNAME} \
+ "@dir(,,777) /var/run/${PORTNAME}"
PORTDOCS= README.markdown
+OPTIONS_DEFINE= BACKTRACE PCRE
+OPTIONS_DEFAULT=BACKTRACE PCRE
+
+BACKTRACE_DESC= Stack backtrace support via (lib)execinfo
+BACKTRACE_USES= execinfo
+BACKTRACE_CPPFLAGS= ${EXECINFO_CPPFLAGS}
+BACKTRACE_LDFLAGS= ${EXECINFO_LDFLAGS}
+BACKTRACE_LIBS= -lexecinfo
+
+PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_CONFIGURE_WITH= pcre
+
post-patch:
- @${REINPLACE_CMD} -e '/^docdir = /d' ${WRKSRC}/Makefile.am
+# 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' \
+ ${WRKSRC}/Makefile.am
.include <bsd.port.mk>
diff --git a/sysutils/watchman/distinfo b/sysutils/watchman/distinfo
index befa1fd64963..b4d77303882b 100644
--- a/sysutils/watchman/distinfo
+++ b/sysutils/watchman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (facebook-watchman-v3.0.0_GH0.tar.gz) = 9481c801b848acaa2783e511faaeae8d276e624e2703bd53f4e33cc9d0c0f12f
-SIZE (facebook-watchman-v3.0.0_GH0.tar.gz) = 199034
+SHA256 (facebook-watchman-v4.2.0_GH0.tar.gz) = d8998df9795951d49dce9df82da11eeba384934d5d9d3f0ea2d543a9837e2ddb
+SIZE (facebook-watchman-v4.2.0_GH0.tar.gz) = 406210
diff --git a/sysutils/watchman/files/patch-root.c b/sysutils/watchman/files/patch-root.c
deleted file mode 100644
index 472e33a4a22c..000000000000
--- a/sysutils/watchman/files/patch-root.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- root.c.orig 2014-11-03 21:24:12 UTC
-+++ root.c
-@@ -1092,7 +1092,7 @@ void set_poison_state(w_root_t *root, st
- "All requests will continue to fail with this message until you resolve\n"
- "the underlying problem. You will find more information on fixing this at\n"
- "https://facebook.github.io/watchman/docs/troubleshooting.html#poison-%s\n",
-- now.tv_sec,
-+ (long)now.tv_sec,
- syscall,
- dir->path->len,
- dir->path->buf,