Attachment #159872 for bug #202327





PORTNAME=	collectd
PORTVERSION=	5.5.0
PORTREVISION=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	https://collectd.org/files/ \
		http://collectd.org/files/

RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
SIGROK_DESC=		Enable sigrok plugin
SNMP_DESC=		Enable SNMP plugin
STATGRAB_DESC=		Enable statgrab-based plugins (interface, etc)
STATSD_DESC=		Enable statsd plugin
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
VARNISH_DESC=		Enable varnish 4.x cache statistics

		--enable-cpu \
		--enable-csv \
		--enable-df \
		--enable-disk \
		--enable-dns \
		--enable-email \
		--enable-exec \

LIB_DEPENDS+=	libstatgrab.so:${PORTSDIR}/devel/libstatgrab
LIBS+=		`pkg-config --libs libstatgrab`
CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \
		--enable-disk \
		--enable-interface
PLIST_SUB+=	STATGRAB=""
.else




--- configure.ac.orig	2015-05-27 07:51:35 UTC
+++ configure.ac
@@ -120,7 +120,7 @@ then
 fi

 AC_SUBST(pkgconfigdir)
 
 # Check for standards compliance mode
@@ -641,7 +641,7 @@ SAVE_CFLAGS="$CFLAGS"
 # Emulate behavior of src/Makefile.am
 if test "x$GCC" = "xyes"
 then
-	CFLAGS="$CFLAGS -Wall -Werror"
+	CFLAGS="$CFLAGS -Wall "
 fi
 
 AC_CACHE_CHECK([for strtok_r],
@@ -770,7 +770,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
 if test "x$GCC" = "xyes"
 then
 	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS -Wall -Wextra -Werror"
+	CFLAGS="$CFLAGS -Wall -Wextra "
 fi
 
 AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])

 fi
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
@@ -3346,7 +3349,7 @@ then
 	SAVE_LIBS="$LIBS"
 	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
 	# (see issues #41 and #42)
-	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
+	CFLAGS="$CFLAGS $PERL_CFLAGS -Wall "
 	LIBS="$LIBS $PERL_LIBS"
 
 	AC_CACHE_CHECK([for broken Perl_load_module()],
@@ -3576,7 +3579,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python CPPFLAGS])
-	python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>&1`
+	python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>/dev/null`
 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x"
@@ -3599,7 +3602,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python LDFLAGS])
-	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`
+	python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>/dev/null`
 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
@@ -3614,7 +3617,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python LIBS])
-	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`
+	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>/dev/null`
 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
@@ -3629,7 +3632,7 @@ fi
 if test "x$with_python" = "xyes"
 then

 		with_libvarnish="yes"
 	fi; fi; fi
 ],
@@ -5263,6 +5266,7 @@ fi
 
 if test "x$ac_system" = "xFreeBSD"
 then
+	plugin_disk="yes"
         plugin_zfs_arc="yes"
 fi
 

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__Makefile.am (-8 / +26 lines)
1	--- src/Makefile.am.orig 2015-05-26 19:38:14 UTC	1	--- src/Makefile.am.orig 2015-05-26 19:38:14 UTC
2	+++ src/Makefile.am	2	+++ src/Makefile.am
3	@@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon	3	@@ -7,14 +7,14 @@ SUBDIRS += daemon
		4	PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
		5
		6	if COMPILER_IS_GCC
		7	-AM_CFLAGS = -Wall -Werror
		8	+AM_CFLAGS = -Wall
		9	endif
		10
		11	AM_CPPFLAGS = -I$(srcdir)/daemon
