pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Rename munin-c to munin-c-git because it uses the latest git master version
Module Name: pkgsrc-wip
Committed By: Thomas Merkel <tm%core.io@localhost>
Pushed By: drscream
Date: Wed Aug 23 18:06:16 2017 +0200
Changeset: 3653ea15ef653d61d6aba862bc57af7c10c8f152
Modified Files:
Makefile
Added 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
Removed Files:
munin-c/DESCR
munin-c/Makefile
munin-c/PLIST
munin-c/distinfo
munin-c/patches/patch-getversion
munin-c/patches/patch-src_node_Makefile.am
munin-c/patches/patch-src_node_node.c
Log Message:
Rename munin-c to munin-c-git because it uses the latest git master version
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3653ea15ef653d61d6aba862bc57af7c10c8f152
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
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-c/DESCR | 3 ---
munin-c/Makefile | 30 --------------------------
munin-c/PLIST | 10 ---------
munin-c/distinfo | 5 -----
munin-c/patches/patch-getversion | 16 --------------
munin-c/patches/patch-src_node_Makefile.am | 16 --------------
munin-c/patches/patch-src_node_node.c | 16 --------------
15 files changed, 97 insertions(+), 97 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index bc23101c07..a7d25636cd 100644
--- a/Makefile
+++ b/Makefile
@@ -2056,7 +2056,7 @@ SUBDIR+= multisync-syncml-moto
SUBDIR+= multitail
SUBDIR+= mumble
SUBDIR+= munge
-SUBDIR+= munin-c
+SUBDIR+= munin-c-git
SUBDIR+= munin-common
SUBDIR+= munin-master
SUBDIR+= munin-node
diff --git a/munin-c-git/DESCR b/munin-c-git/DESCR
new file mode 100644
index 0000000000..8aec66d51e
--- /dev/null
+++ b/munin-c-git/DESCR
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000000..da0bae68d4
--- /dev/null
+++ b/munin-c-git/Makefile
@@ -0,0 +1,30 @@
+# $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
new file mode 100644
index 0000000000..d8e8d0acb6
--- /dev/null
+++ b/munin-c-git/PLIST
@@ -0,0 +1,10 @@
+@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
new file mode 100644
index 0000000000..52f55ad1d4
--- /dev/null
+++ b/munin-c-git/distinfo
@@ -0,0 +1,5 @@
+$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
new file mode 100644
index 0000000000..4955844b85
--- /dev/null
+++ b/munin-c-git/patches/patch-getversion
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 0000000000..90d73b8c3f
--- /dev/null
+++ b/munin-c-git/patches/patch-src_node_Makefile.am
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 0000000000..402e921b4a
--- /dev/null
+++ b/munin-c-git/patches/patch-src_node_node.c
@@ -0,0 +1,16 @@
+$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-c/DESCR b/munin-c/DESCR
deleted file mode 100644
index 8aec66d51e..0000000000
--- a/munin-c/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/Makefile b/munin-c/Makefile
deleted file mode 100644
index da0bae68d4..0000000000
--- a/munin-c/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/PLIST b/munin-c/PLIST
deleted file mode 100644
index d8e8d0acb6..0000000000
--- a/munin-c/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/distinfo b/munin-c/distinfo
deleted file mode 100644
index 52f55ad1d4..0000000000
--- a/munin-c/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/patches/patch-getversion b/munin-c/patches/patch-getversion
deleted file mode 100644
index 4955844b85..0000000000
--- a/munin-c/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/patches/patch-src_node_Makefile.am b/munin-c/patches/patch-src_node_Makefile.am
deleted file mode 100644
index 90d73b8c3f..0000000000
--- a/munin-c/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/patches/patch-src_node_node.c b/munin-c/patches/patch-src_node_node.c
deleted file mode 100644
index 402e921b4a..0000000000
--- a/munin-c/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();
-
Home |
Main Index |
Thread Index |
Old Index