[pkgsrc/trunk]: pkgsrc/parallel/ganglia-monitor-core Upgradde ganglia-monitor...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/parallel/ganglia-monitor-core Upgradde ganglia-monitor...
From: jschauma <jschauma%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:19:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf5e45659172
branches:  trunk
changeset: 488838:bf5e45659172
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Thu Feb 10 02:33:53 2005 +0000

description:
Upgradde ganglia-monitor-core to version 3.0.0, which was released
one day after the initial import of this package.

diffstat:

 parallel/ganglia-monitor-core/Makefile         |   24 +-
 parallel/ganglia-monitor-core/PLIST            |   37 +--
 parallel/ganglia-monitor-core/distinfo         |   19 +-
 parallel/ganglia-monitor-core/patches/patch-aa |   35 +-
 parallel/ganglia-monitor-core/patches/patch-ab |  270 +++++++++++++------
 parallel/ganglia-monitor-core/patches/patch-ac |   10 +-
 parallel/ganglia-monitor-core/patches/patch-ag |   38 +-
 parallel/ganglia-monitor-core/patches/patch-aj |    9 +
 parallel/ganglia-monitor-core/patches/patch-ak |  340 +++++++++++++++++++++++++
 parallel/ganglia-monitor-core/patches/patch-al |   78 +++++
 parallel/ganglia-monitor-core/patches/patch-am |   13 +
 parallel/ganglia-monitor-core/patches/patch-an |   11 +
 12 files changed, 715 insertions(+), 169 deletions(-)

diffs (truncated from 1107 to 300 lines):

diff -r 86888d6ed038 -r bf5e45659172 parallel/ganglia-monitor-core/Makefile
--- a/parallel/ganglia-monitor-core/Makefile    Thu Feb 10 02:27:46 2005 +0000
+++ b/parallel/ganglia-monitor-core/Makefile    Thu Feb 10 02:33:53 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/02/07 14:33:19 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/02/10 02:33:53 jschauma Exp $
 #
 
-DISTNAME=              ganglia-monitor-core-2.5.7
+DISTNAME=              ganglia-3.0.0
+PKGNAME=               ganglia-monitor-core-3.0.0
 CATEGORIES=            net parallel
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ganglia/}
 
@@ -16,9 +17,10 @@
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --with-gmetad
 
-PATCH_ETC=             lib/ganglia/gmond_config.h                      \
-                       mans/gmetad.1 mans/gmond.1                      \
-                       gmetad/cmdline.c gmond/cmdline.c
+PATCH_ETC=             mans/gmetad.1 mans/gmond.1                      \
+                       gmetad/cmdline.c gmetad/conf.c                  \
+                       gmond/cmdline.c gmond/g25_config.h              \
+                       ganglia.html
 
 PATCH_RCS=             gmond gmetad
 
@@ -28,6 +30,9 @@
 
 RCD_SCRIPTS=           gmond gmetad
 
+pre-patch:
+       ${MKDIR} ${WRKSRC}/srclib/libmetrics/netbsd
+
 post-patch:
 .for pfile in ${PATCH_ETC}
        ${SED} -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'              \
@@ -46,16 +51,13 @@
        ${INSTALL_MAN} ${WRKSRC}/mans/gmetric.1 ${PREFIX}/man/man1/
        ${INSTALL_MAN} ${WRKSRC}/mans/gmond.1 ${PREFIX}/man/man1/
        ${INSTALL_MAN} ${WRKSRC}/mans/gstat.1 ${PREFIX}/man/man1/
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ganglia
+       ${INSTALL_DATA_DIR} ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf ${EGDIR}/
+       ${PREFIX}/sbin/gmond -t > ${EGDIR}/gmond.conf
        ${INSTALL_DATA_DIR} ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