4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'	12	AM_CPPFLAGS += -DPREFIX='"${prefix}"'
5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'	13	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'	14	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'
Lines 27-33 Link Here
27	endif	35	endif
28	if BUILD_WITH_LIBDEVINFO	36	if BUILD_WITH_LIBDEVINFO
29	disk_la_LIBADD += -ldevinfo	37	disk_la_LIBADD += -ldevinfo
30	@@ -408,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS	38	@@ -321,6 +321,9 @@ endif
		39	if BUILD_WITH_PERFSTAT
		40	disk_la_LIBADD += -lperfstat
		41	endif
		42	+if BUILD_FREEBSD
		43	+disk_la_LIBADD += -ldevstat -lgeom
		44	+endif
		45	endif
		46
		47	if BUILD_PLUGIN_DNS
		48	@@ -408,7 +411,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
31	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)	49	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
32	else	50	else
33	if BUILD_WITH_LIBKSTAT	51	if BUILD_WITH_LIBKSTAT
Lines 36-42 Link Here
36	endif	54	endif
37	if BUILD_WITH_LIBDEVINFO	55	if BUILD_WITH_LIBDEVINFO
38	interface_la_LIBADD += -ldevinfo	56	interface_la_LIBADD += -ldevinfo
39	@@ -591,7 +591,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)	57	@@ -591,7 +594,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)
40	memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)	58	memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
41	memory_la_LIBADD =	59	memory_la_LIBADD =
42	if BUILD_WITH_LIBKSTAT	60	if BUILD_WITH_LIBKSTAT
Lines 45-51 Link Here
45	endif	63	endif
46	if BUILD_WITH_LIBDEVINFO	64	if BUILD_WITH_LIBDEVINFO
47	memory_la_LIBADD += -ldevinfo	65	memory_la_LIBADD += -ldevinfo
48	@@ -964,7 +964,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)	66	@@ -964,7 +967,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
49	swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)	67	swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
50	swap_la_LIBADD =	68	swap_la_LIBADD =
51	if BUILD_WITH_LIBKSTAT	69	if BUILD_WITH_LIBKSTAT
Lines 54-60 Link Here
54	endif	72	endif
55	if BUILD_WITH_LIBDEVINFO	73	if BUILD_WITH_LIBDEVINFO
56	swap_la_LIBADD += -ldevinfo	74	swap_la_LIBADD += -ldevinfo
57	@@ -1010,7 +1010,7 @@ if BUILD_PLUGIN_TAPE	75	@@ -1010,7 +1013,7 @@ if BUILD_PLUGIN_TAPE
58	pkglib_LTLIBRARIES += tape.la	76	pkglib_LTLIBRARIES += tape.la
59	tape_la_SOURCES = tape.c	77	tape_la_SOURCES = tape.c
60	tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)	78	tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
Lines 63-69 Link Here
63	endif	81	endif
64		82
65	if BUILD_PLUGIN_TARGET_NOTIFICATION	83	if BUILD_PLUGIN_TARGET_NOTIFICATION
66	@@ -1116,7 +1116,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)	84	@@ -1116,7 +1119,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
67	uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)	85	uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
68	uptime_la_LIBADD =	86	uptime_la_LIBADD =
69	if BUILD_WITH_LIBKSTAT	87	if BUILD_WITH_LIBKSTAT
Lines 72-78 Link Here
72	endif	90	endif
73	if BUILD_WITH_PERFSTAT	91	if BUILD_WITH_PERFSTAT
74	uptime_la_LIBADD += -lperfstat	92	uptime_la_LIBADD += -lperfstat
75	@@ -1275,7 +1275,7 @@ if BUILD_LINUX	93	@@ -1275,7 +1278,7 @@ if BUILD_LINUX
76	# zfs_arc requires no library on linux	94	# zfs_arc requires no library on linux
77	else	95	else
78	# solaris	96	# solaris
Lines 81-87 Link Here
81	endif	99	endif
82	endif	100	endif
83	endif	101	endif
84	@@ -1364,12 +1364,7 @@ endif	102	@@ -1364,12 +1367,7 @@ endif
85		103
86	install-exec-hook:	104	install-exec-hook:
87	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)	105	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__Makefile.in (-1 / +1 lines)
1	--- src/Makefile.in.orig 2015-05-27 07:51:49.001922000 +0000	1	--- src/Makefile.in.orig 2015-05-27 07:51:49 UTC
2	+++ src/Makefile.in	2	+++ src/Makefile.in
3	@@ -2434,7 +2434,7 @@ PLUGIN_LDFLAGS = -module -avoid-version	3	@@ -2434,7 +2434,7 @@ PLUGIN_LDFLAGS = -module -avoid-version
4	AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \	4	AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__daemon__Makefile.am (-1 / +1 lines)
1	--- src/daemon/Makefile.am.orig 2015-05-26 19:38:31 UTC	1	--- src/daemon/Makefile.am.orig 2015-05-26 19:38:31 UTC
2	+++ src/daemon/Makefile.am	2	+++ src/daemon/Makefile.am
3	@@ -6,7 +6,7 @@	3	@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'	4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'
5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'	5	AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"'
6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'	6	AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"'

