- Add a patch to install missing man page

- Add dnssec-* tools to bind-tools[1]

Requested by:	many [1]
Sponsored by:	Absolight

5 files changed, 45 insertions, 7 deletions

diff --git a/dns/bind-tools/Makefile b/dns/bind-tools/Makefile
index f5215feac81c..fe1be13e391c 100644
--- a/dns/bind-tools/Makefile
+++ b/dns/bind-tools/Makefile
@@ -17,21 +17,25 @@ PKGINSTALL=	/nonexistent
 BIND_TOOLS_SLAVE=	YES
 
 post-patch:
-	@${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.presed
-	@${SED} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
+	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
 		-e 's#isc-config.sh installdirs#installdirs#' \
 		-e 's#.*INSTALL.*isc-config.*##' \
 		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in.presed > ${WRKSRC}/Makefile.in
-	@${MV} ${WRKSRC}/bin/Makefile.in ${WRKSRC}/bin/Makefile.in.presed
-	@${SED} -e 's#^SUBDIRS.*#SUBDIRS = dig#' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = dig dnssec#' \
 		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in.presed > ${WRKSRC}/bin/Makefile.in
+		${WRKSRC}/bin/Makefile.in
 
 do-install:
 .for file in dig host nslookup
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/dig/${file} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/bin/dig/${file}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .endfor
+.for file in dnssec-dsfromkey dnssec-importkey dnssec-keyfromlabel \
+	dnssec-keygen dnssec-revoke dnssec-settime dnssec-signzone \
+	dnssec-verify
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/dnssec/${file} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/bin/dnssec/${file}.8 ${STAGEDIR}${MANPREFIX}/man/man8
+.endfor
 
 .include "${MASTERDIR}/Makefile"
diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index 7c0ff02e52dc..ca22487a396d 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -4,3 +4,19 @@ bin/nslookup
 %%SHARE_MAN%%man/man1/dig.1.gz
 %%SHARE_MAN%%man/man1/host.1.gz
 %%SHARE_MAN%%man/man1/nslookup.1.gz
+%%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz
+%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz
+%%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz
+%%SHARE_MAN%%man/man8/dnssec-keygen.8.gz
+%%SHARE_MAN%%man/man8/dnssec-revoke.8.gz
+%%SHARE_MAN%%man/man8/dnssec-settime.8.gz
+%%SHARE_MAN%%man/man8/dnssec-signzone.8.gz
+%%SHARE_MAN%%man/man8/dnssec-verify.8.gz
+sbin/dnssec-dsfromkey
+sbin/dnssec-importkey
+sbin/dnssec-keyfromlabel
+sbin/dnssec-keygen
+sbin/dnssec-revoke
+sbin/dnssec-settime
+sbin/dnssec-signzone
+sbin/dnssec-verify
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index c1c794869dcc..2ba89b3c7305 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	9.9.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	bind9/${ISCVERSION}
diff --git a/dns/bind99/files/patch-bin__dnssec__Makefile.in b/dns/bind99/files/patch-bin__dnssec__Makefile.in
new file mode 100644
index 000000000000..d0ac680f2f4c
--- /dev/null
+++ b/dns/bind99/files/patch-bin__dnssec__Makefile.in
@@ -0,0 +1,17 @@
+--- ./bin/dnssec/Makefile.in.orig	2014-01-27 19:58:24.000000000 +0100
++++ ./bin/dnssec/Makefile.in	2014-04-09 15:42:28.000000000 +0200
+@@ -55,12 +55,12 @@
+ 
+ MANPAGES =	dnssec-dsfromkey.8 dnssec-keyfromlabel.8 dnssec-keygen.8 \
+ 		dnssec-revoke.8 dnssec-settime.8 dnssec-signzone.8 \
+-		dnssec-verify.8
++		dnssec-verify.8 dnssec-importkey.8
+ 
+ HTMLPAGES =	dnssec-dsfromkey.html dnssec-keyfromlabel.html \
+ 		dnssec-keygen.html dnssec-revoke.html \
+ 		dnssec-settime.html dnssec-signzone.html \
+-		dnssec-verify.html
++		dnssec-verify.html dnssec-importkey.html
+ 
+ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ 
diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist
index 667670f94280..a7046c5c181c 100644
--- a/dns/bind99/pkg-plist
+++ b/dns/bind99/pkg-plist
@@ -303,6 +303,7 @@ lib/liblwres.a
 %%SHARE_MAN%%man/man5/rndc.conf.5.gz
 %%SHARE_MAN%%man/man8/ddns-confgen.8.gz
 %%SHARE_MAN%%man/man8/dnssec-dsfromkey.8.gz
+%%SHARE_MAN%%man/man8/dnssec-importkey.8.gz
 %%SHARE_MAN%%man/man8/dnssec-keyfromlabel.8.gz
 %%SHARE_MAN%%man/man8/dnssec-keygen.8.gz
 %%SHARE_MAN%%man/man8/dnssec-revoke.8.gz