[pkgsrc/trunk]: pkgsrc/net Fix bind.keys PLIST handling, thanks joerg@ for th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/accc81d8a18a
branches:  trunk
changeset: 358968:accc81d8a18a
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Fri Feb 24 15:46:14 2017 +0000

description:
Fix bind.keys PLIST handling, thanks joerg@ for the notice.

diffstat:

 net/bind910/Makefile |  15 ++++++++++-----
 net/bind910/PLIST    |   3 ++-
 net/bind99/Makefile  |  15 ++++++++++-----
 net/bind99/PLIST     |   3 ++-
 4 files changed, 24 insertions(+), 12 deletions(-)

diffs (105 lines):

diff -r 5e2090376713 -r accc81d8a18a net/bind910/Makefile
--- a/net/bind910/Makefile      Fri Feb 24 14:33:38 2017 +0000
+++ b/net/bind910/Makefile      Fri Feb 24 15:46:14 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/02/20 15:19:54 fhajny Exp $
+# $NetBSD: Makefile,v 1.31 2017/02/24 15:46:14 fhajny Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -56,18 +56,23 @@
                        BIND_USER=${BIND_USER} PAX=${PAX:Q} \
                        SSLBASE=${SSLBASE}
 MESSAGE_SUBST+=                BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
-DOCDIR=                        ${DESTDIR}${PREFIX}/share/doc/bind9
+
+DOCDIR=                        share/doc/bind9
 
 RCD_SCRIPTS=           lwresd named9
 SMF_METHODS=           named
 
-INSTALLATION_DIRS+=    ${DOCDIR} share/doc/bind9/arm
+INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples/bind9
+CONF_FILES+=           share/examples/bind9/bind.keys \
+                       ${PKG_SYSCONFDIR}/bind.keys
+
+INSTALLATION_DIRS+=    ${DOCDIR} ${DOCDIR}/arm
 
 post-install:
 .for f in ${DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
 .endfor
-       ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCDIR}/arm
+       ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5e2090376713 -r accc81d8a18a net/bind910/PLIST
--- a/net/bind910/PLIST Fri Feb 24 14:33:38 2017 +0000
+++ b/net/bind910/PLIST Fri Feb 24 15:46:14 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/07/19 01:08:05 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/02/24 15:46:14 fhajny Exp $
 bin/bind9-config
 bin/delv
 bin/dig
@@ -453,3 +453,4 @@
 share/doc/bind9/arm/man.rndc.conf.html
 share/doc/bind9/arm/man.rndc.html
 share/doc/bind9/arm/notes.html
+share/examples/bind9/bind.keys
diff -r 5e2090376713 -r accc81d8a18a net/bind99/Makefile
--- a/net/bind99/Makefile       Fri Feb 24 14:33:38 2017 +0000
+++ b/net/bind99/Makefile       Fri Feb 24 15:46:14 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2017/02/20 15:19:54 fhajny Exp $
+# $NetBSD: Makefile,v 1.65 2017/02/24 15:46:14 fhajny Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -57,7 +57,8 @@
                        BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} \
                        SSLBASE=${SSLBASE:Q}
 MESSAGE_SUBST+=                BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER}
-DOCDIR=                        ${DESTDIR}${PREFIX}/share/doc/bind9
+
+DOCDIR=                        share/doc/bind9
 
 # include/isc/ipv6.h is installed on non-ipv6 platforms
 PLIST_VARS+=   inet6
@@ -68,13 +69,17 @@
 RCD_SCRIPTS=           lwresd named9
 SMF_METHODS=           named
 
-INSTALLATION_DIRS+=    ${DOCDIR} share/doc/bind9/arm
+INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples/bind9
+CONF_FILES+=           share/examples/bind9/bind.keys \
+                       ${PKG_SYSCONFDIR}/bind.keys
+
+INSTALLATION_DIRS+=    ${DOCDIR} ${DOCDIR}/arm
 
 post-install:
 .for f in ${DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${DOCDIR}
 .endfor
-       ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DOCDIR}/arm
+       ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${DESTDIR}${PREFIX}/${DOCDIR}/arm
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
diff -r 5e2090376713 -r accc81d8a18a net/bind99/PLIST
--- a/net/bind99/PLIST  Fri Feb 24 14:33:38 2017 +0000
+++ b/net/bind99/PLIST  Fri Feb 24 15:46:14 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/05/02 13:22:06 taca Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/02/24 15:46:14 fhajny Exp $
 bin/bind9-config
 bin/dig
 bin/host
@@ -418,3 +418,4 @@
 share/doc/bind9/arm/man.rndc.conf.html
 share/doc/bind9/arm/man.rndc.html
 share/doc/bind9/arm/notes.html
+share/examples/bind9/bind.keys