Lines 26-32 lib/collectd/csv.so Link Here

(-)net-mgmt/collectd5.new/pkg-plist (-1 / +1 lines)
26	%%CURL_XML%%lib/collectd/curl_xml.so	26	%%CURL_XML%%lib/collectd/curl_xml.so
27	%%DBI%%lib/collectd/dbi.so	27	%%DBI%%lib/collectd/dbi.so
28	lib/collectd/df.so	28	lib/collectd/df.so
29	%%STATGRAB%%lib/collectd/disk.so	29	lib/collectd/disk.so
30	lib/collectd/dns.so	30	lib/collectd/dns.so
31	lib/collectd/email.so	31	lib/collectd/email.so
32	lib/collectd/exec.so	32	lib/collectd/exec.so

Return to bug 202327

Lines 3-8 Link Here

(-)net-mgmt/collectd5.new/Makefile (-2 / +3 lines)
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.5.0	5	PORTVERSION= 5.5.0
		6	PORTREVISION= 1
6	CATEGORIES= net-mgmt	7	CATEGORIES= net-mgmt
7	MASTER_SITES= https://collectd.org/files/ \	8	MASTER_SITES= https://collectd.org/files/ \
8	http://collectd.org/files/	9	http://collectd.org/files/
Lines 59-65 ROUTEROS_DESC= Enable routeros plugin Link Here
59	RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)	60	RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)
60	SIGROK_DESC= Enable sigrok plugin	61	SIGROK_DESC= Enable sigrok plugin
61	SNMP_DESC= Enable SNMP plugin	62	SNMP_DESC= Enable SNMP plugin
62	STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc)	63	STATGRAB_DESC= Enable statgrab-based plugins (interface, etc)
63	STATSD_DESC= Enable statsd plugin	64	STATSD_DESC= Enable statsd plugin
64	TOKYOTYRANT_DESC= Enable tokyotyrant plugin	65	TOKYOTYRANT_DESC= Enable tokyotyrant plugin
65	VARNISH_DESC= Enable varnish 4.x cache statistics	66	VARNISH_DESC= Enable varnish 4.x cache statistics
Lines 114-119 CONFIGURE_ARGS+= \ Link Here
114	--enable-cpu \	115	--enable-cpu \
115	--enable-csv \	116	--enable-csv \
116	--enable-df \	117	--enable-df \
		118	--enable-disk \
