7 files changed, 42 insertions, 33 deletions

diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 3bf4275f78dd..ac070ae84399 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -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
@@ -37,7 +36,7 @@ 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} install-main
+INSTALL_TARGET=	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
@@ -57,7 +56,7 @@ post-install:
 	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 --git a/sysutils/munin-master/distinfo b/sysutils/munin-master/distinfo
index 5f2333009a43..f587b9252397 100644
--- a/sysutils/munin-master/distinfo
+++ b/sysutils/munin-master/distinfo
@@ -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 --git a/sysutils/munin-master/files/patch-Makefile.config b/sysutils/munin-master/files/patch-Makefile.config
index c7097d2ab7e4..dd3aa61849df 100644
--- a/sysutils/munin-master/files/patch-Makefile.config
+++ b/sysutils/munin-master/files/patch-Makefile.config
@@ -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
@@ -67,11 +67,11 @@
  
  # Server only - Where to install the perl libraries
 -PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
-+PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
++PERLLIB    = $(PREFIX)/$(SITE_PERL_REL)
  
  # 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 --git a/sysutils/munin-master/files/pkg-message.in b/sysutils/munin-master/files/pkg-message.in
index 2d56e5464b2f..df049437efa1 100644
--- a/sysutils/munin-master/files/pkg-message.in
+++ b/sysutils/munin-master/files/pkg-message.in
@@ -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 @@ Please edit it according to your needs.
 
 The Munin server will be run from cron under the user 'munin'.
 ********************************************************************
-
diff --git a/sysutils/munin-master/pkg-deinstall b/sysutils/munin-master/pkg-deinstall
index 200d96a2a617..c658a8021c00 100644
--- a/sysutils/munin-master/pkg-deinstall
+++ b/sysutils/munin-master/pkg-deinstall
@@ -5,7 +5,7 @@ ask() {
 
     question=$1
     default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
+    if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
 	read -p "${question} [${default}]? " answer
     fi
     if [ x${answer} = x ]; then
@@ -107,8 +107,10 @@ Do you want me to delete it?" y; then
 
 case $2 in
     DEINSTALL)
-	delete_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN'
-	newsyslog
+	if [ -z "${PACKAGE_BUILDING}" ]; then
+		delete_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN'
+		newsyslog
+	fi
 	;;
     POST-DEINSTALL)
 	delete_account munin munin
diff --git a/sysutils/munin-master/pkg-install b/sysutils/munin-master/pkg-install
index 3ce03edb2f51..e068113d3c43 100644
--- a/sysutils/munin-master/pkg-install
+++ b/sysutils/munin-master/pkg-install
@@ -5,7 +5,7 @@ ask() {
 
     question=$1
     default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
+    if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
         read -p "${question} [${default}]? " answer
     fi
     if [ x${answer} = x ]; then
@@ -97,21 +97,31 @@ EOT
     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
-	create_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' <<EOT
+	if [ -z "${PACKAGE_BUILDING}" ]; then
+		newsyslog
+		create_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' <<EOT
 #BEGIN_MUNIN_MAIN
 MAILTO=root
 
 */5 * * * *     ${PKG_PREFIX}/bin/munin-cron
 #END_MUNIN_MAIN
 EOT
+	fi
 	;;      
 esac
diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist
index 91507cadc4bc..54fe34525604 100644
--- a/sysutils/munin-master/pkg-plist
+++ b/sysutils/munin-master/pkg-plist
@@ -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/data/munin && chown munin:munin %D/www/data/munin
+@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
-@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
+@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-domainview.tmpl
 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/data/munin/style.css; then rm -f %D/www/data/munin/style.css; fi
+@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
-@unexec rmdir /var/run/munin 2>/dev/null || true
-@unexec rmdir /var/log/munin-main 2>/dev/null || true
-@dirrmtry www/data/munin
-@dirrmtry www/data
+@dirrmtry /var/run/munin
+@dirrmtry /var/log/munin-main
+@dirrmtry www/munin
 @dirrmtry www/cgi-bin
 @dirrmtry var/munin
-@dirrmtry share/munin
+@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
-@unexec if [ -d %D/www/data/munin ]; then echo "    rm -rf %D/www/data/munin \\"; fi
+@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