CVS commit: pkgsrc/net

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

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Feb 24 15:46:14 UTC 2017

Modified Files:
        pkgsrc/net/bind910: Makefile PLIST
        pkgsrc/net/bind99: Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/bind910/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/bind910/PLIST
cvs rdiff -u -r1.64 -r1.65 pkgsrc/net/bind99/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/bind99/PLIST

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

Modified files:

Index: pkgsrc/net/bind910/Makefile
diff -u pkgsrc/net/bind910/Makefile:1.30 pkgsrc/net/bind910/Makefile:1.31
--- pkgsrc/net/bind910/Makefile:1.30    Mon Feb 20 15:19:54 2017
+++ pkgsrc/net/bind910/Makefile Fri Feb 24 15:46:14 2017
@@ -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 @@ FILES_SUBST+=               BIND_GROUP=${BIND_GROUP} 
                        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"

Index: pkgsrc/net/bind910/PLIST
diff -u pkgsrc/net/bind910/PLIST:1.7 pkgsrc/net/bind910/PLIST:1.8
--- pkgsrc/net/bind910/PLIST:1.7        Tue Jul 19 01:08:05 2016
+++ pkgsrc/net/bind910/PLIST    Fri Feb 24 15:46:14 2017
@@ -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-confgen.htm
 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

Index: pkgsrc/net/bind99/Makefile
diff -u pkgsrc/net/bind99/Makefile:1.64 pkgsrc/net/bind99/Makefile:1.65
--- pkgsrc/net/bind99/Makefile:1.64     Mon Feb 20 15:19:54 2017
+++ pkgsrc/net/bind99/Makefile  Fri Feb 24 15:46:14 2017
@@ -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 @@ FILES_SUBST+=         BIND_GROUP=${BIND_GROUP:Q
                        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 @@ PLIST.inet6=        yes
 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"

Index: pkgsrc/net/bind99/PLIST
diff -u pkgsrc/net/bind99/PLIST:1.11 pkgsrc/net/bind99/PLIST:1.12
--- pkgsrc/net/bind99/PLIST:1.11        Mon May  2 13:22:06 2016
+++ pkgsrc/net/bind99/PLIST     Fri Feb 24 15:46:14 2017
@@ -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-confgen.htm
 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