Update to 1.2.6.

PR:		ports/126371
Submitted by:	Matthias Fechner <idefix@fechner.net>, Lupe Christoph <lupe@lupe-christoph.de>

4 files changed, 29 insertions, 23 deletions

diff --git a/sysutils/munin-main/Makefile b/sysutils/munin-main/Makefile
index bd4a8a396600..2c9cb0b48ed2 100644
--- a/sysutils/munin-main/Makefile
+++ b/sysutils/munin-main/Makefile
@@ -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 @@ USE_GMAKE=	yes
 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
@@ -47,7 +46,7 @@ MAN8=		munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8
 SUB_FILES=pkg-message
 
 pre-install:
-	@PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/build/server/munin.conf ${PREFIX}/etc/munin/munin.conf.sample
@@ -57,9 +56,9 @@ post-install:
 	@for man in ${MAN8}; do \
 		${INSTALL_MAN} -C ${WRKSRC}/build/doc/$$man ${PREFIX}/man/man8; \
 	done
-	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
+	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/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 --git a/sysutils/munin-main/distinfo b/sysutils/munin-main/distinfo
index f587b9252397..3222d2677ecc 100644
--- a/sysutils/munin-main/distinfo
+++ b/sysutils/munin-main/distinfo
@@ -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 --git a/sysutils/munin-main/files/patch-Makefile.config b/sysutils/munin-main/files/patch-Makefile.config
index dd3aa61849df..a231598e53d3 100644
--- a/sysutils/munin-main/files/patch-Makefile.config
+++ b/sysutils/munin-main/files/patch-Makefile.config
@@ -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 --git a/sysutils/munin-main/pkg-plist b/sysutils/munin-main/pkg-plist
index 54fe34525604..87eed812ca29 100644
--- a/sysutils/munin-main/pkg-plist
+++ b/sysutils/munin-main/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/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-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/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 @@ www/cgi-bin/munin-cgi-graph
 @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 @@ www/cgi-bin/munin-cgi-graph
 @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