Attachment 205263 Details for Bug 238745 – collectd5: update to 5.9.0

[patch] collectd5: update to 5.9.0

_collectd.590.patch (text/plain), 6.75 KB, created by Krzysztof on 2019-06-21 12:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2019-06-21 12:10:06 UTC

Size: 6.75 KB

patch

obsolete

>diff -ruN net-mgmt/collectd5/distinfo net-mgmt/collectd5.new/distinfo
>--- net-mgmt/collectd5/distinfo	2018-11-09 17:05:53.000000000 +0100
>+++ net-mgmt/collectd5.new/distinfo	2019-06-21 12:05:39.613250000 +0200
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1511130105
>-SHA256 (collectd-5.8.1.tar.bz2) = e796fda27ce06377f491ad91aa286962a68c2b54076aa77a29673d53204453da
>-SIZE (collectd-5.8.1.tar.bz2) = 1789228
>+SHA256 (collectd-5.9.0.tar.bz2) = 7b220f8898a061f6e7f29a8c16697d1a198277f813da69474a67911097c0626b
>+SIZE (collectd-5.9.0.tar.bz2) = 1899573
>diff -ruN net-mgmt/collectd5/files/patch-Makefile.am net-mgmt/collectd5.new/files/patch-Makefile.am
>--- net-mgmt/collectd5/files/patch-Makefile.am	2017-11-21 19:40:25.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-Makefile.am	2019-06-21 12:11:30.197141000 +0200
>@@ -1,15 +1,15 @@
>---- Makefile.am.orig	2017-11-18 09:03:27 UTC
>+--- Makefile.am.orig	2019-06-13 09:13:42 UTC
> +++ Makefile.am
>-@@ -165,7 +165,7 @@ AM_CPPFLAGS = \
>+@@ -187,7 +187,7 @@ AM_CPPFLAGS = \
>  	-DPREFIX='"${prefix}"' \
>  	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
>  	-DLOCALSTATEDIR='"${localstatedir}"' \
>--	-DPKGLOCALSTATEDIR='"${localstatedir}/lib/${PACKAGE_NAME}"' \
>+-	-DPKGLOCALSTATEDIR='"${cpkglocalstatedir}"' \
> +	-DPKGLOCALSTATEDIR='"/var/db/${PACKAGE_NAME}"' \
>- 	-DPLUGINDIR='"${pkglibdir}"' \
>- 	-DPKGDATADIR='"${pkgdatadir}"'
>- 
>-@@ -1964,15 +1964,10 @@ endif
>+ 	-DPLUGINDIR='"${cpkglibdir}"' \
>+ 	-DPKGDATADIR='"${cpkgdatadir}"'
>+ if BUILD_WIN32
>+@@ -2184,15 +2184,10 @@ endif
>  
>  install-exec-hook:
>  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
>@@ -19,11 +19,11 @@
>  	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
> -	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
> -	then \
>--		$(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
>+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
> -	else \
>--		$(INSTALL) -m 0640 $(srcdir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
>+-		$(INSTALL) -m 0640 $(builddir)/src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
> -	fi; \
> +	$(INSTALL) -m 0640 src/collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
>- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
>- 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(pkgdatadir)/types.db;
>+ 	$(mkinstalldirs) $(DESTDIR)$(cpkgdatadir)
>+ 	$(INSTALL) -m 0644 $(srcdir)/src/types.db $(DESTDIR)$(cpkgdatadir)/types.db;
>  	$(INSTALL) -m 0644 $(srcdir)/src/postgresql_default.conf \
>diff -ruN net-mgmt/collectd5/files/patch-src_daemon_collectd.h net-mgmt/collectd5.new/files/patch-src_daemon_collectd.h
>--- net-mgmt/collectd5/files/patch-src_daemon_collectd.h	2017-11-21 19:40:25.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-src_daemon_collectd.h	2019-06-21 12:16:47.223059000 +0200
>@@ -1,6 +1,6 @@
>---- src/daemon/collectd.h.orig	2017-11-18 09:03:27 UTC
>+--- src/daemon/collectd.h.orig	2019-06-13 09:13:42 UTC
> +++ src/daemon/collectd.h
>-@@ -207,7 +207,7 @@
>+@@ -213,7 +213,7 @@ typedef int uid_t;
>  #endif
>  
>  #ifndef PKGLOCALSTATEDIR
>diff -ruN net-mgmt/collectd5/files/patch-src_libcollectdclient_network.c net-mgmt/collectd5.new/files/patch-src_libcollectdclient_network.c
>--- net-mgmt/collectd5/files/patch-src_libcollectdclient_network.c	2017-11-29 14:12:24.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-src_libcollectdclient_network.c	2019-06-21 12:16:47.224748000 +0200
>@@ -1,6 +1,6 @@
>---- src/libcollectdclient/network.c.orig
>+--- src/libcollectdclient/network.c.orig	2019-06-13 09:13:42 UTC
> +++ src/libcollectdclient/network.c
>-@@ -174,6 +174,13 @@
>+@@ -178,6 +178,13 @@ static int server_open_socket(lcc_server
>        continue;
>      }
>  
>diff -ruN net-mgmt/collectd5/files/patch-src_network.c net-mgmt/collectd5.new/files/patch-src_network.c
>--- net-mgmt/collectd5/files/patch-src_network.c	2017-11-29 14:12:24.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-src_network.c	2019-06-21 12:16:47.226448000 +0200
>@@ -1,6 +1,6 @@
>---- src/network.c.orig
>+--- src/network.c.orig	2019-06-13 09:13:42 UTC
> +++ src/network.c
>-@@ -2000,6 +2000,13 @@
>+@@ -2013,6 +2013,13 @@ static int sockent_client_connect(socken
>        continue;
>      }
>  
>diff -ruN net-mgmt/collectd5/files/patch-src_zfs__arc.c net-mgmt/collectd5.new/files/patch-src_zfs__arc.c
>--- net-mgmt/collectd5/files/patch-src_zfs__arc.c	2017-11-21 19:40:25.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-src_zfs__arc.c	2019-06-21 12:16:47.228141000 +0200
>@@ -1,6 +1,6 @@
>---- src/zfs_arc.c.orig	2017-11-18 09:03:27 UTC
>+--- src/zfs_arc.c.orig	2019-06-13 09:13:42 UTC
> +++ src/zfs_arc.c
>-@@ -301,8 +301,6 @@ static int za_read(void) {
>+@@ -322,8 +322,6 @@ static int za_read(void) {
>    za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
>                   "prefetch_metadata-hit");
>    za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");
>diff -ruN net-mgmt/collectd5/files/patch-version-gen.sh net-mgmt/collectd5.new/files/patch-version-gen.sh
>--- net-mgmt/collectd5/files/patch-version-gen.sh	2017-11-21 19:40:25.000000000 +0100
>+++ net-mgmt/collectd5.new/files/patch-version-gen.sh	2019-06-21 12:16:47.229827000 +0200
>@@ -1,8 +1,8 @@
>---- version-gen.sh.orig	2017-11-18 09:03:27 UTC
>+--- version-gen.sh.orig	2019-06-13 09:32:35 UTC
> +++ version-gen.sh
> @@ -2,10 +2,6 @@
>  
>- DEFAULT_VERSION="5.8.0.git"
>+ DEFAULT_VERSION="5.9.0.git"
>  
> -if [ -d .git ]; then
> -	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
>diff -ruN net-mgmt/collectd5/Makefile net-mgmt/collectd5.new/Makefile
>--- net-mgmt/collectd5/Makefile	2019-03-31 15:41:02.000000000 +0200
>+++ net-mgmt/collectd5.new/Makefile	2019-06-21 13:57:13.869599000 +0200
>@@ -2,11 +2,9 @@
> # $FreeBSD: head/net-mgmt/collectd5/Makefile 497411 2019-03-31 13:41:02Z sunpoet $
> 
> PORTNAME=	collectd
>-PORTVERSION=	5.8.1
>-PORTREVISION=	2
>+PORTVERSION=	5.9.0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
>-PKGNAMESUFFIX=	5
> 
> MAINTAINER=	ports@bsdserwis.com
> COMMENT=	Systems & network statistics collection daemon
>@@ -199,7 +197,7 @@
> OPENLDAP_CONFIGURE_ENABLE=	openldap
> OPENLDAP_CONFIGURE_WITH=	libldap=${LOCALBASE}
> 
>-PERL_USES=			perl5
>+PERL_USES=			${PERL}
> PERL_CONFIGURE_ENABLE=		perl
> PERL_CONFIGURE_WITH=		perl=${PERL} perl-bindings libperl
> 
>@@ -219,7 +217,7 @@
> PROMETHEUS_LIB_DEPENDS+=	libmicrohttpd.so:www/libmicrohttpd
> PROMETHEUS_CONFIGURE_ENABLE=	write_prometheus
> 
>-PYTHON_USES=			python
>+PYTHON_USES=			${PYTHON_CMD}
> PYTHON_CONFIGURE_ENABLE=	python
> PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}
> PYTHON_CONFIGURE_ENV=		PYTHON_CONFIG=${PYTHON_CMD}-config
>@@ -339,7 +337,7 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} 's/-Werror//' \
>-		${WRKSRC}/configure.ac 
>+		${WRKSRC}/configure.ac
> 	@${REINPLACE_CMD} \
> 		-e 's;@prefix@/var/;/var/;' \
> 		-e 's;/var/lib/;/var/db/;' \

Flags:

ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 238745: 205263