Received: by mail.netbsd.org (Postfix, from userid 605) id E489584D50; Mon, 7 Aug 2017 08:44:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 77CE684D4E for ; Mon, 7 Aug 2017 08:44:15 +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 rGVDVFQxi0mU for ; Mon, 7 Aug 2017 08:44:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0511E84D23 for ; Mon, 7 Aug 2017 08:44:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F025AFACE; Mon, 7 Aug 2017 08:44:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1502095454173720" MIME-Version: 1.0 Date: Mon, 7 Aug 2017 08:44:14 +0000 From: "Johnny C. Lam" Subject: CVS commit: pkgsrc/net/knot To: pkgsrc-changes@NetBSD.org Reply-To: jlam@netbsd.org X-Mailer: log_accum Message-Id: <20170807084414.F025AFACE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1502095454173720 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jlam Date: Mon Aug 7 08:44:14 UTC 2017 Modified Files: pkgsrc/net/knot: Makefile Log Message: Use PKG_SYSCONF* variables correctly in net/knot. Set PKG_SYSCONFSUBDIR to "knot" to have all of the config files located in the "knot" subdirectory of ${PKG_SYSCONFBASE}. Pass ${PKG_SYSCONFBASE} to the configure script since the package's build infrastructure automatically appends "/knot" to the value passed in through --sysconfdir. Remove ${PKG_SYSCONFDIR} from INSTALLATION_DIRS since it is automatically created by the package install script. Bump the PKGREVISION due to changes in the package install scripts. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 pkgsrc/net/knot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1502095454173720 Content-Disposition: inline Content-Length: 1608 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/knot/Makefile diff -u pkgsrc/net/knot/Makefile:1.34 pkgsrc/net/knot/Makefile:1.35 --- pkgsrc/net/knot/Makefile:1.34 Fri Dec 9 22:28:17 2016 +++ pkgsrc/net/knot/Makefile Mon Aug 7 08:44:14 2017 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2016/12/09 22:28:17 pettai Exp $ +# $NetBSD: Makefile,v 1.35 2017/08/07 08:44:14 jlam Exp $ DISTNAME= knot-2.3.3 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= https://secure.nic.cz/files/knot-dns/ EXTRACT_SUFX= .tar.xz @@ -14,7 +15,7 @@ BUILD_DEFS+= VARBASE GNU_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/knot CONFIGURE_ARGS+= --with-rundir=${VARBASE}/run/knot CONFIGURE_ARGS+= --with-storage=${VARBASE}/knot/lib @@ -33,7 +34,7 @@ PKGCONFIG_OVERRIDE+= src/zscanner/libzsc RCD_SCRIPTS= knot EGDIR= ${PREFIX}/share/examples/knot -KNOT_SYSCONFDIR= ${PKG_SYSCONFDIR}/knot +PKG_SYSCONFSUBDIR= knot SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKSRC}/samples/Makefile.in @@ -41,11 +42,11 @@ SUBST_STAGE.paths= post-patch SUBST_SED.paths= -e 's,@EGDIR@,${EGDIR},' CONF_FILES= ${EGDIR}/knot.sample.conf \ - ${KNOT_SYSCONFDIR}/knot.sample.conf + ${PKG_SYSCONFDIR}/knot.conf CONF_FILES+= ${EGDIR}/example.com.zone \ - ${KNOT_SYSCONFDIR}/example.com.zone + ${PKG_SYSCONFDIR}/example.com.zone -INSTALLATION_DIRS= ${EGDIR} ${KNOT_SYSCONFDIR} +INSTALLATION_DIRS= ${EGDIR} OWN_DIRS+= ${VARBASE}/knot .include "../../devel/userspace-rcu/buildlink3.mk" --_----------=_1502095454173720--