Attachment #145380 for bug #192395




USES=		gmake perl5
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}

NO_STAGE=	yes
.include "${.CURDIR}/../munin-common/munin.mk"

ALL_TARGET=	build-common-prime
INSTALL_TARGET=	install-common

MAN3=		Munin::Common::Config.3 \
		Munin::Common::Defaults.3 \
		Munin::Common::TLS.3 \
		Munin::Common::TLSClient.3 \
		Munin::Common::TLSServer.3 \
		Munin::Common::Timeout.3

post-install:
	@${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR}\
		${STAGEDIR}${SPOOLDIR} ${STAGEDIR}${DBDIR}
	@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \
		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
	done)

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (munin-2.0.17.tar.gz) = cfcc5bf3f8e568574ce897af7c17cc160def280e1ac63cd0796ca300ffef439e	1	SHA256 (munin-2.0.21.tar.gz) = 76ad6602706f3449e727adbfc35014e9b4193b3691a5ca032d5a8d78e9ed259b
2	SIZE (munin-2.0.17.tar.gz) = 1334184	2	SIZE (munin-2.0.21.tar.gz) = 1336783




--- Makefile.orig	2014-04-23 04:29:32.000000000 +0900
+++ Makefile	2014-05-15 16:04:04.000000000 +0900
@@ -68,60 +68,60 @@
 
 install-pre: Makefile Makefile.config
 	@$(CHECKUSER)
-	mkdir -p $(LOGDIR)
-	mkdir -p $(STATEDIR)
-	mkdir -p $(SPOOLDIR)
-	mkdir -p $(CONFDIR)
-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
+#	mkdir -p $(LOGDIR)
+	mkdir -p $(STAGEDIR)$(STATEDIR)
+#	mkdir -p $(SPOOLDIR)
+	mkdir -p $(STAGEDIR)$(CONFDIR)
-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
+#	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
 
 install-master-prime: $(INFILES_MASTER) install-pre install-master
-	mkdir -p $(CONFDIR)/templates
-	mkdir -p $(CONFDIR)/static
-	mkdir -p $(CONFDIR)/templates/partial
-	mkdir -p $(CONFDIR)/munin-conf.d
-	mkdir -p $(LIBDIR)
-	mkdir -p $(BINDIR)
-	mkdir -p $(PERLLIB)
-	mkdir -p $(PERLLIB)/Munin/Master
-	mkdir -p $(HTMLDIR)
-	mkdir -p $(DBDIR)
-	mkdir -p $(DBDIR)/cgi-tmp
-	mkdir -p $(CGIDIR)
+	mkdir -p $(STAGEDIR)$(CONFDIR)/templates
+	mkdir -p $(STAGEDIR)$(CONFDIR)/static
+	mkdir -p $(STAGEDIR)$(CONFDIR)/templates/partial
+	mkdir -p $(STAGEDIR)$(CONFDIR)/munin-conf.d
+	mkdir -p $(STAGEDIR)$(LIBDIR)
+	mkdir -p $(STAGEDIR)$(BINDIR)
+	mkdir -p $(STAGEDIR)$(PERLLIB)
+	mkdir -p $(STAGEDIR)$(PERLLIB)/Munin/Master
+	mkdir -p $(STAGEDIR)$(HTMLDIR)
+	mkdir -p $(STAGEDIR)$(DBDIR)
+	mkdir -p $(STAGEDIR)$(DBDIR)/cgi-tmp
+	mkdir -p $(STAGEDIR)$(CGIDIR)
 
-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
-	$(CHMOD) 0755 $(DBDIR)
+	$(CHOWN) $(USER) $(STAGEDIR)$(HTMLDIR) $(STAGEDIR)$(DBDIR)
+	$(CHMOD) 0775 $(STAGEDIR)$(DBDIR)
 
