From nobody@FreeBSD.org  Fri Aug  8 13:27:55 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED5291065673
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Aug 2008 13:27:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id C17BC8FC20
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  8 Aug 2008 13:27:55 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m78DRsoL061992
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 8 Aug 2008 13:27:54 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m78DRrT8061988;
	Fri, 8 Aug 2008 13:27:53 GMT
	(envelope-from nobody)
Message-Id: <200808081327.m78DRrT8061988@www.freebsd.org>
Date: Fri, 8 Aug 2008 13:27:53 GMT
From: Matthias Fechner <idefix@fechner.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: New port sysutil/munin* available (1.2.6)
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         126371
>Category:       ports
>Synopsis:       sysutils/munin-main and sysutils/munin-node 1.2.6 available
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    des
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 08 13:30:02 UTC 2008
>Closed-Date:    Wed Sep 03 13:28:48 UTC 2008
>Last-Modified:  Wed Sep  3 13:30:02 UTC 2008
>Originator:     Matthias Fechner
>Release:        Freebsd 7.0-STABLE
>Organization:
>Environment:
>Description:
New version of munin 1.2.6 with a lot of bugfixes is available.
Has anyone an updated port ready?
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->des 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Aug 9 01:17:20 UTC 2008 
Responsible-Changed-Why:  
Create a useful synopsis and assign. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126371 

From: Lupe Christoph <lupe@lupe-christoph.de>
To: bug-followup@FreeBSD.org, idefix@fechner.net, des@FreeBSD.org
Cc:  
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sat, 9 Aug 2008 18:33:06 +0200

 --u3/rZRmxL6MmkK24
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi!
 
 Now that I finally have VMware running again, I was able to prepare
 patches that take munin-node and munin-main to 1.2.6. Attached.
 
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |
 
 --u3/rZRmxL6MmkK24
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="munin-main-1.2.6.patch"
 
 diff -ruN munin-main-port/Makefile munin-main-1.2.6/Makefile
 --- munin-main-port/Makefile	2008-07-20 15:06:43.000000000 +0200
 +++ munin-main-1.2.6/Makefile	2008-08-09 18:11:48.000000000 +0200
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	munin
 -PORTVERSION=	1.2.5
 -PORTREVISION=	1
 +PORTVERSION=	1.2.6
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -38,8 +37,8 @@
  PATCH_STRIP=	-p1
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
  PKGMESSAGE=	${WRKDIR}/pkg-message
 -ALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} build build-man
 -INSTALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
 +ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
 +INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
  
  MAN5=		munin.conf.5
  MAN8=		munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8
 @@ -59,7 +58,7 @@
  	done
  	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
  	@${CHOWN} munin /var/log/munin-main
 -	@${CHGRP} munin /var/run/munin /var/log/munin-main ${PREFIX}/www/munin ${PREFIX}/var/munin
 +	@${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 diff -ruN munin-main-port/distinfo munin-main-1.2.6/distinfo
 --- munin-main-port/distinfo	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/distinfo	2008-08-09 14:56:00.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
 -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
 -SIZE (munin_1.2.5.tar.gz) = 353005
 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
 +SIZE (munin_1.2.6.tar.gz) = 360694
 diff -ruN munin-main-port/files/patch-Makefile.config munin-main-1.2.6/files/patch-Makefile.config
 --- munin-main-port/files/patch-Makefile.config	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/files/patch-Makefile.config	2008-08-09 18:27:36.000000000 +0200
 @@ -1,6 +1,6 @@
 ---- munin-1.2.5.orig/Makefile.config	Tue Oct 17 14:27:35 2006
 -+++ munin-1.2.5/Makefile.config	Thu Nov  2 12:09:09 2006
 -@@ -7,52 +7,56 @@
 +--- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
 ++++ Makefile.config	2008-08-09 15:44:18.000000000 +0200
 +@@ -7,46 +7,50 @@
   #
   # the base of the Munin installation.
   # 
 @@ -38,7 +38,7 @@
   # Server only - Output directory
  -HTMLDIR    = $(PREFIX)/var/www
  -CGIDIR     = $(HTMLDIR)/cgi
 -+HTMLDIR    = $(PREFIX)/www/munin
 ++HTMLDIR    = $(WWWDIR)
  +CGIDIR     = $(PREFIX)/www/cgi-bin
   
   # Client only - Where to put RRD files and other intenal data
 @@ -64,14 +64,20 @@
   
   # The python interpreter to use (used by some plugins)
   PYTHON     = /usr/bin/env python
 +@@ -62,10 +66,10 @@
 + GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
 + 
 + # Path of bash for bash specific plugins
 +-BASH       = /bin/bash
 ++BASH       = /usr/local/bin/bash
   
   # Server only - Where to install the perl libraries
 --PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
 +-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
  +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
   
   # Client only - Install plugins for this architecture
   OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 -@@ -77,9 +81,8 @@
 +@@ -90,9 +94,8 @@
   PLUGINUSER = nobody
   
   # Which command to use to check if the USER and GROUP to run Munin as, exists.
 @@ -81,5 +87,5 @@
  +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
  +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
   
 - CHOWN      = chown
 - CHMOD      = chmod
 + # For OSX, comment out the previous two lines and comment in these 
 + #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
 diff -ruN munin-main-port/pkg-plist munin-main-1.2.6/pkg-plist
 --- munin-main-port/pkg-plist	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/pkg-plist	2008-08-09 18:12:39.000000000 +0200
 @@ -1,12 +1,12 @@
  @exec mkdir -p /var/run/munin && chown munin:munin /var/run/munin
  @exec mkdir -p /var/log/munin-main && chown munin:munin /var/log/munin-main
 -@exec mkdir -p %D/www/munin && chown munin:munin %D/www/munin
 +@exec mkdir -p %D/%%WWWDIR%% && chown munin:munin %D/%%WWWDIR%%
  @exec mkdir -p %D/var/munin && chown munin:munin %D/var/munin
  bin/munin-cron
  @unexec if cmp -s %D/etc/munin/munin.conf.sample %D/etc/munin/munin.conf; then rm -f %D/etc/munin/munin.conf; fi
  etc/munin/munin.conf.sample
  etc/munin/templates/definitions.html
 -@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/munin/logo.png; then rm -f %D/www/munin/logo.png; fi
 +@unexec if cmp -s %D/etc/munin/templates/logo.png %D/%%WWWDIR%%/logo.png; then rm -f %D/%%WWWDIR%%/logo.png; fi
  etc/munin/templates/logo.png
  etc/munin/templates/munin-comparison-day.tmpl
  etc/munin/templates/munin-comparison-month.tmpl
 @@ -16,7 +16,7 @@
  etc/munin/templates/munin-nodeview.tmpl
  etc/munin/templates/munin-overview.tmpl
  etc/munin/templates/munin-serviceview.tmpl
 -@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/munin/style.css; then rm -f %D/www/munin/style.css; fi
 +@unexec if cmp -s %D/etc/munin/templates/style.css %D/%%WWWDIR%%/style.css; then rm -f %D/%%WWWDIR%%/style.css; fi
  etc/munin/templates/style.css
  %%SITE_PERL%%/Munin.pm
  %%DATADIR%%/VeraMono.ttf
 @@ -28,7 +28,7 @@
  @unexec rm -f /var/run/munin/munin-*.lock
  @dirrmtry /var/run/munin
  @dirrmtry /var/log/munin-main
 -@dirrmtry www/munin
 +@dirrmtry %%WWWDIR%%
  @dirrmtry www/cgi-bin
  @dirrmtry var/munin
  @dirrmtry %%DATADIR%%
 @@ -38,7 +38,8 @@
  @unexec echo '********************************************************************'
  @unexec echo "If you want to *completely* remove munin-main, you have to"
  @unexec echo
 -@unexec if [ -d %D/www/munin ]; then echo "    rm -rf %D/www/munin \\"; fi
 +@unexec echo "           rm -rf \\"
 +@unexec if [ -d %D/%%WWWDIR%% ]; then echo "           %D/%%WWWDIR%% \\"; fi
  @unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* | grep -v plugin-state | fmt -40 | sed -e 's/^/           /' -e 's/$/ \\/'; fi
  @unexec if [ -f %D/etc/munin/munin.conf ]; then echo "           %D/etc/munin/munin.conf \\"; fi
  @unexec if [ -d %D/etc/munin/templates ]; then echo "           %D/etc/munin/templates \\"; fi
 
 --u3/rZRmxL6MmkK24
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="munin-node-1.2.6.patch"
 
 diff -ruN munin-node-port/Makefile munin-node-1.2.6/Makefile
 --- munin-node-port/Makefile	2008-07-20 15:06:43.000000000 +0200
 +++ munin-node-1.2.6/Makefile	2008-08-09 18:06:26.000000000 +0200
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	munin
 -PORTVERSION=	1.2.5
 -PORTREVISION=	3
 +PORTVERSION=	1.2.6
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -31,8 +30,8 @@
  USE_GMAKE=	yes
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
  PKGMESSAGE=	${WRKDIR}/pkg-message
 -ALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} build build-man
 -INSTALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
 +ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
 +INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
  MAKE_ENV=	LANG=C
  
  MAN5=		munin-node.conf.5
 diff -ruN munin-node-port/distinfo munin-node-1.2.6/distinfo
 --- munin-node-port/distinfo	2006-11-06 23:50:50.000000000 +0100
 +++ munin-node-1.2.6/distinfo	2008-08-09 14:55:21.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
 -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
 -SIZE (munin_1.2.5.tar.gz) = 353005
 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
 +SIZE (munin_1.2.6.tar.gz) = 360694
 diff -ruN munin-node-port/files/patch-Makefile.config munin-node-1.2.6/files/patch-Makefile.config
 --- munin-node-port/files/patch-Makefile.config	2007-10-22 14:32:25.000000000 +0200
 +++ munin-node-1.2.6/files/patch-Makefile.config	2008-08-09 18:26:19.000000000 +0200
 @@ -1,6 +1,6 @@
 ---- Makefile.config.orig	2005-01-10 11:38:32.000000000 +0100
 -+++ Makefile.config	2005-02-03 11:55:51.000000000 +0100
 -@@ -7,52 +7,56 @@
 +--- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
 ++++ Makefile.config	2008-08-09 15:44:06.000000000 +0200
 +@@ -7,46 +7,50 @@
   #
   # the base of the Munin installation.
   # 
 @@ -38,7 +38,7 @@
   # Server only - Output directory
  -HTMLDIR    = $(PREFIX)/var/www
  -CGIDIR     = $(HTMLDIR)/cgi
 -+HTMLDIR    = $(PREFIX)/www/munin
 ++HTMLDIR    = $(WWWDIR)
  +CGIDIR     = $(PREFIX)/www/cgi-bin
   
   # Client only - Where to put RRD files and other intenal data
 @@ -64,14 +64,20 @@
   
   # The python interpreter to use (used by some plugins)
   PYTHON     = /usr/bin/env python
 +@@ -62,10 +66,10 @@
 + GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
 + 
 + # Path of bash for bash specific plugins
 +-BASH       = /bin/bash
 ++BASH       = /usr/local/bin/bash
   
   # Server only - Where to install the perl libraries
 --PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
 +-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
  +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
   
   # Client only - Install plugins for this architecture
   OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 -@@ -72,9 +76,8 @@
 +@@ -90,9 +94,8 @@
   PLUGINUSER = nobody
   
   # Which command to use to check if the USER and GROUP to run Munin as, exists.
 @@ -81,5 +87,5 @@
  +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
  +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
   
 - CHOWN      = chown
 - CHMOD      = chmod
 + # For OSX, comment out the previous two lines and comment in these 
 + #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
 diff -ruN munin-node-port/files/patch-hddtemp_smartctl.in munin-node-1.2.6/files/patch-hddtemp_smartctl.in
 --- munin-node-port/files/patch-hddtemp_smartctl.in	2007-10-22 14:32:25.000000000 +0200
 +++ munin-node-1.2.6/files/patch-hddtemp_smartctl.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,13 +0,0 @@
 ---- node/node.d/hddtemp_smartctl.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d/hddtemp_smartctl.in	2007-10-04 09:29:43.931425624 +0200
 -@@ -109,6 +109,10 @@
 -     @drives = grep /hd[a-z]/, readdir IDE;
 -     closedir(IDE);
 -   }
 -+} elsif ($^O eq 'freebsd') {
 -+  opendir(DEV, '/dev');
 -+  @drives = grep /^ad[0-9]+$/, readdir DEV;
 -+  closedir(DEV);
 - } elsif ($^O eq 'solaris') {
 -   @drives = map { s@.*/@@ ; $_ } glob '/dev/rdsk/c*t*d*s2';
 - }
 diff -ruN munin-node-port/files/patch-if_.in munin-node-1.2.6/files/patch-if_.in
 --- munin-node-port/files/patch-if_.in	2008-02-06 22:34:23.000000000 +0100
 +++ munin-node-1.2.6/files/patch-if_.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,22 +0,0 @@
 ---- node/node.d.freebsd/if_.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d.freebsd/if_.in	2007-10-26 10:52:46.000000000 +0200
 -@@ -63,7 +63,7 @@
 - 
 - if [ "$1" = "suggest" ]; then
 - 	if [ -x /usr/bin/netstat ]; then
 --		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 -+		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 - 		exit 0
 - 	else
 - 		exit 1
 ---- node/node.d.freebsd/if_errcoll_.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d.freebsd/if_errcoll_.in	2007-10-26 10:53:08.000000000 +0200
 -@@ -57,7 +57,7 @@
 - 
 - if [ "$1" = "suggest" ]; then
 - 	if [ -x /usr/bin/netstat ]; then
 --		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 -+		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 - 		exit 0
 - 	else
 - 		exit 1
 diff -ruN munin-node-port/pkg-plist munin-node-1.2.6/pkg-plist
 --- munin-node-port/pkg-plist	2008-07-20 15:06:43.000000000 +0200
 +++ munin-node-1.2.6/pkg-plist	2008-08-09 17:55:30.000000000 +0200
 @@ -7,7 +7,9 @@
  etc/munin/munin-node.conf.sample
  @unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi
  etc/munin/plugin-conf.d/plugins.conf.sample
 +bin/munindoc
  etc/rc.d/munin-node.sh
 +%%SITE_PERL%%/Munin/Plugin.pm
  sbin/munin-node
  sbin/munin-node-configure
  sbin/munin-node-configure-snmp
 @@ -62,12 +64,14 @@
  %%DATADIR%%/plugins/named
  %%DATADIR%%/plugins/netstat
  %%DATADIR%%/plugins/ntp_
 +%%DATADIR%%/plugins/ntp_offset
  %%DATADIR%%/plugins/ntp_states
  %%DATADIR%%/plugins/nut_misc
  %%DATADIR%%/plugins/nut_volts
  %%DATADIR%%/plugins/open_files
  %%DATADIR%%/plugins/perdition
  %%DATADIR%%/plugins/ping_
 +%%DATADIR%%/plugins/plugin.sh
  %%DATADIR%%/plugins/plugins.history
  %%DATADIR%%/plugins/pm3users_
  %%DATADIR%%/plugins/pop_stats
 @@ -112,6 +116,8 @@
  @dirrmtry var/munin
  @dirrmtry %%DATADIR%%/plugins
  @dirrmtry %%DATADIR%%
 +@dirrmtry %%SITE_PERL%%/Munin/Plugin
 +@dirrmtry %%SITE_PERL%%/Munin
  @dirrmtry etc/munin/plugin-conf.d
  @dirrmtry etc/munin/plugins
  @dirrmtry etc/munin
 
 --u3/rZRmxL6MmkK24--

From: Lupe Christoph <lupe@lupe-christoph.de>
To: bug-followup@FreeBSD.org, idefix@fechner.net
Cc:  
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 10 Aug 2008 11:28:07 +0200

 --OXfL5xGRrasGEqWY
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I see that bug-followup@FreeBSD.org was unable to cope with two
 attachments. It ran the two together. It shouldn't be hard to separate
 them, though.
 
 This single attachment addresses ports/124258. But I have found nothing
 in the porters' handbook that says anything about the right place for
 dynamic data. And a lot of ports use ${PREFIX}/var/<PORTNAME>.
 
 This mail contains the patch for munin-main, the next one will have the
 patch for munin-node.
 
 Lupe Christoph
 
 --OXfL5xGRrasGEqWY
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="munin-main-1.2.6.patch-var-db"
 
 diff -ruN munin-main-port/Makefile munin-main-1.2.6/Makefile
 --- munin-main-port/Makefile	2008-07-20 15:06:43.000000000 +0200
 +++ munin-main-1.2.6/Makefile	2008-08-09 18:11:48.000000000 +0200
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	munin
 -PORTVERSION=	1.2.5
 -PORTREVISION=	1
 +PORTVERSION=	1.2.6
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -38,8 +37,8 @@
  PATCH_STRIP=	-p1
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
  PKGMESSAGE=	${WRKDIR}/pkg-message
 -ALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} build build-man
 -INSTALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
 +ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
 +INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
  
  MAN5=		munin.conf.5
  MAN8=		munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8
 @@ -59,7 +58,7 @@
  	done
  	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
  	@${CHOWN} munin /var/log/munin-main
 -	@${CHGRP} munin /var/run/munin /var/log/munin-main ${PREFIX}/www/munin ${PREFIX}/var/munin
 +	@${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 diff -ruN munin-main-port/distinfo munin-main-1.2.6/distinfo
 --- munin-main-port/distinfo	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/distinfo	2008-08-09 14:56:00.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
 -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
 -SIZE (munin_1.2.5.tar.gz) = 353005
 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
 +SIZE (munin_1.2.6.tar.gz) = 360694
 diff -ruN munin-main-port/files/patch-Makefile.config munin-main-1.2.6/files/patch-Makefile.config
 --- munin-main-port/files/patch-Makefile.config	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/files/patch-Makefile.config	2008-08-10 11:20:06.000000000 +0200
 @@ -1,6 +1,6 @@
 ---- munin-1.2.5.orig/Makefile.config	Tue Oct 17 14:27:35 2006
 -+++ munin-1.2.5/Makefile.config	Thu Nov  2 12:09:09 2006
 -@@ -7,52 +7,56 @@
 +--- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
 ++++ Makefile.config	2008-08-09 15:44:18.000000000 +0200
 +@@ -7,46 +7,50 @@
   #
   # the base of the Munin installation.
   # 
 @@ -38,12 +38,12 @@
   # Server only - Output directory
  -HTMLDIR    = $(PREFIX)/var/www
  -CGIDIR     = $(HTMLDIR)/cgi
 -+HTMLDIR    = $(PREFIX)/www/munin
 ++HTMLDIR    = $(WWWDIR)
  +CGIDIR     = $(PREFIX)/www/cgi-bin
   
   # Client only - Where to put RRD files and other intenal data
  -DBDIR      = $(DESTDIR)/var/opt/munin
 -+DBDIR      = $(PREFIX)/var/munin
 ++DBDIR      = /var/db/munin
   
   # Client only - Where plugins should put their states. Must be writable by
   # group "munin", and should be preserved between reboots
 @@ -64,14 +64,20 @@
   
   # The python interpreter to use (used by some plugins)
   PYTHON     = /usr/bin/env python
 +@@ -62,10 +66,10 @@
 + GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
 + 
 + # Path of bash for bash specific plugins
 +-BASH       = /bin/bash
 ++BASH       = /usr/local/bin/bash
   
   # Server only - Where to install the perl libraries
 --PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
 +-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
  +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
   
   # Client only - Install plugins for this architecture
   OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 -@@ -77,9 +81,8 @@
 +@@ -90,9 +94,8 @@
   PLUGINUSER = nobody
   
   # Which command to use to check if the USER and GROUP to run Munin as, exists.
 @@ -81,5 +87,5 @@
  +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
  +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
   
 - CHOWN      = chown
 - CHMOD      = chmod
 + # For OSX, comment out the previous two lines and comment in these 
 + #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
 diff -ruN munin-main-port/pkg-plist munin-main-1.2.6/pkg-plist
 --- munin-main-port/pkg-plist	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/pkg-plist	2008-08-09 18:12:39.000000000 +0200
 @@ -1,12 +1,12 @@
  @exec mkdir -p /var/run/munin && chown munin:munin /var/run/munin
  @exec mkdir -p /var/log/munin-main && chown munin:munin /var/log/munin-main
 -@exec mkdir -p %D/www/munin && chown munin:munin %D/www/munin
 +@exec mkdir -p %D/%%WWWDIR%% && chown munin:munin %D/%%WWWDIR%%
  @exec mkdir -p %D/var/munin && chown munin:munin %D/var/munin
  bin/munin-cron
  @unexec if cmp -s %D/etc/munin/munin.conf.sample %D/etc/munin/munin.conf; then rm -f %D/etc/munin/munin.conf; fi
  etc/munin/munin.conf.sample
  etc/munin/templates/definitions.html
 -@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/munin/logo.png; then rm -f %D/www/munin/logo.png; fi
 +@unexec if cmp -s %D/etc/munin/templates/logo.png %D/%%WWWDIR%%/logo.png; then rm -f %D/%%WWWDIR%%/logo.png; fi
  etc/munin/templates/logo.png
  etc/munin/templates/munin-comparison-day.tmpl
  etc/munin/templates/munin-comparison-month.tmpl
 @@ -16,7 +16,7 @@
  etc/munin/templates/munin-nodeview.tmpl
  etc/munin/templates/munin-overview.tmpl
  etc/munin/templates/munin-serviceview.tmpl
 -@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/munin/style.css; then rm -f %D/www/munin/style.css; fi
 +@unexec if cmp -s %D/etc/munin/templates/style.css %D/%%WWWDIR%%/style.css; then rm -f %D/%%WWWDIR%%/style.css; fi
  etc/munin/templates/style.css
  %%SITE_PERL%%/Munin.pm
  %%DATADIR%%/VeraMono.ttf
 @@ -28,7 +28,7 @@
  @unexec rm -f /var/run/munin/munin-*.lock
  @dirrmtry /var/run/munin
  @dirrmtry /var/log/munin-main
 -@dirrmtry www/munin
 +@dirrmtry %%WWWDIR%%
  @dirrmtry www/cgi-bin
  @dirrmtry var/munin
  @dirrmtry %%DATADIR%%
 @@ -38,7 +38,8 @@
  @unexec echo '********************************************************************'
  @unexec echo "If you want to *completely* remove munin-main, you have to"
  @unexec echo
 -@unexec if [ -d %D/www/munin ]; then echo "    rm -rf %D/www/munin \\"; fi
 +@unexec echo "           rm -rf \\"
 +@unexec if [ -d %D/%%WWWDIR%% ]; then echo "           %D/%%WWWDIR%% \\"; fi
  @unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* | grep -v plugin-state | fmt -40 | sed -e 's/^/           /' -e 's/$/ \\/'; fi
  @unexec if [ -f %D/etc/munin/munin.conf ]; then echo "           %D/etc/munin/munin.conf \\"; fi
  @unexec if [ -d %D/etc/munin/templates ]; then echo "           %D/etc/munin/templates \\"; fi
 
 --OXfL5xGRrasGEqWY--

From: Lupe Christoph <lupe@lupe-christoph.de>
To: bug-followup@FreeBSD.org, idefix@fechner.net
Cc:  
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 10 Aug 2008 11:28:40 +0200

 --opJtzjQTFsWo+cga
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Patch for munin-node.
 
 Lupe Christoph
 
 --opJtzjQTFsWo+cga
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="munin-node-1.2.6.patch-var-db"
 
 diff -ruN munin-node-port/Makefile munin-node-1.2.6/Makefile
 --- munin-node-port/Makefile	2008-07-20 15:06:43.000000000 +0200
 +++ munin-node-1.2.6/Makefile	2008-08-09 18:06:26.000000000 +0200
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	munin
 -PORTVERSION=	1.2.5
 -PORTREVISION=	3
 +PORTVERSION=	1.2.6
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -31,8 +30,8 @@
  USE_GMAKE=	yes
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
  PKGMESSAGE=	${WRKDIR}/pkg-message
 -ALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} build build-man
 -INSTALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
 +ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
 +INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
  MAKE_ENV=	LANG=C
  
  MAN5=		munin-node.conf.5
 diff -ruN munin-node-port/distinfo munin-node-1.2.6/distinfo
 --- munin-node-port/distinfo	2006-11-06 23:50:50.000000000 +0100
 +++ munin-node-1.2.6/distinfo	2008-08-09 14:55:21.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
 -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
 -SIZE (munin_1.2.5.tar.gz) = 353005
 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
 +SIZE (munin_1.2.6.tar.gz) = 360694
 diff -ruN munin-node-port/files/patch-Makefile.config munin-node-1.2.6/files/patch-Makefile.config
 --- munin-node-port/files/patch-Makefile.config	2007-10-22 14:32:25.000000000 +0200
 +++ munin-node-1.2.6/files/patch-Makefile.config	2008-08-10 11:20:49.000000000 +0200
 @@ -1,6 +1,6 @@
 ---- Makefile.config.orig	2005-01-10 11:38:32.000000000 +0100
 -+++ Makefile.config	2005-02-03 11:55:51.000000000 +0100
 -@@ -7,52 +7,56 @@
 +--- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
 ++++ Makefile.config	2008-08-09 15:44:06.000000000 +0200
 +@@ -7,46 +7,50 @@
   #
   # the base of the Munin installation.
   # 
 @@ -38,12 +38,12 @@
   # Server only - Output directory
  -HTMLDIR    = $(PREFIX)/var/www
  -CGIDIR     = $(HTMLDIR)/cgi
 -+HTMLDIR    = $(PREFIX)/www/munin
 ++HTMLDIR    = $(WWWDIR)
  +CGIDIR     = $(PREFIX)/www/cgi-bin
   
   # Client only - Where to put RRD files and other intenal data
  -DBDIR      = $(DESTDIR)/var/opt/munin
 -+DBDIR      = $(PREFIX)/var/munin
 ++DBDIR      = /var/db/munin
   
   # Client only - Where plugins should put their states. Must be writable by
   # group "munin", and should be preserved between reboots
 @@ -64,14 +64,20 @@
   
   # The python interpreter to use (used by some plugins)
   PYTHON     = /usr/bin/env python
 +@@ -62,10 +66,10 @@
 + GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
 + 
 + # Path of bash for bash specific plugins
 +-BASH       = /bin/bash
 ++BASH       = /usr/local/bin/bash
   
   # Server only - Where to install the perl libraries
 --PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
 +-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
  +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
   
   # Client only - Install plugins for this architecture
   OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 -@@ -72,9 +76,8 @@
 +@@ -90,9 +94,8 @@
   PLUGINUSER = nobody
   
   # Which command to use to check if the USER and GROUP to run Munin as, exists.
 @@ -81,5 +87,5 @@
  +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
  +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
   
 - CHOWN      = chown
 - CHMOD      = chmod
 + # For OSX, comment out the previous two lines and comment in these 
 + #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
 diff -ruN munin-node-port/files/patch-hddtemp_smartctl.in munin-node-1.2.6/files/patch-hddtemp_smartctl.in
 --- munin-node-port/files/patch-hddtemp_smartctl.in	2007-10-22 14:32:25.000000000 +0200
 +++ munin-node-1.2.6/files/patch-hddtemp_smartctl.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,13 +0,0 @@
 ---- node/node.d/hddtemp_smartctl.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d/hddtemp_smartctl.in	2007-10-04 09:29:43.931425624 +0200
 -@@ -109,6 +109,10 @@
 -     @drives = grep /hd[a-z]/, readdir IDE;
 -     closedir(IDE);
 -   }
 -+} elsif ($^O eq 'freebsd') {
 -+  opendir(DEV, '/dev');
 -+  @drives = grep /^ad[0-9]+$/, readdir DEV;
 -+  closedir(DEV);
 - } elsif ($^O eq 'solaris') {
 -   @drives = map { s@.*/@@ ; $_ } glob '/dev/rdsk/c*t*d*s2';
 - }
 diff -ruN munin-node-port/files/patch-if_.in munin-node-1.2.6/files/patch-if_.in
 --- munin-node-port/files/patch-if_.in	2008-02-06 22:34:23.000000000 +0100
 +++ munin-node-1.2.6/files/patch-if_.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,22 +0,0 @@
 ---- node/node.d.freebsd/if_.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d.freebsd/if_.in	2007-10-26 10:52:46.000000000 +0200
 -@@ -63,7 +63,7 @@
 - 
 - if [ "$1" = "suggest" ]; then
 - 	if [ -x /usr/bin/netstat ]; then
 --		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 -+		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 - 		exit 0
 - 	else
 - 		exit 1
 ---- node/node.d.freebsd/if_errcoll_.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d.freebsd/if_errcoll_.in	2007-10-26 10:53:08.000000000 +0200
 -@@ -57,7 +57,7 @@
 - 
 - if [ "$1" = "suggest" ]; then
 - 	if [ -x /usr/bin/netstat ]; then
 --		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 -+		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 - 		exit 0
 - 	else
 - 		exit 1
 diff -ruN munin-node-port/pkg-plist munin-node-1.2.6/pkg-plist
 --- munin-node-port/pkg-plist	2008-07-20 15:06:43.000000000 +0200
 +++ munin-node-1.2.6/pkg-plist	2008-08-09 17:55:30.000000000 +0200
 @@ -7,7 +7,9 @@
  etc/munin/munin-node.conf.sample
  @unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi
  etc/munin/plugin-conf.d/plugins.conf.sample
 +bin/munindoc
  etc/rc.d/munin-node.sh
 +%%SITE_PERL%%/Munin/Plugin.pm
  sbin/munin-node
  sbin/munin-node-configure
  sbin/munin-node-configure-snmp
 @@ -62,12 +64,14 @@
  %%DATADIR%%/plugins/named
  %%DATADIR%%/plugins/netstat
  %%DATADIR%%/plugins/ntp_
 +%%DATADIR%%/plugins/ntp_offset
  %%DATADIR%%/plugins/ntp_states
  %%DATADIR%%/plugins/nut_misc
  %%DATADIR%%/plugins/nut_volts
  %%DATADIR%%/plugins/open_files
  %%DATADIR%%/plugins/perdition
  %%DATADIR%%/plugins/ping_
 +%%DATADIR%%/plugins/plugin.sh
  %%DATADIR%%/plugins/plugins.history
  %%DATADIR%%/plugins/pm3users_
  %%DATADIR%%/plugins/pop_stats
 @@ -112,6 +116,8 @@
  @dirrmtry var/munin
  @dirrmtry %%DATADIR%%/plugins
  @dirrmtry %%DATADIR%%
 +@dirrmtry %%SITE_PERL%%/Munin/Plugin
 +@dirrmtry %%SITE_PERL%%/Munin
  @dirrmtry etc/munin/plugin-conf.d
  @dirrmtry etc/munin/plugins
  @dirrmtry etc/munin
 
 --opJtzjQTFsWo+cga--

From: Matthias Fechner <idefix@fechner.net>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node	1.2.6
 available
Date: Sun, 10 Aug 2008 15:22:06 +0200

 Hi Christoph,
 
 Lupe Christoph wrote:
 > Now that I finally have VMware running again, I was able to prepare
 > patches that take munin-node and munin-main to 1.2.6. Attached.
 
 The patches will not go in:
 server# patch -sp1C < /home/idefix/munin-main-1.2.6.patch
 3 out of 3 hunks failed--saving rejects to Makefile.rej
 4 out of 4 hunks failed--saving rejects to files/patch-Makefile.config.rej
 4 out of 4 hunks failed--saving rejects to pkg-plist.rej
 
 server# patch -sp1C < /home/idefix/munin-node-1.2.6.patch
 2 out of 2 hunks failed--saving rejects to Makefile.rej
 4 out of 4 hunks failed--saving rejects to files/patch-Makefile.config.rej
 1 out of 1 hunks failed--saving rejects to 
 files/patch-hddtemp_smartctl.in.rej
 1 out of 1 hunks failed--saving rejects to files/patch-if_.in.rej
 3 out of 3 hunks failed--saving rejects to pkg-plist.rej
 
 Bye
 Matthias
 
 -- 
 
 "Programming today is a race between software engineers striving to
 build bigger and better idiot-proof programs, and the universe trying to
 produce bigger and better idiots. So far, the universe is winning." --
 Rich Cook

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 10 Aug 2008 16:11:34 +0200

 On Sunday, 2008-08-10 at 15:22:06 +0200, Matthias Fechner wrote:
 > Lupe Christoph wrote:
 >> Now that I finally have VMware running again, I was able to prepare
 >> patches that take munin-node and munin-main to 1.2.6. Attached.
 
 > The patches will not go in:
 > server# patch -sp1C < /home/idefix/munin-main-1.2.6.patch
 > 3 out of 3 hunks failed--saving rejects to Makefile.rej
 > 4 out of 4 hunks failed--saving rejects to files/patch-Makefile.config.rej
 > 4 out of 4 hunks failed--saving rejects to pkg-plist.rej
 
 > server# patch -sp1C < /home/idefix/munin-node-1.2.6.patch
 > 2 out of 2 hunks failed--saving rejects to Makefile.rej
 > 4 out of 4 hunks failed--saving rejects to files/patch-Makefile.config.rej
 > 1 out of 1 hunks failed--saving rejects to  
 > files/patch-hddtemp_smartctl.in.rej
 > 1 out of 1 hunks failed--saving rejects to files/patch-if_.in.rej
 > 3 out of 3 hunks failed--saving rejects to pkg-plist.rej
 
 Sorry, I can't help you with the patch for munin-main. The patch for
 munin-node is indeed broken. But I get different breakage.
 
 vmw-freebsd7# rm -rf /usr/ports/sysutils/munin-*
 vmw-freebsd7# cvsup -L 2 /etc/cvsupfile.ports
 Parsing supfile "/etc/cvsupfile.ports"
 Connecting to cvsup4.de.FreeBSD.org
 Connected to cvsup4.de.FreeBSD.org
 Server software version: SNAP_16_1h
 Negotiating file attribute support
 Exchanging collection information
 Establishing multiplexed-mode data connection
 Running
 Updating collection ports-all/cvs
  Checkout ports/sysutils/munin-main/Makefile
  Checkout ports/sysutils/munin-main/distinfo
  Checkout ports/sysutils/munin-main/files/patch-Makefile
  Checkout ports/sysutils/munin-main/files/patch-Makefile.config
  Checkout ports/sysutils/munin-main/files/pkg-message.in
  Checkout ports/sysutils/munin-main/pkg-deinstall
  Checkout ports/sysutils/munin-main/pkg-descr
  Checkout ports/sysutils/munin-main/pkg-install
  Checkout ports/sysutils/munin-main/pkg-plist
  Checkout ports/sysutils/munin-node/Makefile
  Checkout ports/sysutils/munin-node/distinfo
  Checkout ports/sysutils/munin-node/files/munin-node-revive.sh.in
  Checkout ports/sysutils/munin-node/files/munin-node.sh.in
  Checkout ports/sysutils/munin-node/files/patch-Makefile.config
  Checkout ports/sysutils/munin-node/files/patch-hddtemp_smartctl.in
  Checkout ports/sysutils/munin-node/files/patch-if_.in
  Checkout ports/sysutils/munin-node/files/patch-munin-node.conf.in
  Checkout ports/sysutils/munin-node/files/pkg-message.in
  Checkout ports/sysutils/munin-node/files/plugins.conf
  Checkout ports/sysutils/munin-node/pkg-deinstall
  Checkout ports/sysutils/munin-node/pkg-descr
  Checkout ports/sysutils/munin-node/pkg-install
  Checkout ports/sysutils/munin-node/pkg-plist
 Shutting down connection to server
 Finished successfully
 vmw-freebsd7# cd /usr/ports/sysutils/munin-main
 vmw-freebsd7# wget -nv -O /tmp/munin-main-1.2.6.patch-var-db 'http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-2-diff&n=/patch-2.diff'
 2008-08-10 15:33:20 URL:http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-2-diff&n=/patch-2.diff [7006] -> "/tmp/munin-main-1.2.6.patch-var-db" [1]
 vmw-freebsd7# patch --silent --strip=1 --check < /tmp/munin-main-1.2.6.patch-var-db
 vmw-freebsd7# cd /usr/ports/sysutils/munin-node
 vmw-freebsd7# wget -nv -O /tmp/munin-node-1.2.6.patch-var-db 'http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-2-diff&n=/patch-3.diff'
 2008-08-10 15:33:25 URL:http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-2-diff&n=/patch-3.diff [7006] -> "/tmp/munin-node-1.2.6.patch-var-db" [1]
 vmw-freebsd7# patch --silent --strip=1 --check < /tmp/munin-node-1.2.6.patch-var-db
 3 out of 3 hunks failed--saving rejects to Makefile.rej
 1 out of 4 hunks failed--saving rejects to files/patch-Makefile.config.rej
 4 out of 4 hunks failed--saving rejects to pkg-plist.rej
 
 I will upload a corrected patch for munin-node.
 
 Thanks for testing,
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 10 Aug 2008 16:20:27 +0200

 On Sunday, 2008-08-10 at 16:11:34 +0200, Lupe Christoph wrote:
 
 > Sorry, I can't help you with the patch for munin-main. The patch for
 > munin-node is indeed broken. But I get different breakage.
 
 Self-inflicted breakage, that is. I should not have tried to hand-edit
 the URL for the patch. I managed to download the munin-main patch again...
 
 > vmw-freebsd7# cd /usr/ports/sysutils/munin-node
 > vmw-freebsd7# wget -nv -O /tmp/munin-node-1.2.6.patch-var-db 'http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-2-diff&n=/patch-3.diff'
 > 2008-08-10 15:33:25 URL:http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-2-diff&n=/patch-3.diff [7006] -> "/tmp/munin-node-1.2.6.patch-var-db" [1]
 > vmw-freebsd7# patch --silent --strip=1 --check < /tmp/munin-node-1.2.6.patch-var-db
 > 3 out of 3 hunks failed--saving rejects to Makefile.rej
 > 1 out of 4 hunks failed--saving rejects to files/patch-Makefile.config.rej
 > 4 out of 4 hunks failed--saving rejects to pkg-plist.rej
 
 This is correct:
 
 vmw-freebsd7# wget -nv -O /tmp/munin-node-1.2.6.patch-var-db 'http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-3-diff&n=/patch-3.diff'
 2008-08-10 15:34:22 URL:http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-3-diff&n=/patch-3.diff [7348] -> "/tmp/munin-node-1.2.6.patch-var-db" [1]
 vmw-freebsd7# patch --silent --strip=1 --check < /tmp/munin-node-1.2.6.patch-var-db
 
 No complaints. 
 
 Now I have no idea what causes your problems.
 
 Sorry,
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: Matthias Fechner <idefix@fechner.net>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node	1.2.6
 available
Date: Sun, 10 Aug 2008 17:40:01 +0200

 Hi Christoph,
 
 Lupe Christoph wrote:
 > This is correct:
 > 
 > vmw-freebsd7# wget -nv -O /tmp/munin-node-1.2.6.patch-var-db 'http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-3-diff&n=/patch-3.diff'
 > 2008-08-10 15:34:22 URL:http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-3-diff&n=/patch-3.diff [7348] -> "/tmp/munin-node-1.2.6.patch-var-db" [1]
 > vmw-freebsd7# patch --silent --strip=1 --check < /tmp/munin-node-1.2.6.patch-var-db
 
 I did it the same way, but it fails with error message posted before.
 My version of installed port is:
 # $FreeBSD: ports/sysutils/munin-main/Makefile,v 1.16 2008/06/24 
 12:34:56 rafan Exp $
 
 PORTVERSION=    1.2.5
 PORTREVISION=   1
 
 That is the version I get with portsnap and cvsup.
 I'm running:
 FreeBSD server.idefix.lan 7.0-STABLE FreeBSD 7.0-STABLE #4: Sat Jul 19 
 11:54:07 CEST 2008 
 root@server.idefix.lan:/usr/obj/usr/src/sys/SERVER2_I4B  i386
 
 Bye
 Matthias
 
 -- 
 
 "Programming today is a race between software engineers striving to
 build bigger and better idiot-proof programs, and the universe trying to
 produce bigger and better idiots. So far, the universe is winning." --
 Rich Cook

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 10 Aug 2008 17:59:04 +0200

 On Sunday, 2008-08-10 at 17:40:01 +0200, Matthias Fechner wrote:
 > Lupe Christoph wrote:
 >> This is correct:
 
 >> vmw-freebsd7# wget -nv -O /tmp/munin-node-1.2.6.patch-var-db 'http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-3-diff&n=/patch-3.diff'
 >> 2008-08-10 15:34:22 URL:http://www.freebsd.org/cgi/query-pr.cgi?prp=126371-3-diff&n=/patch-3.diff [7348] -> "/tmp/munin-node-1.2.6.patch-var-db" [1]
 >> vmw-freebsd7# patch --silent --strip=1 --check < /tmp/munin-node-1.2.6.patch-var-db
 
 > I did it the same way, but it fails with error message posted before.
 > My version of installed port is:
 > # $FreeBSD: ports/sysutils/munin-main/Makefile,v 1.16 2008/06/24  
 > 12:34:56 rafan Exp $
 
 > PORTVERSION=    1.2.5
 > PORTREVISION=   1
 
 Yes, that's the most recent version of the munin-main port.
 
 > That is the version I get with portsnap and cvsup.
 > I'm running:
 > FreeBSD server.idefix.lan 7.0-STABLE FreeBSD 7.0-STABLE #4: Sat Jul 19  
 > 11:54:07 CEST 2008  
 > root@server.idefix.lan:/usr/obj/usr/src/sys/SERVER2_I4B  i386
 
 I doubt the FreeBSD version makes any difference. In fact, you should be
 able to use the patch on any platform that has a patch command which
 understands unified diffs.
 
 As I said, i have no idea what is going wrong on your side. The
 patches are OK.
 
 Sorry,
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Thu, 14 Aug 2008 12:46:31 +0200

 On Sunday, 2008-08-10 at 17:59:04 +0200, Lupe Christoph wrote:
 
 > As I said, i have no idea what is going wrong on your side. The
 > patches are OK.
 
 Any news from your tests? I fear your problems with the patches are
 keeping them from being committed.
 
 Thanks,
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: Matthias Fechner <idefix@fechner.net>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node	1.2.6
 available
Date: Sun, 17 Aug 2008 12:56:00 +0200

 Hi Christoph,
 
 Lupe Christoph wrote:
 > Any news from your tests? I fear your problems with the patches are
 > keeping them from being committed.
 
 was now able to patch and compile the new version.
 One problem I found was in:
 /usr/local/share/munin/plugins/netstat
 
 There the path for netstat was /bin/netstat, I changed it to 
 /usr/bin/netstat.
 
 Then I symlinked /usr/local/var/munin to /var/db/munin.
 
 Now everything seems to work fine.
 
 Thanks for your work!
 
 Bye
 Matthias
 
 -- 
 
 "Programming today is a race between software engineers striving to
 build bigger and better idiot-proof programs, and the universe trying to
 produce bigger and better idiots. So far, the universe is winning." --
 Rich Cook

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 17 Aug 2008 13:40:00 +0200

 On Sunday, 2008-08-17 at 12:56:00 +0200, Matthias Fechner wrote:
 
 > was now able to patch and compile the new version.
 
 Good.
 
 > One problem I found was in:
 > /usr/local/share/munin/plugins/netstat
 
 > There the path for netstat was /bin/netstat, I changed it to  
 > /usr/bin/netstat.
 
 Somebody stupid (me) hardcoded pathes for external programs and made
 that mistake. I wonder why nobody complained before.
 
 I will add a patch for this release of the port and correct munin.
 
 > Then I symlinked /usr/local/var/munin to /var/db/munin.
 
 Well, I think we should have automatic data migration if we adopt this.
 But that makes upgrading even more complicated because we may run into
 problems like too little space in the /var filesystem.
 
 I will undo that change.
 
 > Now everything seems to work fine.
 
 > Thanks for your work!
 
 You cut out a little more work for me ;-)
 
 Thanks for your test!
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 17 Aug 2008 14:13:20 +0200

 --XF85m9dhOBO43t/C
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Resending. I omitted bug-followup@FreeBSD.org and des@FreeBSD.org.
 
 On Sunday, 2008-08-17 at 13:40:00 +0200, Lupe Christoph wrote:
 > On Sunday, 2008-08-17 at 12:56:00 +0200, Matthias Fechner wrote:
 
 > > One problem I found was in:
 > > /usr/local/share/munin/plugins/netstat
 
 > > There the path for netstat was /bin/netstat, I changed it to  
 > > /usr/bin/netstat.
 
 > Somebody stupid (me) hardcoded pathes for external programs and made
 > that mistake. I wonder why nobody complained before.
 
 > I will add a patch for this release of the port and correct munin.
 
 This is a new patch for munin-node that adds files/patch-netstat.in. It
 also undoes the change from $(PREFIX)/var/munin to /var/db/munin for the
 reasons stated in my previous mail. But this is only relevant for
 munin-main. See my next mail.
 
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |
 
 --XF85m9dhOBO43t/C
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="munin-node-1.2.6.patch"
 
 diff -ruN munin-node-port/Makefile munin-node-1.2.6/Makefile
 --- munin-node-port/Makefile	2008-07-20 15:06:43.000000000 +0200
 +++ munin-node-1.2.6/Makefile	2008-08-09 18:06:26.000000000 +0200
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	munin
 -PORTVERSION=	1.2.5
 -PORTREVISION=	3
 +PORTVERSION=	1.2.6
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -31,8 +30,8 @@
  USE_GMAKE=	yes
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
  PKGMESSAGE=	${WRKDIR}/pkg-message
 -ALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} build build-man
 -INSTALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
 +ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
 +INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
  MAKE_ENV=	LANG=C
  
  MAN5=		munin-node.conf.5
 diff -ruN munin-node-port/distinfo munin-node-1.2.6/distinfo
 --- munin-node-port/distinfo	2006-11-06 23:50:50.000000000 +0100
 +++ munin-node-1.2.6/distinfo	2008-08-09 14:55:21.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
 -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
 -SIZE (munin_1.2.5.tar.gz) = 353005
 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
 +SIZE (munin_1.2.6.tar.gz) = 360694
 diff -ruN munin-node-port/files/patch-Makefile.config munin-node-1.2.6/files/patch-Makefile.config
 --- munin-node-port/files/patch-Makefile.config	2007-10-22 14:32:25.000000000 +0200
 +++ munin-node-1.2.6/files/patch-Makefile.config	2008-08-17 13:57:29.000000000 +0200
 @@ -1,6 +1,6 @@
 ---- Makefile.config.orig	2005-01-10 11:38:32.000000000 +0100
 -+++ Makefile.config	2005-02-03 11:55:51.000000000 +0100
 -@@ -7,52 +7,56 @@
 +--- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
 ++++ Makefile.config	2008-08-09 15:44:06.000000000 +0200
 +@@ -7,46 +7,50 @@
   #
   # the base of the Munin installation.
   # 
 @@ -38,7 +38,7 @@
   # Server only - Output directory
  -HTMLDIR    = $(PREFIX)/var/www
  -CGIDIR     = $(HTMLDIR)/cgi
 -+HTMLDIR    = $(PREFIX)/www/munin
 ++HTMLDIR    = $(WWWDIR)
  +CGIDIR     = $(PREFIX)/www/cgi-bin
   
   # Client only - Where to put RRD files and other intenal data
 @@ -64,14 +64,20 @@
   
   # The python interpreter to use (used by some plugins)
   PYTHON     = /usr/bin/env python
 +@@ -62,10 +66,10 @@
 + GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
 + 
 + # Path of bash for bash specific plugins
 +-BASH       = /bin/bash
 ++BASH       = /usr/local/bin/bash
   
   # Server only - Where to install the perl libraries
 --PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
 +-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
  +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
   
   # Client only - Install plugins for this architecture
   OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 -@@ -72,9 +76,8 @@
 +@@ -90,9 +94,8 @@
   PLUGINUSER = nobody
   
   # Which command to use to check if the USER and GROUP to run Munin as, exists.
 @@ -81,5 +87,5 @@
  +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
  +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
   
 - CHOWN      = chown
 - CHMOD      = chmod
 + # For OSX, comment out the previous two lines and comment in these 
 + #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
 diff -ruN munin-node-port/files/patch-hddtemp_smartctl.in munin-node-1.2.6/files/patch-hddtemp_smartctl.in
 --- munin-node-port/files/patch-hddtemp_smartctl.in	2007-10-22 14:32:25.000000000 +0200
 +++ munin-node-1.2.6/files/patch-hddtemp_smartctl.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,13 +0,0 @@
 ---- node/node.d/hddtemp_smartctl.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d/hddtemp_smartctl.in	2007-10-04 09:29:43.931425624 +0200
 -@@ -109,6 +109,10 @@
 -     @drives = grep /hd[a-z]/, readdir IDE;
 -     closedir(IDE);
 -   }
 -+} elsif ($^O eq 'freebsd') {
 -+  opendir(DEV, '/dev');
 -+  @drives = grep /^ad[0-9]+$/, readdir DEV;
 -+  closedir(DEV);
 - } elsif ($^O eq 'solaris') {
 -   @drives = map { s@.*/@@ ; $_ } glob '/dev/rdsk/c*t*d*s2';
 - }
 diff -ruN munin-node-port/files/patch-if_.in munin-node-1.2.6/files/patch-if_.in
 --- munin-node-port/files/patch-if_.in	2008-02-06 22:34:23.000000000 +0100
 +++ munin-node-1.2.6/files/patch-if_.in	1970-01-01 01:00:00.000000000 +0100
 @@ -1,22 +0,0 @@
 ---- node/node.d.freebsd/if_.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d.freebsd/if_.in	2007-10-26 10:52:46.000000000 +0200
 -@@ -63,7 +63,7 @@
 - 
 - if [ "$1" = "suggest" ]; then
 - 	if [ -x /usr/bin/netstat ]; then
 --		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 -+		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 - 		exit 0
 - 	else
 - 		exit 1
 ---- node/node.d.freebsd/if_errcoll_.in.orig	2006-10-17 14:27:35.000000000 +0200
 -+++ node/node.d.freebsd/if_errcoll_.in	2007-10-26 10:53:08.000000000 +0200
 -@@ -57,7 +57,7 @@
 - 
 - if [ "$1" = "suggest" ]; then
 - 	if [ -x /usr/bin/netstat ]; then
 --		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 -+		netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
 - 		exit 0
 - 	else
 - 		exit 1
 diff -ruN munin-node-port/files/patch-netstat.in munin-node-1.2.6/files/patch-netstat.in
 --- munin-node-port/files/patch-netstat.in	1970-01-01 01:00:00.000000000 +0100
 +++ munin-node-1.2.6/files/patch-netstat.in	2008-08-17 14:01:46.000000000 +0200
 @@ -0,0 +1,18 @@
 +--- node/node.d.freebsd/netstat.in.orig	2006-11-02 15:15:57.000000000 +0100
 ++++ node/node.d.freebsd/netstat.in	2008-08-17 14:01:14.000000000 +0200
 +@@ -45,7 +45,7 @@
 + 
 + 
 + if [ "$1" = "autoconf" ]; then
 +-	if ( /bin/netstat -s 2>/dev/null >/dev/null ); then
 ++	if ( /usr/bin/netstat -s 2>/dev/null >/dev/null ); then
 + 		echo yes
 + 		exit 0
 + 	else
 +@@ -96,5 +96,5 @@
 + 	exit 0
 + fi
 + 
 +-/bin/netstat -s | awk '/connection requests/ { print "active.value " $1 } /connection accepts/ { print "passive.value " $1 } /bad connection/ { print "failed.value " $1 } /reset/ { print "resets.value " $1 } /connections established/ { print "established.value " $1 }'
 ++/usr/bin/netstat -s | awk '/connection requests/ { print "active.value " $1 } /connection accepts/ { print "passive.value " $1 } /bad connection/ { print "failed.value " $1 } /reset/ { print "resets.value " $1 } /connections established/ { print "established.value " $1 }'
 + 
 diff -ruN munin-node-port/pkg-plist munin-node-1.2.6/pkg-plist
 --- munin-node-port/pkg-plist	2008-07-20 15:06:43.000000000 +0200
 +++ munin-node-1.2.6/pkg-plist	2008-08-09 17:55:30.000000000 +0200
 @@ -7,7 +7,9 @@
  etc/munin/munin-node.conf.sample
  @unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi
  etc/munin/plugin-conf.d/plugins.conf.sample
 +bin/munindoc
  etc/rc.d/munin-node.sh
 +%%SITE_PERL%%/Munin/Plugin.pm
  sbin/munin-node
  sbin/munin-node-configure
  sbin/munin-node-configure-snmp
 @@ -62,12 +64,14 @@
  %%DATADIR%%/plugins/named
  %%DATADIR%%/plugins/netstat
  %%DATADIR%%/plugins/ntp_
 +%%DATADIR%%/plugins/ntp_offset
  %%DATADIR%%/plugins/ntp_states
  %%DATADIR%%/plugins/nut_misc
  %%DATADIR%%/plugins/nut_volts
  %%DATADIR%%/plugins/open_files
  %%DATADIR%%/plugins/perdition
  %%DATADIR%%/plugins/ping_
 +%%DATADIR%%/plugins/plugin.sh
  %%DATADIR%%/plugins/plugins.history
  %%DATADIR%%/plugins/pm3users_
  %%DATADIR%%/plugins/pop_stats
 @@ -112,6 +116,8 @@
  @dirrmtry var/munin
  @dirrmtry %%DATADIR%%/plugins
  @dirrmtry %%DATADIR%%
 +@dirrmtry %%SITE_PERL%%/Munin/Plugin
 +@dirrmtry %%SITE_PERL%%/Munin
  @dirrmtry etc/munin/plugin-conf.d
  @dirrmtry etc/munin/plugins
  @dirrmtry etc/munin
 
 --XF85m9dhOBO43t/C--

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Sun, 17 Aug 2008 14:15:21 +0200

 --Pk6IbRAofICFmK5e
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Sunday, 2008-08-17 at 13:40:00 +0200, Lupe Christoph wrote:
 > On Sunday, 2008-08-17 at 12:56:00 +0200, Matthias Fechner wrote:
 
 > > Then I symlinked /usr/local/var/munin to /var/db/munin.
 
 > Well, I think we should have automatic data migration if we adopt this.
 > But that makes upgrading even more complicated because we may run into
 > problems like too little space in the /var filesystem.
 
 > I will undo that change.
 
 This new version of the patch to the munin-main port does just that.
 Anybody wishing to have the volatile data under /var/db, please write a
 robust data migration routine and submit a patch.
 
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |
 
 --Pk6IbRAofICFmK5e
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="munin-main-1.2.6.patch"
 
 diff -ruN munin-main-port/Makefile munin-main-1.2.6/Makefile
 --- munin-main-port/Makefile	2008-07-20 15:06:43.000000000 +0200
 +++ munin-main-1.2.6/Makefile	2008-08-09 18:11:48.000000000 +0200
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	munin
 -PORTVERSION=	1.2.5
 -PORTREVISION=	1
 +PORTVERSION=	1.2.6
  CATEGORIES=	sysutils perl5
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	munin
 @@ -38,8 +37,8 @@
  PATCH_STRIP=	-p1
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
  PKGMESSAGE=	${WRKDIR}/pkg-message
 -ALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} build build-man
 -INSTALL_TARGET=	DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
 +ALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
 +INSTALL_TARGET=	WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
  
  MAN5=		munin.conf.5
  MAN8=		munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8
 @@ -59,7 +58,7 @@
  	done
  	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
  	@${CHOWN} munin /var/log/munin-main
 -	@${CHGRP} munin /var/run/munin /var/log/munin-main ${PREFIX}/www/munin ${PREFIX}/var/munin
 +	@${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.mk>
 diff -ruN munin-main-port/distinfo munin-main-1.2.6/distinfo
 --- munin-main-port/distinfo	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/distinfo	2008-08-09 14:56:00.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
 -SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
 -SIZE (munin_1.2.5.tar.gz) = 353005
 +MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
 +SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
 +SIZE (munin_1.2.6.tar.gz) = 360694
 diff -ruN munin-main-port/files/patch-Makefile.config munin-main-1.2.6/files/patch-Makefile.config
 --- munin-main-port/files/patch-Makefile.config	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/files/patch-Makefile.config	2008-08-17 14:06:26.000000000 +0200
 @@ -1,6 +1,6 @@
 ---- munin-1.2.5.orig/Makefile.config	Tue Oct 17 14:27:35 2006
 -+++ munin-1.2.5/Makefile.config	Thu Nov  2 12:09:09 2006
 -@@ -7,52 +7,56 @@
 +--- Makefile.config.orig	2008-01-20 20:32:46.000000000 +0100
 ++++ Makefile.config	2008-08-09 15:44:18.000000000 +0200
 +@@ -7,46 +7,50 @@
   #
   # the base of the Munin installation.
   # 
 @@ -38,7 +38,7 @@
   # Server only - Output directory
  -HTMLDIR    = $(PREFIX)/var/www
  -CGIDIR     = $(HTMLDIR)/cgi
 -+HTMLDIR    = $(PREFIX)/www/munin
 ++HTMLDIR    = $(WWWDIR)
  +CGIDIR     = $(PREFIX)/www/cgi-bin
   
   # Client only - Where to put RRD files and other intenal data
 @@ -64,14 +64,20 @@
   
   # The python interpreter to use (used by some plugins)
   PYTHON     = /usr/bin/env python
 +@@ -62,10 +66,10 @@
 + GOODSH     = $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
 + 
 + # Path of bash for bash specific plugins
 +-BASH       = /bin/bash
 ++BASH       = /usr/local/bin/bash
   
   # Server only - Where to install the perl libraries
 --PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
 +-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
  +PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
   
   # Client only - Install plugins for this architecture
   OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
 -@@ -77,9 +81,8 @@
 +@@ -90,9 +94,8 @@
   PLUGINUSER = nobody
   
   # Which command to use to check if the USER and GROUP to run Munin as, exists.
 @@ -81,5 +87,5 @@
  +CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
  +CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
   
 - CHOWN      = chown
 - CHMOD      = chmod
 + # For OSX, comment out the previous two lines and comment in these 
 + #CHECKUSER  = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2")) 
 diff -ruN munin-main-port/pkg-plist munin-main-1.2.6/pkg-plist
 --- munin-main-port/pkg-plist	2006-11-06 23:52:45.000000000 +0100
 +++ munin-main-1.2.6/pkg-plist	2008-08-09 18:12:39.000000000 +0200
 @@ -1,12 +1,12 @@
  @exec mkdir -p /var/run/munin && chown munin:munin /var/run/munin
  @exec mkdir -p /var/log/munin-main && chown munin:munin /var/log/munin-main
 -@exec mkdir -p %D/www/munin && chown munin:munin %D/www/munin
 +@exec mkdir -p %D/%%WWWDIR%% && chown munin:munin %D/%%WWWDIR%%
  @exec mkdir -p %D/var/munin && chown munin:munin %D/var/munin
  bin/munin-cron
  @unexec if cmp -s %D/etc/munin/munin.conf.sample %D/etc/munin/munin.conf; then rm -f %D/etc/munin/munin.conf; fi
  etc/munin/munin.conf.sample
  etc/munin/templates/definitions.html
 -@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/munin/logo.png; then rm -f %D/www/munin/logo.png; fi
 +@unexec if cmp -s %D/etc/munin/templates/logo.png %D/%%WWWDIR%%/logo.png; then rm -f %D/%%WWWDIR%%/logo.png; fi
  etc/munin/templates/logo.png
  etc/munin/templates/munin-comparison-day.tmpl
  etc/munin/templates/munin-comparison-month.tmpl
 @@ -16,7 +16,7 @@
  etc/munin/templates/munin-nodeview.tmpl
  etc/munin/templates/munin-overview.tmpl
  etc/munin/templates/munin-serviceview.tmpl
 -@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/munin/style.css; then rm -f %D/www/munin/style.css; fi
 +@unexec if cmp -s %D/etc/munin/templates/style.css %D/%%WWWDIR%%/style.css; then rm -f %D/%%WWWDIR%%/style.css; fi
  etc/munin/templates/style.css
  %%SITE_PERL%%/Munin.pm
  %%DATADIR%%/VeraMono.ttf
 @@ -28,7 +28,7 @@
  @unexec rm -f /var/run/munin/munin-*.lock
  @dirrmtry /var/run/munin
  @dirrmtry /var/log/munin-main
 -@dirrmtry www/munin
 +@dirrmtry %%WWWDIR%%
  @dirrmtry www/cgi-bin
  @dirrmtry var/munin
  @dirrmtry %%DATADIR%%
 @@ -38,7 +38,8 @@
  @unexec echo '********************************************************************'
  @unexec echo "If you want to *completely* remove munin-main, you have to"
  @unexec echo
 -@unexec if [ -d %D/www/munin ]; then echo "    rm -rf %D/www/munin \\"; fi
 +@unexec echo "           rm -rf \\"
 +@unexec if [ -d %D/%%WWWDIR%% ]; then echo "           %D/%%WWWDIR%% \\"; fi
  @unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* | grep -v plugin-state | fmt -40 | sed -e 's/^/           /' -e 's/$/ \\/'; fi
  @unexec if [ -f %D/etc/munin/munin.conf ]; then echo "           %D/etc/munin/munin.conf \\"; fi
  @unexec if [ -d %D/etc/munin/templates ]; then echo "           %D/etc/munin/templates \\"; fi
 
 --Pk6IbRAofICFmK5e--

From: Matthias Fechner <idefix@fechner.net>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: Matthias Fechner <idefix@fechner.net>, bug-followup@FreeBSD.org,
        des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Fri, 22 Aug 2008 15:23:10 +0200

 Hi Christoph,
 
 * Lupe Christoph <lupe@lupe-christoph.de> [17-08-08 14:13]:
 > This is a new patch for munin-node that adds files/patch-netstat.in. It
 > also undoes the change from $(PREFIX)/var/munin to /var/db/munin for the
 > reasons stated in my previous mail. But this is only relevant for
 > munin-main. See my next mail.
 
 there seems to be some missing dependencies:
 net-mgmt/p5-Net-Netmask
 
 And I have a problem with a missing font:
 /usr/local/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
 But that seems to be related to rrdtool and not munin.
 
 Great work!
 
 Bye
 Matthias
 
 -- 
 
 "Programming today is a race between software engineers striving to
 build bigger and better idiot-proof programs, and the universe trying to
 produce bigger and better idiots. So far, the universe is winning." --
 Rich Cook

From: Matthias Fechner <idefix@fechner.net>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: Matthias Fechner <idefix@fechner.net>, bug-followup@FreeBSD.org,
        des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Fri, 22 Aug 2008 15:23:56 +0200

 Hi Christoph,
 
 * Lupe Christoph <lupe@lupe-christoph.de> [17-08-08 14:15]:
 > This new version of the patch to the munin-main port does just that.
 > Anybody wishing to have the volatile data under /var/db, please write a
 > robust data migration routine and submit a patch.
 
 good work, all problems seems to be fixed now with this patch.
 
 Bye
 Matthias
 
 -- 
 
 "Programming today is a race between software engineers striving to
 build bigger and better idiot-proof programs, and the universe trying to
 produce bigger and better idiots. So far, the universe is winning." --
 Rich Cook

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Fri, 22 Aug 2008 21:34:03 +0200

 On Friday, 2008-08-22 at 15:23:10 +0200, Matthias Fechner wrote:
 
 > there seems to be some missing dependencies:
 > net-mgmt/p5-Net-Netmask
 
 I'm not sure where this is a missing dependency. I have installed
 munin-node on my test-VM and it runs without that.
 
 > And I have a problem with a missing font:
 > /usr/local/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
 > But that seems to be related to rrdtool and not munin.
 
 I can't see that Munin tries to use that font. I only found references
 to VeraMono, and Munin includes server/VeraMono.ttf.
 
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: Matthias Fechner <idefix@fechner.net>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: Matthias Fechner <idefix@fechner.net>, bug-followup@FreeBSD.org,
        des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Tue, 2 Sep 2008 17:35:33 +0200

 Hi Christoph,
 
 * Lupe Christoph <lupe@lupe-christoph.de> [22-08-08 21:34]:
 > I'm not sure where this is a missing dependency. I have installed
 > munin-node on my test-VM and it runs without that.
 
 if you use the script dhcpd3 it says:
 # Requires:
 #       Net::Netmask
 #       HTTP::Date
 
 so it requires the following ports for this script:
 net-mgmt/p5-Net-Netmask
 www/p5-libwww
 
 Maybe other ports are required, but that I cannot really check because
 all other scripts are running fine. ;)
 
 > I can't see that Munin tries to use that font. I only found references
 > to VeraMono, and Munin includes server/VeraMono.ttf.
 
 it seems to be a problem to the current version of rrd_tool.
 I got warnings in my log files but graphs are looking fine.
 
 Bye
 Matthias
 
 -- 
 
 "Programming today is a race between software engineers striving to
 build bigger and better idiot-proof programs, and the universe trying to
 produce bigger and better idiots. So far, the universe is winning." --
 Rich Cook

From: Lupe Christoph <lupe@lupe-christoph.de>
To: Matthias Fechner <idefix@fechner.net>
Cc: bug-followup@FreeBSD.org, des@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node
	1.2.6 available
Date: Wed, 3 Sep 2008 11:16:15 +0200

 On Tuesday, 2008-09-02 at 17:35:33 +0200, Matthias Fechner wrote:
 > * Lupe Christoph <lupe@lupe-christoph.de> [22-08-08 21:34]:
 > > I'm not sure where this is a missing dependency. I have installed
 > > munin-node on my test-VM and it runs without that.
 
 > if you use the script dhcpd3 it says:
 > # Requires:
 > #       Net::Netmask
 > #       HTTP::Date
 
 > so it requires the following ports for this script:
 > net-mgmt/p5-Net-Netmask
 > www/p5-libwww
 
 > Maybe other ports are required, but that I cannot really check because
 > all other scripts are running fine. ;)
 
 You have to distinguish between the ports the Perl programs munin-<foo>
 require and those of the plugins. The Munin packagers made a decision
 not to add dependencies on Perl modules and external programs required
 by plugins.
 
 This prevents us from, e.g. installing smartmontools on a virtual
 machine that has no disks supporting S.M.A.R.T. We want to avoid pulling
 in all kinds of stuff the user does not need.
 
 The alternative would be to package all plugins individually, each with
 its dependencies. This would swamp the ports system (and the package
 repositories of all platforms supporting Munin) with tiny packages.
 
 So there is no missing dependency. BTW, the Debian package format allows
 one to specify "Depends", "Recommends", and "Suggests". The Ubuntu
 munin-node package has these lines:
 
 Depends: adduser, libnet-server-perl, lsb-base (>= 3.0-10), perl, procps
 Recommends: libnet-snmp-perl
 Suggests: acpi | lm-sensors, ethtool, libnet-irc-perl, libwww-perl,
   munin, mysql-client, python (>= 2.2), smartmontools
 
 But since FreeBSD has no equivalent of "Recommends" and "Suggests", the
 port can only specify what the minimum requirements are to get munin-run
 running.
 
 > > I can't see that Munin tries to use that font. I only found references
 > > to VeraMono, and Munin includes server/VeraMono.ttf.
 
 > it seems to be a problem to the current version of rrd_tool.
 > I got warnings in my log files but graphs are looking fine.
 
 It looks like there are no problems with the two ports left. DES, can
 you please commit the patches?
 
 Matthias, thank you for your effort in getting this straightened out!
 
 Lupe Christoph
 -- 
 | Insanity is catching.                                                  |
 | Terry Pratchett, "Making Money"                                        |

From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no>
To: Lupe Christoph <lupe@lupe-christoph.de>
Cc: Matthias Fechner <idefix@fechner.net>,  bug-followup@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node 1.2.6 available
Date: Wed, 03 Sep 2008 13:07:46 +0200

 Lupe Christoph <lupe@lupe-christoph.de> writes:
 > It looks like there are no problems with the two ports left. DES, can
 > you please commit the patches?
 
 You guys done arguing now?  :)
 
 DES
 --=20
 Dag-Erling Sm=C3=B8rgrav - des@des.no

From: Matthias Fechner <idefix@fechner.net>
To: =?UTF-8?B?RGFnLUVybGluZyBTbcO4cmdyYXY=?= <des@des.no>
Cc: Lupe Christoph <lupe@lupe-christoph.de>, bug-followup@FreeBSD.org
Subject: Re: ports/126371: sysutils/munin-main and sysutils/munin-node 1.2.6
 available
Date: Wed, 03 Sep 2008 13:58:51 +0200

 Hi Des,
 
 Dag-Erling Smørgrav wrote:
 > You guys done arguing now?  :)
 
 hehe no, it fine for me.
 
 Bye,
 Matthias
 
 -- 
 "Programming today is a race between software engineers striving to 
 build bigger and better idiot-proof programs, and the universe trying to 
 produce bigger and better idiots. So far, the universe is winning." -- 
 Rich Cook
