Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Aug 2016 15:11:35 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420799 - head/dns/unbound
Message-ID:  <201608241511.u7OFBZHG080012@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Wed Aug 24 15:11:35 2016
New Revision: 420799
URL: https://svnweb.freebsd.org/changeset/ports/420799

Log:
  Do not auto-enable unbound munin plugins when installing unbound.
  
  PR:		211999
  Submitted by:	maintainer
  Reported by:	wollman
  Sponsored by:	Absolight

Modified:
  head/dns/unbound/Makefile   (contents, props changed)
  head/dns/unbound/pkg-plist   (contents, props changed)

Modified: head/dns/unbound/Makefile
==============================================================================
--- head/dns/unbound/Makefile	Wed Aug 24 15:10:21 2016	(r420798)
+++ head/dns/unbound/Makefile	Wed Aug 24 15:11:35 2016	(r420799)
@@ -3,6 +3,7 @@
 
 PORTNAME=	unbound
 PORTVERSION=	1.5.9
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
@@ -12,9 +13,8 @@ COMMENT=	Validating, recursive, and cach
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES+=		autoreconf cpe libtool
+USES+=		autoreconf cpe libtool ssl
 CPE_VENDOR=	nlnetlabs
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} --with-libexpat=${LOCALBASE}
 USE_LDCONFIG=	yes
@@ -77,8 +77,6 @@ LIB_DEPENDS+=	libfstrm.so:devel/fstrm
 
 .if ${PORT_OPTIONS:MMUNIN_PLUGIN}
 SUB_FILES+=	pkg-message
-MUNIN_PLUGIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
-		by_flags histogram
 .endif
 
 .if ${PORT_OPTIONS:MLIBEVENT}
@@ -112,13 +110,8 @@ post-install-PYTHON-on:
 
 post-install-MUNIN_PLUGIN-on:
 	@${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_PLUGIN_ALL}; do \
-		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_ \
-			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i; \
-	done
 	@${ECHO_MSG}
 	@${ECHO_MSG} "============================================================="
 	@${CAT} ${WRKDIR}/pkg-message

Modified: head/dns/unbound/pkg-plist
==============================================================================
--- head/dns/unbound/pkg-plist	Wed Aug 24 15:10:21 2016	(r420798)
+++ head/dns/unbound/pkg-plist	Wed Aug 24 15:11:35 2016	(r420799)
@@ -1,12 +1,3 @@
-%%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
 @sample %%ETCDIR%%/unbound.conf.sample
 include/unbound.h
 lib/libunbound.a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608241511.u7OFBZHG080012>