117	--enable-dns \	119	--enable-dns \
118	--enable-email \	120	--enable-email \
119	--enable-exec \	121	--enable-exec \
Lines 455-461 PLIST_SUB+= RRDTOOL="@comment " Link Here
455	LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab	457	LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab
456	LIBS+= `pkg-config --libs libstatgrab`	458	LIBS+= `pkg-config --libs libstatgrab`
457	CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \	459	CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \
458	--enable-disk \
459	--enable-interface	460	--enable-interface
460	PLIST_SUB+= STATGRAB=""	461	PLIST_SUB+= STATGRAB=""
461	.else	462	.else

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-configure.ac (-1 / +63 lines)
1	--- configure.ac.orig 2015-02-26 11:49:16 UTC	1	--- configure.ac.orig 2015-05-27 07:51:35 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -120,7 +120,7 @@ then	3	@@ -120,7 +120,7 @@ then
4	fi	4	fi
Lines 9-14 Link Here
9	AC_SUBST(pkgconfigdir)	9	AC_SUBST(pkgconfigdir)
10		10
11	# Check for standards compliance mode	11	# Check for standards compliance mode
		12	@@ -641,7 +641,7 @@ SAVE_CFLAGS="$CFLAGS"
		13	# Emulate behavior of src/Makefile.am
		14	if test "x$GCC" = "xyes"
		15	then
		16	- CFLAGS="$CFLAGS -Wall -Werror"
		17	+ CFLAGS="$CFLAGS -Wall "
		18	fi
		19
		20	AC_CACHE_CHECK([for strtok_r],
		21	@@ -770,7 +770,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
		22	if test "x$GCC" = "xyes"
		23	then
		24	SAVE_CFLAGS="$CFLAGS"
		25	- CFLAGS="$CFLAGS -Wall -Wextra -Werror"
		26	+ CFLAGS="$CFLAGS -Wall -Wextra "
		27	fi
		28
		29	AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
12	@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"	30	@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"
13	then	31	then
14	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])	32	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
Lines 26-31 Link Here
26	fi	44	fi
27	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")	45	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
28	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")	46	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
		47	@@ -3346,7 +3349,7 @@ then
		48	SAVE_LIBS="$LIBS"
		49	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
		50	# (see issues #41 and #42)
		51	- CFLAGS="$CFLAGS $PERL_CFLAGS -Wall -Werror"
		52	+ CFLAGS="$CFLAGS $PERL_CFLAGS -Wall "
		53	LIBS="$LIBS $PERL_LIBS"
		54
		55	AC_CACHE_CHECK([for broken Perl_load_module()],
		56	@@ -3576,7 +3579,7 @@ fi
		57	if test "x$with_python" = "xyes"
		58	then
		59	AC_MSG_CHECKING([for Python CPPFLAGS])
		60	- python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" \| "$with_python_prog" 2>&1`
		61	+ python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" \| "$with_python_prog" 2>/dev/null`
		62	python_config_status=$?
		63
		64	if test "$python_config_status" -ne 0 \|\| test "x$python_include_path" = "x"
		65	@@ -3599,7 +3602,7 @@ fi
		66	if test "x$with_python" = "xyes"
		67	then
		68	AC_MSG_CHECKING([for Python LDFLAGS])
		69	- 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`
		70	+ python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" \| "$with_python_prog" 2>/dev/null`
		71	python_config_status=$?
		72
		73	if test "$python_config_status" -ne 0 \|\| test "x$python_library_path" = "x"
		74	@@ -3614,7 +3617,7 @@ fi
		75	if test "x$with_python" = "xyes"
		76	then
		77	AC_MSG_CHECKING([for Python LIBS])
		78	- 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`
		79	+ python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" \| "$with_python_prog" 2>/dev/null`
		80	python_config_status=$?
		81
		82	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"
29	@@ -3629,7 +3632,7 @@ fi	83	@@ -3629,7 +3632,7 @@ fi
30	if test "x$with_python" = "xyes"	84	if test "x$with_python" = "xyes"
31	then	85	then
Lines 46-48 Link Here
46	with_libvarnish="yes"	100	with_libvarnish="yes"
47	fi; fi; fi	101	fi; fi; fi
48	],	102	],
		103	@@ -5263,6 +5266,7 @@ fi
		104
		105	if test "x$ac_system" = "xFreeBSD"
		106	then
		107	+ plugin_disk="yes"
		108	plugin_zfs_arc="yes"
		109	fi
		110