Re: More collectd plugins for pkgsrc

To: pkgsrc-users%netbsd.org@localhost
Subject: Re: More collectd plugins for pkgsrc
From: Edgar Fuß <ef%math.uni-bonn.de@localhost>
Date: Wed, 16 Oct 2019 19:02:23 +0200

> If the change is small and obviously won't hurt, you could just post a
> patch here.
OK, attached. It's mostly buildlink3.mk files (the one for xentools411 
provided by bouyer@) and a change to ups-nut to include the "dev" files 
(library et al).
I would like the bl3 files being revieved by someone knowledgeable.

> I had the impression from your message the changes to existing packages 
> were pretty substantial, but maybe I read it too fast.
I did sone refactoring to the existing collectd and collectd-* packages 
(which I would like to discuss). But the modification to other packages are 
mostly just the bl3 files (which I guess are error-prone).

> and that explanations of the state of things and aspirations belong 
> in comments, as those are expected to survive the trip into pkgsrc proper.
OK, I'll do that.

EF> Where do I discus things?
GDT> here is fine.

OK, the main points (according to my notes):
1. The current sysutils/collectd/Makefiles.common first assembles 
CONFIGURE_ARGS to disable "all libraries" (in fact, some are missing or 
semm to have changed), an then sysutils/collectd-foo .include-s the bl3 
file of the package providing libfoo and adds 
CONFIGURE_AGS+= --with-libfoo=${BUILDLINK_PREFIX.package-providing-libfoo}. 
This leads to configure being invocated as 
... --with-libfoo=no ... --with-libfoo=/usr/pkg ..., 
which seems to work, but I doubt that's defined behaviour. 
It's also a bit of boilerplate (given the current implementation already 
saves a lot of boilerplate).
I've changed that to the sysutils/collectd-foo setting 
COLLECTD_LIB.foo=${BUILDLINK_PREFIX.package-providing-libfoo} 
and then sysutils/collectd/Makefile.common selectively supplying 
--with-libbar=no (COLLECTD_LIB.bar unset) and --with-libfoo=/usr/pkg 
(COLLECTD_LIB.foo set to /usr/pkg). That also means to 
.include ../../sysutils/collect/Makefile.common before the assignement 
to COLLECTD_LIB.foo.

2. The current implementation first adds 
CONFIFURE_ARGS+= --with-libfoo=${BUILDLINK_PREFIX.package-providing-libfoo} 
and only later .include-s package-providing-libfoo/buildlink3.mk. 
This also seems to work, but may just happen to in the usual cases. 
I've moved the .include before the COLLECTD_LIB.foo assignment.

The other changes are patches to configure.ac/Makefile.am (bugs filed upstream), enabling of more no-dependency plugins and adding options to include more simple plugins.

Plus 15 new collectd-* packages, of course.

