Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 387357A26F for ; Thu, 9 Feb 2017 15:01:22 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B341285572; Thu, 9 Feb 2017 15:01:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3FE2585572 for ; Thu, 9 Feb 2017 15:01:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 41XjQDuPKmzr for ; Thu, 9 Feb 2017 15:01:20 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id BEEF584CDE for ; Thu, 9 Feb 2017 15:01:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B55B2FBE3; Thu, 9 Feb 2017 15:01:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1486652480258260" MIME-Version: 1.0 Date: Thu, 9 Feb 2017 15:01:20 +0000 From: "Stephen Borrill" Subject: CVS commit: pkgsrc/sysutils/salt To: pkgsrc-changes@NetBSD.org Reply-To: sborrill@netbsd.org X-Mailer: log_accum Message-Id: <20170209150120.B55B2FBE3@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1486652480258260 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sborrill Date: Thu Feb 9 15:01:20 UTC 2017 Modified Files: pkgsrc/sysutils/salt: Makefile Log Message: Fix configuration paths by not specifying PREFIX as installation root. Move file server root paths to VARBASE/salt. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/salt/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1486652480258260 Content-Disposition: inline Content-Length: 2536 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/salt/Makefile diff -u pkgsrc/sysutils/salt/Makefile:1.46 pkgsrc/sysutils/salt/Makefile:1.47 --- pkgsrc/sysutils/salt/Makefile:1.46 Mon Feb 6 12:48:18 2017 +++ pkgsrc/sysutils/salt/Makefile Thu Feb 9 15:01:20 2017 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2017/02/06 12:48:18 sborrill Exp $ +# $NetBSD: Makefile,v 1.47 2017/02/09 15:01:20 sborrill Exp $ DISTNAME= salt-2016.11.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} @@ -25,13 +25,12 @@ BUILD_DEFS+= VARBASE PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-m2crypto -PYSETUPARGS+= --salt-root-dir=${PREFIX} PYSETUPARGS+= --salt-config-dir=${PKG_SYSCONFDIR} PYSETUPARGS+= --salt-cache-dir=${VARBASE}/cache/salt PYSETUPARGS+= --salt-sock-dir=${VARBASE}/run/salt -PYSETUPARGS+= --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states -PYSETUPARGS+= --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar -PYSETUPARGS+= --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master +PYSETUPARGS+= --salt-base-file-roots-dir=${VARBASE}/salt/file-roots +PYSETUPARGS+= --salt-base-pillar-roots-dir=${VARBASE}/salt/pillar-roots +PYSETUPARGS+= --salt-base-master-roots-dir=${VARBASE}/salt/master-roots PYSETUPARGS+= --salt-logs-dir=${VARBASE}/log/salt PYSETUPARGS+= --salt-pidfile-dir=${VARBASE}/run @@ -49,8 +48,9 @@ INSTALLATION_DIRS+= ${EGDIR} CONF_FILES+= ${EGDIR}/master ${PKG_SYSCONFDIR}/master CONF_FILES+= ${EGDIR}/minion ${PKG_SYSCONFDIR}/minion -OWN_DIRS+= ${PKG_SYSCONFDIR}/states ${PKG_SYSCONFDIR}/pillar -OWN_DIRS+= ${PKG_SYSCONFDIR}/salt-master +OWN_DIRS+= ${VARBASE}/salt/file-roots +OWN_DIRS+= ${VARBASE}/salt/pillar-roots +OWN_DIRS+= ${VARBASE}/salt/master-roots OWN_DIRS+= ${VARBASE}/cache/salt ${VARBASE}/run/salt OWN_DIRS+= ${VARBASE}/log/salt @@ -61,8 +61,8 @@ SUBST_FILES.fix-paths= conf/* SUBST_FILES.fix-paths+= doc/man/* salt/modules/munin.py setup.py SUBST_FILES.fix-paths+= salt/utils/rsax931.py salt/grains/core.py SUBST_SED.fix-paths= -e 's,/etc/salt,${PKG_SYSCONFDIR},g' -SUBST_SED.fix-paths+= -e 's,/srv/salt,${PKG_SYSCONFDIR}/states,g' -SUBST_SED.fix-paths+= -e 's,/srv/pillar,${PKG_SYSCONFDIR}/pillar,g' +SUBST_SED.fix-paths+= -e 's,/srv/salt,${VARBASE}/salt/file-roots,g' +SUBST_SED.fix-paths+= -e 's,/srv/pillar,${VARBASE}/salt/pillar-roots,g' SUBST_SED.fix-paths+= -e 's,/etc/munin,${PKG_SYSCONFBASEDIR}/munin,g' SUBST_SED.fix-paths+= -e 's,share/man,${PKGMANDIR},g' SUBST_SED.fix-paths+= -e 's,/opt/local/lib,${PREFIX}/lib,g' --_----------=_1486652480258260--