Index: dns/nsd/Makefile
===================================================================
--- dns/nsd/Makefile
+++ dns/nsd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nsd
-PORTVERSION=	4.1.6
+PORTVERSION=	4.1.7
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/
@@ -79,31 +79,30 @@
 RRL_CONFIGURE_ENABLE=		ratelimit
 ZONE_STATS_CONFIGURE_ENABLE=	zone-stats
 
-.include <bsd.port.options.mk>
-
-post-build:
-.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
+post-build-MUNIN_PLUGIN-on:
 	${REINPLACE_CMD} \
 		-e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|/usr/local/etc/nsd.conf|${ETCDIR}/nsd.conf|g' \
 		-e 's|/usr/local/var/munin/plugin-state|/var/munin/plugin-state/root|g' \
 		-e '90s|/var/munin/plugin-state/root|$${MUNIN_PLUGSTATE}|' \
 		${WRKSRC}/contrib/nsd_munin_
-.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/nsd.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/nsd/nsd.conf.sample
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/nsd \
 		${STAGEDIR}${PREFIX}/sbin/nsd-checkconf \
 		${STAGEDIR}${PREFIX}/sbin/nsd-checkzone \
 		${STAGEDIR}${PREFIX}/sbin/nsd-control
-.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
+
+post-install-MUNIN_PLUGINS-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/nsd_munin_ \
 		${STAGEDIR}${PREFIX}/share/munin/plugins
-.endif
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+
 
 .include <bsd.port.mk>
Index: dns/nsd/distinfo
===================================================================
--- dns/nsd/distinfo
+++ dns/nsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nsd-4.1.6.tar.gz) = 88f622055c95d38b9ef3723a240d1d0da35a28d09fe23b601015181a61d7775f
-SIZE (nsd-4.1.6.tar.gz) = 1072173
+SHA256 (nsd-4.1.7.tar.gz) = 7ba8beb29b495ab795e927d9aa82a5bb1b66296a78f61ed47d6ccfe59e9b1a8a
+SIZE (nsd-4.1.7.tar.gz) = 1072576