Attachment #240644 for bug #268972




PORTNAME=	collectd
PORTVERSION=	5.12.0
PORTREVISION=	8
CATEGORIES=	net-mgmt
MASTER_SITES=	https://storage.googleapis.com/collectd-tarballs/
PKGNAMESUFFIX=	5

LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
MEMCACHEC_DESC=		Enable memcachec plugin
MODBUS_DESC=		Enable modbus plugin
MONGODB_DESC=		Enable write_mongodb plugin
MQTT_DESC=		Enable MQTT broker metrics
MYSQL_DESC=		Enable mysql-based plugins
NOTIFYDESKTOP_DESC=	Enable desktop notifications

REDIS_DESC=		Enable redis-based plugins
RIEMANN_DESC=		Enable write_riemann plugin (via riemann-c-client)
RRDTOOL_DESC=		Enable rrdtool plugin (also rrdcached plugin)
SIGROK_DESC=		Enable sigrok plugin (BROKEN)
SLURM_DESC=		Enable slurm plugin
SNMP_DESC=		Enable SNMP plugin
STATSD_DESC=		Enable statsd plugin
TOKYOTYRANT_DESC=	Enable tokyotyrant plugin
TSDB_DESC=		Enable write_tsdb plugin
VARNISH_DESC=		Enable varnish 6.x cache statistics
VIRT_DESC=		Enable libvirt plugin (requires XML)
XML_DESC=		Enable XML plugins
ZOOKEEPER_DESC=		Enable zookeeper plugin

		--disable-ceph \
		--disable-cgroups \
		--disable-fhcount \
		--disable-lvm \
		--disable-static \
		--disable-turbostat \
		--enable-disk \

		--without-libganglia \
		--without-libiptc \
		--without-libldap \
		--without-liblvm2app \
		--without-libmnl \
		--without-libnetapp \
		--without-libowcapi \


JAVA_USE=		java
JAVA_CONFIGURE_ENABLE=	java
JAVA_CONFIGURE_WITH=	java=${LOCALBASE}

DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
DBI_CONFIGURE_ENABLE=	dbi

MODBUS_CONFIGURE_ENABLE=	modbus
MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig

MONGODB_LIB_DEPENDS+=		libmongoc-1.0.so:devel/mongo-c-driver
				libmongoc-1.0.so:devel/mongo-c-driver
MONGODB_CONFIGURE_ENABLE=	write_mongodb
MONGODB_CONFIGURE_WITH=		libmongoc
MONGODB_BROKEN=			fails to configure with write_mongodb option

MQTT_LIB_DEPENDS=	libmosquitto.so:net/mosquitto
MQTT_CONFIGURE_ENABLE=	mqtt


NOTIFYDESKTOP_LIB_DEPENDS=	libnotify.so:devel/libnotify
NOTIFYDESKTOP_CONFIGURE_ENABLE=	notify_desktop
NOTIFYDESKTOP_CONFIGURE_WITH=	libnotify=${LOCALBASE}
NOTIFYDESKTOP_USE=		GNOME=gdkpixbuf2
NOTIFYDESKTOP_USES=		gettext-runtime gnome


NOTIFYEMAIL_CONFIGURE_ENABLE=	notify_email
NOTIFYEMAIL_CONFIGURE_WITH=	libesmtp=${LOCALBASE}

NUTUPS_LIB_DEPENDS=		libupsclient.so:sysutils/nut
NUTUPS_CONFIGURE_ENABLE=	nut
NUTUPS_CONFIGURE_WITH=		libupsclient=${LOCALBASE}

OLSRD_CONFIGURE_ENABLE=	olsrd



PERL_USES=		perl5
PERL_CONFIGURE_ENABLE=	perl
PERL_CONFIGURE_WITH=	libperl=${LOCALBASE} perl-bindings

PGSQL_USES=		pgsql
PGSQL_CONFIGURE_ENABLE=	postgresql
PGSQL_CONFIGURE_WITH=	libpq=${LOCALBASE}

PINBA_LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
PINBA_CONFIGURE_ENABLE=	pinba


