diff options
| author | mat <mat@FreeBSD.org> | 2016-08-24 23:11:35 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-08-24 23:11:35 +0800 |
| commit | 42928539755aa424129fa1dd5f5b6a320bacb382 (patch) | |
| tree | 76428c106666f1d9f61b3efc8b81799a870774d4 /dns | |
| parent | 1288ebb050f683594351b6fd4355fca239dfafd5 (diff) | |
| download | freebsd-ports-gnome-42928539755aa424129fa1dd5f5b6a320bacb382.tar.gz freebsd-ports-gnome-42928539755aa424129fa1dd5f5b6a320bacb382.tar.zst freebsd-ports-gnome-42928539755aa424129fa1dd5f5b6a320bacb382.zip | |
Do not auto-enable unbound munin plugins when installing unbound.
PR: 211999
Submitted by: maintainer
Reported by: wollman
Sponsored by: Absolight
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/unbound/Makefile | 11 | ||||
| -rw-r--r-- | dns/unbound/pkg-plist | 9 |
2 files changed, 2 insertions, 18 deletions
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile index e5431b67168f..2e40247ee816 100644 --- a/dns/unbound/Makefile +++ b/dns/unbound/Makefile @@ -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 caching DNS resolver 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 diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist index 29aeb759df30..e1a62774768b 100644 --- a/dns/unbound/pkg-plist +++ b/dns/unbound/pkg-plist @@ -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 |