Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Dec 2015 03:19:16 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r403355 - in head/sysutils/watchman: . files
Message-ID:  <201512090319.tB93JG1T090593@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Dec  9 03:19:16 2015
New Revision: 403355
URL: https://svnweb.freebsd.org/changeset/ports/403355

Log:
  sysutils/watchman: update to 4.2.0
  
  - Add BACKTRACE option
  - Convert PCRE dependency into an option
  - Respect PREFIX for /etc/watchman.json
  - Explicitly disable devel/libinotify
  - Connect to new testing framework
  
  PR:		201031
  Submitted by:	linpct@gmail.com (maintainer, based on)
  Reviewed by:	amdmi3 (previous version)
  Approved by:	cookie licking (47 days)

Deleted:
  head/sysutils/watchman/files/
Modified:
  head/sysutils/watchman/Makefile   (contents, props changed)
  head/sysutils/watchman/distinfo   (contents, props changed)

Modified: head/sysutils/watchman/Makefile
==============================================================================
--- head/sysutils/watchman/Makefile	Wed Dec  9 03:17:49 2015	(r403354)
+++ head/sysutils/watchman/Makefile	Wed Dec  9 03:19:16 2015	(r403355)
@@ -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 serv
 
 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>

Modified: head/sysutils/watchman/distinfo
==============================================================================
--- head/sysutils/watchman/distinfo	Wed Dec  9 03:17:49 2015	(r403354)
+++ head/sysutils/watchman/distinfo	Wed Dec  9 03:19:16 2015	(r403355)
@@ -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



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