From de626f2bc88c87d85111761376c5bb5c0b512c02 Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Tue, 15 Feb 2011 00:14:20 +0000 Subject: [PATCH] - fix newsyslog entries, logs have been living in /var/log/munin for some time now [1] - drop MD5 checksum Inspired by: ports/151182 [1] --- sysutils/munin-master/Makefile | 2 +- sysutils/munin-master/distinfo | 1 - sysutils/munin-master/pkg-deinstall | 6 +++--- sysutils/munin-master/pkg-install | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile index 2bf80fbfd9cb..32274637f462 100644 --- a/sysutils/munin-master/Makefile +++ b/sysutils/munin-master/Makefile @@ -7,7 +7,7 @@ PORTNAME= munin PORTVERSION= 1.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils perl5 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} PKGNAMESUFFIX= -master diff --git a/sysutils/munin-master/distinfo b/sysutils/munin-master/distinfo index bd9f4c48c587..8d15a9b32ca5 100644 --- a/sysutils/munin-master/distinfo +++ b/sysutils/munin-master/distinfo @@ -1,3 +1,2 @@ -MD5 (munin-1.4.5.tar.gz) = 4ae84b9a27b686c3819d8d7b51d8cb4c SHA256 (munin-1.4.5.tar.gz) = 4f8632713c5267e282b091cf7ef5163c5de321536e76dbaab2204aa23c957138 SIZE (munin-1.4.5.tar.gz) = 1231622 diff --git a/sysutils/munin-master/pkg-deinstall b/sysutils/munin-master/pkg-deinstall index d55087497a7f..ae415c932f23 100644 --- a/sysutils/munin-master/pkg-deinstall +++ b/sysutils/munin-master/pkg-deinstall @@ -51,14 +51,14 @@ delete_crontab_entries() { delnewsyslog() { tmp="/etc/#munin-node$$" - sed -e '/^\/var\/log\/munin-master\/\*\.log[ ]/d' /etc/newsyslog.conf >${tmp} + sed -e '/^\/var\/log\/munin\/\*\.log[ ]/d' /etc/newsyslog.conf >${tmp} cat ${tmp} > /etc/newsyslog.conf rm ${tmp} } newsyslog() { - ENTRY=`fgrep '/var/log/munin-master/*' /etc/newsyslog.conf` - DEFAULT='/var/log/munin-master/*.log munin:munin 644 7 * @T00 GNWZ' + ENTRY=`fgrep '/var/log/munin/*' /etc/newsyslog.conf` + DEFAULT='/var/log/munin/*.log munin:munin 644 7 * @T00 GNWZ' if [ -z "$ENTRY" ]; then exit 0 elif [ "$ENTRY" = "$DEFAULT" ]; then diff --git a/sysutils/munin-master/pkg-install b/sysutils/munin-master/pkg-install index ff0fb2f16b7c..b6b9fe42a75c 100644 --- a/sysutils/munin-master/pkg-install +++ b/sysutils/munin-master/pkg-install @@ -49,11 +49,11 @@ mklogdir() { } newsyslog() { - if fgrep -q '/var/log/munin-master/*' /etc/newsyslog.conf; then + if fgrep -q '/var/log/munin/*' /etc/newsyslog.conf; then : else cat >> /etc/newsyslog.conf <