Date: Wed, 6 Jul 2022 00:32:46 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: f5e103cefaf5 - 2022Q3 - sysutils/nut*: Add Modbus support Message-ID: <202207060032.2660WkHR042828@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5e103cefaf582e83ac4a719c72b24deec0c3859 commit f5e103cefaf582e83ac4a719c72b24deec0c3859 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-07-05 03:44:02 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-07-06 00:31:55 +0000 sysutils/nut*: Add Modbus support Some newer UPS models require modbus support. Add and enable modbus support by default for binary package users. PR: 265014 Reported by: tomli@tomli.me (cherry picked from commit b792fe675c33e7f40ecba03404890d82958e0706) --- sysutils/nut-devel/Makefile | 10 +++++++--- sysutils/nut-devel/pkg-plist | 10 ++++++++++ sysutils/nut/Makefile | 10 +++++++--- sysutils/nut/pkg-plist | 10 ++++++++++ 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index 175ed72b59ec..b5fc1cd13c58 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= ${NUT_COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -devel # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -38,8 +38,8 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} PLIST_SUB+= CGIDIR="${CGIDIR_REL}" PLIST_SUB+= CGIETCDIR="etc/nut/" -OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES +OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS OPTIONS_SUB= yes @@ -48,6 +48,7 @@ SERIAL_DESC= SERIAL support USB_DESC= USB support NEON_DESC= NEON XML/HTTP support PDU_DESC= Powerman PDU support +MODBUS_DESC= Modbus support CGI_DESC= Web CGI interface FREEIPMI_DESC= freeipmi support IPMIPSU_DESC= Use nut-ipmipsu support (experimental) @@ -106,6 +107,9 @@ NEON_CONFIGURE_WITH= neon PDU_LIB_DEPENDS= libpowerman.so:sysutils/powerman PDU_CONFIGURE_WITH= powerman +MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus +MODBUS_CONFIGURE_WITH= modbus + BASH_BUILD_DEPENDS= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion BASH_RUN_DEPENDS= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist index 013196dd7f5d..51fabcb8782c 100644 --- a/sysutils/nut-devel/pkg-plist +++ b/sysutils/nut-devel/pkg-plist @@ -110,6 +110,11 @@ libdata/pkgconfig/libnutclientstub.pc %%SERIAL%%libexec/nut/tripplitesu %%SERIAL%%libexec/nut/upscode2 %%USB%%libexec/nut/usbhid-ups +%%MODBUS%%libexec/nut/adelsystem_cbi +%%MODBUS%%libexec/nut/generic_modbus +%%MODBUS%%libexec/nut/huawei-ups2000 +%%MODBUS%%libexec/nut/phoenixcontact_modbus +%%MODBUS%%libexec/nut/socomec_jbus %%SERIAL%%libexec/nut/victronups %%MANPAGES%%man/man3/libnutclient.3.gz %%MANPAGES%%man/man3/libnutclient_commands.3.gz @@ -201,6 +206,11 @@ libdata/pkgconfig/libnutclientstub.pc %%MANPAGES%%man/man8/nutupsdrv.8.gz %%MANPAGES%%%%SERIAL%%man/man8/riello_ser.8.gz %%MANPAGES%%%%USB%%man/man8/riello_usb.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/adelsystem_cbi.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/generic_modbus.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/huawei-ups2000.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/phoenixcontact_modbus.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/socomec_jbus.8.gz %%MANPAGES%%man/man8/upsc.8.gz %%MANPAGES%%man/man8/upscmd.8.gz %%MANPAGES%%man/man8/upsd.8.gz diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 57ac8174e9d3..8a12fd719aa4 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -2,7 +2,7 @@ PORTNAME= nut PORTVERSION= 2.8.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -29,8 +29,8 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} PLIST_SUB+= CGIDIR="${CGIDIR_REL}" PLIST_SUB+= CGIETCDIR="etc/nut/" -OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES +OPTIONS_DEFAULT=SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI FREEIPMI DOCS MANPAGES OPENSSL +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES OPTIONS_SINGLE= IPMI SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS OPTIONS_SUB= yes @@ -39,6 +39,7 @@ SERIAL_DESC= SERIAL support USB_DESC= USB support NEON_DESC= NEON XML/HTTP support PDU_DESC= Powerman PDU support +MODBUS_DESC= Modbus support CGI_DESC= Web CGI interface FREEIPMI_DESC= freeipmi support IPMIPSU_DESC= Use nut-ipmipsu support (experimental) @@ -92,6 +93,9 @@ NEON_CONFIGURE_WITH= neon PDU_LIB_DEPENDS+= libpowerman.so:sysutils/powerman PDU_CONFIGURE_WITH= powerman +MODBUS_LIB_DEPENDS+= libmodbus.so:comms/libmodbus +MODBUS_CONFIGURE_WITH= modbus + BASH_BUILD_DEPENDS= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion BASH_RUN_DEPENDS= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index 013196dd7f5d..51fabcb8782c 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -110,6 +110,11 @@ libdata/pkgconfig/libnutclientstub.pc %%SERIAL%%libexec/nut/tripplitesu %%SERIAL%%libexec/nut/upscode2 %%USB%%libexec/nut/usbhid-ups +%%MODBUS%%libexec/nut/adelsystem_cbi +%%MODBUS%%libexec/nut/generic_modbus +%%MODBUS%%libexec/nut/huawei-ups2000 +%%MODBUS%%libexec/nut/phoenixcontact_modbus +%%MODBUS%%libexec/nut/socomec_jbus %%SERIAL%%libexec/nut/victronups %%MANPAGES%%man/man3/libnutclient.3.gz %%MANPAGES%%man/man3/libnutclient_commands.3.gz @@ -201,6 +206,11 @@ libdata/pkgconfig/libnutclientstub.pc %%MANPAGES%%man/man8/nutupsdrv.8.gz %%MANPAGES%%%%SERIAL%%man/man8/riello_ser.8.gz %%MANPAGES%%%%USB%%man/man8/riello_usb.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/adelsystem_cbi.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/generic_modbus.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/huawei-ups2000.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/phoenixcontact_modbus.8.gz +%%MANPAGES%%%%MODBUS%%man/man8/socomec_jbus.8.gz %%MANPAGES%%man/man8/upsc.8.gz %%MANPAGES%%man/man8/upscmd.8.gz %%MANPAGES%%man/man8/upsd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207060032.2660WkHR042828>