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

(-)collectd5.new/Makefile (-5 / +19 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/net-mgmt/collectd5/Makefile 339321 2014-01-10 08:25:34Z demon $
2
# $FreeBSD: head/net-mgmt/collectd5/Makefile 339321 2014-01-10 08:25:34Z demon $
3
3
4
PORTNAME=	collectd
4
PORTNAME=	collectd
5
PORTVERSION=	5.4.0
5
PORTVERSION=	5.4.1
6
PORTREVISION=	3
7
PKGNAMESUFFIX=	5
6
PKGNAMESUFFIX=	5
8
CATEGORIES=	net-mgmt
7
CATEGORIES=	net-mgmt
9
MASTER_SITES=	http://collectd.org/files/
8
MASTER_SITES=	http://collectd.org/files/
Lines 22-28 Link Here
22
OPTIONS_DEFINE=		CGI DEBUG GCRYPT VIRT
21
OPTIONS_DEFINE=		CGI DEBUG GCRYPT VIRT
23
OPTIONS_GROUP=		INPUT OUTPUT
22
OPTIONS_GROUP=		INPUT OUTPUT
24
OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP
23
OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP
25
OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MYSQL \
24
OPTIONS_GROUP_INPUT=	CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \
26
			NUTUPS PGSQL PING PYTHON RABBITMQ REDIS \
25
			NUTUPS PGSQL PING PYTHON RABBITMQ REDIS \
27
			ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS
26
			ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS
28
27
Lines 34-39 Link Here
34
JSON_DESC=		Enable JSON plugins
33
JSON_DESC=		Enable JSON plugins
35
MEMCACHEC_DESC=		Enable memcachec plugin
34
MEMCACHEC_DESC=		Enable memcachec plugin
36
MODBUS_DESC=		Enable modbus plugin
35
MODBUS_DESC=		Enable modbus plugin
36
MONGODB_DESC=		Enable MongoDB-based plugins
37
MYSQL_DESC=		Enable mysql-based plugins
37
MYSQL_DESC=		Enable mysql-based plugins
38
NOTIFYEMAIL_DESC=	Enable notifications via email
38
NOTIFYEMAIL_DESC=	Enable notifications via email
39
NOTIFYDESKTOP_DESC=	Enable desktop notifications
39
NOTIFYDESKTOP_DESC=	Enable desktop notifications
Lines 68-80 Link Here
68
CONFIGURE_ARGS=	--localstatedir=/var \
68
CONFIGURE_ARGS=	--localstatedir=/var \
69
		--disable-all-plugins \
69
		--disable-all-plugins \
70
		--disable-static \
70
		--disable-static \
71
		--without-amqp \
71
		--without-java \
72
		--without-java \
73
		--without-libaquaero5 \
72
		--without-libganglia \
74
		--without-libganglia \
73
		--without-libiptc \
75
		--without-libiptc \
74
		--without-libjvm \
76
		--without-libjvm \
75
		--without-libkstat \
77
		--without-libkstat \
76
		--without-libmodbus \
78
		--without-libmodbus \
77
		--without-libmongoc \
78
		--without-libnetlink \
79
		--without-libnetlink \
79
		--without-libnetapp \
80
		--without-libnetapp \
80
		--without-libopenipmi \
81
		--without-libopenipmi \
Lines 83-88 Link Here
83
		--without-libperl \
84
		--without-libperl \
84
		--without-libsensors \
85
		--without-libsensors \
85
		--without-libvarnish \
86
		--without-libvarnish \
87
		--without-lvm \
88
		--without-mic \
86
		--without-oracle \
89
		--without-oracle \
87
		--without-perl-bindings
90
		--without-perl-bindings
88
91
Lines 233-238 Link Here
233
PLIST_SUB+=	MODBUS="@comment "
236
PLIST_SUB+=	MODBUS="@comment "
234
.endif
237
.endif
235
238
239
.if ${PORT_OPTIONS:MMONGODB}
240
LIB_DEPENDS+=	libmongoc.so:${PORTSDIR}/devel/mongo-c-driver
241
CONFIGURE_ARGS+=--with-libmongoc=${LOCALBASE} \
242
		--enable-write_mongodb
243
PLIST_SUB+=	MONGODB=""
244
.else
245
CONFIGURE_ARGS+=--without-libcmongoc \
246
		--disable-write_mongodb
247
PLIST_SUB+=	MONGODB="@comment "
248
.endif
249
236
.if ${PORT_OPTIONS:MMYSQL}
250
.if ${PORT_OPTIONS:MMYSQL}
237
USE_MYSQL=	yes
251
USE_MYSQL=	yes
238
CONFIGURE_ARGS+=--with-libmysql=${LOCALBASE} --enable-mysql
252
CONFIGURE_ARGS+=--with-libmysql=${LOCALBASE} --enable-mysql
Lines 443-449 Link Here
443
		${WRKSRC}/contrib/collection.conf
457
		${WRKSRC}/contrib/collection.conf
444
	@${REINPLACE_CMD} \
458
	@${REINPLACE_CMD} \
445
		-e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \
459
		-e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \
446
		${WRKSRC}/configure.in
460
		${WRKSRC}/configure.ac
447
461
448
post-install:
462
post-install:
449
	@${MKDIR} ${STAGEDIR}/var/db/collectd
463
	@${MKDIR} ${STAGEDIR}/var/db/collectd
(-)collectd5.new/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (collectd-5.4.0.tar.bz2) = 90973894a1f10775d409fe23ce7bc4d89c1b7c6f4d9918b305d160605871923e
1
SHA256 (collectd-5.4.1.tar.bz2) = 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0
2
SIZE (collectd-5.4.0.tar.bz2) = 1506520
2
SIZE (collectd-5.4.1.tar.bz2) = 1521907
(-)collectd5.new/files/patch-configure.ac (-10 / +8 lines)
Lines 1-5 Link Here
1
--- configure.ac.orig	2014-01-26 09:09:23.512559000 +0100
1
--- configure.ac.orig	2014-01-26 09:09:23.512559000 +0100
2
+++ configure.ac	2014-02-28 23:49:11.000000000 +0100
2
+++ configure.ac	2014-03-04 11:57:05.000000000 +0100
3
@@ -111,7 +111,7 @@
3
@@ -111,7 +111,7 @@
4
 fi
4
 fi
5
 
5
 
Lines 32-58 Link Here
32
 fi
32
 fi
33
 
33
 
34
 CPPFLAGS="$SAVE_CPPFLAGS"
34
 CPPFLAGS="$SAVE_CPPFLAGS"
35
@@ -3458,7 +3455,7 @@
35
@@ -3473,7 +3470,7 @@
36
 if test "x$with_python" = "xyes"
36
 if test "x$with_python" = "xyes"
37
 then
37
 then
38
 	AC_MSG_CHECKING([for Python LDFLAGS])
38
 	AC_MSG_CHECKING([for Python LIBS])
39
-	python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>&1`
39
-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
40
+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1`
40
+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_var(\"LINKFORSHARED\")+\" -L\"+distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0)+\" -l\"+distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0).replace(\"lib\", \"\").replace(\".a\", \"\"))" | "$with_python_prog" 2>&1`
41
 	python_config_status=$?
41
 	python_config_status=$?
42
 
42
 
43
 	if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
43
 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
44
@@ -3486,9 +3483,8 @@
44
@@ -3488,7 +3485,7 @@
45
 fi
46
 
47
 if test "x$with_python" = "xyes"
45
 if test "x$with_python" = "xyes"
48
-then
46
 then
49
 	LDFLAGS="-L$python_library_path $LDFLAGS"
47
 	LDFLAGS="-L$python_library_path $LDFLAGS"
50
-	LIBS="$python_library_flags $LIBS"
48
-	LIBS="$python_library_flags $LIBS"
51
+	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
49
+	LIBS="$python_library_flags $LIBS -lm -lpthread -lutil"
52
 
50
 
53
 	AC_CHECK_FUNC(PyObject_CallFunction,
51
 	AC_CHECK_FUNC(PyObject_CallFunction,
54
 		      [with_python="yes"],
52
 		      [with_python="yes"],
55
@@ -4393,7 +4389,7 @@
53
@@ -4393,7 +4390,7 @@
56
 	then
54
 	then
57
 		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
55
 		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
58
 		with_libvarnish_cflags="-I$withval/include"
56
 		with_libvarnish_cflags="-I$withval/include"
(-)collectd5.new/files/patch-src-curl_xml.c (-3 / +3 lines)
Lines 1-11 Link Here
1
--- src/curl_xml.c.orig	2013-08-18 14:24:25.069973000 +0400
1
--- src/curl_xml.c.orig	2014-01-26 09:09:23.528559000 +0100
2
+++ src/curl_xml.c	2014-01-03 00:25:17.000000000 +0400
2
+++ src/curl_xml.c	2014-02-28 23:28:54.000000000 +0100
3
@@ -607,7 +607,7 @@
3
@@ -607,7 +607,7 @@
4
   int status;
4
   int status;
5
   long rc;
5
   long rc;
6
   char *ptr;
6
   char *ptr;
7
-  char *url;
7
-  char *url;
8
+  char *url = NULL;
8
+  char *url = NULL;
9
   url = db->url;
9
 
10
 
10
   db->buffer_fill = 0; 
11
   db->buffer_fill = 0; 
11
   status = curl_easy_perform (curl);
(-)collectd5.new/files/patch-src-interface.c (-21 / +22 lines)
Lines 1-36 Link Here
1
--- src/interface.c.orig	2014-01-05 00:36:58.000000000 +0400
1
--- src/interface.c.orig	2014-01-26 09:09:14.860391000 +0100
2
+++ src/interface.c	2014-01-05 00:45:10.000000000 +0400
2
+++ src/interface.c	2014-02-28 23:32:40.000000000 +0100
3
@@ -212,20 +212,19 @@ static int interface_read (void)
3
@@ -212,21 +212,19 @@
4
 		return (-1);
4
 		return (-1);
5
 
5
 
6
 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
6
 	for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
7
-	{
7
-	{
8
-		if ((if_data = (struct IFA_DATA *) if_ptr->ifa_data) == NULL)
8
-		if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
9
-			continue;
9
-			if_data = (struct IFA_DATA *) if_ptr->ifa_data;
10
-
10
-
11
-		if_submit (if_ptr->ifa_name, "if_octets",
11
-			if_submit (if_ptr->ifa_name, "if_octets",
12
-				if_data->IFA_RX_BYTES,
12
-				if_data->IFA_RX_BYTES,
13
-				if_data->IFA_TX_BYTES);
13
-				if_data->IFA_TX_BYTES);
14
-		if_submit (if_ptr->ifa_name, "if_packets",
14
-			if_submit (if_ptr->ifa_name, "if_packets",
15
-				if_data->IFA_RX_PACKT,
15
-				if_data->IFA_RX_PACKT,
16
-				if_data->IFA_TX_PACKT);
16
-				if_data->IFA_TX_PACKT);
17
-		if_submit (if_ptr->ifa_name, "if_errors",
17
-			if_submit (if_ptr->ifa_name, "if_errors",
18
-				if_data->IFA_RX_ERROR,
18
-				if_data->IFA_RX_ERROR,
19
-				if_data->IFA_TX_ERROR);
19
-				if_data->IFA_TX_ERROR);
20
-		}
20
-	}
21
-	}
21
+        if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
22
+         if (if_ptr->ifa_addr != NULL && if_ptr->ifa_addr->sa_family == AF_LINK) {
22
+            if_data = (struct IFA_DATA *) if_ptr->ifa_data;
23
+             if_data = (struct IFA_DATA *) if_ptr->ifa_data;
23
+            
24
+             
24
+            if_submit (if_ptr->ifa_name, "if_octets",
25
+             if_submit (if_ptr->ifa_name, "if_octets",
25
+                       if_data->IFA_RX_BYTES,
26
+                        if_data->IFA_RX_BYTES,
26
+                       if_data->IFA_TX_BYTES);
27
+                        if_data->IFA_TX_BYTES);
27
+            if_submit (if_ptr->ifa_name, "if_packets",
28
+             if_submit (if_ptr->ifa_name, "if_packets",
28
+                       if_data->IFA_RX_PACKT,
29
+                        if_data->IFA_RX_PACKT,
29
+                       if_data->IFA_TX_PACKT);
30
+                        if_data->IFA_TX_PACKT);
30
+            if_submit (if_ptr->ifa_name, "if_errors",
31
+             if_submit (if_ptr->ifa_name, "if_errors",
31
+                       if_data->IFA_RX_ERROR,
32
+                        if_data->IFA_RX_ERROR,
32
+                       if_data->IFA_TX_ERROR);
33
+                        if_data->IFA_TX_ERROR);
33
+        }
34
+         }
34
 
35
 
35
 	freeifaddrs (if_list);
36
 	freeifaddrs (if_list);
36
 /* #endif HAVE_GETIFADDRS */
37
 /* #endif HAVE_GETIFADDRS */
(-)collectd5.new/files/patch-src_modbus.c (-3 / +3 lines)
Lines 1-11 Link Here
1
--- src/modbus.c.orig       2013-01-27 17:47:18.246255000 +0400
1
--- src/modbus.c.orig	2014-01-26 09:09:14.876392000 +0100
2
+++ src/modbus.c    2013-05-14 18:40:05.000000000 +0400
2
+++ src/modbus.c	2014-02-28 23:35:41.000000000 +0100
3
@@ -25,6 +25,9 @@
3
@@ -25,6 +25,9 @@
4
 #include "plugin.h"
4
 #include "plugin.h"
5
 #include "configfile.h"
5
 #include "configfile.h"
6
 
6
 
7
+/* FreeBSD needs this */
7
+/* FreeBSD needs this */
8
+#include <sys/socket.h> 
8
+#include <sys/socket.h>
9
+
9
+
10
 #include <netdb.h>
10
 #include <netdb.h>
11
 
11
 
(-)collectd5.new/files/patch-version-gen.sh (-7 / +7 lines)
Lines 1-10 Link Here
1
--- version-gen.sh.orig	2013-08-19 10:57:47.000000000 -0600
1
--- version-gen.sh.orig	2014-01-26 09:09:23.540560000 +0100
2
+++ version-gen.sh	2013-08-19 10:58:15.000000000 -0600
2
+++ version-gen.sh	2014-02-28 23:34:20.000000000 +0100
3
@@ -1,13 +1,3 @@
3
@@ -1,13 +1,2 @@
4
-#!/usr/bin/env bash
4
-#!/usr/bin/env bash
5
+#!/bin/sh
5
-
6
 
6
-DEFAULT_VERSION="5.4.1.git"
7
-DEFAULT_VERSION="5.4.0.git"
8
-
7
-
9
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
8
-VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"
10
-
9
-
Lines 15-18 Link Here
15
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
14
-VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
16
-
15
-
17
-echo -n "$VERSION"
16
-echo -n "$VERSION"
18
+echo -n '5.4.0.git'
17
+#!/bin/sh
18
+echo -n '5.4.1.git'
(-)collectd5.new/pkg-plist (-1 / +3 lines)
Lines 226-231 Link Here
226
%%CURL%%lib/collectd/write_http.a
226
%%CURL%%lib/collectd/write_http.a
227
%%CURL%%lib/collectd/write_http.so
227
%%CURL%%lib/collectd/write_http.so
228
%%CURL%%lib/collectd/write_http.la
228
%%CURL%%lib/collectd/write_http.la
229
%%MONGODB%%lib/collectd/write_mongodb.a
230
%%MONGODB%%lib/collectd/write_mongodb.so
231
%%MONGODB%%lib/collectd/write_mongodb.la
229
%%REDIS%%lib/collectd/write_redis.a
232
%%REDIS%%lib/collectd/write_redis.a
230
%%REDIS%%lib/collectd/write_redis.so
233
%%REDIS%%lib/collectd/write_redis.so
231
%%REDIS%%lib/collectd/write_redis.la
234
%%REDIS%%lib/collectd/write_redis.la
232
--------------------------------------------------- cut here ----------------------------------------------------

Return to bug 187254