From nobody Wed Jul 06 00:32:46 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0625B1D0B65B; Wed, 6 Jul 2022 00:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ld0qy4Nbsz4pcZ; Wed, 6 Jul 2022 00:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657067568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIDgMqFoUgdJ6x/+BqB2JKkF6twhoe4oCVFU4jm5Hsw=; b=ndR3v8B8iqwgcGx7yMmT7bpTyfgCRSIorN1SJNL6fm+wVSmjT0ciZws1U9tll4PpU8iQVW 5ZOEsazmVqo9OkMtfHRQv3z/Te7bM4n1nn63KL6lQc7iqeMd/sOeOe8pMZWr9fod7C3lOf Fg/1lSM1ewk3DiQDf4Hwm0fexVq9FvSCKydhcsvOsFW8DI2KOe9xhWTVhKeKEmB1ki5iOW QFDxt+DvLhi7XcgbAe3Kos+SqLhz7b9A4yYAricEbRbR0Wbic9dkxmBBxm1PNDU57rOYtY IramUJwq4xV8p75UxJ70RTqJcWSRMnGZuVybOhqQfoaM2/IcEe68ur3uncUtBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53F527F31; Wed, 6 Jul 2022 00:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2660Wkbp042829; Wed, 6 Jul 2022 00:32:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2660WkHR042828; Wed, 6 Jul 2022 00:32:46 GMT (envelope-from git) Date: Wed, 6 Jul 2022 00:32:46 GMT Message-Id: <202207060032.2660WkHR042828@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: f5e103cefaf5 - 2022Q3 - sysutils/nut*: Add Modbus support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: f5e103cefaf582e83ac4a719c72b24deec0c3859 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657067568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIDgMqFoUgdJ6x/+BqB2JKkF6twhoe4oCVFU4jm5Hsw=; b=KsD7EzH32CBcI5PLoSA/rECYoWDI6Zako/1NrXOOl94O9W0VedK2bz5z0iEe20LNzq3jMN HxYVH7xAEPI+1q9lnMysKiqF0wWO6rewbCRnereaw9M6eode+vjdByOOShVcsiiW2jFXlR huop3VDiL9Xykco5Z0EXjlWUlC8/3D7rgsPBUGUZ30Zz+2UA0OFArgCrx+xBQMXd/kYFCY ZIDJG5wlZ6YtVwYZy7SpN5Rma+PNmaEF7I97ggd5KhSvkROIuHk7yr7A2I6pU8R2xiy8kz j7GvowSdj08KcGbAqJzjx5cwsN7b1oOecUZhsm9sLoBUEM/H1dogrxSe1Ak0GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657067568; a=rsa-sha256; cv=none; b=ppCEoBcJvCO8QuQeiD7PIIdsWp8tDAaDG/y8pek/2cmX1uR9xE5OlWyaCsVKr2J5ChrUiz nLdF+iqXFgwM8z0blZn0BENJdl8Q4tqZQS6Xj9Od8kTwz/3CYLgM+/v/JikmHpKkazMJ2S vzCwzKiy3m/aNZByoB5P9LMEp6Qnoq6WzlJFVJqY6SdH4jsonc5D2Aff3IxbGR4vr9eLoH 5G4MFeu/AY7+NbSJ9ANjH0rwWcsh43aYTEdR1tH1yGMGzqIDrHyIaU5i+Ig1Onlx4UYh+N KUxl5GhNHecaPRg2uwk10OYXHCTXOnBEhgZfETSZR3l0Xuk2db7jnVLod1sz3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f5e103cefaf582e83ac4a719c72b24deec0c3859 commit f5e103cefaf582e83ac4a719c72b24deec0c3859 Author: Cy Schubert AuthorDate: 2022-07-05 03:44:02 +0000 Commit: Cy Schubert 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