diff options
Diffstat (limited to 'parallel')
| -rw-r--r-- | parallel/ganglia-monitor-core/Makefile | 24 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/PLIST | 37 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/distinfo | 19 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-aa | 35 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-ab | 228 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-ac | 10 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-ag | 38 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-aj | 9 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-ak | 340 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-al | 78 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-am | 13 | ||||
| -rw-r--r-- | parallel/ganglia-monitor-core/patches/patch-an | 11 |
12 files changed, 694 insertions, 148 deletions
diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile index 745aca9930f..d66c1fe142d 100644 --- a/parallel/ganglia-monitor-core/Makefile +++ b/parallel/ganglia-monitor-core/Makefile @@ -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 @@ USE_PKGINSTALL= YES 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 @@ CONF_FILES+= ${EGDIR}/gmetad.conf ${PKG_SYSCONFDIR}/gmetad.conf 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 @@ post-install: ${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 --git a/parallel/ganglia-monitor-core/PLIST b/parallel/ganglia-monitor-core/PLIST index f904175d189..143234cda0e 100644 --- a/parallel/ganglia-monitor-core/PLIST +++ b/parallel/ganglia-monitor-core/PLIST @@ -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 -sbin/gmond +man/man1/gmetad.1 +man/man1/gmetric.1 +man/man1/gmond.1 +man/man1/gstat.1 sbin/gmetad -share/examples/ganglia/gmond.conf +sbin/gmond share/examples/ganglia/gmetad.conf +share/examples/ganglia/gmond.conf @dirrm share/examples/ganglia -@dirrm include/ganglia diff --git a/parallel/ganglia-monitor-core/distinfo b/parallel/ganglia-monitor-core/distinfo index f57c3175699..b7cf5c142a2 100644 --- a/parallel/ganglia-monitor-core/distinfo +++ b/parallel/ganglia-monitor-core/distinfo @@ -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 --git a/parallel/ganglia-monitor-core/patches/patch-aa b/parallel/ganglia-monitor-core/patches/patch-aa index 8db09735fd8..9d18fd9234e 100644 --- a/parallel/ganglia-monitor-core/patches/patch-aa +++ b/parallel/ganglia-monitor-core/patches/patch-aa @@ -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 --git a/parallel/ganglia-monitor-core/patches/patch-ab b/parallel/ganglia-monitor-core/patches/patch-ab index fd69dddf5f0..da764620542 100644 --- a/parallel/ganglia-monitor-core/patches/patch-ab +++ b/parallel/ganglia-monitor-core/patches/patch-ab @@ -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> @@ -18,9 +18,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ +#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 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ +#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 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + 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 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + 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 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + 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 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + 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,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + 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]; @@ -257,65 +275,168 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + memcpy(&cp_old, &cp_time, CPUSTATES*sizeof(long)); + /* puts kern.cp_time array into cp_time */ + if (sysctl(mib, 2, &cp_time, &len, NULL, 0) == -1 || !len) -+ return 0.0; -+ /* Use percentages function lifted from top(1) to figure percentages */ -+ tot = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); -+ -+ return cpu_states[which]; ++ res = 0.0; ++ else { ++ /* Use percentages function lifted from top(1) to figure percentages */ ++ tot = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); ++ res = cpu_states[CP_USER]; ++ } ++ val.f = (float)res/10; ++ return val; +} + +g_val_t -+cpu_user_func ( void ) ++cpu_nice_func ( void ) +{ + g_val_t val; + int res; + -+ res = cpu_state(CP_USER); ++ 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; ++ mib[1] = KERN_CP_TIME; ++ ++ /* Copy the last cp_time into cp_old */ ++ memcpy(&cp_old, &cp_time, CPUSTATES*sizeof(long)); ++ /* puts kern.cp_time array into cp_time */ ++ if (sysctl(mib, 2, &cp_time, &len, NULL, 0) == -1 || !len) ++ res = 0.0; ++ else { ++ /* Use percentages function lifted from top(1) to figure percentages */ ++ tot = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); ++ res = cpu_states[CP_NICE]; ++ } + val.f = (float)res/10; + return val; +} + -+g_val_t -+cpu_nice_func ( void ) ++g_val_t ++cpu_system_func ( void ) +{ + g_val_t val; + int res; + -+ res = cpu_state(CP_NICE); -+ val.f = (float)res/10; ++ 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; ++ mib[1] = KERN_CP_TIME; + ++ /* Copy the last cp_time into cp_old */ ++ memcpy(&cp_old, &cp_time, CPUSTATES*sizeof(long)); ++ /* puts kern.cp_time array into cp_time */ ++ if (sysctl(mib, 2, &cp_time, &len, NULL, 0) == -1 || !len) ++ res = 0.0; ++ else { ++ /* Use percentages function lifted from top(1) to figure percentages */ ++ tot = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); ++ res = cpu_states[CP_SYS]; ++ } ++ val.f = (float)res/10; + return val; +} + +g_val_t -+cpu_system_func ( void ) ++cpu_idle_func ( void ) +{ + g_val_t val; + int res; + -+ res = cpu_state(CP_SYS); ++ 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; ++ mib[1] = KERN_CP_TIME; ++ ++ /* Copy the last cp_time into cp_old */ ++ memcpy(&cp_old, &cp_time, CPUSTATES*sizeof(long)); ++ /* puts kern.cp_time array into cp_time */ ++ if (sysctl(mib, 2, &cp_time, &len, NULL, 0) == -1 || !len) ++ res = 0.0; ++ else { ++ /* Use percentages function lifted from top(1) to figure percentages */ ++ tot = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); ++ res = cpu_states[CP_IDLE]; ++ } + val.f = (float)res/10; ++ return val; ++} + ++/* ++** FIXME ++*/ ++g_val_t ++cpu_wio_func ( void ) ++{ ++ g_val_t val; ++ val.f = 0.0; + return val; +} + +g_val_t -+cpu_idle_func ( void ) ++cpu_aidle_func ( void ) ++{ ++ g_val_t val; ++ ++ val.f = 0.0; ++ return val; ++} ++ ++g_val_t ++cpu_intr_func ( void ) +{ + g_val_t val; + int res; + -+ res = cpu_state(CP_IDLE); -+ val.f = (float)res/10; ++ 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; ++ mib[1] = KERN_CP_TIME; + ++ /* Copy the last cp_time into cp_old */ ++ memcpy(&cp_old, &cp_time, CPUSTATES*sizeof(long)); ++ /* puts kern.cp_time array into cp_time */ ++ if (sysctl(mib, 2, &cp_time, &len, NULL, 0) == -1 || !len) ++ res = 0.0; ++ else { ++ /* Use percentages function lifted from top(1) to figure percentages */ ++ tot = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff); ++ res = cpu_states[CP_INTR]; ++ } ++ ++ val.f = (float)res/10; + return val; +} + ++/* ++** FIXME ++*/ +g_val_t -+cpu_aidle_func ( void ) ++cpu_sintr_func ( void ) +{ + g_val_t val; -+ + val.f = 0.0; + return val; +} @@ -403,7 +524,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + state = kp->kp_proc.p_stat; +#endif + switch(state) { ++#if (__NetBSD_Version__ >= 200000000) + case SACTIVE: ++#else ++ case SRUN: ++ case SONPROC: ++#endif + case SIDL: + val.uint32++; + break; @@ -459,9 +585,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + g_val_t val; + size_t len; + int buffers; ++ int mib[2]; ++ ++ mib[0] = CTL_VM; ++ mib[1] = VM_NKMEMPAGES; + + len = sizeof (buffers); -+ if((sysctlbyname("vfs.nkmempages", &buffers, &len, NULL, 0) == -1) || !len) ++ if((sysctl(mib, 2, &buffers, &len, NULL, 0) == -1) || !len) + buffers = 0; + buffers /= 1024; + @@ -522,43 +652,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ + return val; +} + -+ -+static int -+find_mtu(const struct intf_entry *entry, void *arg) -+{ -+ unsigned int mtu; -+ unsigned int *min = (unsigned int *) arg; -+ -+ /* Only consider interfaces that are up. */ -+ if (! entry->intf_flags & INTF_FLAG_UP) -+ return 0; -+ -+ mtu=entry->intf_mtu; -+ if ( !*min || *min>mtu) -+ *min=mtu; -+ -+ return 0; -+} -+ +g_val_t +mtu_func ( void ) +{ + /* We want to find the minimum MTU (Max packet size) over all UP interfaces. +*/ -+ unsigned int min=0; + g_val_t val; -+ -+ intf_t *intf; -+ intf = intf_open(); -+ intf_loop(intf, find_mtu, &min); -+ intf_close(intf); -+ val.uint32 = min; -+ ++ val.uint32 = get_min_mtu(); + /* A val of 0 means there are no UP interfaces. Shouldn't happen. */ + return val; +} + -+ +/* + * Function to get cpu percentages. + * Might be changed ever so slightly, but is still mostly: diff --git a/parallel/ganglia-monitor-core/patches/patch-ac b/parallel/ganglia-monitor-core/patches/patch-ac index ddf7b742179..627f13ac99e 100644 --- a/parallel/ganglia-monitor-core/patches/patch-ac +++ b/parallel/ganglia-monitor-core/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ +$NetBSD: patch-ac,v 1.2 2005/02/10 02:33:53 jschauma Exp $ ---- lib/ganglia/gmond_config.h.orig 2005-02-04 17:27:08.000000000 -0500 -+++ lib/ganglia/gmond_config.h 2005-02-04 17:27:47.000000000 -0500 -@@ -5,7 +5,7 @@ - #include <ganglia/llist.h> +--- gmond/g25_config.h.orig 2005-02-07 22:27:32.000000000 -0500 ++++ gmond/g25_config.h 2005-02-07 22:27:46.000000000 -0500 +@@ -4,7 +4,7 @@ + #include <string.h> /* autoconf me later */ -#define DEFAULT_GMOND_CONFIG_FILE "/etc/gmond.conf" diff --git a/parallel/ganglia-monitor-core/patches/patch-ag b/parallel/ganglia-monitor-core/patches/patch-ag index d4cbf32454d..f6f7f3824d3 100644 --- a/parallel/ganglia-monitor-core/patches/patch-ag +++ b/parallel/ganglia-monitor-core/patches/patch-ag @@ -1,22 +1,22 @@ -$NetBSD: patch-ag,v 1.1.1.1 2005/02/07 14:33:21 jschauma Exp $ +$NetBSD: patch-ag,v 1.2 2005/02/10 02:33:53 jschauma Exp $ ---- gmond/cmdline.c.orig 2005-02-04 17:32:28.000000000 -0500 -+++ gmond/cmdline.c 2005-02-04 17:32:47.000000000 -0500 -@@ -49,7 +49,7 @@ - "Usage: %s [OPTIONS]...\n", PACKAGE); - printf(" -h --help Print help and exit\n"); - printf(" -V --version Print version and exit\n"); -- printf(" -cSTRING --conf=STRING Location of gmond configuration file (default='/etc/gmond.conf')\n"); -+ printf(" -cSTRING --conf=STRING Location of gmond configuration file (default='@PKG_SYSCONFDIR@/gmond.conf')\n"); - printf(" -lSTRING --location=STRING Location of this host in the cluster 'rack,rank,plane'. (default='0,0,0')\n"); - printf(" -dINT --debug=INT Debug level. If greater than zero, daemon will stay in foreground. (default=0)\n"); - } -@@ -81,7 +81,7 @@ - args_info->location_given = 0 ; - args_info->debug_given = 0 ; +--- gmond/cmdline.c.orig 2005-02-07 22:23:36.000000000 -0500 ++++ gmond/cmdline.c 2005-02-07 22:24:47.000000000 -0500 +@@ -42,7 +42,7 @@ + printf("\n"); + printf(" -h, --help Print help and exit\n"); + printf(" -V, --version Print version and exit\n"); +- printf(" -c, --conf=STRING Location of gmond configuration file (default=\n `/etc/gmond.conf')\n"); ++ printf(" -c, --conf=STRING Location of gmond configuration file (default=\n `@PKG_SYSCONFDIR@/gmond.conf')\n"); + printf(" -l, --location=STRING Location of this host in the cluster \n 'rack,rank,plane'. (default=`0,0,0')\n"); + printf(" -d, --debug=INT Debug level. If greater than zero, daemon will stay \n in foreground. (default=`0')\n"); + printf(" -f, --foreground Run in foreground (don't daemonize) (default=off)\n"); +@@ -84,7 +84,7 @@ + args_info->bandwidth_given = 0 ; + args_info->convert_given = 0 ; #define clear_args() { \ -- args_info->conf_arg = strdup("/etc/gmond.conf") ;\ -+ args_info->conf_arg = strdup("@PKG_SYSCONFDIR@/gmond.conf") ;\ - args_info->location_arg = strdup("0,0,0") ;\ +- args_info->conf_arg = gengetopt_strdup("/etc/gmond.conf") ;\ ++ args_info->conf_arg = gengetopt_strdup("@PKG_SYSCONFDIR@/gmond.conf") ;\ + args_info->location_arg = gengetopt_strdup("0,0,0") ;\ args_info->debug_arg = 0 ;\ - } + args_info->foreground_flag = 0;\ diff --git a/parallel/ganglia-monitor-core/patches/patch-aj b/parallel/ganglia-monitor-core/patches/patch-aj new file mode 100644 index 00000000000..5c8f208f2fb --- /dev/null +++ b/parallel/ganglia-monitor-core/patches/patch-aj @@ -0,0 +1,9 @@ +$NetBSD: patch-aj,v 1.1 2005/02/10 02:33:53 jschauma Exp $ + +--- /dev/null 2005-02-07 22:12:34.000000000 -0500 ++++ srclib/libmetrics/netbsd/Makefile.am 2005-02-07 22:17:51.000000000 -0500 +@@ -0,0 +1,4 @@ ++AM_CFLAGS=-I.. -I$(top_builddir)/lib ++ ++noinst_LTLIBRARIES = libmetric25.la ++libmetric25_la_SOURCES = metrics.c diff --git a/parallel/ganglia-monitor-core/patches/patch-ak b/parallel/ganglia-monitor-core/patches/patch-ak new file mode 100644 index 00000000000..07e9ac3813a --- /dev/null +++ b/parallel/ganglia-monitor-core/patches/patch-ak @@ -0,0 +1,340 @@ +$NetBSD: patch-ak,v 1.1 2005/02/10 02:33:53 jschauma Exp $ + +--- /dev/null 2005-02-07 22:12:34.000000000 -0500 ++++ srclib/libmetrics/netbsd/Makefile.in 2005-02-07 22:17:51.000000000 -0500 +@@ -0,0 +1,335 @@ ++# Makefile.in generated by automake 1.6.3 from Makefile.am. ++# @configure_input@ ++ ++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ++# Free Software Foundation, Inc. ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++SHELL = @SHELL@ ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++VPATH = @srcdir@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++ ++bindir = @bindir@ ++sbindir = @sbindir@ ++libexecdir = @libexecdir@ ++datadir = @datadir@ ++sysconfdir = @sysconfdir@ ++sharedstatedir = @sharedstatedir@ ++localstatedir = @localstatedir@ ++libdir = @libdir@ ++infodir = @infodir@ ++mandir = @mandir@ ++includedir = @includedir@ ++oldincludedir = /usr/include ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++top_builddir = .. ++ ++ACLOCAL = @ACLOCAL@ ++AUTOCONF = @AUTOCONF@ ++AUTOMAKE = @AUTOMAKE@ ++AUTOHEADER = @AUTOHEADER@ ++ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++INSTALL = @INSTALL@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_DATA = @INSTALL_DATA@ ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = @program_transform_name@ ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++host_alias = @host_alias@ ++host_triplet = @host@ ++ ++EXEEXT = @EXEEXT@ ++OBJEXT = @OBJEXT@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++AMTAR = @AMTAR@ ++AR = @AR@ ++AS = @AS@ ++AWK = @AWK@ ++CC = @CC@ ++CXX = @CXX@ ++CXXCPP = @CXXCPP@ ++DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ ++ECHO = @ECHO@ ++EGREP = @EGREP@ ++F77 = @F77@ ++GCJ = @GCJ@ ++GCJFLAGS = @GCJFLAGS@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LIBTOOL = @LIBTOOL@ ++LN_S = @LN_S@ ++OBJDUMP = @OBJDUMP@ ++OS = @OS@ ++PACKAGE = @PACKAGE@ ++RANLIB = @RANLIB@ ++RC = @RC@ ++STRIP = @STRIP@ ++VERSION = @VERSION@ ++am__include = @am__include@ ++am__quote = @am__quote@ ++install_sh = @install_sh@ ++AM_CFLAGS = -I.. -I$(top_builddir)/lib ++ ++noinst_LTLIBRARIES = libmetric25.la ++libmetric25_la_SOURCES = metrics.c ++subdir = netbsd ++mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs ++CONFIG_HEADER = $(top_builddir)/config.h ++CONFIG_CLEAN_FILES = ++LTLIBRARIES = $(noinst_LTLIBRARIES) ++ ++libmetric25_la_LDFLAGS = ++libmetric25_la_LIBADD = ++am_libmetric25_la_OBJECTS = metrics.lo ++libmetric25_la_OBJECTS = $(am_libmetric25_la_OBJECTS) ++ ++DEFS = @DEFS@ ++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++CPPFLAGS = @CPPFLAGS@ ++LDFLAGS = @LDFLAGS@ ++LIBS = @LIBS@ ++depcomp = $(SHELL) $(top_srcdir)/build/depcomp ++am__depfiles_maybe = depfiles ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/metrics.Plo ++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ++ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++CCLD = $(CC) ++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++CFLAGS = @CFLAGS@ ++DIST_SOURCES = $(libmetric25_la_SOURCES) ++DIST_COMMON = Makefile.am Makefile.in ++SOURCES = $(libmetric25_la_SOURCES) ++ ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .c .lo .o .obj ++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu netbsd/Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ++ ++clean-noinstLTLIBRARIES: ++ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ++ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ ++ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ++ test -z "$dir" && dir=.; \ ++ echo "rm -f \"$${dir}/so_locations\""; \ ++ rm -f "$${dir}/so_locations"; \ ++ done ++libmetric25.la: $(libmetric25_la_OBJECTS) $(libmetric25_la_DEPENDENCIES) ++ $(LINK) $(libmetric25_la_LDFLAGS) $(libmetric25_la_OBJECTS) $(libmetric25_la_LIBADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) core *.core ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/metrics.Plo@am__quote@ ++ ++distclean-depend: ++ -rm -rf ./$(DEPDIR) ++ ++.c.o: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ++ ++.c.obj: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(COMPILE) -c `cygpath -w $<` ++ ++.c.lo: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++CCDEPMODE = @CCDEPMODE@ ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ETAGS = etags ++ETAGSFLAGS = ++ ++tags: TAGS ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(ETAGS_ARGS)$$tags$$unique" \ ++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ ++top_distdir = .. ++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) ++ ++distdir: $(DISTFILES) ++ @list='$(DISTFILES)'; for file in $$list; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkinstalldirs) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(LTLIBRARIES) ++ ++installdirs: ++ ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -rm -f Makefile $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ ++ mostlyclean-am ++ ++distclean: distclean-am ++ ++distclean-am: clean-am distclean-compile distclean-depend \ ++ distclean-generic distclean-libtool distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-exec-am: ++ ++install-info: install-info-am ++ ++install-man: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++uninstall-am: uninstall-info-am ++ ++.PHONY: GTAGS all all-am check check-am clean clean-generic \ ++ clean-libtool clean-noinstLTLIBRARIES distclean \ ++ distclean-compile distclean-depend distclean-generic \ ++ distclean-libtool distclean-tags distdir dvi dvi-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-exec install-exec-am install-info install-info-am \ ++ install-man install-strip installcheck installcheck-am \ ++ installdirs maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool tags uninstall uninstall-am \ ++ uninstall-info-am ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: diff --git a/parallel/ganglia-monitor-core/patches/patch-al b/parallel/ganglia-monitor-core/patches/patch-al new file mode 100644 index 00000000000..8936e61d5d0 --- /dev/null +++ b/parallel/ganglia-monitor-core/patches/patch-al @@ -0,0 +1,78 @@ +$NetBSD: patch-al,v 1.1 2005/02/10 02:33:53 jschauma Exp $ + +--- ganglia.html.orig 2005-02-07 22:25:39.000000000 -0500 ++++ ganglia.html 2005-02-07 22:26:58.000000000 -0500 +@@ -278,7 +278,7 @@ + example, you may not want to have <code>gexec</code> run jobs on your cluster frontend nodes.</p> + </dd> + <dd> +-<p>You simply add the following line to your <code>gmond</code> configuration file (<code>/etc/gmond.conf</code> by ++<p>You simply add the following line to your <code>gmond</code> configuration file (<code>@PKG_SYSCONFDIR@/gmond.conf</code> by + default)</p> + </dd> + <dd> +@@ -383,16 +383,16 @@ + <p>The configuration file format has changed between gmond version 2.5.x and version + 2.6.x. The change was necessary in order to allow more complex configuration options.</p> + <p>Gmond has a default configuration it will use if it does not find the default configuration +-file <strong>/etc/gmond.conf</strong>. To see the default configuration simply run the command:</p> ++file <strong>@PKG_SYSCONFDIR@/gmond.conf</strong>. To see the default configuration simply run the command:</p> + <pre> + % gmond --default_config</pre> + <p>and gmond will output its default configuration to stdout. This default configuration can + serve as a good starting place for building a more custom configuration.</p> + <pre> + % gmond --default_config > gmond.conf</pre> +-<p>would create a file <strong>gmond.conf</strong> which you can then edit to taste and copy to <strong>/etc/gmond.conf</strong> ++<p>would create a file <strong>gmond.conf</strong> which you can then edit to taste and copy to <strong>@PKG_SYSCONFDIR@/gmond.conf</strong> + or elsewhere.</p> +-<p>To start gmond with a configuration file other then <strong>/etc/gmond.conf</strong>, simply specify the ++<p>To start gmond with a configuration file other then <strong>@PKG_SYSCONFDIR@/gmond.conf</strong>, simply specify the + configuration file location by running</p> + <pre> + % gmond --config /my/ganglia/configs/custom.conf</pre> +@@ -411,7 +411,7 @@ + </p> + <h2><a name="gmetad_configuration">Gmetad Configuration</a></h2> + <p>The behavior of the Ganglia Meta Daemon is completely controlled by a single configuration +-file which is by default <code>/etc/gmetad.conf</code>. For gmetad to do anything useful you much ++file which is by default <code>@PKG_SYSCONFDIR@/gmetad.conf</code>. For gmetad to do anything useful you much + specify at least one <code>data_source</code> in the configuration. The format of the data_source + line is as follows</p> + <pre> +@@ -574,7 +574,7 @@ + -h, --help Print help and exit + -V, --version Print version and exit + -c, --conf=STRING The configuration file to use for finding send channels +- (default=`/etc/gmond.conf') ++ (default=`@PKG_SYSCONFDIR@/gmond.conf') + -n, --name=STRING Name of the metric + -v, --value=STRING Value of the metric + -t, --type=STRING Either +@@ -586,7 +586,7 @@ + (default=`60') + -d, --dmax=INT The lifetime in seconds of this metric (default=`0')</pre> + <p>Gmetric sends the metric specified on the commandline to all <strong>udp_send_channel</strong>s specified +-in the configuration file <strong>/etc/gmond.conf</strong> by default. If you want to send metric to ++in the configuration file <strong>@PKG_SYSCONFDIR@/gmond.conf</strong> by default. If you want to send metric to + alternate <strong>udp_send_channel</strong>s, you can specify a different configuration file as such:</p> + <pre> + % gmetric --conf=./custom.conf -n "wow" -v "it works" -t "string"</pre> +@@ -913,7 +913,7 @@ + + mcast_if eth1 + +- .. in /etc/gmond.conf that tells gmond to send its data out the "eth1" ++ .. in @PKG_SYSCONFDIR@/gmond.conf that tells gmond to send its data out the "eth1" + network interface but that doesn't necessarily mean that the source + address of the packets will match the "eth1" interface. to make sure that + data sent out eth1 has the correct source address run the following... +@@ -951,7 +951,7 @@ + > 26 nodes each + > gmond + > +- > In the frontend /etc/gmond.conf I have the ++ > In the frontend @PKG_SYSCONFDIR@/gmond.conf I have the + > following statement: mcast_if eth1 + > + > The 26 nodes are correctly reported. diff --git a/parallel/ganglia-monitor-core/patches/patch-am b/parallel/ganglia-monitor-core/patches/patch-am new file mode 100644 index 00000000000..04e822e8be5 --- /dev/null +++ b/parallel/ganglia-monitor-core/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2005/02/10 02:33:53 jschauma Exp $ + +--- srclib/libmetrics/Makefile.in.orig 2005-02-07 22:33:09.000000000 -0500 ++++ srclib/libmetrics/Makefile.in 2005-02-07 22:33:21.000000000 -0500 +@@ -93,7 +93,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + SUBDIRS = @OS@ . tests +-DIST_SUBDIRS = aix cygwin darwin freebsd hpux irix linux osf solaris tests ++DIST_SUBDIRS = aix cygwin darwin freebsd hpux irix linux netbsd osf solaris tests + + + #AM_CFLAGS = -I$(top_builddir)/lib diff --git a/parallel/ganglia-monitor-core/patches/patch-an b/parallel/ganglia-monitor-core/patches/patch-an new file mode 100644 index 00000000000..25d39d15aa0 --- /dev/null +++ b/parallel/ganglia-monitor-core/patches/patch-an @@ -0,0 +1,11 @@ +$NetBSD: patch-an,v 1.1 2005/02/10 02:33:53 jschauma Exp $ + +--- srclib/libmetrics/Makefile.am.orig 2005-02-07 22:35:25.000000000 -0500 ++++ srclib/libmetrics/Makefile.am 2005-02-07 22:35:58.000000000 -0500 +@@ -1,5 +1,5 @@ + SUBDIRS=@OS@ . tests +-DIST_SUBDIRS= aix cygwin darwin freebsd hpux irix linux osf solaris tests ++DIST_SUBDIRS= aix cygwin darwin freebsd hpux irix linux netbsd osf solaris tests + + #AM_CFLAGS = -I$(top_builddir)/lib + |