CVS commit: pkgsrc/sysutils/watchman

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Sat Oct 29 20:14:42 UTC 2016

Modified Files:
        pkgsrc/sysutils/watchman: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/watchman/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/watchman/Makefile
diff -u pkgsrc/sysutils/watchman/Makefile:1.7 pkgsrc/sysutils/watchman/Makefile:1.8
--- pkgsrc/sysutils/watchman/Makefile:1.7       Sun Apr 26 09:39:06 2015
+++ pkgsrc/sysutils/watchman/Makefile   Sat Oct 29 20:14:42 2016
@@ -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
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=facebook/}
-GITHUB_PROJECT=        watchman
-GITHUB_TAG=    v3.1
+DISTNAME=      watchman-3.1
+PKGREVISION=   1
 CATEGORIES=    sysutils
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=facebook/}
 
 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: