CVS commit: pkgsrc/net/knot

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

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.

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"