[pkgsrc/trunk]: pkgsrc/sysutils/watchman Use proper configure arg instead of ...

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/24c6b29b180f
branches:  trunk
changeset: 354427:24c6b29b180f
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Sat Oct 29 20:14:42 2016 +0000

description:
Use proper configure arg instead of wrong subst that leaked DESTDIR.
Clean up. PKGREVISION bump.

diffstat:

 sysutils/watchman/Makefile |  20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diffs (44 lines):

diff -r 9901ad0c0ed9 -r 24c6b29b180f sysutils/watchman/Makefile
--- a/sysutils/watchman/Makefile        Sat Oct 29 19:47:19 2016 +0000
+++ b/sysutils/watchman/Makefile        Sat Oct 29 20:14:42 2016 +0000
@@ -1,32 +1,28 @@
-# $NetBSD: Makefile,v 1.7 2015/04/26 09:39:06 mef Exp $
+# $NetBSD: Makefile,v 1.8 2016/10/29 20:14:42 fhajny Exp $
 
-DISTNAME=      watchman-${VERSION}
-VERSION=       3.1
+DISTNAME=      watchman-3.1
+PKGREVISION=   1
+CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=facebook/}
-GITHUB_PROJECT=        watchman
-GITHUB_TAG=    v3.1
-CATEGORIES=    sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/facebook/watchman/
 COMMENT=       Watches files and takes action when they change
 LICENSE=       apache-2.0
 
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
 USE_TOOLS+=    autoconf automake autoreconf gmake
 GNU_CONFIGURE= yes
+
 # https://github.com/facebook/watchman/issues/50
 CONFIGURE_ARGS+=       --enable-lenient
 CONFIGURE_ARGS+=       --enable-conffile=${PKG_SYSCONFDIR}/watchman.json
+CONFIGURE_ARGS+=       --enable-statedir=${VARBASE}/run/watchman
 CONFIGURE_ARGS+=       --with-pcre
 
 BUILD_DEFS+=           VARBASE
 
-SUBST_CLASSES+=                varbase
-SUBST_MESSAGE.varbase= set WATCHMAN_STATE_DIR to ${VARBASE}/run/watchman
-SUBST_STAGE.varbase=   pre-configure
-SUBST_FILES.varbase=   configure.ac
-SUBST_SED.varbase=     -e '/^WATCHMAN_STATE_DIR/s,\\$$(prefix)/var/,${DESTDIR}${VARBASE}/,'
-
 PLIST_SUBST+=          API_VERSION=${PKGNAME_NOREV}.0
 
 pre-configure: