ports/105106: [maintainer update] sysutils/munin-main 1.2.4 -> 1.2.5

Lupe Christoph lupe at lupe-christoph.de
Fri Nov 3 12:11:41 UTC 2006 

>Number:         105106
>Category:       ports
>Synopsis:       [maintainer update] sysutils/munin-main 1.2.4 -> 1.2.5
>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:   Fri Nov 03 12:10:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Lupe Christoph
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD vmw-freebsd6.lupe-christoph.de 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:32:43 UTC 2006 root at opus.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Update to support Munin 1.2.5
	Files changed:
		Makefile
		distinfo
		files/patch-Makefile.config
		files/pkg-message.in
		pkg-install
		pkg-plist

	This moves the directory for HTML and PNG files from
	$PREFIX/www/data/munin to $PREFIX/www/munin.

	Some miscellaneous cleanup.
>How-To-Repeat:
	
>Fix:
--- munin-main-1.2.5.patch begins here ---
diff -ruN munin-main-port/Makefile munin-main-1.2.5/Makefile
--- munin-main-port/Makefile	Sun Oct 22 18:49:42 2006
+++ munin-main-1.2.5/Makefile	Thu Nov  2 12:53:43 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	munin
-PORTVERSION=	1.2.4
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	munin
@@ -57,7 +56,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/data/munin ${PREFIX}/var/munin
+	@${CHGRP} munin /var/run/munin /var/log/munin-main ${PREFIX}/www/munin ${PREFIX}/var/munin
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -ruN munin-main-port/distinfo munin-main-1.2.5/distinfo
--- munin-main-port/distinfo	Tue Jan 24 02:06:19 2006
+++ munin-main-1.2.5/distinfo	Wed Nov  1 11:39:47 2006
@@ -1,3 +1,3 @@
-MD5 (munin_1.2.4.tar.gz) = f91f5d96c01d8527db1d2f4b3f0f4cc5
-SHA256 (munin_1.2.4.tar.gz) = 23a6404ad84776446b7af0c4d27c57f8a06ab74602f4304e0745c35621ae7f7c
-SIZE (munin_1.2.4.tar.gz) = 345821
+MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
+SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
+SIZE (munin_1.2.5.tar.gz) = 353005
diff -ruN munin-main-port/files/patch-Makefile.config munin-main-1.2.5/files/patch-Makefile.config
--- munin-main-port/files/patch-Makefile.config	Sun Oct 22 18:49:42 2006
+++ munin-main-1.2.5/files/patch-Makefile.config	Thu Nov  2 12:11:18 2006
@@ -1,5 +1,5 @@
---- munin-1.2.0rc2.orig/Makefile.config	Mon Jan 10 11:38:32 2005
-+++ munin-1.2.0rc2/Makefile.config	Thu Feb  3 11:11:46 2005
+--- 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 @@
  #
  # the base of the Munin installation.
@@ -38,7 +38,7 @@
  # Server only - Output directory
 -HTMLDIR    = $(PREFIX)/var/www
 -CGIDIR     = $(HTMLDIR)/cgi
-+HTMLDIR    = $(PREFIX)/www/data/munin
++HTMLDIR    = $(PREFIX)/www/munin
 +CGIDIR     = $(PREFIX)/www/cgi-bin
  
  # Client only - Where to put RRD files and other intenal data
@@ -71,7 +71,7 @@
  
  # Client only - Install plugins for this architecture
  OSTYPE     = $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -72,9 +76,8 @@
+@@ -77,9 +81,8 @@
  PLUGINUSER = nobody
  
  # Which command to use to check if the USER and GROUP to run Munin as, exists.
diff -ruN munin-main-port/files/pkg-message.in munin-main-1.2.5/files/pkg-message.in
--- munin-main-port/files/pkg-message.in	Fri Mar  4 18:45:10 2005
+++ munin-main-1.2.5/files/pkg-message.in	Thu Nov  2 12:49:21 2006
@@ -1,4 +1,3 @@
-
 ********************************************************************
 Unless this file already existed, a sample configuration file
 has been placed in %%PREFIX%%/etc/munin/munin.conf.