-       ${INSTALL_DATA} ${WRKSRC}/gmond/gmond.conf ${PREFIX}/share/examples/ganglia/
-       ${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf ${PREFIX}/share/examples/ganglia/
        ${INSTALL_DATA} ${WRKSRC}/gmond.sh ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/gmond
        ${INSTALL_DATA} ${WRKSRC}/gmetad.sh ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/gmetad
 
-CFLAGS+=-g
-LDFLAGS+=-g
-
 .include "../../databases/rrdtool/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff -r 86888d6ed038 -r bf5e45659172 parallel/ganglia-monitor-core/PLIST
--- a/parallel/ganglia-monitor-core/PLIST       Thu Feb 10 02:27:46 2005 +0000
+++ b/parallel/ganglia-monitor-core/PLIST       Thu Feb 10 02:33:53 2005 +0000
@@ -1,36 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/07 14:33:19 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/02/10 02:33:53 jschauma Exp $
+bin/ganglia-config
 bin/gmetric
 bin/gstat
 include/ganglia.h
-include/ganglia/ascii.h
-include/ganglia/asciitab.h
-include/ganglia/daemon_inetd.h
-include/ganglia/daemon_init.h
-include/ganglia/debug_msg.h
-include/ganglia/error.h
-include/ganglia/file.h
-include/ganglia/fsusage.h
-include/ganglia/gexec_funcs.h
-include/ganglia/gexec_process.h
-include/ganglia/gmond_config.h
-include/ganglia/hash.h
-include/ganglia/iasciitab.h
-include/ganglia/latin1tab.h
-include/ganglia/llist.h
-include/ganglia/my_inet_ntop.h
-include/ganglia/nametab.h
-include/ganglia/net.h
-include/ganglia/rdwr.h
-include/ganglia/utf8tab.h
-include/ganglia/xmldef.h
-include/ganglia/xmlparse.h
-include/ganglia/xmlrole.h
-include/ganglia/xmltok.h
-include/ganglia/xmltok_impl.h
 lib/libganglia.la
+man/man1/gmetad.1
+man/man1/gmetric.1
+man/man1/gmond.1
+man/man1/gstat.1
+sbin/gmetad
 sbin/gmond
-sbin/gmetad
+share/examples/ganglia/gmetad.conf
 share/examples/ganglia/gmond.conf
-share/examples/ganglia/gmetad.conf
 @dirrm share/examples/ganglia
-@dirrm include/ganglia
diff -r 86888d6ed038 -r bf5e45659172 parallel/ganglia-monitor-core/distinfo
--- a/parallel/ganglia-monitor-core/distinfo    Thu Feb 10 02:27:46 2005 +0000
+++ b/parallel/ganglia-monitor-core/distinfo    Thu Feb 10 02:33:53 2005 +0000
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/02/07 14:33:19 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2005/02/10 02:33:53 jschauma Exp $
 
-SHA1 (ganglia-monitor-core-2.5.7.tar.gz) = b5cfbb319bea0bafd6b0272584570207378ff841
-Size (ganglia-monitor-core-2.5.7.tar.gz) = 497202 bytes
-SHA1 (patch-aa) = 7a2f44bbde10513b66036169aaa990c64d0d0370
-SHA1 (patch-ab) = bdac9969d31762bc54b9e5476572a9be45faf0e6
-SHA1 (patch-ac) = 5a3fe5b9d86d495d4e157b3e2a152ac25cf91f7f
+SHA1 (ganglia-3.0.0.tar.gz) = e669aa828e10a5f71e90c8226ba41566b5fb9e42
+Size (ganglia-3.0.0.tar.gz) = 3389093 bytes
+SHA1 (patch-aa) = 88972d2268ebc76d72d8f2197bb272c6553f7098
+SHA1 (patch-ab) = 21cae050a12d8b63aa313a327b6358fd6b9e397e
+SHA1 (patch-ac) = 23ad60ea06080a6763b21256e20549868110cf54
 SHA1 (patch-ad) = 4f03c665800827e1d89d7d76b81b667f0cf82ca6
 SHA1 (patch-ae) = 417a7ed552583fc61f8c3e095e9233c68311caf9
 SHA1 (patch-af) = 1874ebe88fa2ac288c5ca0a94f864bd0a71415ba
-SHA1 (patch-ag) = f78a42a47dcd8d396400ca4ed4c85e0041d21778
+SHA1 (patch-ag) = a214bed25baff256c7670285129f77d31b18de82
 SHA1 (patch-ah) = 40fae7e64918a0c7709005e9de0629dfb2c22565
 SHA1 (patch-ai) = 1ae508692d8160aa202e02612590d329d910f434
+SHA1 (patch-aj) = d73aa994a2a6c9441d0b1cbcc9247bdf522b37c4
+SHA1 (patch-ak) = 6d84043aaf005e319517e8df61097dc00067ed10
+SHA1 (patch-al) = fbcf90d61ab6a160cbce7b90d0cdfcab44a1429c
+SHA1 (patch-am) = 89cc8fe1f4da758c5c0c46135e4a4310de75cc32
+SHA1 (patch-an) = f6e2d97fd474b5b00b68c575e0c3e376d772b2c0
diff -r 86888d6ed038 -r bf5e45659172 parallel/ganglia-monitor-core/patches/patch-aa
--- a/parallel/ganglia-monitor-core/patches/patch-aa    Thu Feb 10 02:27:46 2005 +0000
+++ b/parallel/ganglia-monitor-core/patches/patch-aa    Thu Feb 10 02:33:53 2005 +0000
@@ -1,23 +1,28 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/02/07 14:33:19 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2005/02/10 02:33:53 jschauma Exp $
 
---- configure.orig     2005-02-03 16:34:11.000000000 -0500
-+++ configure  2005-02-03 16:34:49.000000000 -0500
-@@ -11470,6 +11470,18 @@
- #define FREEBSD 1
+--- srclib/libmetrics/configure.orig   2005-02-02 13:24:14.000000000 -0500
++++ srclib/libmetrics/configure        2005-02-07 22:39:36.000000000 -0500
+@@ -22271,6 +22271,14 @@
  _ACEOF
- ;;
-+*netbsd*)      metric_source="netbsd.c"
-+                CFLAGS="-pthread $CFLAGS -D_REENTRANT"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define SUPPORT_GEXEC 0
-+_ACEOF
-+
+ 
+               ;;
++*netbsd*)      OS="netbsd"
++              varstatedir="/var/db"
 +
 +cat >>confdefs.h <<\_ACEOF
 +#define NETBSD 1
 +_ACEOF
