pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ganglia-monitor-core: Remove outdated version
Module Name: pkgsrc-wip
Committed By: Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By: outpaddling
Date: Wed Jun 27 20:05:47 2018 -0500
Changeset: f5f2b4226e255001b4b0304ac4cd34e32f02229d
Removed Files:
ganglia-monitor-core/DESCR
ganglia-monitor-core/Makefile
ganglia-monitor-core/PLIST
ganglia-monitor-core/TODO
ganglia-monitor-core/buildlink3.mk
ganglia-monitor-core/distinfo
ganglia-monitor-core/files/gmetad.in
ganglia-monitor-core/files/gmetad.sh
ganglia-monitor-core/files/gmetasnap.sh
ganglia-monitor-core/files/gmond.sh
ganglia-monitor-core/files/pkg-install.in
ganglia-monitor-core/patches/patch-configure
ganglia-monitor-core/patches/patch-gmetad_Makefile.in
ganglia-monitor-core/patches/patch-gmetad_conf.c.in
ganglia-monitor-core/patches/patch-gmond_modules_conf.d_modpython.conf.in
ganglia-monitor-core/patches/patch-gmond_modules_python_Makefile.in
ganglia-monitor-core/patches/patch-lib_default__conf.h.in
ganglia-monitor-core/patches/patch-libmetrics_freebsd_metrics.c
Log Message:
ganglia-monitor-core: Remove outdated version
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f5f2b4226e255001b4b0304ac4cd34e32f02229d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ganglia-monitor-core/DESCR | 7 -
ganglia-monitor-core/Makefile | 104 -----------
ganglia-monitor-core/PLIST | 37 ----
ganglia-monitor-core/TODO | 2 -
ganglia-monitor-core/buildlink3.mk | 22 ---
ganglia-monitor-core/distinfo | 12 --
ganglia-monitor-core/files/gmetad.in | 60 ------
ganglia-monitor-core/files/gmetad.sh | 45 -----
ganglia-monitor-core/files/gmetasnap.sh | 208 ---------------------
ganglia-monitor-core/files/gmond.sh | 42 -----
ganglia-monitor-core/files/pkg-install.in | 21 ---
ganglia-monitor-core/patches/patch-configure | 22 ---
.../patches/patch-gmetad_Makefile.in | 13 --
.../patches/patch-gmetad_conf.c.in | 13 --
.../patch-gmond_modules_conf.d_modpython.conf.in | 15 --
.../patches/patch-gmond_modules_python_Makefile.in | 15 --
.../patches/patch-lib_default__conf.h.in | 13 --
.../patches/patch-libmetrics_freebsd_metrics.c | 22 ---
18 files changed, 673 deletions(-)
diffs:
diff --git a/ganglia-monitor-core/DESCR b/ganglia-monitor-core/DESCR
deleted file mode 100644
index 6a60c69516..0000000000
--- a/ganglia-monitor-core/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Ganglia provides a complete real-time monitoring and execution
-environment that is in use by hundreds of universities, private and
-government laboratories and commercial cluster implementors around the
-world. Whether you want to monitor hundreds of computers in real-time
-across a university campus or around the world, ganglia is for you.
-
-WWW: http://ganglia.info/
diff --git a/ganglia-monitor-core/Makefile b/ganglia-monitor-core/Makefile
deleted file mode 100644
index d5d18626f3..0000000000
--- a/ganglia-monitor-core/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2015/04/06 20:57:30 outpaddling Exp $
-
-###########################################################
-# Generated by fbsd2pkg #
-###########################################################
-
-PKGNAME= ganglia-monitor-core-${PORTVERSION}
-DISTNAME= ganglia-${PORTVERSION}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/}
-
-MAINTAINER= bacon%NetBSD.org@localhost
-
-COMMENT= Ganglia cluster monitor, monitoring daemon
-LICENSE= modified-bsd
-
-SET_LIBDIR= yes
-
-USE_LANGUAGES= c
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-SUBST_CLASSES+= pkg_sysconfdir
-SUBST_STAGE.pkg_sysconfdir= pre-configure
-SUBST_MESSAGE.pkg_sysconfdir= Fixing PKG_SYSCONFDIR
-SUBST_FILES.pkg_sysconfdir= ganglia.html \
- gmetad/cmdline.c gmetad/cmdline.h \
- gmetric/cmdline.c gmetric/cmdline.h \
- gmond/cmdline.c gmond/cmdline.h \
- gmond/g25_config.h gmond/gmond.conf.5 \
- gmond/modules/conf.d/modpython.conf \
- gmond/modules/conf.d/modpython.conf.in \
- gmond/modules/python/README.in \
- mans/gmetad.1 mans/gmetric.1 mans/gmond.1
-SUBST_SED.pkg_sysconfdir+= -e 's|/etc/ganglia|${PKG_SYSCONFDIR}|g'
-SUBST_SED.pkg_sysconfdir+= -e 's|/usr/lib/ganglia|${PREFIX}/lib/ganglia|g'
-
-## gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but
-## doing so requires perl installed in the build stage.
-SUBST_CLASSES+= etcdir
-SUBST_STAGE.etcdir= post-patch
-SUBST_FILES.etcdir= ${WRKSRC}/README \
- ${WRKSRC}/mans/gmetad.1 \
- ${WRKSRC}/mans/gmond.1
-SUBST_SED.etcdir= -e "s|/etc/ganglia/\(gm.*d\.conf\)|${PREFIX}/etc/\1|g"
-
-SUBST_CLASSES+= linux_init
-SUBST_STAGE.linux_init= post-patch
-SUBST_FILES.linux_init= gmetad/gmetad.init gmond/gmond.init
-SUBST_SED.linux_init= -e 's|/usr/sbin|${PREFIX}/sbin|g'
-
-CONFIGURE_ENV= GANGLIA_ACK_SYSCONFDIR=1
-
-CONFIGURE_ARGS+= --with-gmetad \
- --with-python=${PYTHONBIN} \
- --sysconfdir=${PREFIX}/etc
-
-CFLAGS+= -I${LOCALBASE}/include
-
-PORTVERSION= 3.6.0
-DATADIR= ${PREFIX}/share/ganglia-monitor-core
-DOCSDIR= ${PREFIX}/share/doc/ganglia-monitor-core
-EXAMPLESDIR= ${PREFIX}/share/examples/ganglia-monitor-core
-
-# You may need this, especially if using do-install.
-#AUTO_MKDIRS= yes
-
-RCD_SCRIPTS= gmond gmetad
-
-post-build:
- ${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf
-
-post-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \
- ${DESTDIR}${PREFIX}/sbin/gmetasnap
- ${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 ${DESTDIR}${PREFIX}/man/man1
- ${MKDIR} ${DESTDIR}${PREFIX}/etc
- ${MKDIR} ${DESTDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKDIR}/gmond.conf \
- ${DESTDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \
- ${DESTDIR}${EXAMPLESDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/gmond/gmond.init \
- ${DESTDIR}${EXAMPLESDIR}/gmond.init.linux
- ${INSTALL_SCRIPT} ${WRKSRC}/gmetad/gmetad.init \
- ${DESTDIR}${EXAMPLESDIR}/gmetad.init.linux
- ${INSTALL_MAN} \
- ${WRKSRC}/mans/gmetric.1 \
- ${WRKSRC}/mans/gmond.1 \
- ${WRKSRC}/mans/gstat.1 \
- ${DESTDIR}${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 \
- ${DESTDIR}${PREFIX}/man/man5
- ${MKDIR} ${DESTDIR}${PREFIX}/lib/ganglia/python_modules
-
-# Add any _DEPENDS that have a buildlink3.mk
-.include "../../devel/apr/buildlink3.mk"
-.include "../../devel/confuse/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../databases/rrdtool/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/ganglia-monitor-core/PLIST b/ganglia-monitor-core/PLIST
deleted file mode 100644
index 91e3e43d2e..0000000000
--- a/ganglia-monitor-core/PLIST
+++ /dev/null
@@ -1,37 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2015/04/06 20:57:30 outpaddling Exp $
-bin/ganglia-config
-bin/gmetric
-bin/gstat
-etc/gmond.conf.d/modpython.conf
-include/ganglia.h
-include/ganglia_gexec.h
-include/gm_file.h
-include/gm_metric.h
-include/gm_mmn.h
-include/gm_msg.h
-include/gm_protocol.h
-include/gm_value.h
-lib/ganglia/modcpu.so
-lib/ganglia/moddisk.so
-lib/ganglia/modload.so
-lib/ganglia/modmem.so
-lib/ganglia/modmulticpu.so
-lib/ganglia/modnet.so
-lib/ganglia/modproc.so
-lib/ganglia/modpython.so
-lib/ganglia/modsys.so
-lib/libganglia.la
-man/man1/gmetad.1
-man/man1/gmetad.py.1
-man/man1/gmetric.1
-man/man1/gmond.1
-man/man1/gstat.1
-man/man5/gmond.conf.5
-sbin/gmetad
-sbin/gmetasnap
-sbin/gmond
-share/examples/ganglia-monitor-core/gmetad.conf
-share/examples/ganglia-monitor-core/gmetad.init.linux
-share/examples/ganglia-monitor-core/gmond.conf
-share/examples/ganglia-monitor-core/gmond.init.linux
-@pkgdir lib/ganglia/python_modules
diff --git a/ganglia-monitor-core/TODO b/ganglia-monitor-core/TODO
deleted file mode 100644
index bc6ce89537..0000000000
--- a/ganglia-monitor-core/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Patch cpu_steal for NetBSD. See FreeBSD patch for a reference.
diff --git a/ganglia-monitor-core/buildlink3.mk b/ganglia-monitor-core/buildlink3.mk
deleted file mode 100644
index 165f46e0bc..0000000000
--- a/ganglia-monitor-core/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/06 20:57:30 outpaddling Exp $
-# XXX
-# XXX This file was created automatically using createbuildlink-3.16.
-# XXX After this file has been verified as correct, the comment lines
-# XXX beginning with "XXX" should be removed. Please do not commit
-# XXX unverified buildlink3.mk files.
-# XXX
-# XXX Packages that only install static libraries or headers should
-# XXX include the following line:
-# XXX
-# XXX BUILDLINK_DEPMETHOD.ganglia-monitor-core-?= build
-
-BUILDLINK_TREE+= ganglia-monitor-core-
-
-.if !defined(GANGLIA_MONITOR_CORE__BUILDLINK3_MK)
-GANGLIA_MONITOR_CORE__BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ganglia-monitor-core-+= ganglia-monitor-core->=3.6.0
-BUILDLINK_PKGSRCDIR.ganglia-monitor-core-?= ../../wip/ganglia-monitor-core
-.endif # GANGLIA_MONITOR_CORE__BUILDLINK3_MK
-
-BUILDLINK_TREE+= -ganglia-monitor-core-
diff --git a/ganglia-monitor-core/distinfo b/ganglia-monitor-core/distinfo
deleted file mode 100644
index 37bf1551d5..0000000000
--- a/ganglia-monitor-core/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2015/04/06 20:57:30 outpaddling Exp $
-
-SHA1 (ganglia-3.6.0.tar.gz) = b06529ac49deb1f1c65c6215b8d2d13c3f3fa23f
-RMD160 (ganglia-3.6.0.tar.gz) = 459a3de13cf741adce53fc682c0b5d3dc93c0284
-Size (ganglia-3.6.0.tar.gz) = 1248273 bytes
-SHA1 (patch-configure) = 55819c1613e56c0ebcbdf2692b9252c7c37d1770
-SHA1 (patch-gmetad_Makefile.in) = 6a31211b3eaa71ef7b7260b57531bbfa5b6865eb
-SHA1 (patch-gmetad_conf.c.in) = 661c533a83e7441aaaacee96046420ca8b27f1d7
-SHA1 (patch-gmond_modules_conf.d_modpython.conf.in) = 71bbee2cf5ed8a9f2f73b46bd7b33f99cb952d7a
-SHA1 (patch-gmond_modules_python_Makefile.in) = 6a28e384d88e06aa2be49b59f94f52039ab81fff
-SHA1 (patch-lib_default__conf.h.in) = f560802c62975438fed3ad05ed43edfe3f5d0773
-SHA1 (patch-libmetrics_freebsd_metrics.c) = 49e3f3806d4c97c9ac74bf76359088bae5454f03
diff --git a/ganglia-monitor-core/files/gmetad.in b/ganglia-monitor-core/files/gmetad.in
deleted file mode 100644
index cfa91f64a6..0000000000
--- a/ganglia-monitor-core/files/gmetad.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmetad.in 302141 2012-08-05 23:19:36Z dougb $
-
-# PROVIDE: gmetad
-# REQUIRE: gmond
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name=gmetad
-rcvar=gmetad_enable
-command="%%PREFIX%%/sbin/${name}"
-start_precmd="gmetad_prestart"
-stop_postcmd="gmetad_poststop"
-
-gmetad_prestart()
-{
- if [ ! -d ${gmetasnap_rrddir} ]; then
- mkdir -p ${gmetasnap_rrddir}
- fi
- chown ganglia:ganglia ${gmetasnap_rrddir}
- if checkyesno gmetasnap_enable; then
- if [ ! -d ${gmetasnap_snapdir} ]; then
- mkdir -p ${gmetasnap_snapdir}
- chown ganglia:ganglia ${gmetasnap_snapdir}
- fi
- if [ `ls ${gmetasnap_rrddir} | egrep -v ^.snap | wc -l` -eq 0 ]; then
- ${gmetasnap_command} -r ${gmetasnap_rrddir} \
- -s ${gmetasnap_snapdir} ${gmetasnap_flags} \
- restore ${gmetasnap_snapname}
- fi
- fi
-}
-
-gmetad_poststop()
-{
- if checkyesno gmetasnap_enable; then
- ${gmetasnap_command} -r ${gmetasnap_rrddir} \
- -s ${gmetasnap_snapdir} ${gmetasnap_flags} \
- save ${gmetasnap_snapname}
- fi
-}
-
-load_rc_config ganglia
-
-load_rc_config $name
-
-gmetad_enable=${gmetad_enable-NO}
-gmetad_conf=${gmetad_conf-%%PREFIX%%/etc/gmetad.conf}
-
-gmetasnap_enable=${gmetasnap_enable-NO}
-gmetasnap_rrddir=${gmetasnap_rrddir-/var/db/ganglia/rrds}
-gmetasnap_snapdir=${gmetasnap_snapdir-/var/db/ganglia/snaps}
-gmetasnap_snapname=${gmetasnap_snapname-snap}
-gmetasnap_command=${gmetasnap_command-%%PREFIX%%/sbin/gmetasnap}
-
-command_args="-c ${gmetad_conf}"
-required_files=${gmetad_conf}
-
-run_rc_command $*
diff --git a/ganglia-monitor-core/files/gmetad.sh b/ganglia-monitor-core/files/gmetad.sh
deleted file mode 100644
index 1414179ed6..0000000000
--- a/ganglia-monitor-core/files/gmetad.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: gmetad.sh,v 1.3 2015/04/06 20:57:30 outpaddling Exp $
-#
-# PROVIDE: gmetad
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start gmetad:
-#
-# gmetad=YES
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="gmetad"
-rcvar=$name
-command="@PREFIX@/sbin/gmetad"
-required_files="@PKG_SYSCONFDIR@/gmetad.conf"
-start_cmd="gmetad_start"
-stop_cmd="gmetad_stop"
-restart_cmd="gmetad_stop ; gmetad_start"
-
-gmetad_start ()
-{
- # gmetad/process_xml.c 1060 re-releases a lock, claiming it's
- # ``required under certain errors''
- export PTHREAD_DIAGASSERT=A
- ${command}
-}
-
-gmetad_stop()
-{
- pkill ${name} 2>/dev/null
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
-then
- load_rc_config $name
- run_rc_command "$1"
-else
- eval ${start_cmd}
-fi
diff --git a/ganglia-monitor-core/files/gmetasnap.sh b/ganglia-monitor-core/files/gmetasnap.sh
deleted file mode 100644
index 3fbbe73ec2..0000000000
--- a/ganglia-monitor-core/files/gmetasnap.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/sh
-#
-# gmetasnapshot - Ganglia gmetad snapshot manager
-#
-# $FreeBSD: head/sysutils/ganglia-monitor-core/files/gmetasnap.sh 300897 2012-07-14 14:29:18Z beat $
-
-command=`basename $0`
-
-def_rrddir=/var/db/ganglia/rrds
-def_snapdir=/var/db/ganglia/snaps
-def_snapname=snap
-def_comp=gzip
-
-rrddir=$def_rrddir
-snapdir=$def_snapdir
-snapname=$def_snapname
-comp=$def_comp
-delete_old=0
-quiet=0
-
-usage()
-{
- exitcode=$1
- shift
- if [ -n "$*" ]; then
- warn $*
- fi
- cat <<EOU
-usage:
- ${command} [<options>] save [<snapname>]
- ${command} [<options>] restore [<snapname>]
-
-options:
- -D Delete .old file after creating snapshot.
- -h Display this message
- -q Avoid output unless there is an error.
- -r <rrddir> Set the rrddir [default: ${def_rrddir}]
- -s <snapdir> Set the snapdir [default: ${def_snapdir}]
- -z <comptype> Set the compression type. Valid values are
- gzip, bzip2, and none. [default: ${def_comp}]
-
-notes:
- - The default snapname is: ${def_snapname}
- - ${command} will not create rrddir or snapdir.
-EOU
- exit $1
-}
-
-err()
-{
- exitcode=$1
- shift
- echo ${command} $* >&2
- exit $exitcode
-}
-
-warn()
-{
- echo ${command} $* >&2
-}
-
-status()
-{
- if [ $quiet -eq 0 ]; then
- echo $*
- fi
-}
-
-compsuffix()
-{
- case "$1" in
- gzip)
- echo ".gz"
- ;;
- bzip2)
- echo ".bz2"
- ;;
- none)
- echo ""
- ;;
- *)
- echo "Unsupposed compression type ignored: $1" >&2
- echo ""
- ;;
- esac
-}
-
-compflag()
-{
- case "$1" in
- gzip)
- echo "z"
- ;;
- bzip2)
- echo "y"
- ;;
- none)
- echo ""
- ;;
- *)
- echo "Unsupposed compression type ignored: $1" >&2
- echo ""
- ;;
- esac
-}
-
-while [ -n "$1" ]; do
- case "$1" in
- -D)
- shift
- delete_old=1
- ;;
- -h)
- shift
- usage 0
- ;;
- -q)
- shift
- quiet=1
- ;;
- -r)
- shift
- if [ -z "$1" ]; then
- usage 1 "-r requires an argument"
- fi
- rrddir=$1
- shift
- ;;
- -s)
- shift
- if [ -z "$1" ]; then
- usage 1 "-s requires an argument"
- fi
- snapdir=$1
- shift
- ;;
- -z)
- shift
- if [ -z "$1" ]; then
- usage 1 "-z requires an argument"
- fi
- rrddir=$1
- shift
- ;;
- -*)
- usage 1 "unknown argument $1"
- ;;
- *)
- break
- esac
-done
-
-if [ -n "$2" ]; then
- snapname=$2
-fi
-
-basefile=${snapdir}/${snapname}.tar`compsuffix ${comp}`
-tarcmd="tar `compflag ${comp}`"
-
-case "$1" in
-save)
- if [ ! -d ${rrddir} ]; then
- err 2 "rrddir ${rrddir} does not exist"
- fi
- if [ ! -d ${snapdir} ]; then
- err 2 "snapdir ${snapdir} does not exist"
- fi
- status "saving ${rrddir} to ${basefile}"
- cd ${rrddir}
- if ! ${tarcmd}cf ${basefile}.new .; then
- err 2 "Failed to create ${basefile}.new"
- fi
- if [ -e ${basefile} ]; then
- mv ${basefile} ${basefile}.old
- sync
- fi
- mv ${basefile}.new ${basefile}
- sync
- if [ $delete_old -ne 0 ]; then
- rm ${basefile}.old
- fi
- sync
- ;;
-restore)
- for file in ${basefile} ${basefile}.new ${basefile}.old; do
- if [ -e ${file} ]; then
- if ${tarcmd}tf ${file} >/dev/null 2>&1 ; then
- sourcefile=${file}
- break
- else
- warn "${file} exists but is not a valid tarball. Ignoring."
- fi
- fi
- done
- if [ -z "$sourcefile" ]; then
- err 1 "no snapshot found in ${snapdir}."
- fi
- status "restoring ${rrddir} from ${sourcefile}"
- if [ ! -d "${rrddir}" ]; then
- err 1 "${rrddir} does not exist"
- fi
- cd ${rrddir}
- ${tarcmd}xpf ${sourcefile}
- ;;
-*)
- usage 1 "unknown command: $1"
- ;;
-esac
diff --git a/ganglia-monitor-core/files/gmond.sh b/ganglia-monitor-core/files/gmond.sh
deleted file mode 100644
index 170539eee6..0000000000
--- a/ganglia-monitor-core/files/gmond.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: gmond.sh,v 1.3 2015/04/06 20:57:30 outpaddling Exp $
-#
-# PROVIDE: gmond
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# You will need to set some variables in /etc/rc.conf to start gmond:
-#
-# gmond=YES
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="gmond"
-rcvar=$name
-command="@PREFIX@/sbin/gmond"
-required_files="@PKG_SYSCONFDIR@/gmond.conf"
-start_cmd="gmond_start"
-stop_cmd="gmond_stop"
-restart_cmd="gmond_stop ; gmond_start"
-
-gmond_start ()
-{
- ${command}
-}
-
-gmond_stop()
-{
- pkill ${name} 2>/dev/null
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]
-then
- load_rc_config $name
- run_rc_command "$1"
-else
- eval ${start_cmd}
-fi
diff --git a/ganglia-monitor-core/files/pkg-install.in b/ganglia-monitor-core/files/pkg-install.in
deleted file mode 100644
index 659e2b965a..0000000000
--- a/ganglia-monitor-core/files/pkg-install.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-u=ganglia
-g=ganglia
-rrd_rootdir=/var/db/ganglia/rrds
-
-case $2 in
-POST-INSTALL)
- if [ ! -f %%PREFIX%%/etc/gmond.conf ]; then
- cp %%PREFIX%%/etc/gmond.conf.sample %%PREFIX%%/etc/gmond.conf
- fi
-
-%%GMETAD%% mkdir -p ${rrd_rootdir}
-%%GMETAD%% chown -R ${u}:${g} ${rrd_rootdir}
-%%GMETAD%%
-%%GMETAD%% if [ ! -f %%PREFIX%%/etc/gmetad.conf ]; then
-%%GMETAD%% cp %%PREFIX%%/etc/gmetad.conf.sample %%PREFIX%%/etc/gmetad.conf
-%%GMETAD%% fi
-
- ;;
-esac
diff --git a/ganglia-monitor-core/patches/patch-configure b/ganglia-monitor-core/patches/patch-configure
deleted file mode 100644
index cfdef8c9c8..0000000000
--- a/ganglia-monitor-core/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- configure.orig 2013-05-07 14:39:40.000000000 +0000
-+++ configure
-@@ -12167,7 +12167,7 @@ if test "${with_memcached+set}" = set; t
- fi
-
-
--if test x"$memcache" == xyes; then
-+if test x"$memcache" = xyes; then
-
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5
-@@ -12491,7 +12491,7 @@ if test x"$libpcrepath" != x && test x"$
- echo "Added -I$libpcrepath/include to CFLAGS"
- echo "Added -L$libpcrepath/${LIB_SUFFIX} to LDFLAGS"
- fi
--if test x"$libpcre" == xyes ; then
-+if test x"$libpcre" = xyes ; then
- for ac_header in pcre/pcre.h pcre.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/ganglia-monitor-core/patches/patch-gmetad_Makefile.in b/ganglia-monitor-core/patches/patch-gmetad_Makefile.in
deleted file mode 100644
index fd8120dfb9..0000000000
--- a/ganglia-monitor-core/patches/patch-gmetad_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gmetad_Makefile.in,v 1.1 2015/04/06 20:57:31 outpaddling Exp $
-
---- gmetad/Makefile.in.orig 2013-05-07 09:39:40.000000000 -0500
-+++ gmetad/Makefile.in 2014-10-14 15:31:54.000000000 -0500
-@@ -659,8 +659,6 @@
- $(FIXCONFIG) gmetad.service.in
-
- install-data-hook: gmetad.conf
-- mkdir -p $(DESTDIR)$(sysconfdir) && \
-- $(INSTALL_DATA) gmetad.conf $(DESTDIR)$(sysconfdir)/gmetad.conf
-
- # 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.
diff --git a/ganglia-monitor-core/patches/patch-gmetad_conf.c.in b/ganglia-monitor-core/patches/patch-gmetad_conf.c.in
deleted file mode 100644
index 98617e398f..0000000000
--- a/ganglia-monitor-core/patches/patch-gmetad_conf.c.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gmetad_conf.c.in,v 1.1 2015/04/06 20:57:31 outpaddling Exp $
-
---- gmetad/conf.c.in.orig 2013-05-07 09:39:40.000000000 -0500
-+++ gmetad/conf.c.in 2014-10-14 15:31:54.000000000 -0500
-@@ -374,7 +374,7 @@
- config->trusted_hosts = NULL;
- config->debug_level = 0;
- config->should_setuid = 1;
-- config->setuid_username = "nobody";
-+ config->setuid_username = SETUID_USER;
- config->rrd_rootdir = "@varstatedir@/ganglia/rrds";
- config->write_rrds = 1;
- config->scalable_mode = 1;
diff --git a/ganglia-monitor-core/patches/patch-gmond_modules_conf.d_modpython.conf.in b/ganglia-monitor-core/patches/patch-gmond_modules_conf.d_modpython.conf.in
deleted file mode 100644
index 3701c52fb4..0000000000
--- a/ganglia-monitor-core/patches/patch-gmond_modules_conf.d_modpython.conf.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gmond_modules_conf.d_modpython.conf.in,v 1.1 2015/04/06 20:57:31 outpaddling Exp $
-
---- gmond/modules/conf.d/modpython.conf.in.orig 2013-05-07 09:39:40.000000000 -0500
-+++ gmond/modules/conf.d/modpython.conf.in 2014-10-14 15:31:54.000000000 -0500
-@@ -9,8 +9,8 @@
- module {
- name = "python_module"
- path = "modpython.so"
-- params = "@moduledir@/python_modules"
-+ params = "@moduledir@"
- }
- }
-
--include ("@sysconfdir@/conf.d/*.pyconf")
-+include ("@sysconfdir@/gmond.conf.d/*.pyconf")
diff --git a/ganglia-monitor-core/patches/patch-gmond_modules_python_Makefile.in b/ganglia-monitor-core/patches/patch-gmond_modules_python_Makefile.in
deleted file mode 100644
index c80f89593b..0000000000
--- a/ganglia-monitor-core/patches/patch-gmond_modules_python_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gmond_modules_python_Makefile.in,v 1.1 2015/04/06 20:57:31 outpaddling Exp $
-
---- gmond/modules/python/Makefile.in.orig 2013-05-07 09:39:40.000000000 -0500
-+++ gmond/modules/python/Makefile.in 2014-10-14 15:31:54.000000000 -0500
-@@ -601,8 +601,8 @@
- # Note that README is listed as a dependency to be generated, but it
- # is not currently installed anywhere
- install-exec-hook: ../conf.d/modpython.conf README
-- mkdir -p $(DESTDIR)$(sysconfdir)/conf.d && \
-- $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/conf.d/modpython.conf
-+ mkdir -p $(DESTDIR)$(sysconfdir)/gmond.conf.d && \
-+ $(INSTALL_DATA) ../conf.d/modpython.conf $(DESTDIR)$(sysconfdir)/gmond.conf.d/modpython.conf
-
- # 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.
diff --git a/ganglia-monitor-core/patches/patch-lib_default__conf.h.in b/ganglia-monitor-core/patches/patch-lib_default__conf.h.in
deleted file mode 100644
index e4f8be44a7..0000000000
--- a/ganglia-monitor-core/patches/patch-lib_default__conf.h.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_default__conf.h.in,v 1.1 2015/04/06 20:57:31 outpaddling Exp $
-
---- lib/default_conf.h.in.orig 2013-05-07 09:39:40.000000000 -0500
-+++ lib/default_conf.h.in 2014-10-14 15:31:54.000000000 -0500
-@@ -397,7 +397,7 @@
- }\n\
- }\n\
- \n\
--include (\"" SYSCONFDIR "/conf.d/*.conf\")\n\
-+include (\"" SYSCONFDIR "/gmond.conf.d/*.conf\")\n\
- \n\
- "
-
diff --git a/ganglia-monitor-core/patches/patch-libmetrics_freebsd_metrics.c b/ganglia-monitor-core/patches/patch-libmetrics_freebsd_metrics.c
deleted file mode 100644
index 5272596287..0000000000
--- a/ganglia-monitor-core/patches/patch-libmetrics_freebsd_metrics.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-libmetrics_freebsd_metrics.c,v 1.1 2015/04/06 20:57:31 outpaddling Exp $
-
---- libmetrics/freebsd/metrics.c.orig 2013-05-07 09:39:40.000000000 -0500
-+++ libmetrics/freebsd/metrics.c 2014-10-14 15:32:43.000000000 -0500
-@@ -461,6 +461,17 @@
- return val;
- }
-
-+/*
-+** FIXME - Not yet implemented on FreeBSD.
-+*/
-+g_val_t
-+cpu_steal_func ( void )
-+{
-+ g_val_t val;
-+ val.f = 0.0;
-+ return val;
-+}
-+
- g_val_t
- load_one_func ( void )
- {
Home |
Main Index |
Thread Index |
Old Index