@@ -7,4 +6,3 @@
 
 The Munin server will be run from cron under the user 'munin'.
 ********************************************************************
-
diff -ruN munin-main-port/pkg-install munin-main-1.2.5/pkg-install
--- munin-main-port/pkg-install	Sun Oct 22 18:49:42 2006
+++ munin-main-1.2.5/pkg-install	Thu Nov  2 18:50:46 2006
@@ -97,12 +97,20 @@
     fi  
 }
 
+move_www_dir() {
+    if [ -d ${PKG_PREFIX}/www/data/munin -a ! -d ${PKG_PREFIX}/www/munin ]; then
+	echo Migrating ${PKG_PREFIX}/www/data/munin to ${PKG_PREFIX}/www/munin
+	mv ${PKG_PREFIX}/www/data/munin ${PKG_PREFIX}/www/munin
+    fi
+}
+
 
 ########################################################################
 
 case $2 in
     PRE-INSTALL)
 	make_account munin munin "Munin owner"
+	move_www_dir # at some point in the installation, the www dir is created
 	;;      
     POST-INSTALL)
 	newsyslog
diff -ruN munin-main-port/pkg-plist munin-main-1.2.5/pkg-plist
--- munin-main-port/pkg-plist	Sun Jan 22 03:52:13 2006
+++ munin-main-1.2.5/pkg-plist	Thu Nov  2 12:48:14 2006
@@ -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
- at exec mkdir -p %D/www/data/munin && chown munin:munin %D/www/data/munin
+ at exec mkdir -p %D/www/munin && chown munin:munin %D/www/munin
 @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
- at unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/data/munin/logo.png; then rm -f %D/www/data/munin/logo.png; fi
+ at unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/munin/logo.png; then rm -f %D/www/munin/logo.png; fi
 etc/munin/templates/logo.png
 etc/munin/templates/munin-comparison-day.tmpl
 etc/munin/templates/munin-comparison-month.tmpl
@@ -16,29 +16,29 @@
 etc/munin/templates/munin-nodeview.tmpl
 etc/munin/templates/munin-overview.tmpl
 etc/munin/templates/munin-serviceview.tmpl
- at unexec if cmp -s %D/etc/munin/templates/style.css %D/www/data/munin/style.css; then rm -f %D/www/data/munin/style.css; fi
+ at unexec if cmp -s %D/etc/munin/templates/style.css %D/www/munin/style.css; then rm -f %D/www/munin/style.css; fi
 etc/munin/templates/style.css
 %%SITE_PERL%%/Munin.pm
-share/munin/munin-graph
-share/munin/munin-html
-share/munin/munin-limits
-share/munin/munin-update
+%%DATADIR%%/VeraMono.ttf
+%%DATADIR%%/munin-graph
+%%DATADIR%%/munin-html
+%%DATADIR%%/munin-limits
+%%DATADIR%%/munin-update
 www/cgi-bin/munin-cgi-graph
 @unexec rm -f /var/run/munin/munin-*.lock
- at unexec rmdir /var/run/munin 2>/dev/null || true
- at unexec rmdir /var/log/munin-main 2>/dev/null || true
- at dirrmtry www/data/munin
- at dirrmtry www/data
+ at dirrmtry /var/run/munin
+ at dirrmtry /var/log/munin-main
+ at dirrmtry www/munin
 @dirrmtry www/cgi-bin
 @dirrmtry var/munin
- at dirrmtry share/munin
+ at dirrmtry %%DATADIR%%
 @dirrmtry etc/munin/templates
 @dirrmtry etc/munin
 @unexec echo
 @unexec echo '********************************************************************'
 @unexec echo "If you want to *completely* remove munin-main, you have to"
 @unexec echo
- at unexec if [ -d %D/www/data/munin ]; then echo "    rm -rf %D/www/data/munin \\"; fi
+ at unexec if [ -d %D/www/munin ]; then echo "    rm -rf %D/www/munin \\"; 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
--- munin-main-1.2.5.patch ends here ---


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

More information about the freebsd-ports-bugs mailing list