State-Changed-From-To: open->closed 
State-Changed-By: des 
State-Changed-When: Wed Sep 3 13:28:47 UTC 2008 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126371 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126371: commit references a PR
Date: Wed,  3 Sep 2008 13:28:03 +0000 (UTC)

 des         2008-09-03 13:27:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/munin-main  Makefile distinfo pkg-plist 
     sysutils/munin-main/files patch-Makefile.config 
     sysutils/munin-node  Makefile distinfo pkg-plist 
     sysutils/munin-node/files patch-Makefile.config 
                               patch-hddtemp_smartctl.in 
                               patch-if_.in 
   Added files:
     sysutils/munin-node/files patch-netstat.in 
   Log:
   Update to 1.2.6.
   
   PR:             ports/126371
   Submitted by:   Matthias Fechner <idefix@fechner.net>, Lupe Christoph <lupe@lupe-christoph.de>
   
   Revision  Changes    Path
   1.17      +6 -7      ports/sysutils/munin-main/Makefile
   1.12      +3 -3      ports/sysutils/munin-main/distinfo
   1.5       +14 -8     ports/sysutils/munin-main/files/patch-Makefile.config
   1.8       +6 -5      ports/sysutils/munin-main/pkg-plist
   1.25      +3 -4      ports/sysutils/munin-node/Makefile
   1.12      +3 -3      ports/sysutils/munin-node/distinfo
   1.6       +14 -8     ports/sysutils/munin-node/files/patch-Makefile.config
   1.2       +0 -13     ports/sysutils/munin-node/files/patch-hddtemp_smartctl.in
   1.2       +0 -22     ports/sysutils/munin-node/files/patch-if_.in
   1.1       +18 -0     ports/sysutils/munin-node/files/patch-netstat.in (new)
   1.13      +6 -0      ports/sysutils/munin-node/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