PYTHON_USES=			python
PYTHON_CONFIGURE_ENABLE=	python
PYTHON_CONFIGURE_WITH=		python=${PYTHON_CMD}
PYTHON_CONFIGURE_ENV=		PYTHON_CONFIG=${PYTHON_CMD}-config

RABBITMQ_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
RABBITMQ_CONFIGURE_ENABLE=	rabbitmq
RABBITMQ_CONFIGURE_WITH=	librabbitmq=${LOCALBASE}

REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis

RRDTOOL_CONFIGURE_WITH=		librrd=${LOCALBASE}

SIGROK_USE=			GNOME=glib20
SIGROK_CFLAGS=			`pkg-config --cflags libsigrok`
SIGROK_LIB_DEPENDS=		libsigrok.so:devel/libsigrok
SIGROK_CONFIGURE_ENABLE=	sigrok
SIGROK_CONFIGURE_WITH=		libsigrok=${LOCALBASE}
SIGROK_USES=			gettext-runtime
SIGROK_BROKEN=			working only with sigrok < 0.4

SLURM_LIB_DEPENDS=		libslurm.so:sysutils/slurm-wlm
SLURM_CONFIGURE_ENABLE=		slurm


TSDB_CONFIGURE_ENABLE=	write_tsdb

VARNISH_LIB_DEPENDS=		libvarnishapi.so:www/varnish6
VARNISH_CONFIGURE_ENABLE=	varnish

VIRT_IMPLIES=		XML

			libgpg-error.so:security/libgpg-error \
			libvirt.so:devel/libvirt
VIRT_CONFIGURE_ENABLE=	virt
VIRT_CONFIGURE_WITH=	virt=${LOCALBASE}

XML_CFLAGS=		`pkg-config --cflags libxml-2.0`
XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2


ZOOKEEPER_LIB_DEPENDS=		libzookeeper_mt.so:devel/libzookeeper
ZOOKEEPER_CONFIGURE_ENABLE=	zookeeper
ZOOKEEPER_CONFIGURE_WITH=	libzookeeper=${LOCALBASE}

# NOTE: Plugins without external dependencies
CONFIGURE_ARGS+=	--enable-aggregation \

Lines 1-6 Link Here

(-)b/net-mgmt/collectd5/files/patch-Makefile.am (-3 / +3 lines)
1	--- Makefile.am.orig 2020-03-08 15:57:09 UTC	1	--- Makefile.am.orig 2020-09-03 15:12:19 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -188,7 +188,7 @@ AM_CPPFLAGS = \	3	@@ -190,7 +190,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}"' \
Lines 9-15 Link Here
9	-DPLUGINDIR='"${cpkglibdir}"' \	9	-DPLUGINDIR='"${cpkglibdir}"' \
10	-DPKGDATADIR='"${cpkgdatadir}"'	10	-DPKGDATADIR='"${cpkgdatadir}"'
11	if BUILD_WIN32	11	if BUILD_WIN32
12	@@ -2377,15 +2377,10 @@ endif	12	@@ -2424,15 +2424,10 @@ endif
13		13
14	install-exec-hook:	14	install-exec-hook:
15	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run	15	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run




--- configure.ac.orig	2020-09-03 11:09:35 UTC
+++ configure.ac
@@ -24,7 +24,7 @@ AC_SYS_LARGEFILE
 #
 # Checks for programs.
 #
