Hi, this patch updates sysutils/collectd to version 4.10.1
Changelog: http://collectd.org/news.shtml#news85 Running this for about two weeks on amd64 with the following plugins: syslog cpu interface load memory rrdtool Is this the right way to deal with REVISION? -- Simon Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/collectd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 8 Aug 2010 07:41:40 -0000 1.5 +++ Makefile 18 Aug 2010 09:44:22 -0000 @@ -6,18 +6,13 @@ COMMENT-rrdtool = collectd rrdtool plugin COMMENT-snmp = collectd snmp plugin -V = 4.10.0 +V = 4.10.1 DISTNAME = collectd-$V PKGNAME-main = collectd-$V -REVISION-main = 2 PKGNAME-mysql = collectd-mysql-$V -REVISION-mysql = 2 PKGNAME-pgsql = collectd-pgsql-$V -REVISION-pgsql = 2 PKGNAME-rrdtool = collectd-rrdtool-$V -REVISION-rrdtool = 2 PKGNAME-snmp = collectd-snmp-$V -REVISION-snmp = 2 CATEGORIES = sysutils HOMEPAGE = http://www.collectd.org/ Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/collectd/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- distinfo 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ distinfo 18 Aug 2010 09:44:22 -0000 @@ -1,5 +1,5 @@ -MD5 (collectd-4.10.0.tar.gz) = xHPPjp8i9an370xb4bDENg== -RMD160 (collectd-4.10.0.tar.gz) = LtCW54QJnFV0sg3lSIOA9Dd//ps= -SHA1 (collectd-4.10.0.tar.gz) = V2Pyi4chvhFa/tWHUvXedsYnu6U= -SHA256 (collectd-4.10.0.tar.gz) = tqu1+NDd5Tx7q9WMTm7v3mEST/QFrCf5Oq/8aXnF938= -SIZE (collectd-4.10.0.tar.gz) = 1731377 +MD5 (collectd-4.10.1.tar.gz) = r1ErAHh6ZYl8lRl2QdGkyw== +RMD160 (collectd-4.10.1.tar.gz) = tJusYPcKlKsO9OvzO9JN5MLa1Fo= +SHA1 (collectd-4.10.1.tar.gz) = 5RZ7mtNJ3ld4xGVvislCcUYaW8Y= +SHA256 (collectd-4.10.1.tar.gz) = 2SPGI9Gg3sJwrrbYlFe9uyMtxz+F5C6JVnDiWmFuPB8= +SIZE (collectd-4.10.1.tar.gz) = 1732940 Index: patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-Makefile_in --- patches/patch-Makefile_in 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ patches/patch-Makefile_in 18 Aug 2010 09:44:22 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $ dont create var/{run,lib,log} ---- Makefile.in.orig Sat Jun 19 16:51:23 2010 -+++ Makefile.in Sat Jun 19 16:51:33 2010 -@@ -813,9 +813,6 @@ uninstall-am: +--- Makefile.in.orig Fri Jul 9 12:02:16 2010 ++++ Makefile.in Thu Aug 5 13:07:16 2010 +@@ -815,9 +815,6 @@ uninstall-am: install-exec-hook: Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-configure,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-configure --- patches/patch-configure 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ patches/patch-configure 18 Aug 2010 09:44:22 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $ ---- configure.orig Sat May 1 11:16:01 2010 -+++ configure Sat Jun 19 11:22:07 2010 -@@ -11701,7 +11701,7 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` +--- configure.orig Fri Jul 9 12:02:17 2010 ++++ configure Thu Aug 5 13:07:16 2010 +@@ -11709,7 +11709,7 @@ LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""` @@ -10,7 +10,7 @@ -@@ -15440,7 +15440,7 @@ SAVE_CFLAGS="$CFLAGS" +@@ -15451,7 +15451,7 @@ SAVE_CFLAGS="$CFLAGS" # Emulate behavior of src/Makefile.am if test "x$GCC" = "xyes" then @@ -19,7 +19,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtok_r" >&5 -@@ -20747,7 +20747,7 @@ then +@@ -20750,7 +20750,7 @@ then SAVE_LDFLAGS="$LDFLAGS" # trigger an error if Perl_load_module*() uses __attribute__nonnull__(3) # (see issues #41 and #42) Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/sysutils/collectd/patches/patch-src_Makefile_in,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-src_Makefile_in --- patches/patch-src_Makefile_in 23 Jun 2010 18:04:26 -0000 1.1.1.1 +++ patches/patch-src_Makefile_in 18 Aug 2010 09:44:22 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/06/23 18:04:26 landry Exp $ Install config file in examples/ ---- src/Makefile.in.orig Sat May 1 11:16:00 2010 -+++ src/Makefile.in Sat Jun 19 17:43:52 2010 +--- src/Makefile.in.orig Fri Jul 9 12:02:16 2010 ++++ src/Makefile.in Thu Aug 5 15:09:27 2010 @@ -37,7 +37,7 @@ build_triplet = @build@ host_triplet = @host@ @build_with_own_libiptc_t...@am__append_1 = owniptc @@ -29,16 +29,16 @@ @build_with_own_liboconfig_fa...@am__append_17 = -loconfig @build_with_libsocket_t...@am__append_18 = -lsocket @build_aix_t...@am__append_19 = -lm -@@ -333,7 +333,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) - @build_plugin_snmp_t...@am__append_287 = snmp.la - @BUILD_PLUGIN_SNMP_TRUE@@build_with_libnetsnmp_t...@am__append_288 = $(BUILD_WITH_LIBSNMP_CFLAGS) - @BUILD_PLUGIN_SNMP_TRUE@@build_with_libnetsnmp_t...@am__append_289 = $(BUILD_WITH_LIBSNMP_LIBS) -...@build_plugin_snmp_true@@build_with_libpthread_t...@am__append_290 = -lpthread -...@build_plugin_snmp_true@@build_with_libpthread_t...@am__append_290 = -pthread - @build_plugin_snmp_t...@am__append_291 = "-dlopen" snmp.la - @build_plugin_snmp_t...@am__append_292 = snmp.la - @build_plugin_swap_t...@am__append_293 = swap.la -@@ -1836,7 +1836,7 @@ SUBDIRS = libcollectdclient $(am__append_1) $(am__appe +@@ -335,7 +335,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) + @build_plugin_snmp_t...@am__append_289 = snmp.la + @BUILD_PLUGIN_SNMP_TRUE@@build_with_libnetsnmp_t...@am__append_290 = $(BUILD_WITH_LIBSNMP_CFLAGS) + @BUILD_PLUGIN_SNMP_TRUE@@build_with_libnetsnmp_t...@am__append_291 = $(BUILD_WITH_LIBSNMP_LIBS) +...@build_plugin_snmp_true@@build_with_libpthread_t...@am__append_292 = -lpthread +...@build_plugin_snmp_true@@build_with_libpthread_t...@am__append_292 = -pthread + @build_plugin_snmp_t...@am__append_293 = "-dlopen" snmp.la + @build_plugin_snmp_t...@am__append_294 = snmp.la + @build_plugin_swap_t...@am__append_295 = swap.la +@@ -1840,7 +1840,7 @@ SUBDIRS = libcollectdclient $(am__append_1) $(am__appe AM_CPPFLAGS = -DPREFIX='"${prefix}"' \ -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \ -DLOCALSTATEDIR='"${localstatedir}"' \ @@ -47,7 +47,7 @@ $(am__append_3) -DPLUGINDIR='"${pkglibdir}"' \ -DPKGDATADIR='"${pkgdatadir}"' collectd_SOURCES = collectd.c collectd.h \ -@@ -2047,10 +2047,10 @@ BUILT_SOURCES = $(am__append_249) +@@ -2052,10 +2052,10 @@ CLEANFILES = $(am__append_250) @BUILD_PLUGIN_DISK_TRUE@ $(am__append_86) $(am__append_87) @build_plugin_dns_t...@dns_la_sources = dns.c utils_dns.c utils_dns.h @build_plugin_dns_t...@dns_la_ldflags = -module -avoid-version @@ -60,7 +60,7 @@ @build_plugin_entropy_t...@entropy_la_sources = entropy.c @build_plugin_entropy_t...@entropy_la_ldflags = -module -avoid-version @build_plugin_exec_t...@exec_la_sources = exec.c \ -@@ -2058,7 +2058,7 @@ BUILT_SOURCES = $(am__append_249) +@@ -2063,7 +2063,7 @@ CLEANFILES = $(am__append_250) @BUILD_PLUGIN_EXEC_TRUE@ utils_cmd_putval.c utils_cmd_putval.h @build_plugin_exec_t...@exec_la_ldflags = -module -avoid-version @@ -69,7 +69,7 @@ @build_plugin_filecount_t...@filecount_la_sources = filecount.c @build_plugin_filecount_t...@filecount_la_ldflags = -module -avoid-version @build_plugin_gmond_t...@gmond_la_sources = gmond.c -@@ -2165,7 +2165,7 @@ BUILT_SOURCES = $(am__append_249) +@@ -2170,7 +2170,7 @@ CLEANFILES = $(am__append_250) @BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_203) @build_plugin_network_t...@network_la_ldflags = -module -avoid-version \ @BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_204) @@ -78,7 +78,7 @@ @BUILD_PLUGIN_NETWORK_TRUE@ $(am__append_202) $(am__append_205) @build_plugin_nfs_t...@nfs_la_sources = nfs.c @build_plugin_nfs_t...@nfs_la_ldflags = -module -avoid-version -@@ -2182,14 +2182,14 @@ BUILT_SOURCES = $(am__append_249) +@@ -2187,14 +2187,14 @@ CLEANFILES = $(am__append_250) @build_plugin_notify_desktop_t...@notify_desktop_la_libadd = $(LIBNOTIFY_LIBS) @build_plugin_notify_email_t...@notify_email_la_sources = notify_email.c @build_plugin_notify_email_t...@notify_email_la_ldflags = -module -avoid-version @@ -95,7 +95,7 @@ @build_plugin_olsrd_t...@olsrd_la_sources = olsrd.c @build_plugin_olsrd_t...@olsrd_la_ldflags = -module -avoid-version @build_plugin_olsrd_t...@olsrd_la_libadd = $(am__append_233) -@@ -2316,7 +2316,7 @@ BUILT_SOURCES = $(am__append_249) +@@ -2323,7 +2323,7 @@ CLEANFILES = $(am__append_250) @BUILD_PLUGIN_UNIXSOCK_TRUE@ utils_cmd_putnotif.h utils_cmd_putnotif.c @build_plugin_unixsock_t...@unixsock_la_ldflags = -module -avoid-version @@ -104,8 +104,8 @@ @build_plugin_uptime_t...@uptime_la_sources = uptime.c @build_plugin_uptime_t...@uptime_la_cflags = $(AM_CFLAGS) @build_plugin_uptime_t...@uptime_la_ldflags = -module -avoid-version -@@ -4032,13 +4032,8 @@ uninstall-man: uninstall-man1 uninstall-man5 - @HAVE_PROTOC_C_TRUE@ protoc-c --c_out $(builddir) pinba.proto +@@ -4039,13 +4039,8 @@ pinba.pb-c.c pinba.pb-c.h: pinba.proto + protoc-c --c_out $(builddir) pinba.proto install-exec-hook: - $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
