Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Mar 2005 13:38:44 +0100 (CET)
From:      Lupe Christoph <lupe@lupe-christoph.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/79127: [maintainer update] sysutils/munin-node 1.2.0 -> 1.2.2
Message-ID:  <20050322123844.C48C280E8@vmw-freebsd5.lupe-christoph.de>
Resent-Message-ID: <200503221240.j2MCe3L3016277@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         79127
>Category:       ports
>Synopsis:       [maintainer update] sysutils/munin-node 1.2.0 -> 1.2.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 22 12:40:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Lupe Christoph
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD vmw-freebsd5.lupe-christoph.de 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Sun Nov 7 16:52:12 CET 2004 lupe@vmw-freebsd5.lupe-christoph.de:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	Update to support Munin 1.2.2
	On FreeBSD 4.X, make sure sysutils/rc_subr is installed
	Remove %%SITE_PERL%%/Munin/Plugin and %%SITE_PERL%%/Munin
		on delete
	New plugin: mbmon_
	Dynamically add left directories and files to delete message.
	Files changed:
		Makefile
		distinfo
		pkg-plist
>How-To-Repeat:
>Fix:

--- munin-node-1.2.2.patch begins here ---
diff -ruN /usr/ports/sysutils/munin-node/Makefile munin-node-1.2.2/Makefile
--- /usr/ports/sysutils/munin-node/Makefile	Tue Mar 22 12:36:04 2005
+++ munin-node-1.2.2/Makefile	Tue Mar 22 13:32:24 2005
@@ -2,11 +2,11 @@
 # Date created:				25 Januar 2004
 # Whom:					Lupe Christoph <lupe@lupe-christoph.de>
 #
-# $FreeBSD: ports/sysutils/munin-node/Makefile,v 1.13 2005/03/04 17:47:19 sem Exp $
+# $FreeBSD: ports/sysutils/munin-node/Makefile,v 1.12 2004/12/14 01:43:10 sem Exp $
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.2
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	munin
@@ -20,6 +20,10 @@
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 .include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS=	${LOCALBASE}/etc/rc.subr:${PORTSDIR}/sysutils/rc_subr
+.endif
 
 .if ${PERL_LEVEL} < 500800
 RUN_DEPENDS+=	${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
diff -ruN /usr/ports/sysutils/munin-node/distinfo munin-node-1.2.2/distinfo
--- /usr/ports/sysutils/munin-node/distinfo	Tue Mar 22 12:36:04 2005
+++ munin-node-1.2.2/distinfo	Tue Mar 22 13:32:46 2005
@@ -1,2 +1,2 @@
-MD5 (munin_1.2.0.tar.gz) = bbab7bf91ac837e4c72889aaef7cf2e8
-SIZE (munin_1.2.0.tar.gz) = 318364
+MD5 (munin_1.2.2.tar.gz) = e55ff3cc8d506558f32598f639952cca
+SIZE (munin_1.2.2.tar.gz) = 325356
diff -ruN /usr/ports/sysutils/munin-node/pkg-plist munin-node-1.2.2/pkg-plist
--- /usr/ports/sysutils/munin-node/pkg-plist	Tue Mar 22 12:36:04 2005
+++ munin-node-1.2.2/pkg-plist	Tue Mar 22 13:36:03 2005
@@ -48,6 +48,7 @@
 %%DATADIR%%/plugins/loggrep
 %%DATADIR%%/plugins/mailman
 %%DATADIR%%/plugins/mailscanner
+%%DATADIR%%/plugins/mbmon_
 %%DATADIR%%/plugins/memory
 %%DATADIR%%/plugins/mhttping
 %%DATADIR%%/plugins/multips
@@ -113,12 +114,18 @@
 @unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
 @unexec rmdir %D/etc/munin/plugin-conf.d 2>/dev/null || true
 @unexec rmdir %D/etc/munin 2>/dev/null || true
+@unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin 2>/dev/null || true
+@unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin 2>/dev/null || true
 @unexec echo
 @unexec echo '********************************************************************'
 @unexec echo "If you want to *completely* remove munin-node, you have to"
 @unexec echo
-@unexec echo "    rm -rf %D/var/munin/plugin-state %D/etc/munin/VERSION.node \\"
-@unexec echo "           %D/etc/munin/munin-node.conf %D/etc/munin/plugins \\"
+@unexec echo "    rm -rf %D/etc/munin/VERSION.node %D/etc/munin/plugins \\"
+@unexec if [ -d %D/var/munin/plugin-state ]; then echo "           %D/var/munin/plugin-state \\"; fi
+@unexec if [ -f %D/etc/munin/munin-node.conf ]; then echo "           %D/etc/munin/munin-node.conf \\"; fi
+@unexec if [ -d %D/var/munin/plugin-state ]; then echo "           %D/var/munin/plugin-state \\"; fi
+@unexec if [ -d %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin ]; then echo "           %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin \\"; fi
+@unexec if [ -d %%LOCALBASE%%/%%SITE_PERL%%/Munin ]; then echo "           %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin \\"; fi
 @unexec echo "           /var/log/munin-node.log*"
 @unexec echo
 @unexec echo "If you have already deinstalled munin-main, you can also"
--- munin-node-1.2.2.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



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