Attachment 150670 Details for Bug 195911 – munin-master.patch

[patch] munin-master.patch

munin-master.patch (text/plain), 6.67 KB, created by takefu on 2014-12-17 03:06:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-12-17 03:06:44 UTC

Size: 6.67 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/munin-master/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-master/Makefile	2014-11-26 22:08:24.000000000 +0900
>+++ ./Makefile	2014-12-17 11:54:45.000000000 +0900
>@@ -20,7 +20,6 @@
> 		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
> 		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
> 		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
>-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
> 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
> 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
> 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
>@@ -33,7 +32,6 @@
> 		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
> 		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
> 		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
>-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
> 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
> 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
> 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
>@@ -55,12 +53,41 @@
> SUB_FILES=	pkg-message
> PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
> 
>+OPTIONS_DEFINE=	IPV6
>+
>+IPV6_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-master_extras_munin-update_old.in
>+IPV6_BUILD_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
>+IPV6_RUN_DEPENDS=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
>+
>+.include <bsd.port.pre.mk>
>+
>+.if !${PORT_OPTIONS:MIPV6}
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-master_lib_Munin_Master_Node.pm
>+.endif
>+
>+post-patch:
>+	@${REINPLACE_CMD}\
>+		-e 's|@@CONFDIR@@|${ETCDIR}|'\
>+		-e 's|@@DBDIR@@|${DBDIR}|'\
>+		-e 's|@@LOGDIR@@|${LOGDIR}|'\
>+		-e 's|@@HTMLDIR@@|${WWWDIR}|'\
>+		-e 's|@@STATEDIR@@|${STATEDIR}|'\
>+		-e 's|@@VERSION@@|${MUNIN_VERSION}|'\
>+		${WRKSRC}/master/lib/Munin/Master/HTMLOld.pm
>+
> post-install:
> 	(cd ${WRKSRC}/build/doc; \
>-		${INSTALL_MAN} munin.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5; \
>-		${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8 munin-limits.8 munin-update.8 ${STAGEDIR}${MAN8PREFIX}/man/man8; \
>+		${INSTALL_MAN} munin.conf.5\
>+			${STAGEDIR}${MAN5PREFIX}/man/man5; \
>+		${INSTALL_MAN} munin-cron.8 munin-graph.8 munin-html.8\
>+			munin-limits.8 munin-update.8\
>+			${STAGEDIR}${MAN8PREFIX}/man/man8; \
> 	)
>-	(cd ${STAGEDIR}${ETCDIR}; for i in `find . -type f`; do mv $$i $$i.sample; done)
>-	${MV} ${STAGEDIR}${WWWDIR}/.htaccess ${STAGEDIR}${WWWDIR}/.htaccess.sample
>+	${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state
>+	${MKDIR} ${STAGEDIR}${ETCDIR}/munin-conf.d
>+	${INSTALL_DATA} ${WRKSRC}/build/master/munin.conf \
>+		${STAGEDIR}${PREFIX}/etc/munin/munin.conf.sample
>+	${INSTALL_DATA} ${WRKSRC}/build/master/www/munin-htaccess\
>+		${STAGEDIR}${WWWDIR}/.htaccess.sample
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN /usr/ports/sysutils/munin-master/pkg-plist ./pkg-plist
>--- /usr/ports/sysutils/munin-master/pkg-plist	2014-11-26 00:07:23.000000000 +0900
>+++ ./pkg-plist	2014-12-12 14:03:15.000000000 +0900
>@@ -1,38 +1,6 @@
> bin/munin-check
> bin/munin-cron
> @sample %%ETCDIR%%/munin.conf.sample
>-@sample %%ETCDIR%%/static/definitions.html.sample
>-@sample %%ETCDIR%%/static/dynazoom.html.sample
>-@sample %%ETCDIR%%/static/favicon.ico.sample
>-@sample %%ETCDIR%%/static/formatdate.js.sample
>-@sample %%ETCDIR%%/static/logo-h.png.sample
>-@sample %%ETCDIR%%/static/logo.png.sample
>-@sample %%ETCDIR%%/static/querystring.js.sample
>-@sample %%ETCDIR%%/static/style-1.2.css.sample
>-@sample %%ETCDIR%%/static/style-new.css.sample
>-@sample %%ETCDIR%%/static/style.css.sample
>-@sample %%ETCDIR%%/static/zoom.js.sample
>-@sample %%ETCDIR%%/templates/munin-categoryview.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-comparison-day.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-comparison-month.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-comparison-week.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-comparison-year.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-domainview.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-dynazoom.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-nodeview.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-overview.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-problemview.tmpl.sample
>-@sample %%ETCDIR%%/templates/munin-serviceview.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/bottom_navigation.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/footer.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/generated_by.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/head.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/logo_navigation.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/logo_path.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/navigation.tmpl.sample
>-@sample %%ETCDIR%%/templates/partial/path.tmpl.sample
> %%SITE_PERL%%/Munin/Master/Config.pm
> %%SITE_PERL%%/Munin/Master/GraphOld.pm
> %%SITE_PERL%%/Munin/Master/Group.pm
>@@ -48,6 +16,38 @@
> %%SITE_PERL%%/Munin/Master/UpdateWorker.pm
> %%SITE_PERL%%/Munin/Master/Utils.pm
> %%SITE_PERL%%/Munin/Master/Worker.pm
>+%%ETCDIR%%/static/definitions.html
>+%%ETCDIR%%/static/dynazoom.html
>+%%ETCDIR%%/static/favicon.ico
>+%%ETCDIR%%/static/formatdate.js
>+%%ETCDIR%%/static/logo-h.png
>+%%ETCDIR%%/static/logo.png
>+%%ETCDIR%%/static/querystring.js
>+%%ETCDIR%%/static/style-1.2.css
>+%%ETCDIR%%/static/style-new.css
>+%%ETCDIR%%/static/style.css
>+%%ETCDIR%%/static/zoom.js
>+%%ETCDIR%%/templates/munin-comparison-day.tmpl
>+%%ETCDIR%%/templates/munin-comparison-month.tmpl
>+%%ETCDIR%%/templates/munin-comparison-week.tmpl
>+%%ETCDIR%%/templates/munin-comparison-year.tmpl
>+%%ETCDIR%%/templates/munin-categoryview.tmpl
>+%%ETCDIR%%/templates/munin-dynazoom.tmpl
>+%%ETCDIR%%/templates/munin-domainview.tmpl
>+%%ETCDIR%%/templates/munin-nodeview.tmpl
>+%%ETCDIR%%/templates/munin-overview.tmpl
>+%%ETCDIR%%/templates/munin-problemview.tmpl
>+%%ETCDIR%%/templates/munin-serviceview.tmpl
>+%%ETCDIR%%/templates/partial/bottom_navigation.tmpl
>+%%ETCDIR%%/templates/partial/footer.tmpl
>+%%ETCDIR%%/templates/partial/generated_by.tmpl
>+%%ETCDIR%%/templates/partial/head.tmpl
>+%%ETCDIR%%/templates/partial/logo_navigation.tmpl
>+%%ETCDIR%%/templates/partial/logo_navigation_comparison.tmpl
>+%%ETCDIR%%/templates/partial/logo_navigation_problem.tmpl
>+%%ETCDIR%%/templates/partial/logo_path.tmpl
>+%%ETCDIR%%/templates/partial/navigation.tmpl
>+%%ETCDIR%%/templates/partial/path.tmpl
> man/man3/Munin::Master::Config.3.gz
> man/man3/Munin::Master::Group.3.gz
> man/man3/Munin::Master::GroupRepository.3.gz
>@@ -81,3 +81,4 @@
> @dir %%ETCDIR%%/munin-conf.d
> @dir(%%USER%%,%%GROUP%%,) %%WWWDIR%%
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%DBDIR%%/cgi-tmp
>+@dir(%%USER%%,%%GROUP%%,0775) %%DBDIR%%/plugin-state

Actions: View | Diff

Attachments on bug 195911: 150501 | 150669 | 150670 | 150671