[Midnightbsd-cvs] mports [21449] trunk/dns/unbound: unbound 1.5.8

[laffer1 at midnightbsd.org]

Revision: 21449
          http://svnweb.midnightbsd.org/mports/?rev=21449
Author:   laffer1
Date:     2016-05-25 20:46:41 -0400 (Wed, 25 May 2016)
Log Message:
-----------
unbound 1.5.8

Modified Paths:
--------------
    trunk/dns/unbound/Makefile
    trunk/dns/unbound/distinfo
    trunk/dns/unbound/pkg-plist

Modified: trunk/dns/unbound/Makefile
===================================================================
--- trunk/dns/unbound/Makefile	2016-05-26 00:17:34 UTC (rev 21448)
+++ trunk/dns/unbound/Makefile	2016-05-26 00:46:41 UTC (rev 21449)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	unbound
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.5.8
+PORTREVISION=	0
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
@@ -29,13 +29,14 @@
 		ietf67-design-02.pdf requirements.txt
 PLIST_SUB+=	PYTHON=${PYTHON} MUNIN=${MUNIN}
 
-OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT FILTER_AAAA
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT FILTER_AAAA
 OPTIONS_DEFAULT=THREADS ECDSA
 
 LIBEVENT_DESC=	Build against libevent
 GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
 ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
-MUNIN_DESC=	Install Munin plugin
+MUNIN_PLUGIN_DESC=	Install Munin plugin
 FILTER_AAAA_DESC=	Build with AAAA filter functionality (contrib)
 
 .include <bsd.mport.options.mk>
@@ -71,9 +72,9 @@
 CONFIGURE_ARGS+=--disable-ecdsa
 .endif
 
-.if ${PORT_OPTIONS:MMUNIN}
+.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
 SUB_FILES+=	pkg-message
-MUNIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
+MUNIN_PLUGIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
 		by_flags histogram
 MUNIN=
 .else
@@ -111,12 +112,12 @@
 .if ${PORT_OPTIONS:MPYTHON}
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so
 .endif
-.if ${PORT_OPTIONS:MMUNIN}
+.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins
 	@${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_\
 		${STAGEDIR}${PREFIX}/share/munin/plugins/
-	@for i in ${MUNIN_ALL}; do\
+	@for i in ${MUNIN_PLUGIN_ALL}; do\
 		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_\
 			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i ;\
 	done

Modified: trunk/dns/unbound/distinfo
===================================================================
--- trunk/dns/unbound/distinfo	2016-05-26 00:17:34 UTC (rev 21448)
+++ trunk/dns/unbound/distinfo	2016-05-26 00:46:41 UTC (rev 21449)
@@ -1,2 +1,2 @@
-SHA256 (unbound-1.5.3.tar.gz) = 76bdc875ed4d1d3f8e4cfe960e6df78ee5c6c7c18abac11331cf93a7ae129eca
-SIZE (unbound-1.5.3.tar.gz) = 4821300
+SHA256 (unbound-1.5.8.tar.gz) = 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be
+SIZE (unbound-1.5.8.tar.gz) = 4895649

Modified: trunk/dns/unbound/pkg-plist
===================================================================
--- trunk/dns/unbound/pkg-plist	2016-05-26 00:17:34 UTC (rev 21448)
+++ trunk/dns/unbound/pkg-plist	2016-05-26 00:46:41 UTC (rev 21449)
@@ -1,9 +1,21 @@
-etc/unbound/unbound.conf.sample
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_class
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_flags
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_opcode
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_rcode
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_type
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_histogram
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_hits
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_memory
+%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_queue
+ at sample %%ETCDIR%%/unbound.conf.sample
 include/unbound.h
-lib/libunbound.so.2.3.6
+lib/libunbound.a
+lib/libunbound.so
 lib/libunbound.so.2
-lib/libunbound.so
-lib/libunbound.a
+lib/libunbound.so.2.4.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
 man/man1/unbound-host.1.gz
 man/man3/libunbound.3.gz
 man/man3/ub_cancel.3.gz
@@ -48,17 +60,5 @@
 sbin/unbound-control
 sbin/unbound-control-setup
 sbin/unbound-host
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_class
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_flags
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_opcode
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_rcode
-%%MUNIN%%etc/munin/plugins/unbound_munin_by_type
-%%MUNIN%%etc/munin/plugins/unbound_munin_histogram
-%%MUNIN%%etc/munin/plugins/unbound_munin_hits
-%%MUNIN%%etc/munin/plugins/unbound_munin_memory
-%%MUNIN%%etc/munin/plugins/unbound_munin_queue
-%%MUNIN%%share/munin/plugins/unbound_munin_
- at exec chown unbound %D/etc/unbound
+%%MUNIN_PLUGIN%%share/munin/plugins/unbound_munin_
+ at dir(unbound,,) %%ETCDIR%%