Attachment #89433 for bug #126371




#

PORTNAME=	munin
PORTVERSION=	1.2.6
PORTREVISION=	1
CATEGORIES=	sysutils perl5
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	munin

PATCH_STRIP=	-p1
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
PKGMESSAGE=	${WRKDIR}/pkg-message
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

	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 ${WWWDIR} ${PREFIX}/var/munin
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)munin-main-1.2.6/distinfo (-3 / +3 lines)
1	MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd	1	MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
2	SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e	2	SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
3	SIZE (munin_1.2.5.tar.gz) = 353005	3	SIZE (munin_1.2.6.tar.gz) = 360694

Lines 1-6 Link Here

(-)munin-main-1.2.6/files/patch-Makefile.config (-8 / +14 lines)
1	--- munin-1.2.5.orig/Makefile.config Tue Oct 17 14:27:35 2006	1	--- Makefile.config.orig 2008-01-20 20:32:46.000000000 +0100
2	+++ munin-1.2.5/Makefile.config Thu Nov 2 12:09:09 2006	2	+++ Makefile.config 2008-08-09 15:44:18.000000000 +0200
3	@@ -7,52 +7,56 @@	3	@@ -7,46 +7,50 @@
4	#	4	#
5	# the base of the Munin installation.	5	# the base of the Munin installation.
6	#	6	#
Lines 38-44 Link Here
38	# Server only - Output directory	38	# Server only - Output directory
39	-HTMLDIR = $(PREFIX)/var/www	39	-HTMLDIR = $(PREFIX)/var/www
40	-CGIDIR = $(HTMLDIR)/cgi	40	-CGIDIR = $(HTMLDIR)/cgi
41	+HTMLDIR = $(PREFIX)/www/munin	41	+HTMLDIR = $(WWWDIR)
42	+CGIDIR = $(PREFIX)/www/cgi-bin	42	+CGIDIR = $(PREFIX)/www/cgi-bin
43		43
44	# Client only - Where to put RRD files and other intenal data	44	# Client only - Where to put RRD files and other intenal data
Lines 64-77 Link Here
64		64
65	# The python interpreter to use (used by some plugins)	65	# The python interpreter to use (used by some plugins)
66	PYTHON = /usr/bin/env python	66	PYTHON = /usr/bin/env python
		67	@@ -62,10 +66,10 @@
		68	GOODSH = $(shell PATH=`getconf PATH` sh -c 'type sh \| sed "s/.* //"')
		69
		70	# Path of bash for bash specific plugins
		71	-BASH = /bin/bash
		72	+BASH = /usr/local/bin/bash
67		73
68	# Server only - Where to install the perl libraries	74	# Server only - Where to install the perl libraries
69	-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib \| cut -d= -f2 \| sed "s/[\';]//g")	75	-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib \| cut -d"'" -f2)
70	+PERLLIB = $(PREFIX)/$(SITE_PERL_REL)	76	+PERLLIB = $(PREFIX)/$(SITE_PERL_REL)
71		77
72	# Client only - Install plugins for this architecture	78	# Client only - Install plugins for this architecture
73	OSTYPE = $(shell uname \| tr '[A-Z]' '[a-z]')	79	OSTYPE = $(shell uname \| tr '[A-Z]' '[a-z]')
74	@@ -77,9 +81,8 @@	80	@@ -90,9 +94,8 @@
75	PLUGINUSER = nobody	81	PLUGINUSER = nobody
76		82
77	# Which command to use to check if the USER and GROUP to run Munin as, exists.	83	# Which command to use to check if the USER and GROUP to run Munin as, exists.
Lines 81-85 Link Here
81	+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"))	87	+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"))
82	+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"))	88	+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"))
83		89
84	CHOWN = chown	90	# For OSX, comment out the previous two lines and comment in these
85	CHMOD = chmod	91	#CHECKUSER = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))




@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/%%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/%%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

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/%%WWWDIR%%/style.css; then rm -f %D/%%WWWDIR%%/style.css; fi
etc/munin/templates/style.css
%%SITE_PERL%%/Munin.pm
%%DATADIR%%/VeraMono.ttf

@unexec rm -f /var/run/munin/munin-*.lock
@dirrmtry /var/run/munin
@dirrmtry /var/log/munin-main
@dirrmtry %%WWWDIR%%
@dirrmtry www/cgi-bin
@dirrmtry var/munin
@dirrmtry %%DATADIR%%

@unexec echo '********************************************************************'
@unexec echo "If you want to *completely* remove munin-main, you have to"
@unexec echo
@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

Return to bug 126371

Lines 6-13 Link Here

