diff --git a/monitor/collectd/accept-docdir.patch b/monitor/collectd/accept-docdir.patch deleted file mode 100644 index e1f9d36c1..000000000 --- a/monitor/collectd/accept-docdir.patch +++ /dev/null @@ -1,78 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../collectd/accept-docdir.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- collectd-3.11.0/libltdl/Makefile.in.orig 2007-01-25 15:54:43.000000000 +0100 -+++ collectd-3.11.0/libltdl/Makefile.in 2007-01-25 15:55:14.000000000 +0100 -@@ -188,6 +188,7 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+docdir = @docdir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ ---- collectd-3.11.0/libltdl/configure.orig 2007-01-25 16:03:01.000000000 +0100 -+++ collectd-3.11.0/libltdl/configure 2007-01-25 16:16:55.000000000 +0100 -@@ -465,7 +465,7 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir docdir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -503,8 +503,9 @@ - libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+infodir='${datadir}/info' -+mandir='${datadir}/man' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' - - ac_prev= - for ac_option -@@ -557,6 +558,11 @@ - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -@@ -824,7 +830,7 @@ - - # Be sure to have absolute paths. - for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+ localstatedir libdir includedir oldincludedir infodir mandir docdir - do - eval ac_val=$`echo $ac_var` - case $ac_val in -@@ -22270,6 +22276,7 @@ - s,@oldincludedir@,$oldincludedir,;t t - s,@infodir@,$infodir,;t t - s,@mandir@,$mandir,;t t -+s,@docdir@,$docdir,;t t - s,@build_alias@,$build_alias,;t t - s,@host_alias@,$host_alias,;t t - s,@target_alias@,$target_alias,;t t diff --git a/monitor/collectd/collectd.conf b/monitor/collectd/collectd.conf index c376c4779..e51fe9fa0 100644 --- a/monitor/collectd/collectd.conf +++ b/monitor/collectd/collectd.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../collectd/collectd.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -15,6 +15,9 @@ prefix="opt/collectd" set_confopt +# collectd's configure doesn't accept '--docdir' option +var_remove_regex confopt ' ' "\-\-docdir\=.*" + # apache plugin pkginstalled apache || var_append confopt ' ' "--disable-apache" diff --git a/monitor/collectd/collectd.desc b/monitor/collectd/collectd.desc index e5bae0d38..b98f8e412 100644 --- a/monitor/collectd/collectd.desc +++ b/monitor/collectd/collectd.desc @@ -29,7 +29,7 @@ [L] GPL [S] Stable -[V] 3.11.4 +[V] 4.0.1 [P] X -----5---9 800.000 -[D] 3360349550 collectd-3.11.4.tar.bz2 http://collectd.org/files/ +[D] 2695491754 collectd-4.0.1.tar.bz2 http://collectd.org/files/ diff --git a/monitor/collectd/configure-typo.patch b/monitor/collectd/configure-typo.patch deleted file mode 100644 index 571071a2f..000000000 --- a/monitor/collectd/configure-typo.patch +++ /dev/null @@ -1,27 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../collectd/configure-typo.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- collectd-3.11.0/configure.orig 2007-01-25 17:17:02.000000000 +0100 -+++ collectd-3.11.0/configure 2007-01-25 17:17:22.000000000 +0100 -@@ -1588,7 +1588,7 @@ - --disable-multimeter disable multimeter statistics (enabled by def) - --disable-mysql disable mysql statistics (enabled by def) - --disable-nfs disable nfs statistics (enabled by def) -- --disable-ntpd disable nfs statistics (enabled by def) -+ --disable-ntpd disable ntpd statistics (enabled by def) - --disable-ping disable ping statistics (enabled by def) - --disable-processes disable processes statistics (enabled by def) - --disable-sensors disable lm_sensors statistics (enabled by def)