-+;;
- *cygwin*)             metric_source="cygwin.c"
++
++              ;;
+ *cygwin*)             OS="cygwin"
  
  cat >>confdefs.h <<\_ACEOF
+@@ -22281,7 +22289,7 @@
+ esac
+ 
+ 
+-                                                                                                              ac_config_files="$ac_config_files Makefile tests/Makefile aix/Makefile cygwin/Makefile 
darwin/Makefile freebsd/Makefile hpux/Makefile irix/Makefile linux/Makefile osf/Makefile solaris/Makefile"
++                                                                                                              ac_config_files="$ac_config_files Makefile tests/Makefile aix/Makefile cygwin/Makefile 
darwin/Makefile freebsd/Makefile hpux/Makefile irix/Makefile linux/Makefile netbsd/Makefile osf/Makefile solaris/Makefile"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
diff -r 86888d6ed038 -r bf5e45659172 parallel/ganglia-monitor-core/patches/patch-ab
--- a/parallel/ganglia-monitor-core/patches/patch-ab    Thu Feb 10 02:27:46 2005 +0000
+++ b/parallel/ganglia-monitor-core/patches/patch-ab    Thu Feb 10 02:33:53 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2005/02/10 02:33:53 jschauma Exp $
 
---- /dev/null  2005-02-06 17:33:10.000000000 -0500
-+++ gmond/machines/netbsd.c    2005-02-06 17:33:11.000000000 -0500
-@@ -0,0 +1,1006 @@
+--- /dev/null  2005-02-08 14:28:37.000000000 -0500
++++ srclib/libmetrics/netbsd/metrics.c 2005-02-08 14:34:29.000000000 -0500
+@@ -0,0 +1,1110 @@
 +/*
 + *  First stab at support for metrics in NetBSD
 + *  by Jan Schaumann <jschauma%netbsd.org@localhost>
@@ -18,9 +18,10 @@
 +#include <sys/time.h>
 +#include <sys/user.h>
 +#include <sys/resource.h>
++#include <sys/sched.h>
 +#include <sys/stat.h>
 +#include <sys/swap.h>
-+#include <vm/vm_param.h>
++#include <uvm/uvm_param.h>
 +
 +#include <sys/socket.h>
 +#include <net/if.h>
@@ -33,9 +34,8 @@
 +#include <limits.h>
 +#include <paths.h>
 +
-+#include "dnet.h"
-+#include "ganglia.h"
-+#include "metric_typedefs.h"
++#include "interface.h"
++#include "libmetrics.h"
 +
 +#define MIB_SWAPINFO_SIZE 3
 +
@@ -92,7 +92,11 @@
 +   g_val_t val;
 +   int ncpu;
 +   size_t len = sizeof (int);
-+   if (sysctlbyname("hw.ncpu", &ncpu, &len, NULL, 0) == -1 || !len)
++   int mib[2];
++
++   mib[0] = CTL_HW;
++   mib[1] = HW_NCPU;
++   if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == -1 || !len)
 +        ncpu = 1;
 +
 +   val.uint16 = ncpu;
@@ -106,8 +110,12 @@
 +   size_t len;
 +   long cpu_speed;
 +
++   cpu_speed = 0;
++
++#if (__NetBSD_Version__ > 299000000)
 +   if (sysctlbyname("machdep.est.frequency.target", &cpu_speed, &len, NULL, 0) == -1)
 +      val.uint16 = 0;
++#endif
 +
 +   val.uint16 = cpu_speed /= 1000000;
 +   return val;
@@ -194,7 +202,12 @@
 +   g_val_t val;
 +   char machine_type[MAX_G_STRING_SIZE];
 +   size_t len = MAX_G_STRING_SIZE;
-+   if (sysctlbyname("hw.machine", &machine_type, &len, NULL, 0) == -1 || !len)
++   int mib[2];
++
++   mib[0] = CTL_HW;
++   mib[1] = HW_MACHINE;
++
++   if (sysctl(mib, 2, &machine_type, &len, NULL, 0) == -1 || !len)
 +        strncpy( val.str, "x86", MAX_G_STRING_SIZE );
 +
 +   strncpy( val.str, machine_type, MAX_G_STRING_SIZE );
@@ -207,7 +220,12 @@
 +   g_val_t val;
 +   char osname[MAX_G_STRING_SIZE];
 +   size_t len = MAX_G_STRING_SIZE;
-+   if (sysctlbyname("kern.ostype", &osname, &len, NULL, 0) == -1 || !len)
++   int mib[2];
++
++   mib[0] = CTL_KERN;
++   mib[1] = KERN_OSTYPE;
++
++   if (sysctl(mib, 2, &osname, &len, NULL, 0) == -1 || !len)
 +        strncpy( val.str, "NetBSD", MAX_G_STRING_SIZE );
 +
 +   strncpy( val.str, osname, MAX_G_STRING_SIZE );
@@ -236,11 +254,73 @@
 +   return val;
 +}
 +
-+/* Get the CPU state given by index, from kern.cp_time
-+ * Use the constants in <sys/dkstat.h>
-+ * CP_USER=0, CP_NICE=1, CP_SYS=2, CP_INTR=3, CP_IDLE=4
-+ */
-+int cpu_state(int which) {
++g_val_t
++cpu_user_func ( void )
++{
++   g_val_t val;
++   int res;
++
++   static u_int64_t cp_time[CPUSTATES];
++   static u_int64_t cp_old[CPUSTATES];
++   static u_int64_t cp_diff[CPUSTATES];
++   static u_int64_t cpu_states[CPUSTATES];
++   static long tot;
++   size_t len = sizeof(cp_time);
++   int mib[2];
++
++   mib[0] = CTL_KERN;
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/exim-exiscan Be more specific about exiscan capab...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Note upgrade for ganglia packages to 3.0.0:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/exim-exiscan Be more specific about exiscan capab...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Note upgrade for ganglia packages to 3.0.0:
Indexes:
Home | Main Index | Thread Index | Old Index