(-)munin-main-1.2.6/Makefile (-5 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= munin	8	PORTNAME= munin
9	PORTVERSION= 1.2.5	9	PORTVERSION= 1.2.6
10	PORTREVISION= 1
11	CATEGORIES= sysutils perl5	10	CATEGORIES= sysutils perl5
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= munin	12	MASTER_SITE_SUBDIR= munin
Lines 38-45 Link Here
38	PATCH_STRIP= -p1	37	PATCH_STRIP= -p1
39	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}	38	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
40	PKGMESSAGE= ${WRKDIR}/pkg-message	39	PKGMESSAGE= ${WRKDIR}/pkg-message
41	ALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} build build-man	40	ALL_TARGET= WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} build build-man
42	INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main	41	INSTALL_TARGET= WWWDIR=${WWWDIR} DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-main
43		42
44	MAN5= munin.conf.5	43	MAN5= munin.conf.5
45	MAN8= munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8	44	MAN8= munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8
Lines 59-65 Link Here
59	done	58	done
60	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL	59	@DATADIR=${DATADIR} PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} POST-INSTALL
61	@${CHOWN} munin /var/log/munin-main	60	@${CHOWN} munin /var/log/munin-main
62	@${CHGRP} munin /var/run/munin /var/log/munin-main ${PREFIX}/www/munin ${PREFIX}/var/munin	61	@${CHGRP} munin /var/run/munin /var/log/munin-main ${WWWDIR} ${PREFIX}/var/munin
63	@${CAT} ${PKGMESSAGE}	62	@${CAT} ${PKGMESSAGE}
64		63
65	.include <bsd.port.post.mk>	64	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)munin-main-1.2.6/pkg-plist (-5 / +6 lines)
1	@exec mkdir -p /var/run/munin && chown munin:munin /var/run/munin	1	@exec mkdir -p /var/run/munin && chown munin:munin /var/run/munin
2	@exec mkdir -p /var/log/munin-main && chown munin:munin /var/log/munin-main	2	@exec mkdir -p /var/log/munin-main && chown munin:munin /var/log/munin-main
3	@exec mkdir -p %D/www/munin && chown munin:munin %D/www/munin	3	@exec mkdir -p %D/%%WWWDIR%% && chown munin:munin %D/%%WWWDIR%%
4	@exec mkdir -p %D/var/munin && chown munin:munin %D/var/munin	4	@exec mkdir -p %D/var/munin && chown munin:munin %D/var/munin
5	bin/munin-cron	5	bin/munin-cron
6	@unexec if cmp -s %D/etc/munin/munin.conf.sample %D/etc/munin/munin.conf; then rm -f %D/etc/munin/munin.conf; fi	6	@unexec if cmp -s %D/etc/munin/munin.conf.sample %D/etc/munin/munin.conf; then rm -f %D/etc/munin/munin.conf; fi
7	etc/munin/munin.conf.sample	7	etc/munin/munin.conf.sample
8	etc/munin/templates/definitions.html	8	etc/munin/templates/definitions.html
9	@unexec if cmp -s %D/etc/munin/templates/logo.png %D/www/munin/logo.png; then rm -f %D/www/munin/logo.png; fi	9	@unexec if cmp -s %D/etc/munin/templates/logo.png %D/%%WWWDIR%%/logo.png; then rm -f %D/%%WWWDIR%%/logo.png; fi
10	etc/munin/templates/logo.png	10	etc/munin/templates/logo.png
11	etc/munin/templates/munin-comparison-day.tmpl	11	etc/munin/templates/munin-comparison-day.tmpl
12	etc/munin/templates/munin-comparison-month.tmpl	12	etc/munin/templates/munin-comparison-month.tmpl
Lines 16-22 Link Here
16	etc/munin/templates/munin-nodeview.tmpl	16	etc/munin/templates/munin-nodeview.tmpl
17	etc/munin/templates/munin-overview.tmpl	17	etc/munin/templates/munin-overview.tmpl
18	etc/munin/templates/munin-serviceview.tmpl	18	etc/munin/templates/munin-serviceview.tmpl
19	@unexec if cmp -s %D/etc/munin/templates/style.css %D/www/munin/style.css; then rm -f %D/www/munin/style.css; fi	19	@unexec if cmp -s %D/etc/munin/templates/style.css %D/%%WWWDIR%%/style.css; then rm -f %D/%%WWWDIR%%/style.css; fi
20	etc/munin/templates/style.css	20	etc/munin/templates/style.css
21	%%SITE_PERL%%/Munin.pm	21	%%SITE_PERL%%/Munin.pm
22	%%DATADIR%%/VeraMono.ttf	22	%%DATADIR%%/VeraMono.ttf
Lines 28-34 Link Here
28	@unexec rm -f /var/run/munin/munin-*.lock	28	@unexec rm -f /var/run/munin/munin-*.lock
29	@dirrmtry /var/run/munin	29	@dirrmtry /var/run/munin
30	@dirrmtry /var/log/munin-main	30	@dirrmtry /var/log/munin-main
31	@dirrmtry www/munin	31	@dirrmtry %%WWWDIR%%
32	@dirrmtry www/cgi-bin	32	@dirrmtry www/cgi-bin
33	@dirrmtry var/munin	33	@dirrmtry var/munin
34	@dirrmtry %%DATADIR%%	34	@dirrmtry %%DATADIR%%
Lines 38-44 Link Here
38	@unexec echo '********************************************************************'	38	@unexec echo '********************************************************************'
39	@unexec echo "If you want to completely remove munin-main, you have to"	39	@unexec echo "If you want to completely remove munin-main, you have to"
40	@unexec echo	40	@unexec echo
41	@unexec if [ -d %D/www/munin ]; then echo " rm -rf %D/www/munin \\"; fi	41	@unexec echo " rm -rf \\"
		42	@unexec if [ -d %D/%%WWWDIR%% ]; then echo " %D/%%WWWDIR%% \\"; fi
42	@unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* \| grep -v plugin-state \| fmt -40 \| sed -e 's/^/ /' -e 's/$/ \\/'; fi	43	@unexec if [ -d %D/var/munin ]; then ls -d %D/var/munin/* \| grep -v plugin-state \| fmt -40 \| sed -e 's/^/ /' -e 's/$/ \\/'; fi
43	@unexec if [ -f %D/etc/munin/munin.conf ]; then echo " %D/etc/munin/munin.conf \\"; fi	44	@unexec if [ -f %D/etc/munin/munin.conf ]; then echo " %D/etc/munin/munin.conf \\"; fi
44	@unexec if [ -d %D/etc/munin/templates ]; then echo " %D/etc/munin/templates \\"; fi	45	@unexec if [ -d %D/etc/munin/templates ]; then echo " %D/etc/munin/templates \\"; fi