-AC_PROG_CC_C99([],
+AC_PROG_CC([],
   [AC_MSG_ERROR([No compiler found that supports C99])]
 )
 
@@ -725,7 +725,7 @@ AC_C_CONST
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-AC_HEADER_TIME
+AC_CHECK_HEADERS([sys/time.h])
 
 test_cxx_flags() {
   AC_LANG_PUSH([C++])
@@ -757,7 +757,7 @@ AC_FUNC_STRERROR_R
 
 if test "x$GCC" = "xyes"; then
   SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -Wall -Werror"
+  CFLAGS="$CFLAGS -Wall "
 fi
 SAVE_LDFLAGS="$LDFLAGS"
 LDFLAGS=""
@@ -929,7 +929,7 @@ AC_CHECK_FUNCS([thread_info], [have_thread_info="yes"]
 # Check for strptime {{{
 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"])
@@ -1000,10 +1000,10 @@ fi
 
 # Check for timegm {{{
 
-# These checks need -Werror because implicit function declarations are only a
+# These checks need  because implicit function declarations are only a
 # warning ...
 SAVE_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
+CFLAGS="$CFLAGS "
 
 AC_CACHE_CHECK([for timegm],
   [c_cv_have_timegm],
@@ -3454,7 +3454,7 @@ if test "x$with_libmongoc" = "xyes"; then
   SAVE_LDFLAGS="$LDFLAGS"
 
   CPPFLAGS="$CPPFLAGS $LIBMONGOC_CFLAGS"
-  LDFLAGS="$LDFLAGS $LIBMONGOC_LDFLAGS"
+  LDFLAGS="$LDFLAGS $LIBMONGOC_LIBS"
 
   AC_CHECK_LIB([mongoc-1.0], [mongoc_init],
     [with_libmongoc="yes"],
@@ -3874,7 +3874,7 @@ if test "x$with_libnetsnmp" = "xyes"; then
   SAVE_LIBS="$LIBS"
   CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
   if test "x$GCC" = "xyes"; then
-    CPPFLAGS="$CPPFLAGS -Wall -Werror"
+    CPPFLAGS="$CPPFLAGS -Wall "
   fi
   LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags"
   LIBS="$LIBS -lnetsnmp"
@@ -4348,7 +4348,7 @@ if test "x$with_libperl" = "xyes"; then
   SAVE_LIBS="$LIBS"
   CFLAGS="$CFLAGS $PERL_CFLAGS"
   if test "x$GCC" = "xyes"; then
-    CFLAGS="$CFLAGS -Wall -Werror"
+    CFLAGS="$CFLAGS -Wall "
   fi
   LIBS="$LIBS $PERL_LIBS"
 
@@ -5810,6 +5810,7 @@ if test "x$with_libupsclient" = "xyes"; then
     [],
     [],
     [[

       #include <stdlib.h>
       #include <stdio.h>
       #include <upsclient.h>
@@ -6507,7 +6508,7 @@ AC_ARG_WITH([libslurm],
     else if test -d "$with_libslurm/lib"; then
       AC_MSG_NOTICE([Not checking for libslurm: Manually configured])
       with_libslurm_cflags="-I$withval/include"

       with_libslurm="yes"
     fi; fi; fi
   ],
@@ -6579,7 +6580,7 @@ collectd features:])
 AC_COLLECTD([debug],     [enable],  [feature], [debugging])
 AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
 AC_COLLECTD([getifaddrs],[enable],  [feature], [getifaddrs under Linux])
-AC_COLLECTD([werror],    [disable], [feature], [building with -Werror])
+AC_COLLECTD([werror],    [disable], [feature], [building with ])
 
 dependency_warning="no"
 dependency_error="no"
@@ -7348,8 +7349,8 @@ if test "x$GCC" = "xyes"; then
   AM_CFLAGS="-Wall"
   AM_CXXFLAGS="-Wall"
   if test "x$enable_werror" != "xno"; then
-    AM_CFLAGS="$AM_CFLAGS -Werror"
-    AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
+    AM_CFLAGS="$AM_CFLAGS "
+    AM_CXXFLAGS="$AM_CXXFLAGS "
   fi
 fi
 

Lines 1-8 Link Here

(-)b/net-mgmt/collectd5/files/patch-version-gen.sh (-3 / +3 lines)
1	--- version-gen.sh.orig 2020-03-19 09:52:56.313967100 +0100	1	--- version-gen.sh.orig 2020-09-03 11:26:25 UTC
2	+++ version-gen.sh 2020-03-27 19:15:53.407855000 +0100	2	+++ version-gen.sh
3	@@ -2,10 +2,6 @@	3	@@ -2,10 +2,6 @@
4		4
5	DEFAULT_VERSION="5.11.0.git"	5	DEFAULT_VERSION="5.12.0.git"
6		6
7	-if [ -d .git ]; then	7	-if [ -d .git ]; then
8	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"	8	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| sed -e '/^collectd-/!d' -e 's///' -e 'y/-/./'`"

Return to bug 268972

Lines 1-6 Link Here

(-)b/net-mgmt/collectd5/Makefile (-24 / +14 lines)
1	PORTNAME= collectd	1	PORTNAME= collectd
2	PORTVERSION= 5.12.0	2	PORTVERSION= 5.12.0
3	PORTREVISION= 7	3	PORTREVISION= 8
4	CATEGORIES= net-mgmt	4	CATEGORIES= net-mgmt
5	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/	5	MASTER_SITES= https://storage.googleapis.com/collectd-tarballs/
6	PKGNAMESUFFIX= 5	6	PKGNAMESUFFIX= 5
Lines 42-48 LOGGING_DESC= Enable debug logging Link Here
42	LOGSTASH_DESC= Enable log_logstash plugin (requires json)	42	LOGSTASH_DESC= Enable log_logstash plugin (requires json)
43	MEMCACHEC_DESC= Enable memcachec plugin	43	MEMCACHEC_DESC= Enable memcachec plugin
44	MODBUS_DESC= Enable modbus plugin	44	MODBUS_DESC= Enable modbus plugin
45	MONGODB_DESC= Enable write_mongodb plugin (BROKEN)	45	MONGODB_DESC= Enable write_mongodb plugin
46	MQTT_DESC= Enable MQTT broker metrics	46	MQTT_DESC= Enable MQTT broker metrics
47	MYSQL_DESC= Enable mysql-based plugins	47	MYSQL_DESC= Enable mysql-based plugins
48	NOTIFYDESKTOP_DESC= Enable desktop notifications	48	NOTIFYDESKTOP_DESC= Enable desktop notifications
Lines 61-73 RABBITMQ_DESC= Enable rabbitmq-based plugins Link Here
61	REDIS_DESC= Enable redis-based plugins	61	REDIS_DESC= Enable redis-based plugins
62	RIEMANN_DESC= Enable write_riemann plugin (via riemann-c-client)	62	RIEMANN_DESC= Enable write_riemann plugin (via riemann-c-client)
63	RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)	63	RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin)
64	SIGROK_DESC= Enable sigrok plugin	64	SIGROK_DESC= Enable sigrok plugin (BROKEN)
65	SLURM_DESC= Enable slurm plugin	65	SLURM_DESC= Enable slurm plugin
66	SNMP_DESC= Enable SNMP plugin	66	SNMP_DESC= Enable SNMP plugin
67	STATSD_DESC= Enable statsd plugin	67	STATSD_DESC= Enable statsd plugin
68	TOKYOTYRANT_DESC= Enable tokyotyrant plugin	68	TOKYOTYRANT_DESC= Enable tokyotyrant plugin
69	TSDB_DESC= Enable write_tsdb plugin	69	TSDB_DESC= Enable write_tsdb plugin
70	VARNISH_DESC= Enable varnish 4.x cache statistics	70	VARNISH_DESC= Enable varnish 6.x cache statistics
71	VIRT_DESC= Enable libvirt plugin (requires XML)	71	VIRT_DESC= Enable libvirt plugin (requires XML)
72	XML_DESC= Enable XML plugins	72	XML_DESC= Enable XML plugins
73	ZOOKEEPER_DESC= Enable zookeeper plugin	73	ZOOKEEPER_DESC= Enable zookeeper plugin
Lines 87-93 CONFIGURE_ARGS= --disable-all-plugins \ Link Here
87	--disable-ceph \	87	--disable-ceph \
88	--disable-cgroups \	88	--disable-cgroups \
89	--disable-fhcount \	89	--disable-fhcount \
90	--disable-lvm \
91	--disable-static \	90	--disable-static \
92	--disable-turbostat \	91	--disable-turbostat \
93	--enable-disk \	92	--enable-disk \
Lines 96-102 CONFIGURE_ARGS= --disable-all-plugins \ Link Here
96	--without-libganglia \	95	--without-libganglia \
97	--without-libiptc \	96	--without-libiptc \
98	--without-libldap \	97	--without-libldap \
99	--without-liblvm2app \
100	--without-libmnl \	98	--without-libmnl \
101	--without-libnetapp \	99	--without-libnetapp \
102	--without-libowcapi \	100	--without-libowcapi \
Lines 123-129 CURL_XML_CONFIGURE_ENABLE= ascent bind curl_xml Link Here
123		121
124	JAVA_USE= java	122	JAVA_USE= java
125	JAVA_CONFIGURE_ENABLE= java	123	JAVA_CONFIGURE_ENABLE= java
126	JAVA_CONFIGURE_WITH= java=${LOCALBASE} libjvm	124	JAVA_CONFIGURE_WITH= java=${LOCALBASE}
127		125
128	DBI_LIB_DEPENDS= libdbi.so:databases/libdbi	126	DBI_LIB_DEPENDS= libdbi.so:databases/libdbi
129	DBI_CONFIGURE_ENABLE= dbi	127	DBI_CONFIGURE_ENABLE= dbi
Lines 158-168 MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus Link Here
158	MODBUS_CONFIGURE_ENABLE= modbus	156	MODBUS_CONFIGURE_ENABLE= modbus
159	MODBUS_CONFIGURE_WITH= libmodbus=use_pkgconfig	157	MODBUS_CONFIGURE_WITH= libmodbus=use_pkgconfig
160		158
161	MONGODB_LIB_DEPENDS+= libbson-1.0.so:devel/libbson \	159	MONGODB_LIB_DEPENDS+= libmongoc-1.0.so:devel/mongo-c-driver
162	libmongoc-1.0.so:devel/mongo-c-driver
163	MONGODB_CONFIGURE_ENABLE= write_mongodb	160	MONGODB_CONFIGURE_ENABLE= write_mongodb
164	MONGODB_CONFIGURE_WITH= libmongoc=${LOCALBASE}	161	MONGODB_CONFIGURE_WITH= libmongoc
165	MONGODB_BROKEN= fails to configure with write_mongodb option
166		162
167	MQTT_LIB_DEPENDS= libmosquitto.so:net/mosquitto	163	MQTT_LIB_DEPENDS= libmosquitto.so:net/mosquitto
168	MQTT_CONFIGURE_ENABLE= mqtt	164	MQTT_CONFIGURE_ENABLE= mqtt
Lines 174-180 MYSQL_CONFIGURE_WITH= libmysql=${LOCALBASE} Link Here
174		170
175	NOTIFYDESKTOP_LIB_DEPENDS= libnotify.so:devel/libnotify	171	NOTIFYDESKTOP_LIB_DEPENDS= libnotify.so:devel/libnotify
176	NOTIFYDESKTOP_CONFIGURE_ENABLE= notify_desktop	172	NOTIFYDESKTOP_CONFIGURE_ENABLE= notify_desktop
177	NOTIFYDESKTOP_CONFIGURE_WITH= libnotify=${LOCALBASE}
178	NOTIFYDESKTOP_USE= GNOME=gdkpixbuf2	173	NOTIFYDESKTOP_USE= GNOME=gdkpixbuf2
179	NOTIFYDESKTOP_USES= gettext-runtime gnome	174	NOTIFYDESKTOP_USES= gettext-runtime gnome
180		175
Lines 182-190 NOTIFYEMAIL_LIB_DEPENDS= libesmtp.so:mail/libesmtp Link Here
182	NOTIFYEMAIL_CONFIGURE_ENABLE= notify_email	177	NOTIFYEMAIL_CONFIGURE_ENABLE= notify_email
183	NOTIFYEMAIL_CONFIGURE_WITH= libesmtp=${LOCALBASE}	178	NOTIFYEMAIL_CONFIGURE_WITH= libesmtp=${LOCALBASE}
184		179
185	NUTUPS_LIB_DEPENDS= libnutclient.so:sysutils/nut	180	NUTUPS_LIB_DEPENDS= libupsclient.so:sysutils/nut
186	NUTUPS_CONFIGURE_ENABLE= nut	181	NUTUPS_CONFIGURE_ENABLE= nut
187	NUTUPS_CONFIGURE_WITH= upsclient=${LOCALBASE}	182	NUTUPS_CONFIGURE_WITH= libupsclient=${LOCALBASE}
188		183
189	OLSRD_CONFIGURE_ENABLE= olsrd	184	OLSRD_CONFIGURE_ENABLE= olsrd
190		185
Lines 198-208 OPENLDAP_CONFIGURE_WITH= libldap=${LOCALBASE} Link Here
198		193
199	PERL_USES= perl5	194	PERL_USES= perl5
200	PERL_CONFIGURE_ENABLE= perl	195	PERL_CONFIGURE_ENABLE= perl
201	PERL_CONFIGURE_WITH= libperl perl-bindings perl=${PERL}	196	PERL_CONFIGURE_WITH= libperl=${LOCALBASE} perl-bindings
202		197
203	PGSQL_USES= pgsql	198	PGSQL_USES= pgsql
204	PGSQL_CONFIGURE_ENABLE= postgresql	199	PGSQL_CONFIGURE_ENABLE= postgresql
205	PGSQL_CONFIGURE_WITH= libpq postgresql=${LOCALBASE}	200	PGSQL_CONFIGURE_WITH= libpq=${LOCALBASE}
206		201
207	PINBA_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c	202	PINBA_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c
208	PINBA_CONFIGURE_ENABLE= pinba	203	PINBA_CONFIGURE_ENABLE= pinba
Lines 218-228 PROMETHEUS_CONFIGURE_ENABLE= write_prometheus Link Here
218		213
219	PYTHON_USES= python	214	PYTHON_USES= python
220	PYTHON_CONFIGURE_ENABLE= python	215	PYTHON_CONFIGURE_ENABLE= python
221	PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD}
222	PYTHON_CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config	216	PYTHON_CONFIGURE_ENV= PYTHON_CONFIG=${PYTHON_CMD}-config
223		217
224	RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c	218	RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c
225	RABBITMQ_CONFIGURE_ENABLE= rabbitmq
226	RABBITMQ_CONFIGURE_WITH= librabbitmq=${LOCALBASE}	219	RABBITMQ_CONFIGURE_WITH= librabbitmq=${LOCALBASE}
227		220
228	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis	221	REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis
Lines 238-249 RRDTOOL_CONFIGURE_ENABLE= rrdcached rrdtool Link Here
238	RRDTOOL_CONFIGURE_WITH= librrd=${LOCALBASE}	231	RRDTOOL_CONFIGURE_WITH= librrd=${LOCALBASE}
239		232
240	SIGROK_USE= GNOME=glib20	233	SIGROK_USE= GNOME=glib20
241	SIGROK_CFLAGS= `pkg-config --cflags glib-2.0`	234	SIGROK_CFLAGS= `pkg-config --cflags libsigrok`
242	SIGROK_LIB_DEPENDS= libsigrok.so:devel/libsigrok	235	SIGROK_LIB_DEPENDS= libsigrok.so:devel/libsigrok
243	SIGROK_CONFIGURE_ENABLE= sigrok	236	SIGROK_CONFIGURE_ENABLE= sigrok
244	SIGROK_CONFIGURE_WITH= libsigrok=${LOCALBASE}
245	SIGROK_USES= gettext-runtime	237	SIGROK_USES= gettext-runtime
246	SIGROK_BROKEN= fails to configure with sigrok option	238	SIGROK_BROKEN= working only with sigrok < 0.4
247		239
248	SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm	240	SLURM_LIB_DEPENDS= libslurm.so:sysutils/slurm-wlm
249	SLURM_CONFIGURE_ENABLE= slurm	241	SLURM_CONFIGURE_ENABLE= slurm
Lines 262-268 TOKYOTYRANT_CONFIGURE_WITH= libtokyotyrant=${LOCALBASE} Link Here
262		254
263	TSDB_CONFIGURE_ENABLE= write_tsdb	255	TSDB_CONFIGURE_ENABLE= write_tsdb
264		256
265	VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish4	257	VARNISH_LIB_DEPENDS= libvarnishapi.so:www/varnish6
266	VARNISH_CONFIGURE_ENABLE= varnish	258	VARNISH_CONFIGURE_ENABLE= varnish
267		259
268	VIRT_IMPLIES= XML	260	VIRT_IMPLIES= XML
Lines 270-276 VIRT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ Link Here
270	libgpg-error.so:security/libgpg-error \	262	libgpg-error.so:security/libgpg-error \
271	libvirt.so:devel/libvirt	263	libvirt.so:devel/libvirt
272	VIRT_CONFIGURE_ENABLE= virt	264	VIRT_CONFIGURE_ENABLE= virt
273	VIRT_CONFIGURE_WITH= virt=${LOCALBASE}
274		265
275	XML_CFLAGS= `pkg-config --cflags libxml-2.0`	266	XML_CFLAGS= `pkg-config --cflags libxml-2.0`
276	XML_LIB_DEPENDS= libxml2.so:textproc/libxml2	267	XML_LIB_DEPENDS= libxml2.so:textproc/libxml2
Lines 278-284 XML_CONFIGURE_WITH= libxml2 Link Here
278		269
279	ZOOKEEPER_LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper	270	ZOOKEEPER_LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper
280	ZOOKEEPER_CONFIGURE_ENABLE= zookeeper	271	ZOOKEEPER_CONFIGURE_ENABLE= zookeeper
281	ZOOKEEPER_CONFIGURE_WITH= libzookeeper=${LOCALBASE}
282		272
283	# NOTE: Plugins without external dependencies	273	# NOTE: Plugins without external dependencies
284	CONFIGURE_ARGS+= --enable-aggregation \	274	CONFIGURE_ARGS+= --enable-aggregation \

Lines 1-6 Link Here

(-)b/net-mgmt/collectd5/files/patch-configure.ac (-4 / +100 lines)
1	--- configure.ac.orig 2020-09-03 04:09:35.126575027 -0700	1	--- configure.ac.orig 2020-09-03 11:09:35 UTC
2	+++ configure.ac 2022-05-06 19:19:22.707837000 -0700	2	+++ configure.ac
3	@@ -5810,6 +5810,7 @@	3	@@ -24,7 +24,7 @@ AC_SYS_LARGEFILE
		4	#
		5	# Checks for programs.
		6	#
		7	-AC_PROG_CC_C99([],
		8	+AC_PROG_CC([],
		9	[AC_MSG_ERROR([No compiler found that supports C99])]
		10	)
		11
		12	@@ -725,7 +725,7 @@ AC_C_CONST
		13	AC_TYPE_PID_T
		14	AC_TYPE_SIZE_T
		15	AC_TYPE_UID_T
		16	-AC_HEADER_TIME
		17	+AC_CHECK_HEADERS([sys/time.h])
		18
		19	test_cxx_flags() {
		20	AC_LANG_PUSH([C++])
		21	@@ -757,7 +757,7 @@ AC_FUNC_STRERROR_R
		22
		23	if test "x$GCC" = "xyes"; then
		24	SAVE_CFLAGS="$CFLAGS"
		25	- CFLAGS="$CFLAGS -Wall -Werror"
		26	+ CFLAGS="$CFLAGS -Wall "
		27	fi
		28	SAVE_LDFLAGS="$LDFLAGS"
		29	LDFLAGS=""
		30	@@ -929,7 +929,7 @@ AC_CHECK_FUNCS([thread_info], [have_thread_info="yes"]
		31	# Check for strptime {{{
		32	if test "x$GCC" = "xyes"; then
		33	SAVE_CFLAGS="$CFLAGS"
		34	- CFLAGS="$CFLAGS -Wall -Wextra -Werror"
		35	+ CFLAGS="$CFLAGS -Wall -Wextra "
		36	fi
		37
		38	AC_CHECK_FUNCS([strptime], [have_strptime="yes"], [have_strptime="no"])
		39	@@ -1000,10 +1000,10 @@ fi
		40
		41	# Check for timegm {{{
		42
		43	-# These checks need -Werror because implicit function declarations are only a
		44	+# These checks need because implicit function declarations are only a
		45	# warning ...
		46	SAVE_CFLAGS="$CFLAGS"
		47	-CFLAGS="$CFLAGS -Werror"
		48	+CFLAGS="$CFLAGS "
		49
		50	AC_CACHE_CHECK([for timegm],
		51	[c_cv_have_timegm],
		52	@@ -3454,7 +3454,7 @@ if test "x$with_libmongoc" = "xyes"; then
		53	SAVE_LDFLAGS="$LDFLAGS"
		54
		55	CPPFLAGS="$CPPFLAGS $LIBMONGOC_CFLAGS"
		56	- LDFLAGS="$LDFLAGS $LIBMONGOC_LDFLAGS"
		57	+ LDFLAGS="$LDFLAGS $LIBMONGOC_LIBS"
		58
		59	AC_CHECK_LIB([mongoc-1.0], [mongoc_init],
		60	[with_libmongoc="yes"],
		61	@@ -3874,7 +3874,7 @@ if test "x$with_libnetsnmp" = "xyes"; then
		62	SAVE_LIBS="$LIBS"
		63	CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
		64	if test "x$GCC" = "xyes"; then
		65	- CPPFLAGS="$CPPFLAGS -Wall -Werror"
		66	+ CPPFLAGS="$CPPFLAGS -Wall "
		67	fi
68	LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags"
69	LIBS="$LIBS -lnetsnmp"
70	@@ -4348,7 +4348,7 @@ if test "x$with_libperl" = "xyes"; then
71	SAVE_LIBS="$LIBS"
72	CFLAGS="$CFLAGS $PERL_CFLAGS"
73	if test "x$GCC" = "xyes"; then
74	- CFLAGS="$CFLAGS -Wall -Werror"
75	+ CFLAGS="$CFLAGS -Wall "
76	fi
77	LIBS="$LIBS $PERL_LIBS"
78
79	@@ -5810,6 +5810,7 @@ if test "x$with_libupsclient" = "xyes"; then
4	[],	80	[],
5	[],	81	[],
6	[[	82	[[
Lines 8-14 Link Here
8	#include <stdlib.h>	84	#include <stdlib.h>
9	#include <stdio.h>	85	#include <stdio.h>
10	#include <upsclient.h>	86	#include <upsclient.h>
11	@@ -6507,7 +6508,7 @@	87	@@ -6507,7 +6508,7 @@ AC_ARG_WITH([libslurm],
12	else if test -d "$with_libslurm/lib"; then	88	else if test -d "$with_libslurm/lib"; then
13	AC_MSG_NOTICE([Not checking for libslurm: Manually configured])	89	AC_MSG_NOTICE([Not checking for libslurm: Manually configured])
14	with_libslurm_cflags="-I$withval/include"	90	with_libslurm_cflags="-I$withval/include"
Lines 17-19 Link Here
17	with_libslurm="yes"	93	with_libslurm="yes"
18	fi; fi; fi	94	fi; fi; fi
19	],	95	],
		96	@@ -6579,7 +6580,7 @@ collectd features:])
		97	AC_COLLECTD([debug], [enable], [feature], [debugging])
		98	AC_COLLECTD([daemon], [disable], [feature], [daemon mode])
		99	AC_COLLECTD([getifaddrs],[enable], [feature], [getifaddrs under Linux])
		100	-AC_COLLECTD([werror], [disable], [feature], [building with -Werror])
		101	+AC_COLLECTD([werror], [disable], [feature], [building with ])
		102
		103	dependency_warning="no"
		104	dependency_error="no"
		105	@@ -7348,8 +7349,8 @@ if test "x$GCC" = "xyes"; then
		106	AM_CFLAGS="-Wall"
		107	AM_CXXFLAGS="-Wall"
		108	if test "x$enable_werror" != "xno"; then
		109	- AM_CFLAGS="$AM_CFLAGS -Werror"
		110	- AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
		111	+ AM_CFLAGS="$AM_CFLAGS "
		112	+ AM_CXXFLAGS="$AM_CXXFLAGS "
		113	fi
		114	fi
		115