ups-nut: install development files

From Edgar Fuß in PR 55479.

Some pkglint cleanup while here.

Bump PKGREVISION.

5 files changed, 88 insertions, 6 deletions

diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 6921fe52e04..89dbc3a9bcd 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2020/03/23 22:49:53 rillig Exp $
+# $NetBSD: Makefile,v 1.57 2020/07/13 18:50:05 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=		ups-${DISTNAME}
+PKGREVISION=		1
 COMMENT=		Network UPS Tools
 
 # Don't regenerate any files in tools/.
@@ -11,6 +12,7 @@ TOOLS_SCRIPT.perl=	exit 1
 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
diff --git a/sysutils/ups-nut/Makefile.common b/sysutils/ups-nut/Makefile.common
index b7c15b2f182..8023dfb8e80 100644
--- a/sysutils/ups-nut/Makefile.common
+++ b/sysutils/ups-nut/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2018/09/21 08:13:26 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2020/07/13 18:50:05 wiz Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
@@ -35,6 +35,8 @@ CHECK_PORTABILITY_SKIP=	packaging/*
 
 .include "../../mk/bsd.prefs.mk"
 
+BUILD_DEFS+=		VARBASE
+
 PKG_SYSCONFSUBDIR?=	nut
 NUT_CONFDIR=		${PKG_SYSCONFDIR}
 NUT_DATADIR=		${PREFIX}/share/nut
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index 4155fa4a024..d1ec08ef4de 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,11 +1,21 @@
-@comment $NetBSD: PLIST,v 1.27 2018/09/21 00:59:53 jym Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/07/13 18:50:05 wiz Exp $
 bin/upsc
 bin/upscmd
 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/tripplite
 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
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 3dada4bdd69..2aa5c14f880 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2018/09/21 00:59:53 jym Exp $
+$NetBSD: distinfo,v 1.34 2020/07/13 18:50:05 wiz Exp $
 
 SHA1 (nut-2.7.4.tar.gz) = a450382dbfaff2e1bdeefeda8d3c682a36a7fc72
 RMD160 (nut-2.7.4.tar.gz) = f39a49128a3ba20b1bf122ce569c5a867815c3a1
@@ -8,4 +8,4 @@ SHA1 (patch-aa) = 5f39487b0ebb39e27dcc76b762ce06090085c24b
 SHA1 (patch-clients_upsclient.c) = 9c521684a5ccf108bd464767f9b31aa2694afae1
 SHA1 (patch-drivers_hidparser.c) = c71d84bbf3140db1f82ef155fdf5afec79cbd38d
 SHA1 (patch-drivers_libusb.c) = 4e75bc13123a37aa2a2b5497d51605f88b0c5464
-SHA1 (patch-snmp-error-msg.c) = f01db1f935cc168c9e831f5b672cd9e16ddf6f2c
+SHA1 (patch-drivers_snmp-ups.c) = f01db1f935cc168c9e831f5b672cd9e16ddf6f2c
diff --git a/sysutils/ups-nut/patches/patch-snmp-error-msg.c b/sysutils/ups-nut/patches/patch-drivers_snmp-ups.c
index a98c80021f7..d463f12efa7 100644
--- a/sysutils/ups-nut/patches/patch-snmp-error-msg.c
+++ b/sysutils/ups-nut/patches/patch-drivers_snmp-ups.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-snmp-error-msg.c,v 1.1 2018/09/21 00:59:53 jym Exp $
+$NetBSD: patch-drivers_snmp-ups.c,v 1.1 2020/07/13 18:50:05 wiz Exp $
 
 Get an explicit error message if we fail obtaining a response.