pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

munin: update to 2.0.49



Module Name:	pkgsrc-wip
Committed By:	Thomas Merkel <tm%core.io@localhost>
Pushed By:	drscream
Date:		Wed Aug 14 14:56:47 2019 +0200
Changeset:	19134416bff985dd32203bc49bf1daa15a14cd1a

Modified Files:
	munin-common/Makefile.common
	munin-common/distinfo
	munin-common/patches/patch-Makefile

Log Message:
munin: update to 2.0.49

Additional fix added for to use configured man3ext from Perl in Munin Makefile. Assuming 3pm breaks building from source on Perl distributions configured with a different suffix (3perl, 3, ...).

munin-2.0.49, 2019-05-09
 Bugfix release.
munin-2.0.47, 2019-02-28
 Bugfix release.
munin-2.0.45, 2019-02-06
 Bugfix release.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=19134416bff985dd32203bc49bf1daa15a14cd1a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 munin-common/Makefile.common        |  2 +-
 munin-common/distinfo               | 10 +++++-----
 munin-common/patches/patch-Makefile | 33 +++++++++++++++++++++++----------
 3 files changed, 29 insertions(+), 16 deletions(-)

diffs:
diff --git a/munin-common/Makefile.common b/munin-common/Makefile.common
index 908059d29e..0414a1e158 100644
--- a/munin-common/Makefile.common
+++ b/munin-common/Makefile.common
@@ -4,7 +4,7 @@
 # used by wip/munin-master/Makefile
 # used by wip/munin-node/Makefile
 
-VERSION=	2.0.44
+VERSION=	2.0.49
 DISTNAME=	munin-${VERSION}
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.munin-monitoring.org/munin/stable/${VERSION}/
diff --git a/munin-common/distinfo b/munin-common/distinfo
index c875b90ec5..f263a1c441 100644
--- a/munin-common/distinfo
+++ b/munin-common/distinfo
@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.7 2015/01/14 15:22:22 fhajny Exp $
 
-SHA1 (munin-2.0.44.tar.gz) = fd0ea55c6f26ea957955c8acaa0b3affb4565d1a
-RMD160 (munin-2.0.44.tar.gz) = 764c9bbd28081f298830f214d63cb513cdfa896c
-SHA512 (munin-2.0.44.tar.gz) = 9196068f12a0cf3c65c875d98baef1c84c7846d373362db47ee31d35377ecda1fcdf806fe7fc24b5af60fd8f036cb87e8dcb5ccdd038952c229af3be5726e4ec
-Size (munin-2.0.44.tar.gz) = 2258278 bytes
+SHA1 (munin-2.0.49.tar.gz) = 48531b84c4382983cf4fe64a7c3ad22a86cbdc2e
+RMD160 (munin-2.0.49.tar.gz) = 0e13eb4dfd01ea122476d041f51233612db00cfd
+SHA512 (munin-2.0.49.tar.gz) = 20f1f27aa1ff39ed92c967a13581ae199930323f5d2b62b62ce0a548a4cf561595e85d069e836b156c05d4a94c66328009aba56cb1b06c4b2719fbd9e1061ca4
+Size (munin-2.0.49.tar.gz) = 2252353 bytes
 SHA1 (patch-MANIFEST) = 538cec30723a6d41b732c9dc4a175472fb821609
-SHA1 (patch-Makefile) = dc69e017d2c5de06234179c80e1a5d6b21b06fff
+SHA1 (patch-Makefile) = a54a569c55894eacc66d55ceec2d49e8a646996b
 SHA1 (patch-Makefile.config) = a59ef54e27b88ff578eb3a2d2885ef89afcd86fb
 SHA1 (patch-common_Build.PL) = 532e4d824e47ca4baeaec81fc78c8a151729f339
 SHA1 (patch-lib_Munin_Common_Defaults.pm) = 2f6ffe9fe1b91361e35b9bfcac239252ba789482
diff --git a/munin-common/patches/patch-Makefile b/munin-common/patches/patch-Makefile
index 71350ea69c..893e28fafe 100644
--- a/munin-common/patches/patch-Makefile
+++ b/munin-common/patches/patch-Makefile
@@ -1,11 +1,23 @@
 $NetBSD$
 
 Installation fixed to use all essential files, populate
-PKG_SYSCONFDIR as expected by the Munin scripts.
+PKG_SYSCONFDIR as expected by the Munin scripts. Gets 
+configured man3ext from Perl instead of assuming 3pm suffix.
 
---- Makefile.orig	2018-12-19 20:56:49.000000000 +0000
-+++ Makefile
-@@ -95,50 +95,37 @@ tags:
+--- Makefile.orig	Thu May  9 03:45:43 2019
++++ Makefile	Wed Aug 14 12:38:00 2019
+@@ -33,8 +33,9 @@
+ PODMAN8          := build/master/doc/munin-cron master/doc/munin master/doc/munin-check
+ PODMAN5          := build/master/doc/munin.conf node/doc/munin-node.conf
+ PYTHON_LINT_CALL ?= python3 -m flake8
++MAN3EXT          := $(shell $(PERL) -e 'use Config; print $$Config{man3ext};')
+ CONFVAR_SUBSTITUTION_FILES = \
+-	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.3pm \
++	master/blib/libdoc/Munin\:\:Master\:\:HTMLOld.$(MAN3EXT) \
+ 	master/blib/lib/Munin/Master/HTMLOld.pm \
+ 	node/blib/sbin/munin-node-configure \
+ 	node/blib/sbin/munin-node \
+@@ -94,50 +95,37 @@
  install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime
  
  install-pre: $(MAKEFILES)
@@ -66,7 +78,7 @@ PKG_SYSCONFDIR as expected by the Munin scripts.
  
  	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
-@@ -157,16 +144,7 @@ install-master-prime: $(INFILES_MASTER)
+@@ -156,17 +144,8 @@
  install-node-plugins: install-plugins-prime
  
  install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
@@ -76,14 +88,15 @@ PKG_SYSCONFDIR as expected by the Munin scripts.
 -	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
- 
-	@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
-	@# generic ones.
-@@ -206,7 +184,7 @@ install-async:
+-
+ 	@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
+ 	@# generic ones.
+ 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
+@@ -205,7 +184,7 @@
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre


Home | Main Index | Thread Index | Old Index