-	$(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
-	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
+	$(CHOWN) $(CGIUSER) $(STAGEDIR)$(DBDIR)/cgi-tmp
+	$(CHMOD) 0755 $(STAGEDIR)$(DBDIR)/cgi-tmp
 
 	for p in master/www/*.tmpl ;  do \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+		$(INSTALL) -m 0644 "$$p" $(STAGEDIR)$(CONFDIR)/templates/ ; \
 	done
 
 	for p in master/static/* ; do \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
+		$(INSTALL) -m 0644 "$$p" $(STAGEDIR)$(CONFDIR)/static/ ; \
 	done
 
 	for p in master/www/partial/*.tmpl; do \
-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
+		$(INSTALL) -m 0644 "$$p" $(STAGEDIR)$(CONFDIR)/templates/partial/ ; \
 	done
 
-	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
-	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
+	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0644 master/DejaVuSans.ttf $(STAGEDIR)$(LIBDIR)/
 
-	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
-	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
+	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(STAGEDIR)$(HTMLDIR)/.htaccess
+	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(STAGEDIR)$(CONFDIR)/
 
-	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/
-	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph
-	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html
+	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(STAGEDIR)$(BINDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-check $(STAGEDIR)$(BINDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-update $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-html $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(STAGEDIR)$(CGIDIR)/munin-cgi-graph
+	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(STAGEDIR)$(CGIDIR)/munin-cgi-html
 
 # Not ready to be installed yet
 # $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
@@ -139,33 +139,33 @@
 install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
 	@$(CHECKGROUP)
 
-	mkdir -p $(CONFDIR)/plugins
-	mkdir -p $(CONFDIR)/plugin-conf.d
-	mkdir -p $(LIBDIR)/plugins
-	mkdir -p $(PLUGSTATE)
-
-	$(CHOWN) root:root $(PLUGSTATE)
-	$(CHMOD) 0755 $(PLUGSTATE)
-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
+	mkdir -p $(STAGEDIR)$(CONFDIR)/plugins
+	mkdir -p $(STAGEDIR)$(CONFDIR)/plugin-conf.d
+	mkdir -p $(STAGEDIR)$(LIBDIR)/plugins
+	mkdir -p $(STAGEDIR)$(PLUGSTATE)
+
+	$(CHOWN) root:wheel $(STAGEDIR)$(PLUGSTATE)
+	$(CHMOD) 0755 $(STAGEDIR)$(PLUGSTATE)
+	$(CHMOD) 0755 $(STAGEDIR)$(CONFDIR)/plugin-conf.d
 
 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
 	    if test -f "$$p" ; then                            \
 		echo Installing $$p;                           \
-		$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
+		$(INSTALL) -m 0755 $$p $(STAGEDIR)$(LIBDIR)/plugins/;     \
 	    fi                                                 \
 	done
 	$(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
-	$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
-	$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
+	$(INSTALL) -m 0644 build/plugins/plugins.history $(STAGEDIR)$(LIBDIR)/plugins/
+	$(INSTALL) -m 0644 build/plugins/plugin.sh $(STAGEDIR)$(LIBDIR)/plugins/
 
 install-plugins-java: build-plugins-java
-	mkdir -p $(JAVALIBDIR)
-	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
-	mkdir -p $(LIBDIR)/plugins
+	mkdir -p $(STAGEDIR)$(JAVALIBDIR)
+	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(STAGEDIR)$(JAVALIBDIR)/
+	mkdir -p $(STAGEDIR)$(LIBDIR)/plugins
 	for p in build/plugins/node.d.java/*; do               \
 	    if test -f "$$p" ; then                            \
 		echo Installing $$p;                           \
-		$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
+		$(INSTALL) -m 0755 $$p $(STAGEDIR)$(LIBDIR)/plugins/;     \
 	    fi                                                 \
 	done
 
@@ -177,36 +177,36 @@
 
 install-async:
 	mkdir -p $(LIBDIR)
-	$(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/
-	$(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/
+	$(INSTALL) -m 0755 build/node/_bin/munin-async $(STAGEDIR)$(LIBDIR)/
+	$(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(STAGEDIR)$(LIBDIR)/
 
 install-node-prime: install-node-pre install-node
 
 install-node-pre: build/node/munin-node.conf install-pre
-	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
+	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(STAGEDIR)$(CONFDIR)/
 
 
 install-common-prime: build-common install-common
 
 
 install-man: build-man Makefile Makefile.config
-	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
-	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
-	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
-	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/
-	$(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/
+	mkdir -p $(STAGEDIR)$(MANDIR)/man1 $(STAGEDIR)$(MANDIR)/man5 $(STAGEDIR)$(MANDIR)/man8
+	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(STAGEDIR)$(MANDIR)/man5/
+	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(STAGEDIR)$(MANDIR)/man5/
+	$(INSTALL) -m 0644 build/doc/munin-update.8 $(STAGEDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(STAGEDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(STAGEDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-html.8 $(STAGEDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(STAGEDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin-check.8 $(STAGEDIR)$(MANDIR)/man8/
+	$(INSTALL) -m 0644 build/doc/munin.8 $(STAGEDIR)$(MANDIR)/man8/
 
 
 install-doc: build-doc
-	mkdir -p $(DOCDIR)/resources
-	$(INSTALL) -m 0644 README $(DOCDIR)/
-	$(INSTALL) -m 0644 COPYING $(DOCDIR)/
-	$(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
+	mkdir -p $(STAGEDIR)$(DOCDIR)/resources
+	$(INSTALL) -m 0644 README $(STAGEDIR)$(DOCDIR)/
+	$(INSTALL) -m 0644 COPYING $(STAGEDIR)$(DOCDIR)/
+	$(INSTALL) -m 0644 build/resources/* $(STAGEDIR)$(DOCDIR)/resources
 
 ######################################################################
 
@@ -284,7 +284,7 @@
              -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;'                      \
              -e 's|\@\@BASH\@\@|$(BASH)|g;'                          \
              -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;'                    \
-             ./master/blib/libdoc/Munin::Master::HTMLOld.3pm    \
+             ./master/blib/libdoc/Munin::Master::HTMLOld.3    \
              ./master/blib/lib/Munin/Master/HTMLOld.pm          \
              ./node/blib/sbin/munin-node-configure              \
              ./node/blib/sbin/munin-node                        \
@@ -460,12 +460,12 @@
 # can't seem to find a way to persuade it to write otherwhere.
 install-%: %/Build
 	cd $* && $(PERL) Build install			\
-            --install_path lib=$(PERLLIB)		\
-            --install_path bin=$(BINDIR)		\
-            --install_path script=$(BINDIR)		\
-            --install_path sbin=$(SBINDIR)		\
-            --install_path bindoc=$(MANDIR)/man1	\
-            --install_path libdoc=$(MANDIR)/man3	\
+            --install_path lib=$(STAGEDIR)$(PERLLIB)		\
+            --install_path bin=$(STAGEDIR)$(BINDIR)		\
+            --install_path script=$(STAGEDIR)$(BINDIR)		\
+            --install_path sbin=$(STAGEDIR)$(SBINDIR)		\
+            --install_path bindoc=$(STAGEDIR)$(MANDIR)/man1	\
+            --install_path libdoc=$(STAGEDIR)$(MANDIR)/man3
 
 test-%: %/Build
 	cd $* && $(PERL) Build test --verbose=0 || true




--- Makefile.config.orig	2009-12-30 05:55:56.000000000 -0700
+++ Makefile.config	2010-01-30 11:17:34.000000000 -0700
@@ -126,9 +129,8 @@
 # Which command to use to check if the USER and GROUP to run Munin as, exists.
 # These will work on most modern OSes:
 #
-GETENT     := $(shell which getent || which true 2>/dev/null)
-CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+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"))
 
 # For OSX, comment out the previous two lines and comment in these
 #




MUNIN_VERSION=	2.0.21
MUNIN_SITES=	SF/${PORTNAME}/stable/${MUNIN_VERSION}
MUNIN_DISTINFO=	${.CURDIR}/../munin-common/distinfo
MUNIN_PATCHES=	${.CURDIR}/../munin-common/files/patch-Makefile
		${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config

PORTSCOUT=	limit:^2\.0\.

DBDIR?=		/var/${PORTNAME}
DBDIRNODE?=	/var/${PORTNAME}
LOGDIR?=	/var/log/${PORTNAME}
STATEDIR?=	/var/run/${PORTNAME}
SPOOLDIR?=	/var/spool/${PORTNAME}

		SPOOLDIR=${SPOOLDIR}
MAKE_ARGS=	${MUNIN_DIRS} \
		BASH=${LOCALBASE}/bin/bash \
		PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}\
		PREFIX=${PREFIX}\
		STAGEDIR=${STAGEDIR}
USERS=		munin
GROUPS=		munin
PLIST_SUB=	${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}




man/man3/Munin::Common::Config.3.gz
man/man3/Munin::Common::Defaults.3.gz
man/man3/Munin::Common::TLS.3.gz
man/man3/Munin::Common::TLSClient.3.gz
man/man3/Munin::Common::TLSServer.3.gz
man/man3/Munin::Common::Timeout.3.gz
%%SITE_PERL%%/Munin/Common/Config.pm
%%SITE_PERL%%/Munin/Common/Defaults.pm
%%SITE_PERL%%/Munin/Common/DictFile.pm

%%SITE_PERL%%/Munin/Common/Timeout.pm
@dirrm %%SITE_PERL%%/Munin/Common
@dirrm %%SITE_PERL%%/Munin
@comment @exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% %%DBDIR%%
@owner %%USER%%
@group %%GROUP%%
@dirrmtry %%LOGDIR%%
@dirrmtry %%STATEDIR%%
@dirrmtry %%SPOOLDIR%%
@mode a+rx,ug+w
@dirrmtry %%DBDIR%%
@mode
@group
@owner

Return to bug 192395

Lines 17-40 Link Here

(-)./Makefile (-13 / +2 lines)
17	USES= gmake perl5	17	USES= gmake perl5
18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}	18	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
19		19
20	NO_STAGE= yes
21	.include "${.CURDIR}/../munin-common/munin.mk"	20	.include "${.CURDIR}/../munin-common/munin.mk"
22		21
23	ALL_TARGET= build-common-prime	22	ALL_TARGET= build-common-prime
24	INSTALL_TARGET= install-common	23	INSTALL_TARGET= install-common
25		24
26	MAN3= Munin::Common::Config.3 \
27	Munin::Common::Defaults.3 \
28	Munin::Common::TLS.3 \
29	Munin::Common::TLSClient.3 \
30	Munin::Common::TLSServer.3 \
31	Munin::Common::Timeout.3
32
33	post-install:	25	post-install:
34	@${MKDIR} ${LOGDIR} ${STATEDIR} ${SPOOLDIR}	26	@${MKDIR} ${STAGEDIR}${LOGDIR} ${STAGEDIR}${STATEDIR}\
35	@${CHOWN} ${USERS}:${GROUPS} ${LOGDIR} ${STADEDIR} ${SPOOLDIR}	27	${STAGEDIR}${SPOOLDIR} ${STAGEDIR}${DBDIR}
36	@(cd ${WRKSRC}/common/blib/libdoc && for man in ${MAN3} ; do \
37	${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
38	done)
39		28
40	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-27 Link Here

(-)./files/patch-Makefile (-13 / +218 lines)
1	--- Makefile.orig 2012-08-31 17:22:50.000000000 +0200	1	--- Makefile.orig 2014-04-23 04:29:32.000000000 +0900
2	+++ Makefile 2012-09-08 00:38:17.000000000 +0200	2	+++ Makefile 2014-05-15 16:04:04.000000000 +0900
3	@@ -68,11 +68,11 @@	3	@@ -68,60 +68,60 @@
4		4
5	install-pre: Makefile Makefile.config	5	install-pre: Makefile Makefile.config
6	@$(CHECKUSER)	6	@$(CHECKUSER)
7	- mkdir -p $(LOGDIR)	7	- mkdir -p $(LOGDIR)
8	- mkdir -p $(STATEDIR)	8	- mkdir -p $(STATEDIR)
9	- mkdir -p $(SPOOLDIR)	9	- mkdir -p $(SPOOLDIR)
		10	- mkdir -p $(CONFDIR)
		11	- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
10	+# mkdir -p $(LOGDIR)	12	+# mkdir -p $(LOGDIR)
11	+# mkdir -p $(STATEDIR)	13	+ mkdir -p $(STAGEDIR)$(STATEDIR)
12	+# mkdir -p $(SPOOLDIR)	14	+# mkdir -p $(SPOOLDIR)
13	mkdir -p $(CONFDIR)	15	+ mkdir -p $(STAGEDIR)$(CONFDIR)
14	- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
15	+# $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)	16	+# $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
16		17
17	install-master-prime: $(INFILES_MASTER) install-pre install-master	18	install-master-prime: $(INFILES_MASTER) install-pre install-master
18	mkdir -p $(CONFDIR)/templates	19	- mkdir -p $(CONFDIR)/templates
19	@@ -144,7 +144,7 @@	20	- mkdir -p $(CONFDIR)/static
20	mkdir -p $(LIBDIR)/plugins	21	- mkdir -p $(CONFDIR)/templates/partial
21	mkdir -p $(PLUGSTATE)	22	- mkdir -p $(CONFDIR)/munin-conf.d
		23	- mkdir -p $(LIBDIR)
		24	- mkdir -p $(BINDIR)
		25	- mkdir -p $(PERLLIB)
		26	- mkdir -p $(PERLLIB)/Munin/Master
		27	- mkdir -p $(HTMLDIR)
		28	- mkdir -p $(DBDIR)
		29	- mkdir -p $(DBDIR)/cgi-tmp
		30	- mkdir -p $(CGIDIR)
		31	+ mkdir -p $(STAGEDIR)$(CONFDIR)/templates
		32	+ mkdir -p $(STAGEDIR)$(CONFDIR)/static
		33	+ mkdir -p $(STAGEDIR)$(CONFDIR)/templates/partial
		34	+ mkdir -p $(STAGEDIR)$(CONFDIR)/munin-conf.d
		35	+ mkdir -p $(STAGEDIR)$(LIBDIR)
		36	+ mkdir -p $(STAGEDIR)$(BINDIR)
		37	+ mkdir -p $(STAGEDIR)$(PERLLIB)
		38	+ mkdir -p $(STAGEDIR)$(PERLLIB)/Munin/Master
		39	+ mkdir -p $(STAGEDIR)$(HTMLDIR)
		40	+ mkdir -p $(STAGEDIR)$(DBDIR)
		41	+ mkdir -p $(STAGEDIR)$(DBDIR)/cgi-tmp
		42	+ mkdir -p $(STAGEDIR)$(CGIDIR)
		43
		44	- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
		45	- $(CHMOD) 0755 $(DBDIR)
		46	+ $(CHOWN) $(USER) $(STAGEDIR)$(HTMLDIR) $(STAGEDIR)$(DBDIR)
		47	+ $(CHMOD) 0775 $(STAGEDIR)$(DBDIR)
		48
		49	- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
		50	- $(CHMOD) 0755 $(DBDIR)/cgi-tmp
		51	+ $(CHOWN) $(CGIUSER) $(STAGEDIR)$(DBDIR)/cgi-tmp
		52	+ $(CHMOD) 0755 $(STAGEDIR)$(DBDIR)/cgi-tmp
		53
		54	for p in master/www/*.tmpl ; do \
		55	- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
		56	+ $(INSTALL) -m 0644 "$$p" $(STAGEDIR)$(CONFDIR)/templates/ ; \
		57	done
		58
		59	for p in master/static/* ; do \
		60	- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
		61	+ $(INSTALL) -m 0644 "$$p" $(STAGEDIR)$(CONFDIR)/static/ ; \
		62	done
		63
		64	for p in master/www/partial/*.tmpl; do \
		65	- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
		66	+ $(INSTALL) -m 0644 "$$p" $(STAGEDIR)$(CONFDIR)/templates/partial/ ; \
		67	done
22		68
		69	- $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
		70	- $(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
		71	+ $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(STAGEDIR)$(LIBDIR)/
		72	+ $(INSTALL) -m 0644 master/DejaVuSans.ttf $(STAGEDIR)$(LIBDIR)/
		73
		74	- test -f $(HTMLDIR)/.htaccess \|\| $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
		75	- test -f "$(CONFDIR)/munin.conf" \|\| $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
		76	+ test -f $(HTMLDIR)/.htaccess \|\| $(INSTALL) -m 0644 build/master/www/munin-htaccess $(STAGEDIR)$(HTMLDIR)/.htaccess
		77	+ test -f "$(CONFDIR)/munin.conf" \|\| $(INSTALL) -m 0644 build/master/munin.conf $(STAGEDIR)$(CONFDIR)/
		78
		79	- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
		80	- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
		81	- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
		82	- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
		83	- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
		84	- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
		85	- $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/
		86	- $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/
		87	- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph
		88	- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html
		89	+ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(STAGEDIR)$(BINDIR)/
		90	+ $(INSTALL) -m 0755 build/master/_bin/munin-check $(STAGEDIR)$(BINDIR)/
		91	+ $(INSTALL) -m 0755 build/master/_bin/munin-update $(STAGEDIR)$(LIBDIR)/
		92	+ $(INSTALL) -m 0755 build/master/_bin/munin-html $(STAGEDIR)$(LIBDIR)/
		93	+ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(STAGEDIR)$(LIBDIR)/
		94	+ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(STAGEDIR)$(LIBDIR)/
		95	+ $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(STAGEDIR)$(LIBDIR)/
		96	+ $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(STAGEDIR)$(LIBDIR)/
		97	+ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(STAGEDIR)$(CGIDIR)/munin-cgi-graph
		98	+ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(STAGEDIR)$(CGIDIR)/munin-cgi-html
		99
		100	# Not ready to be installed yet
		101	# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
		102	@@ -139,33 +139,33 @@
		103	install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
		104	@$(CHECKGROUP)
		105
		106	- mkdir -p $(CONFDIR)/plugins
		107	- mkdir -p $(CONFDIR)/plugin-conf.d
		108	- mkdir -p $(LIBDIR)/plugins
		109	- mkdir -p $(PLUGSTATE)
		110	-
23	- $(CHOWN) root:root $(PLUGSTATE)	111	- $(CHOWN) root:root $(PLUGSTATE)
24	+ $(CHOWN) root:wheel $(PLUGSTATE)	112	- $(CHMOD) 0755 $(PLUGSTATE)
25	$(CHMOD) 0755 $(PLUGSTATE)	113	- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
26	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d	114	+ mkdir -p $(STAGEDIR)$(CONFDIR)/plugins
		115	+ mkdir -p $(STAGEDIR)$(CONFDIR)/plugin-conf.d
		116	+ mkdir -p $(STAGEDIR)$(LIBDIR)/plugins
		117	+ mkdir -p $(STAGEDIR)$(PLUGSTATE)
		118	+
		119	+ $(CHOWN) root:wheel $(STAGEDIR)$(PLUGSTATE)
		120	+ $(CHMOD) 0755 $(STAGEDIR)$(PLUGSTATE)
		121	+ $(CHMOD) 0755 $(STAGEDIR)$(CONFDIR)/plugin-conf.d
		122
		123	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
		124	if test -f "$$p" ; then \
		125	echo Installing $$p; \
		126	- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
		127	+ $(INSTALL) -m 0755 $$p $(STAGEDIR)$(LIBDIR)/plugins/; \
		128	fi \
		129	done
		130	$(HPUXONLY) mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
		131	- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
		132	- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
		133	+ $(INSTALL) -m 0644 build/plugins/plugins.history $(STAGEDIR)$(LIBDIR)/plugins/
		134	+ $(INSTALL) -m 0644 build/plugins/plugin.sh $(STAGEDIR)$(LIBDIR)/plugins/
		135
		136	install-plugins-java: build-plugins-java
		137	- mkdir -p $(JAVALIBDIR)
		138	- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
		139	- mkdir -p $(LIBDIR)/plugins
		140	+ mkdir -p $(STAGEDIR)$(JAVALIBDIR)
		141	+ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(STAGEDIR)$(JAVALIBDIR)/
		142	+ mkdir -p $(STAGEDIR)$(LIBDIR)/plugins
		143	for p in build/plugins/node.d.java/*; do \
		144	if test -f "$$p" ; then \
		145	echo Installing $$p; \
		146	- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \
		147	+ $(INSTALL) -m 0755 $$p $(STAGEDIR)$(LIBDIR)/plugins/; \
		148	fi \
		149	done
		150
		151	@@ -177,36 +177,36 @@
		152
		153	install-async:
		154	mkdir -p $(LIBDIR)
		155	- $(INSTALL) -m 0755 build/node/_bin/munin-async $(LIBDIR)/
		156	- $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(LIBDIR)/
		157	+ $(INSTALL) -m 0755 build/node/_bin/munin-async $(STAGEDIR)$(LIBDIR)/
		158	+ $(INSTALL) -m 0755 build/node/_bin/munin-asyncd $(STAGEDIR)$(LIBDIR)/
		159
		160	install-node-prime: install-node-pre install-node
		161
		162	install-node-pre: build/node/munin-node.conf install-pre
		163	- test -f "$(CONFDIR)/munin-node.conf" \|\| $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
		164	+ test -f "$(CONFDIR)/munin-node.conf" \|\| $(INSTALL) -m 0644 build/node/munin-node.conf $(STAGEDIR)$(CONFDIR)/
		165
		166
		167	install-common-prime: build-common install-common
		168
		169
		170	install-man: build-man Makefile Makefile.config
		171	- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
		172	- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
		173	- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
		174	- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
		175	- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
		176	- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
		177	- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
		178	- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
179	- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/
180	- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/
181	+ mkdir -p $(STAGEDIR)$(MANDIR)/man1 $(STAGEDIR)$(MANDIR)/man5 $(STAGEDIR)$(MANDIR)/man8
182	+ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(STAGEDIR)$(MANDIR)/man5/
183	+ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(STAGEDIR)$(MANDIR)/man5/
184	+ $(INSTALL) -m 0644 build/doc/munin-update.8 $(STAGEDIR)$(MANDIR)/man8/
185	+ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(STAGEDIR)$(MANDIR)/man8/
186	+ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(STAGEDIR)$(MANDIR)/man8/
187	+ $(INSTALL) -m 0644 build/doc/munin-html.8 $(STAGEDIR)$(MANDIR)/man8/
188	+ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(STAGEDIR)$(MANDIR)/man8/
189	+ $(INSTALL) -m 0644 build/doc/munin-check.8 $(STAGEDIR)$(MANDIR)/man8/
190	+ $(INSTALL) -m 0644 build/doc/munin.8 $(STAGEDIR)$(MANDIR)/man8/
191
192
193	install-doc: build-doc
194	- mkdir -p $(DOCDIR)/resources
195	- $(INSTALL) -m 0644 README $(DOCDIR)/
196	- $(INSTALL) -m 0644 COPYING $(DOCDIR)/
197	- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
198	+ mkdir -p $(STAGEDIR)$(DOCDIR)/resources
199	+ $(INSTALL) -m 0644 README $(STAGEDIR)$(DOCDIR)/
200	+ $(INSTALL) -m 0644 COPYING $(STAGEDIR)$(DOCDIR)/
201	+ $(INSTALL) -m 0644 build/resources/* $(STAGEDIR)$(DOCDIR)/resources
202
203	######################################################################
204
205	@@ -284,7 +284,7 @@
206	-e 's\|\@\@GOODSH\@\@\|$(GOODSH)\|g;' \
207	-e 's\|\@\@BASH\@\@\|$(BASH)\|g;' \
208	-e 's\|\@\@HASSETR\@\@\|$(HASSETR)\|g;' \
209	- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \
210	+ ./master/blib/libdoc/Munin::Master::HTMLOld.3 \
211	./master/blib/lib/Munin/Master/HTMLOld.pm \
212	./node/blib/sbin/munin-node-configure \
213	./node/blib/sbin/munin-node \
214	@@ -460,12 +460,12 @@
215	# can't seem to find a way to persuade it to write otherwhere.
216	install-%: %/Build
217	cd $* && $(PERL) Build install \
218	- --install_path lib=$(PERLLIB) \
219	- --install_path bin=$(BINDIR) \
220	- --install_path script=$(BINDIR) \
221	- --install_path sbin=$(SBINDIR) \
222	- --install_path bindoc=$(MANDIR)/man1 \
223	- --install_path libdoc=$(MANDIR)/man3 \
224	+ --install_path lib=$(STAGEDIR)$(PERLLIB) \
225	+ --install_path bin=$(STAGEDIR)$(BINDIR) \
226	+ --install_path script=$(STAGEDIR)$(BINDIR) \
227	+ --install_path sbin=$(STAGEDIR)$(SBINDIR) \
228	+ --install_path bindoc=$(STAGEDIR)$(MANDIR)/man1 \
229	+ --install_path libdoc=$(STAGEDIR)$(MANDIR)/man3
27		230
		231	test-%: %/Build
		232	cd $* && $(PERL) Build test --verbose=0 \|\| true

Lines 1-14 Link Here

(-)./files/patch-Makefile.config (-14 lines)
1	--- Makefile.config.orig 2009-12-30 05:55:56.000000000 -0700
2	+++ Makefile.config 2010-01-30 11:17:34.000000000 -0700
3	@@ -126,9 +129,8 @@
4	# Which command to use to check if the USER and GROUP to run Munin as, exists.
5	# These will work on most modern OSes:
6	#
7	-GETENT := $(shell which getent \|\| which true 2>/dev/null)
8	-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null \|\| (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
9	-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null \|\| (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
10	+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"))
11	+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"))
12
13	# For OSX, comment out the previous two lines and comment in these
14	#

Lines 1-13 Link Here

(-)./munin.mk (-6 / +6 lines)
1	MUNIN_VERSION= 2.0.17	1	MUNIN_VERSION= 2.0.21
2	MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION}	2	MUNIN_SITES= SF/${PORTNAME}/stable/${MUNIN_VERSION}
3	MUNIN_DISTINFO= ${PORTSDIR}/sysutils/munin-common/distinfo	3	MUNIN_DISTINFO= ${.CURDIR}/../munin-common/distinfo
4	MUNIN_PATCHES= ${PORTSDIR}/sysutils/munin-common/files/patch-Makefile \	4	MUNIN_PATCHES= ${.CURDIR}/../munin-common/files/patch-Makefile
5	${PORTSDIR}/sysutils/munin-common/files/patch-Makefile.config
6		5
7	PORTSCOUT= limit:^2\.0\.	6	PORTSCOUT= limit:^2\.0\.
8		7
9	DBDIR?= /var/${PORTNAME}	8	DBDIR?= /var/${PORTNAME}
10	DBDIRNODE?= /var/${PORTNAME}
11	LOGDIR?= /var/log/${PORTNAME}	9	LOGDIR?= /var/log/${PORTNAME}
12	STATEDIR?= /var/run/${PORTNAME}	10	STATEDIR?= /var/run/${PORTNAME}
13	SPOOLDIR?= /var/spool/${PORTNAME}	11	SPOOLDIR?= /var/spool/${PORTNAME}
Lines 26-32 Link Here
26	SPOOLDIR=${SPOOLDIR}	24	SPOOLDIR=${SPOOLDIR}
27	MAKE_ARGS= ${MUNIN_DIRS} \	25	MAKE_ARGS= ${MUNIN_DIRS} \
28	BASH=${LOCALBASE}/bin/bash \	26	BASH=${LOCALBASE}/bin/bash \
29	PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}	27	PERL=${PERL} PERLLIB=${PREFIX}/${SITE_PERL_REL}\
		28	PREFIX=${PREFIX}\
		29	STAGEDIR=${STAGEDIR}
30	USERS= munin	30	USERS= munin
31	GROUPS= munin	31	GROUPS= munin
32	PLIST_SUB= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}	32	PLIST_SUB= ${MUNIN_DIRS} USER=${USERS} GROUP=${GROUPS}

Lines 1-3 Link Here

(-)./pkg-plist (-3 / +17 lines)
		1	man/man3/Munin::Common::Config.3.gz
		2	man/man3/Munin::Common::Defaults.3.gz
		3	man/man3/Munin::Common::TLS.3.gz
		4	man/man3/Munin::Common::TLSClient.3.gz
		5	man/man3/Munin::Common::TLSServer.3.gz
		6	man/man3/Munin::Common::Timeout.3.gz
1	%%SITE_PERL%%/Munin/Common/Config.pm	7	%%SITE_PERL%%/Munin/Common/Config.pm
2	%%SITE_PERL%%/Munin/Common/Defaults.pm	8	%%SITE_PERL%%/Munin/Common/Defaults.pm
3	%%SITE_PERL%%/Munin/Common/DictFile.pm	9	%%SITE_PERL%%/Munin/Common/DictFile.pm
Lines 8-13 Link Here
8	%%SITE_PERL%%/Munin/Common/Timeout.pm	14	%%SITE_PERL%%/Munin/Common/Timeout.pm
9	@dirrm %%SITE_PERL%%/Munin/Common	15	@dirrm %%SITE_PERL%%/Munin/Common
10	@dirrm %%SITE_PERL%%/Munin	16	@dirrm %%SITE_PERL%%/Munin
11	@exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%	17	@comment @exec mkdir -p %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% %%DBDIR%%
12	@exec chown %%USER%%:%%GROUP%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%%	18	@owner %%USER%%
13	@unexec rmdir %%DBDIR%% %%LOGDIR%% %%STATEDIR%% %%SPOOLDIR%% 2>/dev/null \|\| /usr/bin/true	19	@group %%GROUP%%
		20	@dirrmtry %%LOGDIR%%
		21	@dirrmtry %%STATEDIR%%
		22	@dirrmtry %%SPOOLDIR%%
		23	@mode a+rx,ug+w
		24	@dirrmtry %%DBDIR%%
		25	@mode
		26	@group
		27	@owner