svn commit: r319396 - in head/sysutils: munin-common munin-node munin-node/files
Florian Smeets
flo at FreeBSD.org
Wed May 29 23:36:17 UTC 2013
Author: flo
Date: Wed May 29 23:36:16 2013
New Revision: 319396
URL: http://svnweb.freebsd.org/changeset/ports/319396
Log:
- update to 2.0.14
- make port non-interactive [1]
- add PORTSCOUT hints, 2.1.X is a development version
PR: ports/178532 [1]
Submitted by: Claudius Herder <claudius_herder at ambtec.de> [1]
Modified:
head/sysutils/munin-common/distinfo
head/sysutils/munin-common/munin.mk
head/sysutils/munin-node/Makefile
head/sysutils/munin-node/files/pkg-message.in (contents, props changed)
head/sysutils/munin-node/pkg-deinstall
head/sysutils/munin-node/pkg-install
Modified: head/sysutils/munin-common/distinfo
==============================================================================
--- head/sysutils/munin-common/distinfo Wed May 29 23:09:25 2013 (r319395)
+++ head/sysutils/munin-common/distinfo Wed May 29 23:36:16 2013 (r319396)
@@ -1,2 +1,2 @@
-SHA256 (munin-2.0.13.tar.gz) = 9a0b74c55a2d846371ad911f9e1102d21a6d39160771e7734981640fd75668db
-SIZE (munin-2.0.13.tar.gz) = 1333690
+SHA256 (munin-2.0.14.tar.gz) = 7526c7a582dd1ede3c7e78e2b0d9fc19240b289b402feeabe495df1ee70b0dbe
+SIZE (munin-2.0.14.tar.gz) = 1333774
Modified: head/sysutils/munin-common/munin.mk
==============================================================================
--- head/sysutils/munin-common/munin.mk Wed May 29 23:09:25 2013 (r319395)
+++ head/sysutils/munin-common/munin.mk Wed May 29 23:36:16 2013 (r319396)
@@ -1,9 +1,11 @@
-MUNIN_VERSION= 2.0.13
+MUNIN_VERSION= 2.0.14
MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION}
MUNIN_DISTINFO= ${PORTSDIR}/sysutils/munin-common/distinfo
MUNIN_PATCHES= ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \
${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
+PORTSCOUT= limit:^2\.0\.
+
DBDIR?= /var/${PORTNAME}
DBDIRNODE?= /var/${PORTNAME}
LOGDIR?= /var/log/${PORTNAME}
Modified: head/sysutils/munin-node/Makefile
==============================================================================
--- head/sysutils/munin-node/Makefile Wed May 29 23:09:25 2013 (r319395)
+++ head/sysutils/munin-node/Makefile Wed May 29 23:36:16 2013 (r319396)
@@ -3,7 +3,6 @@
PORTNAME= munin
PORTVERSION= ${MUNIN_VERSION}
-PORTREVISION= 2
CATEGORIES= sysutils perl5
MASTER_SITES= ${MUNIN_SITES}
PKGNAMESUFFIX= -node
@@ -15,13 +14,11 @@ BUILD_DEPENDS= p5-Module-Build>=0:${PORT
p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
munin-common>=0:${PORTSDIR}/sysutils/munin-common \
p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
- p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
bash:${PORTSDIR}/shells/bash
RUN_DEPENDS= p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
p5-DateTime-HiRes>=0:${PORTSDIR}/devel/p5-DateTime-HiRes \
munin-common>=0:${PORTSDIR}/sysutils/munin-common \
p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
- p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
p5-Net-CIDR>=0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
bash:${PORTSDIR}/shells/bash
@@ -39,6 +36,17 @@ SHEBANG_FILES= node/sbin/munin-node
ALL_TARGET= build-node build-plugins
INSTALL_TARGET= install-node-prime install-plugins-prime
+OPTIONS_DEFINE= SNMP
+OPTIONS_DEFAULT= SNMP
+SNMP_DESC= Include support for SNMP plugins
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSNMP}
+BUILD_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+RUN_DEPENDS+= p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+.endif
+
MAN1= munin-node-configure.1 \
munin-node.1 \
munin-run.1 \
Modified: head/sysutils/munin-node/files/pkg-message.in
==============================================================================
--- head/sysutils/munin-node/files/pkg-message.in Wed May 29 23:09:25 2013 (r319395)
+++ head/sysutils/munin-node/files/pkg-message.in Wed May 29 23:36:16 2013 (r319396)
@@ -17,3 +17,10 @@ present, the client will be started now.
%%PREFIX%%/etc/rc.d/munin-node start
********************************************************************
+
+For a list of plugins that will probably work run
+%%PREFIX%%/sbin/munin-node-configure --suggest
+
+If this is a fresh install run
+%%PREFIX%%/sbin/munin-node-configure --shell | sh -x
+to install the plugins automatically
Modified: head/sysutils/munin-node/pkg-deinstall
==============================================================================
--- head/sysutils/munin-node/pkg-deinstall Wed May 29 23:09:25 2013 (r319395)
+++ head/sysutils/munin-node/pkg-deinstall Wed May 29 23:36:16 2013 (r319396)
@@ -1,34 +1,5 @@
#! /bin/sh
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local dflt question answer
-
- question=$1
- dflt=$2
- while :; do
- answer=$(ask "${question}" "${dflt}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
stop_process() {
STARTSTOP=${PKG_PREFIX}/etc/rc.d/munin-node
@@ -51,10 +22,9 @@ newsyslog() {
exit 0
elif [ "$ENTRY" = "$DEFAULT" ]; then
delnewsyslog
- elif yesno "You have changed the default munin-node entry in \"/etc/newsyslog.conf\".
-Do you want me to delete it?" y; then
- delnewsyslog
- echo "Done."
+ else
+ echo "You have changed the default munin-node entry in \"/etc/newsyslog.conf\"".
+ echo "If you deinstall munin-node permanently, you have to manually remove it"
fi
}
Modified: head/sysutils/munin-node/pkg-install
==============================================================================
--- head/sysutils/munin-node/pkg-install Wed May 29 23:09:25 2013 (r319395)
+++ head/sysutils/munin-node/pkg-install Wed May 29 23:36:16 2013 (r319396)
@@ -37,9 +37,6 @@ init_plugins() {
if [ -n "$prevver" ]; then
echo -n "Initializing new plugins.."
${PKG_PREFIX}/sbin/munin-node-configure --shell --newer "${prevver%-*}" | sh -x
- else
- echo -n "Initializing plugins.."
- ${PKG_PREFIX}/sbin/munin-node-configure --shell | sh -x
fi
echo "done."
}
@@ -65,7 +62,6 @@ EOT
}
newsyslog() {
- if yesno "Would you like me to set up log rotation" y; then
if grep -q /var/log/munin/munin-node.log /etc/newsyslog.conf; then
:
else
@@ -73,9 +69,6 @@ newsyslog() {
/var/log/munin/munin-node.log 644 7 * @T00 Z /var/run/munin/munin-node.pid
EOT
fi
- else
- echo "/var/log/munin-node.log will grow without bounds."
- fi
}
@@ -90,5 +83,5 @@ case $2 in
${PKG_PREFIX}/etc/rc.d/munin-node start
newsyslog
fi
- ;;
+ ;;
esac
More information about the svn-ports-all
mailing list