Index: databases/tokyotyrant/buildlink3.mk
===================================================================
RCS file: databases/tokyotyrant/buildlink3.mk
diff -N databases/tokyotyrant/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ databases/tokyotyrant/buildlink3.mk	15 Oct 2019 16:50:32 -0000
@@ -0,0 +1,24 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	tokyotyrant
+
+.if !defined(TOKYOTYRANT_BUILDLINK3_MK)
+TOKYOTYRANT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.tokyotyrant+=	tokyotyrant>=1.1.41nb4
+BUILDLINK_PKGSRCDIR.tokyotyrant?=	../../databases/tokyotyrant
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := tokyotyrant
+.include "../../mk/pkg-build-options.mk"
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../databases/tokyocabinet/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.tokyotyrant:Mlua)
+.include "../../lang/lua/buildlink3.mk"
+.endif
+
+.endif	# TOKYOTYRANT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-tokyotyrant
Index: parallel/ganglia-monitor-core/buildlink3.mk
===================================================================
RCS file: parallel/ganglia-monitor-core/buildlink3.mk
diff -N parallel/ganglia-monitor-core/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ parallel/ganglia-monitor-core/buildlink3.mk	15 Oct 2019 16:50:41 -0000
@@ -0,0 +1,18 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	ganglia-monitor-core
+
+.if !defined(GANGLIA_MONITOR_CORE_BUILDLINK3_MK)
+GANGLIA_MONITOR_CORE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ganglia-monitor-core+=	ganglia-monitor-core>=3.7.2nb8
+BUILDLINK_PKGSRCDIR.ganglia-monitor-core?=	../../parallel/ganglia-monitor-core
+
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/confuse/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.endif	# GANGLIA_MONITOR_CORE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-ganglia-monitor-core
Index: sysutils/libvirt/buildlink3.mk
===================================================================
RCS file: sysutils/libvirt/buildlink3.mk
diff -N sysutils/libvirt/buildlink3.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ buildlink3.mk       16 Oct 2019 16:58:32 -0000
@@ -0,0 +1,41 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	libvirt
+
+.if !defined(LIBVIRT_BUILDLINK3_MK)
+LIBVIRT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libvirt+=	libvirt>=1.2.9nb27
+BUILDLINK_PKGSRCDIR.libvirt?=	../../sysutils/libvirt
+
+.include "../../devel/yajl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+pkgbase := libvirt
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libvirt:Mxen)
+.include "../../sysutils/xentools42/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libvirt:Mlibssh2)
+.include "../../security/libssh2/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libvirt:Mhal)
+.include "../../sysutils/hal/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libvirt:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+.endif
+.if !empty(PKG_BUILD_OPTIONS.libvirt:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+.endif
+
+.endif # LIBVIRT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libvirt
Index: sysutils/ups-nut/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/ups-nut/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- sysutils/ups-nut/Makefile	21 Sep 2018 00:59:53 -0000	1.55
+++ sysutils/ups-nut/Makefile	15 Oct 2019 16:50:43 -0000
@@ -8,6 +8,7 @@
 CONFIGURE_ARGS+=	--with-drvpath=${NUT_DRVDIR:Q}
 CONFIGURE_ARGS+=	--with-altpidpath=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=	--with-pidpath=${NUT_STATEDIR:Q}
+CONFIGURE_ARGS+=	--with-dev
 
 PKG_GROUPS_VARS+=	NUT_GROUP
 PKG_USERS_VARS+=	NUT_USER
Index: sysutils/ups-nut/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/ups-nut/PLIST,v
retrieving revision 1.27
diff -u -r1.27 PLIST
--- sysutils/ups-nut/PLIST	21 Sep 2018 00:59:53 -0000	1.27
+++ sysutils/ups-nut/PLIST	15 Oct 2019 16:50:43 -0000
@@ -4,8 +4,18 @@
 bin/upslog
 bin/upsrw
 bin/upssched-cmd
+include/nut-scan.h
+include/nutclient.h
+include/nutscan-device.h
+include/nutscan-init.h
+include/nutscan-ip.h
+include/parseconf.h
+include/upsclient.h
 lib/libnutclient.la
 lib/libupsclient.la
+lib/pkgconfig/libnutclient.pc
+lib/pkgconfig/libnutscan.pc
+lib/pkgconfig/libupsclient.pc
 libexec/nut/al175
 libexec/nut/apcsmart
 libexec/nut/apcsmart-old
@@ -49,6 +59,74 @@
 libexec/nut/tripplitesu
 libexec/nut/upscode2
 libexec/nut/victronups
+man/man3/libnutclient.3
+man/man3/libnutclient_commands.3
+man/man3/libnutclient_devices.3
+man/man3/libnutclient_general.3
+man/man3/libnutclient_misc.3
+man/man3/libnutclient_tcp.3
+man/man3/libnutclient_variables.3
+man/man3/nutclient_authenticate.3
+man/man3/nutclient_destroy.3
+man/man3/nutclient_device_forced_shutdown.3
+man/man3/nutclient_device_login.3
+man/man3/nutclient_device_master.3
+man/man3/nutclient_execute_device_command.3
+man/man3/nutclient_get_device_command_description.3
+man/man3/nutclient_get_device_commands.3
+man/man3/nutclient_get_device_description.3
+man/man3/nutclient_get_device_num_logins.3
+man/man3/nutclient_get_device_rw_variables.3
+man/man3/nutclient_get_device_variable_description.3
+man/man3/nutclient_get_device_variable_values.3
+man/man3/nutclient_get_device_variables.3
+man/man3/nutclient_get_devices.3
+man/man3/nutclient_has_device.3
+man/man3/nutclient_has_device_command.3
+man/man3/nutclient_has_device_variable.3
+man/man3/nutclient_logout.3
+man/man3/nutclient_set_device_variable_value.3
+man/man3/nutclient_set_device_variable_values.3
+man/man3/nutclient_tcp_create_client.3
+man/man3/nutclient_tcp_disconnect.3
+man/man3/nutclient_tcp_get_timeout.3
+man/man3/nutclient_tcp_is_connected.3
+man/man3/nutclient_tcp_reconnect.3
+man/man3/nutclient_tcp_set_timeout.3
+man/man3/nutscan.3
+man/man3/nutscan_add_device_to_device.3
+man/man3/nutscan_add_option_to_device.3
+man/man3/nutscan_cidr_to_ip.3
+man/man3/nutscan_display_parsable.3
+man/man3/nutscan_display_ups_conf.3
+man/man3/nutscan_free_device.3
+man/man3/nutscan_get_serial_ports_list.3
+man/man3/nutscan_init.3
+man/man3/nutscan_new_device.3
+man/man3/nutscan_scan_avahi.3
+man/man3/nutscan_scan_eaton_serial.3
+man/man3/nutscan_scan_ipmi.3
+man/man3/nutscan_scan_nut.3
+man/man3/nutscan_scan_snmp.3
+man/man3/nutscan_scan_usb.3
+man/man3/nutscan_scan_xml_http.3
+man/man3/upscli_add_host_cert.3
+man/man3/upscli_cleanup.3
+man/man3/upscli_connect.3
+man/man3/upscli_disconnect.3
+man/man3/upscli_fd.3
+man/man3/upscli_get.3
+man/man3/upscli_init.3
+man/man3/upscli_list_next.3
+man/man3/upscli_list_start.3
+man/man3/upscli_readline.3
+man/man3/upscli_sendline.3
+man/man3/upscli_splitaddr.3
+man/man3/upscli_splitname.3
+man/man3/upscli_ssl.3
+man/man3/upscli_strerror.3
+man/man3/upscli_upserror.3
+man/man3/upsclient.3
 man/man5/nut.conf.5
 man/man5/ups.conf.5
 man/man5/upsd.conf.5
Index: sysutils/ups-nut/buildlink3.mk
===================================================================
RCS file: sysutils/ups-nut/buildlink3.mk
diff -N sysutils/ups-nut/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/ups-nut/buildlink3.mk	15 Oct 2019 16:50:43 -0000
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	ups-nut
+
+.if !defined(UPS_NUT_BUILDLINK3_MK)
+UPS_NUT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ups-nut+=	ups-nut>=2.7.4
+BUILDLINK_PKGSRCDIR.ups-nut?=	../../sysutils/ups-nut
+
+.include "../../mk/pthread.buildlink3.mk"
+.endif	# UPS_NUT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-ups-nut
Index: sysutils/xentools411/buildlink3.mk
===================================================================
RCS file: sysutils/xentools411/buildlink3.mk
diff -N sysutils/xentools411/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sysutils/xentools411/buildlink3.mk	15 Oct 2019 16:50:43 -0000
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/07/26 20:27:47 schnoebe Exp $
+
+BUILDLINK_TREE+=        xentools411
+
+.if !defined(XENTOOLS411_BUILDLINK3_MK)
+XENTOOLS411_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.xentools411+=     xentools411>=4.11.0
+BUILDLINK_PKGSRCDIR.xentools411?=       ../../sysutils/xentools411
+.endif # XENTOOLS411_BUILDLINK3_MK
+
+BUILDLINK_TREE+=        -xentools411
Index: www/varnish/buildlink3.mk
===================================================================
RCS file: www/varnish/buildlink3.mk
diff -N www/varnish/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/varnish/buildlink3.mk	15 Oct 2019 16:50:45 -0000
@@ -0,0 +1,20 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	varnish
+
+.if !defined(VARNISH_BUILDLINK3_MK)
+VARNISH_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.varnish+=	varnish>=3.0.6nb3
+BUILDLINK_PKGSRCDIR.varnish?=	../../www/varnish
+BUILDLINK_INCDIRS.varnish=	include/varnish
+BUILDLINK_LIBDIRS.varnish=	lib/varnish
+
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+
+.endif	# VARNISH_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-varnish

References:
- More collectd plugins for pkgsrc
  - From: Edgar Fuß
- Re: More collectd plugins for pkgsrc
  - From: Greg Troxel
- Re: More collectd plugins for pkgsrc
  - From: Edgar Fuß
- Re: More collectd plugins for pkgsrc
  - From: Greg Troxel

Prev by Date: hdf5-c++ PLIST
Next by Date: diff from 2019-10-14 14:47 to 2019-10-16 14:07
Previous by Thread: Re: More collectd plugins for pkgsrc
Next by Thread: Re: More collectd plugins for pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index