View | Details | Raw Unified | Return to bug 238745
Collapse All | Expand All

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

Return to bug 238745