pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
munin*: remove, newer version in sysutils/munin-*
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Tue Sep 1 10:08:05 2020 +0200
Changeset: 7df22227e79ecd67eb5dccd11565c8015d05a14f
Modified Files:
Makefile
Removed Files:
munin-c-git/DESCR
munin-c-git/Makefile
munin-c-git/PLIST
munin-c-git/distinfo
munin-c-git/patches/patch-getversion
munin-c-git/patches/patch-src_node_Makefile.am
munin-c-git/patches/patch-src_node_node.c
munin-common/DESCR
munin-common/Makefile
munin-common/Makefile.common
munin-common/distinfo
munin-common/patches/patch-MANIFEST
munin-common/patches/patch-Makefile
munin-common/patches/patch-Makefile.config
munin-common/patches/patch-common_Build.PL
munin-common/patches/patch-lib_Munin_Common_Defaults.pm
munin-master/DESCR
munin-master/MESSAGE
munin-master/Makefile
munin-master/PLIST
munin-node/DESCR
munin-node/MESSAGE
munin-node/Makefile
munin-node/PLIST
munin-node/PLIST.AIX
munin-node/PLIST.FreeBSD
munin-node/PLIST.Linux
munin-node/PLIST.NetBSD
munin-node/PLIST.SunOS
munin-node/files/munin-node.sh
munin-node/files/smf/manifest.xml
Log Message:
munin*: remove, newer version in sysutils/munin-*
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7df22227e79ecd67eb5dccd11565c8015d05a14f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 5 -
munin-c-git/DESCR | 3 -
munin-c-git/Makefile | 30 ---
munin-c-git/PLIST | 10 -
munin-c-git/distinfo | 5 -
munin-c-git/patches/patch-getversion | 16 --
munin-c-git/patches/patch-src_node_Makefile.am | 16 --
munin-c-git/patches/patch-src_node_node.c | 16 --
munin-common/DESCR | 10 -
munin-common/Makefile | 25 ---
munin-common/Makefile.common | 79 -------
munin-common/distinfo | 11 -
munin-common/patches/patch-MANIFEST | 30 ---
munin-common/patches/patch-Makefile | 107 ----------
munin-common/patches/patch-Makefile.config | 160 --------------
munin-common/patches/patch-common_Build.PL | 14 --
.../patches/patch-lib_Munin_Common_Defaults.pm | 41 ----
munin-master/DESCR | 7 -
munin-master/MESSAGE | 10 -
munin-master/Makefile | 68 ------
munin-master/PLIST | 76 -------
munin-node/DESCR | 7 -
munin-node/MESSAGE | 6 -
munin-node/Makefile | 45 ----
munin-node/PLIST | 232 ---------------------
munin-node/PLIST.AIX | 2 -
munin-node/PLIST.FreeBSD | 13 --
munin-node/PLIST.Linux | 32 ---
munin-node/PLIST.NetBSD | 19 --
munin-node/PLIST.SunOS | 15 --
munin-node/files/munin-node.sh | 61 ------
munin-node/files/smf/manifest.xml | 38 ----
32 files changed, 1209 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index aabcb90a43..fb0c495d12 100644
--- a/Makefile
+++ b/Makefile
@@ -2267,10 +2267,6 @@ SUBDIR+= multisync-syncml
SUBDIR+= multisync-syncml-moto
SUBDIR+= multitail
SUBDIR+= munge
-SUBDIR+= munin-c-git
-SUBDIR+= munin-common
-SUBDIR+= munin-master
-SUBDIR+= munin-node
SUBDIR+= muparser
SUBDIR+= mupen64plus
SUBDIR+= mupen64plus-extraplugins
@@ -3603,7 +3599,6 @@ SUBDIR+= py-luminous
SUBDIR+= py-lxmlproc
SUBDIR+= py-lzma
SUBDIR+= py-m2ext
-SUBDIR+= py-macaroons
SUBDIR+= py-macs2
SUBDIR+= py-magnitude
SUBDIR+= py-mahotas
diff --git a/munin-c-git/DESCR b/munin-c-git/DESCR
deleted file mode 100644
index 8aec66d51e..0000000000
--- a/munin-c-git/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-C rewrite of munin node components. It currently consists on a light-weight
-node, and some plugins. These are designed to be very light on resources, and
-compatible with the stock ones.
diff --git a/munin-c-git/Makefile b/munin-c-git/Makefile
deleted file mode 100644
index ea735ecb50..0000000000
--- a/munin-c-git/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: $
-
-VERSION= 0.0.9
-DISTNAME= munin-c-${VERSION}
-COMMENT= System monitoring tool, client version and plugin in C
-CATEGORIES= sysutils
-WRKSRC= ${WRKDIR}/munin-c
-
-MAINTAINER= tm%core.io@localhost
-HOMEPAGE= http://munin-monitoring.org/
-LICENSE= gnu-gpl-v2
-
-GIT_REPOSITORIES= master
-GIT_REPO.master= git://github.com/munin-monitoring/munin-c.git
-GIT_MODULE.master= munin-c
-
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config autoconf aclocal autoheader automake perl
-
-LIBS.SunOS+= -lnsl -lsocket
-
-pre-configure:
- cd ${WRKSRC} && \
- libtoolize --force && \
- autoreconf --install && \
- autoreconf -i -I m4
-
-
-.include "../../wip/mk/git-package.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/munin-c-git/PLIST b/munin-c-git/PLIST
deleted file mode 100644
index d8e8d0acb6..0000000000
--- a/munin-c-git/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-libexec/munin-c/munin-plugins-c
-man/man1/munin-node-c.1
-man/man1/munin-plugins-c.1
-sbin/munin-inetd-c
-sbin/munin-node-c
-sbin/nb_env
-sbin/ok_plugin
-share/doc/munin-c/gpl-2.0.txt
-share/doc/munin-c/gpl-3.0.txt
diff --git a/munin-c-git/distinfo b/munin-c-git/distinfo
deleted file mode 100644
index 52f55ad1d4..0000000000
--- a/munin-c-git/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-getversion) = 175e8cb68eb9a8d83dbad5b431034789e66f68df
-SHA1 (patch-src_node_Makefile.am) = e0075135e441e39f2c5700cc99f3b7fba6ee6c65
-SHA1 (patch-src_node_node.c) = 02643e7c288921f68600ceae517fd9b3fa1c5e54
diff --git a/munin-c-git/patches/patch-getversion b/munin-c-git/patches/patch-getversion
deleted file mode 100644
index 4955844b85..0000000000
--- a/munin-c-git/patches/patch-getversion
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-The newest git branch command include brackets at the name which needed to be
-removed for a valid version name.
-
---- getversion.orig 2017-08-19 16:40:56.000000000 +0000
-+++ getversion
-@@ -34,7 +34,7 @@ current_git_branch() {
- # * (no branch)
- # devel
-
-- GB="$(git branch | awk '$1 == "*" {print $2}')"
-+ GB="$(git branch | awk '$1 == "*" {print $2}' | tr -d \()"
- case $GB in
- "(no" | "(detached" ) echo;;
- * ) echo $GB;;
diff --git a/munin-c-git/patches/patch-src_node_Makefile.am b/munin-c-git/patches/patch-src_node_Makefile.am
deleted file mode 100644
index 90d73b8c3f..0000000000
--- a/munin-c-git/patches/patch-src_node_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Provide the possibility to set the default PLUGINCONFDIR for munin-node plugins.
-This will allow different sysconfdirs based on the operating system.
-
---- src/node/Makefile.am.orig 2017-08-19 16:40:56.000000000 +0000
-+++ src/node/Makefile.am
-@@ -11,7 +11,7 @@
- include $(top_srcdir)/common.am
-
- sbin_PROGRAMS = munin-node-c munin-inetd-c
--AM_CPPFLAGS = -DPLUGINDIR=\"$(sysconfdir)/munin/plugins\"
-+AM_CPPFLAGS = -DPLUGINDIR=\"$(sysconfdir)/munin/plugins\" -DPLUGINCONFDIR=\"$(sysconfdir)/munin/plugin-conf.d\"
- munin_node_c_SOURCES = node.c
- munin_inetd_c_SOURCES = inetd.c
- man_MANS = munin-node-c.1
diff --git a/munin-c-git/patches/patch-src_node_node.c b/munin-c-git/patches/patch-src_node_node.c
deleted file mode 100644
index 402e921b4a..0000000000
--- a/munin-c-git/patches/patch-src_node_node.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Provide the possibility to set the default PLUGINCONFDIR for munin-node plugins.
-This will allow different sysconfdirs based on the operating system.
-
---- src/node/node.c.orig 2017-08-19 16:40:56.000000000 +0000
-+++ src/node/node.c
-@@ -44,7 +44,7 @@ static char* host = "";
- static char* plugin_dir = PLUGINDIR;
- static char* spoolfetch_dir = "";
- static char* client_ip = "-";
--static char* pluginconf_dir = "/etc/munin/plugin-conf.d";
-+static char* pluginconf_dir = PLUGINCONFDIR;
-
- static int handle_connection();
-
diff --git a/munin-common/DESCR b/munin-common/DESCR
deleted file mode 100644
index b8c39d5aee..0000000000
--- a/munin-common/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Munin is a tool for graphing all sorts of information about one or
-more servers and displaying it in a web interface. It uses the
-execellent RRDTool (written by Tobi Oetiker) and is written in Perl.
-Munin has a master/node architecture. The master connects to all the
-nodes at regular intervals, and asks them for data. It then stores
-the data in RRD-files, and (if needed) updates the graphs. One of the
-main goals has been ease of creating own "plugins" (graphs).
-
-This package manages the common components used by both master and
-node munin packages.
diff --git a/munin-common/Makefile b/munin-common/Makefile
deleted file mode 100644
index 758d9936a3..0000000000
--- a/munin-common/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2015/01/13 15:35:54 fhajny Exp $
-#
-
-PKGNAME= ${DISTNAME:S/munin/munin-common/}
-COMMENT= Common components between a munin node and master
-
-.include "../../wip/munin-common/Makefile.common"
-
-# Adjust WRKSRC for the Perl module framework, but keep the same
-# patch base directory
-WRKSRC= ${WRKDIR}/${DISTNAME}/common
-PATCH_ARGS= -d ${WRKSRC}/.. --forward -E ${PATCH_STRIP}
-
-PERL5_MODULE_TYPE= Module::Build
-PERL5_PACKLIST= auto/Munin/Common/.packlist
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= lib/Munin/Common/Defaults.pm
-SUBST_VARS.paths= PKG_SYSCONFDIR MUNIN_DBDIR MUNIN_LIBDIR \
- MUNIN_LOGDIR MUNIN_STATEDIR MUNIN_WWWDIR \
- MUNIN_PLUGSTATE PERL5
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/munin-common/Makefile.common b/munin-common/Makefile.common
deleted file mode 100644
index fa64583433..0000000000
--- a/munin-common/Makefile.common
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile.common,v 1.3 2015/07/14 15:39:50 fhajny Exp $
-#
-# used by wip/munin-common/Makefile
-# used by wip/munin-master/Makefile
-# used by wip/munin-node/Makefile
-
-VERSION= 2.0.49
-DISTNAME= munin-${VERSION}
-CATEGORIES= sysutils
-MASTER_SITES= http://downloads.munin-monitoring.org/munin/stable/${VERSION}/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://munin-monitoring.org/
-LICENSE= gnu-gpl-v2
-
-BUILD_DEPENDS+= p5-CPAN-Meta>=2.141170:../../devel/p5-CPAN-Meta
-BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
-#BUILD_DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes
-DEPENDS= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/munin-common/distinfo
-PATCHDIR= ${.CURDIR}/../../wip/munin-common/patches
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_LANGUAGES= # none
-USE_TOOLS+= gmake bash:run perl:run
-
-BUILD_DEFS+= VARBASE
-
-MUNIN_GROUP?= munin
-MUNIN_USER?= munin
-
-MUNIN_DBDIR?= ${VARBASE}/munin
-MUNIN_LIBDIR= ${PREFIX}/lib/munin
-MUNIN_LOGDIR?= ${VARBASE}/log/munin
-MUNIN_PLUGSTATE?= ${MUNIN_DBDIR}/plugin-state
-MUNIN_SPOOLDIR?= ${VARBASE}/spool/munin
-MUNIN_STATEDIR?= ${VARBASE}/run/munin
-MUNIN_WWWDIR?= ${PREFIX}/www
-
-PKG_GROUPS_VARS+= MUNIN_GROUP
-PKG_USERS_VARS+= MUNIN_USER
-PKG_GROUPS= ${MUNIN_GROUP}
-PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}
-PKG_GECOS.${MUNIN_USER}= Munin user
-PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR}
-PKG_SHELL.${MUNIN_USER}= ${BASH}
-
-PKG_SYSCONFSUBDIR?= munin
-
-EGDIR= ${PREFIX}/share/examples/munin
-
-REPLACE_PERL= master/_bin/munin-update.in
-
-FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP}
-FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q}
-FILES_SUBST+= MUNIN_USER=${MUNIN_USER}
-FILES_SUBST+= PERL=${PERL5:Q}
-FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-FILES_SUBST+= STATEDIR=${STATEDIR}
-
-MAKE_ENV+= PERL_USE_UNSAFE_INC=1
-MAKE_ENV+= BASH=${BASH:Q}
-MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
-MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR}
-MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP}
-MAKE_ENV+= MUNIN_LOGDIR=${MUNIN_LOGDIR}
-MAKE_ENV+= MUNIN_PLUGSTATE=${MUNIN_PLUGSTATE}
-MAKE_ENV+= MUNIN_SPOOLDIR=${MUNIN_SPOOLDIR}
-MAKE_ENV+= MUNIN_STATEDIR=${MUNIN_STATEDIR}
-MAKE_ENV+= MUNIN_USER=${MUNIN_USER}
-MAKE_ENV+= MUNIN_WWWDIR=${MUNIN_WWWDIR}
-MAKE_ENV+= PERL5=${PERL5:Q}
-MAKE_ENV+= PREFIX=${PREFIX}
-MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q}
-MAKE_ENV+= RUBY=${RUBY:Q}
-
-MESSAGE_SUBST+= MUNIN_USER=${MUNIN_USER}
diff --git a/munin-common/distinfo b/munin-common/distinfo
deleted file mode 100644
index a7f2cb959c..0000000000
--- a/munin-common/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.7 2015/01/14 15:22:22 fhajny Exp $
-
-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) = 725b2fbac05ec89882fec295b8d38fc183bb310a
-SHA1 (patch-Makefile.config) = ce29e172ddf3303e6539c269622e3c0d9e10e099
-SHA1 (patch-common_Build.PL) = 7d7f5afde978d0e5641f931d3f2585651ff40c1a
-SHA1 (patch-lib_Munin_Common_Defaults.pm) = 2f6ffe9fe1b91361e35b9bfcac239252ba789482
diff --git a/munin-common/patches/patch-MANIFEST b/munin-common/patches/patch-MANIFEST
deleted file mode 100644
index 1ec4c66cf0..0000000000
--- a/munin-common/patches/patch-MANIFEST
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-MANIFEST,v 1.1 2015/01/13 15:36:04 fhajny Exp $
-
-Add missing MANIFEST file so that Munin::Common becomes manageable
-by the Perl module framework.
-
---- /dev/null 2011-01-09 11:43:05.000000000 +0000
-+++ common/MANIFEST
-@@ -0,0 +1,22 @@
-+Build.PL
-+lib/Munin/Common/Config.pm
-+lib/Munin/Common/Defaults.pm
-+lib/Munin/Common/Timeout.pm
-+lib/Munin/Common/TLS.pm
-+lib/Munin/Common/TLSClient.pm
-+lib/Munin/Common/TLSServer.pm
-+MANIFEST This list of files
-+t/critic.t
-+t/munin_common_config.t
-+t/munin_common_defaults.t
-+t/munin_common_timeout.t
-+t/munin_common_tls.t
-+t/pod-coverage.t
-+t/pod.t
-+t/tls/CA/ca_cert.pem
-+t/tls/master_cert.pem
-+t/tls/master_key.pem
-+t/tls/node_cert.pem
-+t/tls/node_key.pem
-+t/tls/openssl.cnf
-+t/tls/README
diff --git a/munin-common/patches/patch-Makefile b/munin-common/patches/patch-Makefile
deleted file mode 100644
index 893e28fafe..0000000000
--- a/munin-common/patches/patch-Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD$
-
-Installation fixed to use all essential files, populate
-PKG_SYSCONFDIR as expected by the Munin scripts. Gets
-configured man3ext from Perl instead of assuming 3pm suffix.
-
---- 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)
-- @$(CHECKUSER)
-- mkdir -p $(LOGDIR)
-- mkdir -p $(STATEDIR)
-- mkdir -p $(SPOOLDIR)
-- mkdir -p $(CONFDIR)
-- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
-+ mkdir -p $(EGDIR)
-
- 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 $(EGDIR)/templates
-+ mkdir -p $(EGDIR)/static
-+ mkdir -p $(EGDIR)/templates/partial
-+ mkdir -p $(EGDIR)/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)
-
-- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR)
-- $(CHMOD) 0755 $(DBDIR)
--
-- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp
-- $(CHMOD) 0755 $(DBDIR)/cgi-tmp
--
- for p in master/www/*.tmpl ; do \
-- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-+ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/ ; \
- done
-
- for p in master/static/* ; do \
-- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
-+ $(INSTALL) -m 0644 "$$p" $(EGDIR)/static/ ; \
- done
-
- for p in master/www/partial/*.tmpl; do \
-- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
-+ $(INSTALL) -m 0644 "$$p" $(EGDIR)/templates/partial/ ; \
- done
-
- $(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
- $(INSTALL) -m 0644 master/DejaVuSans.ttf $(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)/
-+ $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
-+ $(INSTALL) -m 0644 build/master/munin.conf $(EGDIR)/
-
- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
-@@ -156,17 +144,8 @@
- install-node-plugins: install-plugins-prime
-
- install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
-- @$(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
--
- @# 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
-- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
-+ $(INSTALL) -m 0644 build/node/munin-node.conf $(EGDIR)/
-
-
- install-common-prime: build-common install-common
diff --git a/munin-common/patches/patch-Makefile.config b/munin-common/patches/patch-Makefile.config
deleted file mode 100644
index 7104a02de6..0000000000
--- a/munin-common/patches/patch-Makefile.config
+++ /dev/null
@@ -1,160 +0,0 @@
-$NetBSD$
-
-Define proper default locations and tools. Really need Bash for plugins
-despite what upstream says.
-
---- Makefile.config.orig 2019-01-17 12:20:47.528006286 +0000
-+++ Makefile.config
-@@ -17,35 +17,38 @@
- #
- # the base of the Munin installation.
- #
--PREFIX = $(DESTDIR)/opt/munin
-+UPREFIX = $(DESTDIR)$(PREFIX)
-
- # Where Munin keeps its configurations (server.conf, client.conf, ++)
--CONFDIR = $(DESTDIR)/etc/opt/munin
-+# CONFDIR = $(UPREFIX)/etc/munin
-+
-+# Where pkgsrc installs example config files
-+EGDIR = $(UPREFIX)/share/examples/munin
-
- # Server only - where to put munin-cron
--BINDIR = $(PREFIX)/bin
-+BINDIR = $(UPREFIX)/bin
-
- # Client only - where to put munin-node, munin-node-configure, and munin-run
--SBINDIR = $(PREFIX)/sbin
-+SBINDIR = $(UPREFIX)/sbin
-
- # Where to put text and html documentation
--DOCDIR = $(PREFIX)/doc
-+DOCDIR = $(UPREFIX)/share/doc/munin
-
- # Where to put man pages
--MANDIR = $(PREFIX)/man
-+MANDIR = $(UPREFIX)/$(PKGMANDIR)
-
- # Where to put internal binaries and plugin repository
--LIBDIR = $(PREFIX)/lib
-+LIBDIR = $(UPREFIX)/lib/munin
-
- # Server only - Output directory
--HTMLDIR = $(PREFIX)/www/docs
--CGIDIR = $(PREFIX)/www/cgi
-+HTMLDIR = $(DESTDIR)/$(MUNIN_WWWDIR)/munin/data
-+CGIDIR = $(DESTDIR)/$(MUNIN_WWWDIR)/cgi-bin
-
- # Where to put internal data for master (RRD, internal files, ...)
--DBDIR = $(DESTDIR)/var/opt/munin
-+DBDIR = $(MUNIN_DBDIR)
-
- # Where to put internal data for node (plugin state, ...)
--DBDIRNODE = $(DESTDIR)/var/opt/munin-node
-+DBDIRNODE = $(DBDIR)
-
- # Client only - Where the spool files are written. Must be writable by
- # group "munin", and should be preserved between reboots
-@@ -56,23 +59,23 @@ SPOOLDIR = $(DBDIR)/spool
- PLUGSTATE = $(DBDIRNODE)/plugin-state
-
- # Where Munin should place its logs.
--LOGDIR = $(PREFIX)/log/munin
-+LOGDIR = $(MUNIN_LOGDIR)
-
- # Location of PID files and other statefiles. On the server, must be
- # writable by the user "munin".
--STATEDIR = $(DESTDIR)/var/run/munin
-+STATEDIR = $(MUNIN_STATEDIR)
-
- # The perl interpreter to use
--PERL := $(shell which perl)
-+PERL := $(PERL5)
-
- # The python interpreter to use (used by some plugins)
--PYTHON := /usr/bin/env python3
-+PYTHON := $(PYTHONBIN)
-
- # The ruby interpreter to use (used by some plugins)
--RUBY := /usr/bin/env ruby
-+RUBY := $(RUBY)
-
- # The java runtime to use (used by some plugins)
--JAVARUN := /usr/bin/java
-+JAVARUN := $(JAVA_HOME)/bin/java
-
- # The java library dir to use (used by some plugins)
- # this is needed in order to be able to install
-@@ -89,13 +92,14 @@ JAVALIBDIR = $(LIBDIR)
- # On Linux /bin/sh, SunOS/Solaris /usr/xpg4/bin/sh or /bin/ksh
- # In general: bash or ksh will work
- #
--GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` LANG=C sh -c 'type sh | sed "s/.* //"')
-+GOODSH := $(BASH)
-
- # Path of bash for bash specific plugins
--BASH := /bin/bash
-+BASH := $(BASH)
-
- # Server only - Where to install the perl libraries
--PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-+PERLVENDORLIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
-+PERLLIB = $(DESTDIR)$(PERLVENDORLIB)
-
- # Client only - Install plugins for this architecture
- # the LANG=C makes tr work as expected, not regarding any locale it
-@@ -116,8 +120,8 @@ MKTEMP := $(shell ./test-mktemp)
- VERSION := $(shell ./getversion)
-
- # User to run munin as
--USER := munin
--GROUP := munin
-+USER := $(MUNIN_USER)
-+GROUP := $(MUNIN_GROUP)
-
- # Default user to run the plugins as
- PLUGINUSER := nobody
-@@ -125,32 +129,8 @@ PLUGINUSER := nobody
- # Default user to run the cgi as
- CGIUSER := nobody
-
--# Which command to use to check if the USER and GROUP to run Munin as, exists.
--ifneq ($(shell which getent),)
-- # "getent" works on most modern OS
-- CHECKUSER_COMMAND := getent passwd $(USER)
-- CHECKGROUP_COMMAND := getent group $(GROUP)
--else
-- ifeq ($(OSTYPE),darwin)
-- # This should work for OSX 10.5 (Leopard) or later
-- CHECKUSER_COMMAND := dscl . -read /Users/$(USER)
-- CHECKGROUP_COMMAND := dscl . -read /Groups/$(GROUP)
-- else
-- ifeq ($(OSTYPE),cygwin)
-- CHECKUSER_COMMAND := id $(USER)
-- CHECKGROUP_COMMAND := grep ^$(GROUP): /etc/group
-- else
-- ifeq ($(OSTYPE),hp-ux)
-- CHECKUSER_COMMAND := pwget -n $(USER)
-- CHECKGROUP_COMMAND := grget -n $(GROUP)
-- else
-- $(warning Missing test for user existence on this platform. Skipping this check and hoping for the best ...)
-- CHECKUSER_COMMAND := true
-- CHECKGROUP_COMMAND := true
-- endif
-- endif
-- endif
--endif
-+CHECKUSER_COMMAND := true
-+CHECKGROUP_COMMAND := true
- CHECKUSER := $(shell $(CHECKUSER_COMMAND) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
- CHECKGROUP := $(shell $(CHECKGROUP_COMMAND) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-
-@@ -159,7 +139,7 @@ CHMOD := chmod
- CHGRP := chgrp
-
- # Java compiler stuff - only needed on the buildhost
--JC := javac
-+JC := $(JAVA_HOME)/bin/javac
- JFLAGS := -g -source 1.7 -target 1.7 -Xlint
- JAR := jar
-
diff --git a/munin-common/patches/patch-common_Build.PL b/munin-common/patches/patch-common_Build.PL
deleted file mode 100644
index 3889d177e6..0000000000
--- a/munin-common/patches/patch-common_Build.PL
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Add missing module_name so that Munin::Common becomes a valid Perl Module.
-
---- common/Build.PL.orig 2019-01-17 12:03:08.506724040 +0000
-+++ common/Build.PL
-@@ -4,6 +4,7 @@ my $version = `../getversion`;
- chomp($version);
-
- my $build = Module::Build->new(
-+ module_name => 'Munin::Common',
- dist_name => 'Munin::Common',
- dist_version => $version,
- dist_author => 'The Munin Team <munin-users%lists.sourceforge.net@localhost>',
diff --git a/munin-common/patches/patch-lib_Munin_Common_Defaults.pm b/munin-common/patches/patch-lib_Munin_Common_Defaults.pm
deleted file mode 100644
index b5f5a19087..0000000000
--- a/munin-common/patches/patch-lib_Munin_Common_Defaults.pm
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-lib_Munin_Common_Defaults.pm,v 1.2 2015/01/14 11:18:14 fhajny Exp $
-
-Initialize default paths for all Munin components.
-
---- common/lib/Munin/Common/Defaults.pm.orig 2014-11-24 21:46:24.000000000 +0000
-+++ common/lib/Munin/Common/Defaults.pm
-@@ -18,25 +18,25 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
- our $DROPDOWNLIMIT = 1;
-
- our $MUNIN_PREFIX = '';
--our $MUNIN_CONFDIR = "$COMPONENT_ROOT/t/config/";
-+our $MUNIN_CONFDIR = '@PKG_SYSCONFDIR@/';
- our $MUNIN_BINDIR = '';
- our $MUNIN_SBINDIR = '';
- our $MUNIN_DOCDIR = '';
--our $MUNIN_LIBDIR = '';
--our $MUNIN_HTMLDIR = '';
--our $MUNIN_CGIDIR = '';
-+our $MUNIN_LIBDIR = '@MUNIN_LIBDIR@';
-+our $MUNIN_HTMLDIR = '@MUNIN_WWWDIR@/munin/data';
-+our $MUNIN_CGIDIR = '@MUNIN_WWWDIR@/cgi-bin';
- our $MUNIN_CGITMPDIR = '';
--our $MUNIN_DBDIR = '';
--our $MUNIN_PLUGSTATE = '';
-+our $MUNIN_DBDIR = '@MUNIN_DBDIR@';
-+our $MUNIN_PLUGSTATE = '@MUNIN_PLUGSTATE@';
- our $MUNIN_SPOOLDIR = '';
- our $MUNIN_MANDIR = '';
--our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/";
--our $MUNIN_STATEDIR = '';
-+our $MUNIN_LOGDIR = '@MUNIN_LOGDIR@/';
-+our $MUNIN_STATEDIR = '@MUNIN_STATEDIR@';
- our $MUNIN_USER = getpwuid $UID;
- our $MUNIN_GROUP = getgrgid $GID;
- our $MUNIN_PLUGINUSER = getpwuid $UID;
- our $MUNIN_VERSION = 'svn';
--our $MUNIN_PERL = '/usr/bin/perl';
-+our $MUNIN_PERL = '@PERL5@';
- our $MUNIN_PERLLIB = '';
- our $MUNIN_GOODSH = '';
- our $MUNIN_BASH = '';
diff --git a/munin-master/DESCR b/munin-master/DESCR
deleted file mode 100644
index 73694b6a6f..0000000000
--- a/munin-master/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Munin is a tool for graphing all sorts of information about one or
-more servers and displaying it in a web interface. It uses the
-execellent RRDTool (written by Tobi Oetiker) and is written in Perl.
-Munin has a master/node architecture. The master connects to all the
-nodes at regular intervals, and asks them for data. It then stores
-the data in RRD-files, and (if needed) updates the graphs. One of the
-main goals has been ease of creating own "plugins" (graphs).
diff --git a/munin-master/MESSAGE b/munin-master/MESSAGE
deleted file mode 100644
index a4d51b0e51..0000000000
--- a/munin-master/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2015/01/13 15:36:05 fhajny Exp $
-
-You can start the collection of statistics and production of graphs by
-installing a Cron for the ${MUNIN_USER} user that executes the following
-command every 5 minutes:
-
- ${PREFIX}/bin/munin-cron
-
-===========================================================================
diff --git a/munin-master/Makefile b/munin-master/Makefile
deleted file mode 100644
index f9cf04e763..0000000000
--- a/munin-master/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2015/01/14 15:22:23 fhajny Exp $
-
-PKGNAME= ${DISTNAME:S/munin/munin-master/}
-COMMENT= System monitoring tool, master version
-
-.include "../../wip/munin-common/Makefile.common"
-
-DEPENDS+= munin-common>=${PKGVERSION_NOREV}:../../wip/munin-common
-DEPENDS+= p5-CGI-Fast>=0:../../www/p5-CGI-Fast
-DEPENDS+= p5-Date-Manip>=0:../../devel/p5-Date-Manip
-DEPENDS+= p5-File-Copy-Recursive>=0.38:../../sysutils/p5-File-Copy-Recursive
-DEPENDS+= p5-HTML-Template>=0:../../www/p5-HTML-Template
-DEPENDS+= p5-IO-Socket-INET6>=2.69:../../net/p5-IO-Socket-INET6
-DEPENDS+= p5-Log-Log4perl>=1.18:../../devel/p5-Log-Log4perl
-DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
-#DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes
-DEPENDS+= p5-URI>=1.60:../../www/p5-URI
-DEPENDS+= rrdtool>=1.2:../../databases/rrdtool
-
-OWN_DIRS+= ${PKG_SYSCONFDIR}/munin-conf.d
-OWN_DIRS+= ${PKG_SYSCONFDIR}/static
-OWN_DIRS+= ${PKG_SYSCONFDIR}/templates
-OWN_DIRS+= ${PKG_SYSCONFDIR}/templates/partial
-
-OWN_DIRS_PERMS+= ${MUNIN_DBDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_DBDIR}/cgi-tmp nobody ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_LOGDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_SPOOLDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0775
-OWN_DIRS_PERMS+= ${MUNIN_STATEDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_WWWDIR}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_WWWDIR}/munin/data ${MUNIN_USER} ${MUNIN_GROUP} 0755
-
-TMPL_EGDIR= ${EGDIR}/templates
-STATIC_EGDIR= ${EGDIR}/static
-INST_TMPL_DIR= ${PKG_SYSCONFDIR}/templates
-
-TMPL_FILES= munin-categoryview.tmpl munin-comparison-day.tmpl \
- munin-comparison-month.tmpl munin-comparison-week.tmpl \
- munin-comparison-year.tmpl munin-domainview.tmpl \
- munin-dynazoom.tmpl munin-nodeview.tmpl munin-overview.tmpl \
- munin-problemview.tmpl munin-serviceview.tmpl \
- partial/bottom_navigation.tmpl partial/footer.tmpl \
- partial/generated_by.tmpl partial/head.tmpl partial/logo_navigation.tmpl \
- partial/logo_navigation_comparison.tmpl \
- partial/logo_navigation_problem.tmpl partial/logo_path.tmpl \
- partial/navigation.tmpl partial/path.tmpl
-
-STATIC_FILES= definitions.html dynazoom.html favicon.ico formatdate.js \
- logo-h.png logo.png querystring.js zoom.js \
- style-1.2.css style-new.css style.css
-
-CONF_FILES+= ${EGDIR}/munin.conf ${PKG_SYSCONFDIR}/munin.conf
-.for f in ${TMPL_FILES}
-CONF_FILES+= ${TMPL_EGDIR}/${f} ${INST_TMPL_DIR}/${f}
-.endfor
-.for f in ${STATIC_FILES}
-CONF_FILES+= ${STATIC_EGDIR}/${f} ${PKG_SYSCONFDIR}/static/${f}
-.endfor
-
-INSTALLATION_DIRS+= ${EGDIR}
-
-CHECK_PORTABILITY_SKIP+= node/node.d/*
-
-BUILD_TARGET= build
-INSTALL_TARGET= install-master-prime
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/munin-master/PLIST b/munin-master/PLIST
deleted file mode 100644
index 2857c1101d..0000000000
--- a/munin-master/PLIST
+++ /dev/null
@@ -1,76 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2015/01/13 15:36:05 fhajny Exp $
-bin/munin-check
-bin/munin-cron
-lib/munin/DejaVuSans.ttf
-lib/munin/DejaVuSansMono.ttf
-lib/munin/munin-datafile2storable
-lib/munin/munin-graph
-lib/munin/munin-html
-lib/munin/munin-limits
-lib/munin/munin-storable2datafile
-lib/munin/munin-update
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Config.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/GraphOld.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Group.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/GroupRepository.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/HTMLConfig.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/HTMLOld.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Host.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/LimitsOld.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Logger.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Node.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/ProcessManager.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Update.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/UpdateWorker.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Utils.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Master/Worker.pm
-man/man3/Munin::Master::Config.3
-man/man3/Munin::Master::Group.3
-man/man3/Munin::Master::GroupRepository.3
-man/man3/Munin::Master::HTMLOld.3
-man/man3/Munin::Master::Host.3
-man/man3/Munin::Master::LimitsOld.3
-man/man3/Munin::Master::Logger.3
-man/man3/Munin::Master::Node.3
-man/man3/Munin::Master::ProcessManager.3
-man/man3/Munin::Master::Update.3
-man/man3/Munin::Master::UpdateWorker.3
-man/man3/Munin::Master::Utils.3
-man/man3/Munin::Master::Worker.3
-share/examples/munin/munin.conf
-share/examples/munin/static/definitions.html
-share/examples/munin/static/dynazoom.html
-share/examples/munin/static/favicon.ico
-share/examples/munin/static/formatdate.js
-share/examples/munin/static/logo-h.png
-share/examples/munin/static/logo.png
-share/examples/munin/static/querystring.js
-share/examples/munin/static/style-1.2.css
-share/examples/munin/static/style-new.css
-share/examples/munin/static/style.css
-share/examples/munin/static/zoom.js
-share/examples/munin/templates/munin-categoryview.tmpl
-share/examples/munin/templates/munin-comparison-day.tmpl
-share/examples/munin/templates/munin-comparison-month.tmpl
-share/examples/munin/templates/munin-comparison-week.tmpl
-share/examples/munin/templates/munin-comparison-year.tmpl
-share/examples/munin/templates/munin-domainview.tmpl
-share/examples/munin/templates/munin-dynazoom.tmpl
-share/examples/munin/templates/munin-nodeview.tmpl
-share/examples/munin/templates/munin-overview.tmpl
-share/examples/munin/templates/munin-problemview.tmpl
-share/examples/munin/templates/munin-serviceview.tmpl
-share/examples/munin/templates/partial/bottom_navigation.tmpl
-share/examples/munin/templates/partial/footer.tmpl
-share/examples/munin/templates/partial/generated_by.tmpl
-share/examples/munin/templates/partial/head.tmpl
-share/examples/munin/templates/partial/logo_navigation.tmpl
-share/examples/munin/templates/partial/logo_navigation_comparison.tmpl
-share/examples/munin/templates/partial/logo_navigation_problem.tmpl
-share/examples/munin/templates/partial/logo_path.tmpl
-share/examples/munin/templates/partial/navigation.tmpl
-share/examples/munin/templates/partial/path.tmpl
-www/cgi-bin/munin-cgi-graph
-www/cgi-bin/munin-cgi-html
-www/munin/data/.htaccess
-@pkgdir share/examples/munin/munin-conf.d
diff --git a/munin-node/DESCR b/munin-node/DESCR
deleted file mode 100644
index 73694b6a6f..0000000000
--- a/munin-node/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Munin is a tool for graphing all sorts of information about one or
-more servers and displaying it in a web interface. It uses the
-execellent RRDTool (written by Tobi Oetiker) and is written in Perl.
-Munin has a master/node architecture. The master connects to all the
-nodes at regular intervals, and asks them for data. It then stores
-the data in RRD-files, and (if needed) updates the graphs. One of the
-main goals has been ease of creating own "plugins" (graphs).
diff --git a/munin-node/MESSAGE b/munin-node/MESSAGE
deleted file mode 100644
index ff82b6d164..0000000000
--- a/munin-node/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2015/01/13 15:36:06 fhajny Exp $
-
-Plugins can be auto-configured with "munin-node-configure --shell | sh"
-
-===========================================================================
diff --git a/munin-node/Makefile b/munin-node/Makefile
deleted file mode 100644
index ae307df80b..0000000000
--- a/munin-node/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2015/01/13 15:36:06 fhajny Exp $
-
-PKGNAME= ${DISTNAME:S/munin/munin-node/}
-COMMENT= System monitoring tool, client version
-
-.include "../../wip/munin-common/Makefile.common"
-
-DEPENDS+= munin-common>=${PKGVERSION_NOREV}:../../wip/munin-common
-DEPENDS+= p5-IO-Socket-INET6>=0:../../net/p5-IO-Socket-INET6
-DEPENDS+= p5-List-MoreUtils>=0:../../devel/p5-List-MoreUtils
-DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
-DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server
-DEPENDS+= p5-Socket6>=0:../../net/p5-Socket6
-#DEPENDS+= p5-Time-HiRes>=0:../../time/p5-Time-HiRes
-
-OWN_DIRS+= ${PKG_SYSCONFDIR}/plugin-conf.d
-OWN_DIRS= ${PKG_SYSCONFDIR}/plugins
-
-OWN_DIRS_PERMS+= ${MUNIN_DBDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_LOGDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755
-OWN_DIRS_PERMS+= ${MUNIN_PLUGSTATE} nobody ${MUNIN_GROUP} 0775
-OWN_DIRS_PERMS+= ${MUNIN_SPOOLDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0775
-OWN_DIRS_PERMS+= ${MUNIN_STATEDIR} ${MUNIN_USER} ${MUNIN_GROUP} 0755
-
-REPLACE_PERL+= node/sbin/munin-node
-REPLACE_PERL+= node/sbin/munin-node-configure
-REPLACE_PERL+= node/sbin/munin-run
-REPLACE_PERL+= plugins/node.d/slony_lag_.in
-
-CONF_FILES+= ${EGDIR}/munin-node.conf ${PKG_SYSCONFDIR}/munin-node.conf
-INSTALLATION_DIRS+= ${EGDIR}
-
-CHECK_INTERPRETER_SKIP+= lib/munin/plugins/tomcat_
-
-RCD_SCRIPTS+= munin-node
-
-BUILD_TARGET= build
-INSTALL_TARGET= install-node install-node-plugins
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${DESTDIR}${EGDIR}
-
-.include "../../lang/python/application.mk"
-.include "../../lang/ruby/rubyversion.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/munin-node/PLIST b/munin-node/PLIST
deleted file mode 100644
index 623bb1169a..0000000000
--- a/munin-node/PLIST
+++ /dev/null
@@ -1,232 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2015/01/13 15:36:06 fhajny Exp $
-bin/munindoc
-lib/munin/plugins/amavis
-lib/munin/plugins/apache_accesses
-lib/munin/plugins/apache_processes
-lib/munin/plugins/apache_volume
-lib/munin/plugins/apc_envunit_
-lib/munin/plugins/apc_nis
-lib/munin/plugins/asterisk_channels
-lib/munin/plugins/asterisk_channelstypes
-lib/munin/plugins/asterisk_codecs
-lib/munin/plugins/asterisk_meetme
-lib/munin/plugins/asterisk_meetmeusers
-lib/munin/plugins/asterisk_sipchannels
-lib/munin/plugins/asterisk_sippeers
-lib/munin/plugins/asterisk_voicemail
-lib/munin/plugins/bind9
-lib/munin/plugins/bind9_rndc
-lib/munin/plugins/cmc_tc_sensor_
-lib/munin/plugins/courier_
-lib/munin/plugins/courier_mta_mailqueue
-lib/munin/plugins/courier_mta_mailstats
-lib/munin/plugins/courier_mta_mailvolume
-lib/munin/plugins/cupsys_pages
-lib/munin/plugins/df
-lib/munin/plugins/df_inode
-lib/munin/plugins/dhcpd3
-lib/munin/plugins/digitemp_
-lib/munin/plugins/ejabberd_
-lib/munin/plugins/exim_mailqueue
-lib/munin/plugins/exim_mailqueue_alt
-lib/munin/plugins/exim_mailstats
-lib/munin/plugins/fail2ban
-lib/munin/plugins/foldingathome
-lib/munin/plugins/foldingathome_rank
-lib/munin/plugins/foldingathome_wu
-lib/munin/plugins/freeradius_acct
-lib/munin/plugins/freeradius_auth
-lib/munin/plugins/freeradius_proxy_acct
-lib/munin/plugins/freeradius_proxy_auth
-lib/munin/plugins/haproxy_
-lib/munin/plugins/haproxy_ng
-lib/munin/plugins/hddtemp
-lib/munin/plugins/hddtemp2
-lib/munin/plugins/hddtemp_smartctl
-lib/munin/plugins/hddtempd
-lib/munin/plugins/hp2000_
-lib/munin/plugins/http_loadtime
-lib/munin/plugins/ifx_concurrent_sessions_
-lib/munin/plugins/ipac-ng
-lib/munin/plugins/ipmi_
-lib/munin/plugins/ipmi_sensor_
-lib/munin/plugins/ircu
-lib/munin/plugins/loggrep
-lib/munin/plugins/lpstat
-lib/munin/plugins/mailman
-lib/munin/plugins/mailscanner
-lib/munin/plugins/mbmon_
-lib/munin/plugins/memcached_
-lib/munin/plugins/mhttping
-lib/munin/plugins/multiping
-lib/munin/plugins/multips
-lib/munin/plugins/multips_memory
-lib/munin/plugins/munin_stats
-lib/munin/plugins/munin_update
-lib/munin/plugins/mysql_
-lib/munin/plugins/mysql_bytes
-lib/munin/plugins/mysql_innodb
-lib/munin/plugins/mysql_isam_space_
-lib/munin/plugins/mysql_queries
-lib/munin/plugins/mysql_slowqueries
-lib/munin/plugins/mysql_threads
-lib/munin/plugins/named
-lib/munin/plugins/netopia
-lib/munin/plugins/netstat
-lib/munin/plugins/nginx_request
-lib/munin/plugins/nginx_status
-lib/munin/plugins/nomadix_users_
-lib/munin/plugins/ntp_
-lib/munin/plugins/ntp_kernel_err
-lib/munin/plugins/ntp_kernel_pll_freq
-lib/munin/plugins/ntp_kernel_pll_off
-lib/munin/plugins/ntp_offset
-lib/munin/plugins/ntp_states
-lib/munin/plugins/nut_misc
-lib/munin/plugins/nut_volts
-lib/munin/plugins/nutups_
-lib/munin/plugins/nvidia_
-lib/munin/plugins/openvpn
-lib/munin/plugins/perdition
-lib/munin/plugins/pgbouncer_connections
-lib/munin/plugins/pgbouncer_requests
-lib/munin/plugins/ping_
-lib/munin/plugins/plugin.sh
-lib/munin/plugins/plugins.history
-lib/munin/plugins/pm3users_
-lib/munin/plugins/pop_stats
-lib/munin/plugins/postfix_mailqueue
-lib/munin/plugins/postfix_mailstats
-lib/munin/plugins/postfix_mailvolume
-lib/munin/plugins/postgres_autovacuum
-lib/munin/plugins/postgres_bgwriter
-lib/munin/plugins/postgres_cache_
-lib/munin/plugins/postgres_checkpoints
-lib/munin/plugins/postgres_connections_
-lib/munin/plugins/postgres_connections_db
-lib/munin/plugins/postgres_locks_
-lib/munin/plugins/postgres_oldest_prepared_xact_
-lib/munin/plugins/postgres_prepared_xacts_
-lib/munin/plugins/postgres_querylength_
-lib/munin/plugins/postgres_scans_
-lib/munin/plugins/postgres_size_
-lib/munin/plugins/postgres_streaming_
-lib/munin/plugins/postgres_transactions_
-lib/munin/plugins/postgres_tuples_
-lib/munin/plugins/postgres_users
-lib/munin/plugins/postgres_xlog
-lib/munin/plugins/processes
-lib/munin/plugins/proxy_plugin
-lib/munin/plugins/ps_
-lib/munin/plugins/psu_
-lib/munin/plugins/qmailqstat
-lib/munin/plugins/qmailscan
-lib/munin/plugins/qmailscan-simple
-lib/munin/plugins/samba
-lib/munin/plugins/sendmail_mailqueue
-lib/munin/plugins/sendmail_mailstats
-lib/munin/plugins/sendmail_mailtraffic
-lib/munin/plugins/slapd_
-lib/munin/plugins/slapd_bdb_cache_
-lib/munin/plugins/slony_lag_
-lib/munin/plugins/smart_
-lib/munin/plugins/snmp__cpuload
-lib/munin/plugins/snmp__df
-lib/munin/plugins/snmp__df_ram
-lib/munin/plugins/snmp__fc_if_
-lib/munin/plugins/snmp__fc_if_err_
-lib/munin/plugins/snmp__if_
-lib/munin/plugins/snmp__if_err_
-lib/munin/plugins/snmp__if_multi
-lib/munin/plugins/snmp__load
-lib/munin/plugins/snmp__memory
-lib/munin/plugins/snmp__netapp_diskusage_
-lib/munin/plugins/snmp__netapp_inodeusage_
-lib/munin/plugins/snmp__netstat
-lib/munin/plugins/snmp__print_pages
-lib/munin/plugins/snmp__print_supplies
-lib/munin/plugins/snmp__processes
-lib/munin/plugins/snmp__rdp_users
-lib/munin/plugins/snmp__sensors_fsc_bx_fan
-lib/munin/plugins/snmp__sensors_fsc_bx_temp
-lib/munin/plugins/snmp__sensors_fsc_fan
-lib/munin/plugins/snmp__sensors_fsc_temp
-lib/munin/plugins/snmp__sensors_mbm_fan
-lib/munin/plugins/snmp__sensors_mbm_temp
-lib/munin/plugins/snmp__sensors_mbm_volt
-lib/munin/plugins/snmp__swap
-lib/munin/plugins/snmp__uptime
-lib/munin/plugins/snmp__users
-lib/munin/plugins/snmp__winload
-lib/munin/plugins/snmp__winmem
-lib/munin/plugins/snort_alerts
-lib/munin/plugins/snort_bytes_pkt
-lib/munin/plugins/snort_drop_rate
-lib/munin/plugins/snort_pattern_match
-lib/munin/plugins/snort_pkts
-lib/munin/plugins/snort_traffic
-lib/munin/plugins/spamstats
-lib/munin/plugins/squeezebox_
-lib/munin/plugins/squid_cache
-lib/munin/plugins/squid_icp
-lib/munin/plugins/squid_objectsize
-lib/munin/plugins/squid_requests
-lib/munin/plugins/squid_traffic
-lib/munin/plugins/surfboard
-lib/munin/plugins/sybase_space
-lib/munin/plugins/tomcat_
-lib/munin/plugins/tomcat_access
-lib/munin/plugins/tomcat_jvm
-lib/munin/plugins/tomcat_threads
-lib/munin/plugins/tomcat_volume
-lib/munin/plugins/users
-lib/munin/plugins/varnish_
-lib/munin/plugins/vmstat
-lib/munin/plugins/zimbra_
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Config.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/Debug.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/History.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/HostEnumeration.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/Plugin.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Configure/PluginList.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Logger.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/OS.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/SNMPConfig.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Server.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Service.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Session.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/SpoolReader.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/SpoolWriter.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Node/Utils.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin/Pgsql.pm
-${PERL5_SUB_INSTALLVENDORLIB}/Munin/Plugin/SNMP.pm
-man/man1/munin-node-configure.1
-man/man1/munin-node.1
-man/man1/munin-run.1
-man/man1/munindoc.1
-man/man3/Munin::Node::Config.3
-man/man3/Munin::Node::Configure::Debug.3
-man/man3/Munin::Node::Configure::History.3
-man/man3/Munin::Node::Configure::HostEnumeration.3
-man/man3/Munin::Node::Configure::Plugin.3
-man/man3/Munin::Node::Configure::PluginList.3
-man/man3/Munin::Node::Logger.3
-man/man3/Munin::Node::OS.3
-man/man3/Munin::Node::SNMPConfig.3
-man/man3/Munin::Node::Server.3
-man/man3/Munin::Node::Service.3
-man/man3/Munin::Node::Session.3
-man/man3/Munin::Node::SpoolReader.3
-man/man3/Munin::Node::SpoolWriter.3
-man/man3/Munin::Node::Utils.3
-man/man3/Munin::Plugin.3
-man/man3/Munin::Plugin::Pgsql.3
-man/man3/Munin::Plugin::SNMP.3
-sbin/munin-node
-sbin/munin-node-configure
-sbin/munin-run
-share/examples/munin/munin-node.conf
-share/examples/rc.d/munin-node
-@pkgdir etc/munin/plugin-conf.d
-@pkgdir var/munin/plugin-state
diff --git a/munin-node/PLIST.AIX b/munin-node/PLIST.AIX
deleted file mode 100644
index d3e7d52286..0000000000
--- a/munin-node/PLIST.AIX
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.AIX,v 1.2 2011/09/10 19:55:04 ftigeot Exp $
-lib/munin/plugins/swap
diff --git a/munin-node/PLIST.FreeBSD b/munin-node/PLIST.FreeBSD
deleted file mode 100644
index f291b9e9ae..0000000000
--- a/munin-node/PLIST.FreeBSD
+++ /dev/null
@@ -1,13 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.3 2011/09/10 19:55:04 ftigeot Exp $
-lib/munin/plugins/coretemp
-lib/munin/plugins/cpu
-lib/munin/plugins/dev_cpu_
-lib/munin/plugins/if_
-lib/munin/plugins/if_errcoll_
-lib/munin/plugins/iostat
-lib/munin/plugins/load
-lib/munin/plugins/memory
-lib/munin/plugins/open_files
-lib/munin/plugins/swap
-lib/munin/plugins/systat
-lib/munin/plugins/uptime
diff --git a/munin-node/PLIST.Linux b/munin-node/PLIST.Linux
deleted file mode 100644
index 2987ed4277..0000000000
--- a/munin-node/PLIST.Linux
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2011/09/10 19:55:04 ftigeot Exp $
-lib/munin/plugins/acpi
-lib/munin/plugins/apt
-lib/munin/plugins/apt_all
-lib/munin/plugins/cps_
-lib/munin/plugins/df_abs
-lib/munin/plugins/entropy
-lib/munin/plugins/files_
-lib/munin/plugins/forks
-lib/munin/plugins/fw_conntrack
-lib/munin/plugins/fw_forwarded_local
-lib/munin/plugins/fw_packets
-lib/munin/plugins/i2c
-lib/munin/plugins/i2c_fan
-lib/munin/plugins/if_err_
-lib/munin/plugins/interrupts
-lib/munin/plugins/iostat_ios
-lib/munin/plugins/ip_
-lib/munin/plugins/irqstats
-lib/munin/plugins/netopia
-lib/munin/plugins/nfs_client
-lib/munin/plugins/nfsd
-lib/munin/plugins/open_files
-lib/munin/plugins/open_inodes
-lib/munin/plugins/port_
-lib/munin/plugins/sensors_
-lib/munin/plugins/swap
-lib/munin/plugins/uptime
-lib/munin/plugins/users
-lib/munin/plugins/vlan_
-lib/munin/plugins/vlan_inetuse_
-lib/munin/plugins/vlan_linkuse_
diff --git a/munin-node/PLIST.NetBSD b/munin-node/PLIST.NetBSD
deleted file mode 100644
index 963b213394..0000000000
--- a/munin-node/PLIST.NetBSD
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2011/09/10 19:55:04 ftigeot Exp $
-lib/munin/plugins/cpu
-lib/munin/plugins/forks
-lib/munin/plugins/if_
-lib/munin/plugins/if_errcoll_
-lib/munin/plugins/interrupts
-lib/munin/plugins/iostat
-lib/munin/plugins/iostat_ops
-lib/munin/plugins/irqstats
-lib/munin/plugins/load
-lib/munin/plugins/memory
-lib/munin/plugins/memory_pools
-lib/munin/plugins/memory_types
-lib/munin/plugins/nfs_client
-lib/munin/plugins/nfsd
-lib/munin/plugins/open_files
-lib/munin/plugins/sensors_
-lib/munin/plugins/swap
-lib/munin/plugins/uptime
diff --git a/munin-node/PLIST.SunOS b/munin-node/PLIST.SunOS
deleted file mode 100644
index 6331b4fe01..0000000000
--- a/munin-node/PLIST.SunOS
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2013/02/06 14:22:53 fhajny Exp $
-lib/munin/plugins/cpu
-lib/munin/plugins/if_
-lib/munin/plugins/if_err_
-lib/munin/plugins/io_busy_
-lib/munin/plugins/io_bytes_
-lib/munin/plugins/io_ops_
-lib/munin/plugins/iostat
-lib/munin/plugins/ipmi_
-lib/munin/plugins/load
-lib/munin/plugins/memory
-lib/munin/plugins/paging_in
-lib/munin/plugins/paging_out
-lib/munin/plugins/temperature
-lib/munin/plugins/uptime
diff --git a/munin-node/files/munin-node.sh b/munin-node/files/munin-node.sh
deleted file mode 100644
index 684f12f506..0000000000
--- a/munin-node/files/munin-node.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: munin-node.sh,v 1.1 2011/01/25 14:30:37 ftigeot Exp $
-#
-# PROVIDE: munin-node
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start munin-node:
-#
-# munin_node=YES
-#
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="munin_node"
-rcvar=$name
-command=@PREFIX@/sbin/munin-node
-command_interpreter=@PERL@
-pidfile="@VARBASE@/run/munin/munin-node.pid"
-required_files=@PKG_SYSCONFDIR@/munin-node.conf
-
-stop_cmd="munin_node_stop"
-
-# Net::Server breaks rc.subr's techniques for detecting whether the
-# process running at a certain PID is actually the process we wish to
-# stop. Just unconditionally send SIGTERM to the PID instead.
-#
-munin_node_stop()
-{
- @ECHO@ "Stopping ${name}."
- if [ -f ${pidfile} ]; then
- pid=`@HEAD@ -1 ${pidfile}`
- doit="kill ${pid}"
- if ! eval $doit && [ -z "$rc_force" ]; then
- return 1
- fi
- wait_for_pids $pid
- fi
- @RM@ -f ${pidfile}
-}
-
-if [ ! -d @STATEDIR@ ]; then
- mkdir @STATEDIR@
- chown @MUNIN_USER@:@MUNIN_GROUP@ @STATEDIR@
-fi
-if [ ! -d @MUNIN_RUN@ ]; then
- mkdir @MUNIN_RUN@
- chown @MUNIN_USER@:@MUNIN_GROUP@ @MUNIN_RUN@
-fi
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- echo -n " ${name}"
- exec ${command} ${command_args}
-fi
diff --git a/munin-node/files/smf/manifest.xml b/munin-node/files/smf/manifest.xml
deleted file mode 100644
index 42cbe055a3..0000000000
--- a/munin-node/files/smf/manifest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="munin">
- <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
- <create_default_instance enabled="false" />
- <single_instance />
- <dependency name="network" grouping="require_all" restart_on="error" type="service">
- <service_fmri value="svc:/milestone/network:default" />
- </dependency>
- <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
- <service_fmri value="svc:/system/filesystem/local" />
- </dependency>
- <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
- <service_fmri value='file://@PKG_SYSCONFDIR@/munin-node.conf'/>
- </dependency>
- <method_context>
- <method_environment>
- <envvar name="PATH" value="@PREFIX@/bin:@PREFIX@/sbin:/usr/xpg4/bin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/ccs/bin" />
- </method_environment>
- </method_context>
- <exec_method type="method" name="start" exec="@PREFIX@/sbin/munin-node" timeout_seconds="60" />
- <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
- <property_group name="startd" type="framework">
- <propval name="duration" type="astring" value="contract" />
- <propval name="ignore_error" type="astring" value="core,signal" />
- </property_group>
- <property_group name="application" type="application">
- <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/munin-node.conf" />
- </property_group>
- <stability value="Evolving" />
- <template>
- <common_name>
- <loctext xml:lang="C">Munin node</loctext>
- </common_name>
- </template>
- </service>
-</service_bundle>
-
Home |
Main Index |
Thread Index |
Old Index