From bc76e850f5f26fb69063f7a7748a30b726cdfce7 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 08:28:37 -0700
Subject: [PATCH 1/9] sysutils/nut: Remove redundant EXTRACT_ONLY definition
EXTRACT_ONLY is redundant and does nothing in this port.
PR: 263751
Reported by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
---
sysutils/nut/Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 278ea0196e08..0985cc13e59b 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 2.8.0
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
COMMENT= Network UPS Tools
--
2.35.2
From 393790c51c04787adc78e3b0104d3401eeb5341e Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 08:53:38 -0700
Subject: [PATCH 2/9] sysutils/nut*: Add license
Add license definitions.
PR: 263751
Reported by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
---
sysutils/nut-devel/Makefile | 6 +++++-
sysutils/nut/Makefile | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 16181ae31263..59884c8bba7a 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}/
@@ -12,6 +12,10 @@ PKGNAMESUFFIX= -devel
MAINTAINER= cy@FreeBSD.org
COMMENT= Network UPS Tools
+LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+
+LICENSE_COMB= multi
+LICENSE_FILE= ${WRKSRC}/COPYING
+
USE_GITHUB= yes
GH_ACCOUNT= networkupstools
GH_TAGNAME= 9cb8de681
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 0985cc13e59b..88b04128fefd 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nut
PORTVERSION= 2.8.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -9,6 +10,10 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
COMMENT= Network UPS Tools
+LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+
+LICENSE_COMB= multi
+LICENSE_FILE= ${WRKSRC}/COPYING
+
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build
--
2.35.2
From a6f79504ca735e6407f25f4c0f39fb7923b537d9 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 08:57:02 -0700
Subject: [PATCH 3/9] sysutils/nut*: Use canned options descriptions
Remove the descriptions already documented in Mk/bsd.options.desc.mk.
PR: 263751
Reported by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
---
sysutils/nut-devel/Makefile | 3 ---
sysutils/nut/Makefile | 3 ---
2 files changed, 6 deletions(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 59884c8bba7a..efdcda3a5d64 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -40,12 +40,9 @@ OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
SERIAL_DESC= SERIAL support
USB_DESC= USB support
-SNMP_DESC= SNMP support
NEON_DESC= NEON XML/HTTP support
PDU_DESC= Powerman PDU support
CGI_DESC= Web CGI interface
-BASH_DESC= Bash Completion support
-AVAHI_DESC= Avahi support
IPMI_OFF_DESC= No IPMI support
FREEIPMI_DESC= freeipmi support
IPMIPSU_DESC= Use nut-ipmipsu support (experimental)
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 88b04128fefd..ba58c632e617 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -32,12 +32,9 @@ OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
SERIAL_DESC= SERIAL support
USB_DESC= USB support
-SNMP_DESC= SNMP support
NEON_DESC= NEON XML/HTTP support
PDU_DESC= Powerman PDU support
CGI_DESC= Web CGI interface
-BASH_DESC= Bash Completion support
-AVAHI_DESC= Avahi support
IPMI_OFF_DESC= No IPMI support
FREEIPMI_DESC= freeipmi support
IPMIPSU_DESC= Use nut-ipmipsu support (experimental)
--
2.35.2
From 916e90103e3729a623bda3be324a37da3c6f8d68 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 20:08:22 -0700
Subject: [PATCH 4/9] sysutils/nut: Remove redundant install-strip INSTALL
TARGET
---
sysutils/nut/Makefile | 1 -
1 file changed, 1 deletion(-)
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index ba58c632e617..c26af0cd8c2f 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -44,7 +44,6 @@ USE_RC_SUBR= nut nut_upsmon nut_upslog
SUB_LIST+= STATEDIR=${STATEDIR}
PLIST_SUB+= STATEDIR=${STATEDIR}
-INSTALL_TARGET= install-strip
PORTDOCS= *
.include <bsd.port.options.mk>
--
2.35.2
From 33e70c81f8a0266edb1bfb60bc2f4874c0079006 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 20:22:28 -0700
Subject: [PATCH 5/9] sysutils/nut*: Convert to options helpers
Modernize the sysutils/nut* ports replacing old-school options with
options helpers, cleaning up the Makefiles a lot.
PR: 263751
Reported by: dizzy
---
sysutils/nut-devel/Makefile | 137 +++++--------------
sysutils/nut-devel/pkg-plist | 251 +++++++++++++++++-----------------
sysutils/nut/Makefile | 135 +++++--------------
sysutils/nut/pkg-plist | 252 +++++++++++++++++------------------
4 files changed, 325 insertions(+), 450 deletions(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index efdcda3a5d64..6a12933363b5 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -31,19 +31,22 @@ NUT_GROUP?= uucp
STATEDIR?= /var/db/nut
PLIST_SUB+= NUT_USER=${NUT_USER}
PLIST_SUB+= NUT_GROUP=${NUT_GROUP}
+CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME}
+CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,}
+PLIST_SUB+= CGIDIR="${CGIDIR_REL}"
+PLIST_SUB+= CGIETCDIR="etc/nut/"
-OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF SSL_OFF
-OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI DOCS
-OPTIONS_SINGLE= IPMI SSL
-OPTIONS_SINGLE_IPMI= IPMI_OFF IPMIPSU FREEIPMI
+OPTIONS_DEFAULT=SERIAL USB SNMP NEON SSL_OFF
+OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS
+OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
+OPTIONS_SUB= yes
SERIAL_DESC= SERIAL support
USB_DESC= USB support
NEON_DESC= NEON XML/HTTP support
PDU_DESC= Powerman PDU support
CGI_DESC= Web CGI interface
-IPMI_OFF_DESC= No IPMI support
FREEIPMI_DESC= freeipmi support
IPMIPSU_DESC= Use nut-ipmipsu support (experimental)
SSL_OFF_DESC= No SSL support
@@ -54,8 +57,6 @@ PLIST_SUB+= STATEDIR=${STATEDIR}
PORTDOCS= *
-.include <bsd.port.options.mk>
-
TMPDIR?= /tmp
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
@@ -77,111 +78,47 @@ LIB_DEPENDS+= libltdl.so:devel/libltdl
BUILD_DEPENDS= asciidoc:textproc/asciidoc
-.if ${PORT_OPTIONS:MCGI}
-LIB_DEPENDS+= libgd.so:graphics/gd
-CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME}
-CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,}
-CONFIGURE_ARGS+= --with-cgi --with-cgipath=${CGIDIR} \
+CGI_LIB_DEPENDS= libgd.so:graphics/gd
+CGI_CONFIGURE_WITH= cgi
+CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
--with-htmlpath=${WWWDIR} \
--with-gd-includes=-I${LOCALBASE}/include \
--with-gd-libs="-L${LOCALBASE}/lib -lgd"
-PLIST_SUB+= NUT_CGI=""
-PLIST_SUB+= CGIDIR="${CGIDIR_REL}"
-PLIST_SUB+= CGIETCDIR="etc/nut/"
-.else
-CONFIGURE_ARGS+= --without-cgi
-PLIST_SUB+= NUT_CGI="@comment "
-.endif
-.if ${PORT_OPTIONS:MSERIAL}
-CONFIGURE_ARGS+= --with-serial
-PLIST_SUB+= NUT_SERIAL=""
-.else
-CONFIGURE_ARGS+= --without-serial
-PLIST_SUB+= NUT_SERIAL="@comment "
-.endif
+SERIAL_CONFIGURE_WITH= serial
-.if ${PORT_OPTIONS:MUSB}
-#EXTRA_PATCHES= ${FILESDIR}/extra-patch-m4_nut_check_libusb.m4
-CONFIGURE_ARGS+= --with-usb=auto
-PLIST_SUB+= NUT_USB=""
-.else
-CONFIGURE_ARGS+= --without-usb
-PLIST_SUB+= NUT_USB="@comment "
-.endif
+USB_CONFIGURE_WITH= usb=auto
-.if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp
-CONFIGURE_ARGS+= --with-snmp
-PLIST_SUB+= NUT_SNMP=""
-.else
-CONFIGURE_ARGS+= --without-snmp
-PLIST_SUB+= NUT_SNMP="@comment "
-.endif
+SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_WITH= snmp
-.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+= libneon.so:www/neon
-CONFIGURE_ARGS+= --with-neon
-PLIST_SUB+= NUT_NEON=""
-.else
-CONFIGURE_ARGS+= --without-neon
-CONFIGURE_ARGS+= --disable-neon
-PLIST_SUB+= NUT_NEON="@comment "
-.endif
+NEON_LIB_DEPENDS= libneon.so:www/neon
+NEON_CONFIGURE_WITH= neon
-.if ${PORT_OPTIONS:MPDU}
-LIB_DEPENDS+= libpowerman.so:sysutils/powerman
-CONFIGURE_ARGS+= --with-powerman
-PLIST_SUB+= NUT_PDU=""
-.else
-CONFIGURE_ARGS+= --without-powerman
-PLIST_SUB+= NUT_PDU="@comment "
-.endif
+PDU_LIB_DEPENDS= libpowerman.so:sysutils/powerman
+PDU_CONFIGURE_WITH= powerman
-.if ${PORT_OPTIONS:MBASH}
-BUILD_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
-RUN_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
-PLIST_SUB+= BASH=""
-.else
-PLIST_SUB+= BASH="@comment "
-.endif
+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
-.if ${PORT_OPTIONS:MAVAHI}
-BUILD_DEPENDS+= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
-BUILD_DEPENDS+= avahi-daemon:net/avahi-app
-RUN_DEPENDS+= avahi-daemon:net/avahi-app
-CONFIGURE_ARGS+= --with-avahi
-.else
-CONFIGURE_ARGS+= --without-avahi
-.endif
+AVAHI_BUILD_DEPENDS= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
+AVAHI_BUILD_DEPENDS= avahi-daemon:net/avahi-app
+AVAHI_RUN_DEPENDS= avahi-daemon:net/avahi-app
+AVAHI_CONFIGURE_WITH= avahi
-.if ${PORT_OPTIONS:MFREEIPMI}
-LIB_DEPENDS+= libfreeipmi.so:sysutils/freeipmi
-CONFIGURE_ARGS+= --with-freeipmi
-PLIST_SUB+= NUT_FREEIPMI=""
-.else
-CONFIGURE_ARGS+= --without-freeipmi
-PLIST_SUB+= NUT_FREEIPMI="@comment "
-.endif
+FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
+FREEIPMI_CONFIGURE_WITH=freeipmi
-.if ${PORT_OPTIONS:MIPMIPSU}
-LIB_DEPENDS+= libfreeipmi.so:sysutils/freeipmi
-CONFIGURE_ARGS+= --with-ipmi
-PLIST_SUB+= NUT_IPMIPSU=""
-.else
-CONFIGURE_ARGS+= --without-ipmi
-PLIST_SUB+= NUT_IPMIPSU="@comment "
-.endif
+IPMIPSU_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
+IPMIPSU_CONFIGURE_WITH= ipmi
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+= ssl
-CONFIGURE_ARGS+= --with-openssl
-.elif ${PORT_OPTIONS:MNSS}
-LIB_DEPENDS= libnss3.so:security/nss
-CONFIGURE_ARGS+= --with-nss
-.else
-CONFIGURE_ARGS+= --without-openssl --without-ssl
-.endif
+OPENSSL_USES= ssl
+OPENSSL_CONFIGURE_WITH= openssl
+
+NSS_LIB_DEPENDS= libnss3.so:security/nss
+NSS_CONFIGURE_WITH= nss
+
+.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -i '' -e 's|python|${PYTHON_CMD}|' ${WRKSRC}/autogen.sh
@@ -215,4 +152,4 @@ post-install:
${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog.sample
${MKDIR} ${STAGEDIR}/var/log/nut
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index be882f3530dc..b1dac90a6916 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -1,14 +1,14 @@
-%%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
-%%NUT_CGI%%%%CGIDIR%%/upsset.cgi
-%%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
-%%NUT_CGI%%@sample %%CGIETCDIR%%hosts.conf.sample
-%%NUT_CGI%%@sample %%CGIETCDIR%%upsset.conf.sample
-%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats.html.sample
-%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample
-%%NUT_CGI%%%%WWWDIR%%/bottom.html
-%%NUT_CGI%%%%WWWDIR%%/header.html
-%%NUT_CGI%%%%WWWDIR%%/index.html
-%%NUT_CGI%%%%WWWDIR%%/nut-banner.png
+%%CGI%%%%CGIDIR%%/upsimage.cgi
+%%CGI%%%%CGIDIR%%/upsset.cgi
+%%CGI%%%%CGIDIR%%/upsstats.cgi
+%%CGI%%@sample %%CGIETCDIR%%hosts.conf.sample
+%%CGI%%@sample %%CGIETCDIR%%upsset.conf.sample
+%%CGI%%@sample %%CGIETCDIR%%upsstats.html.sample
+%%CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample
+%%CGI%%%%WWWDIR%%/bottom.html
+%%CGI%%%%WWWDIR%%/header.html
+%%CGI%%%%WWWDIR%%/index.html
+%%CGI%%%%WWWDIR%%/nut-banner.png
%%ETCDIR%%/cmdvartab
%%ETCDIR%%/driver.list
@sample %%ETCDIR%%/nut.conf.sample
@@ -19,7 +19,7 @@
@sample %%ETCDIR%%/upssched.conf.sample
@sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
@sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
-%%NUT_USB%%etc/devd/nut-usb.conf
+%%USB%%etc/devd/nut-usb.conf
bin/nut-scanner
bin/upsc
bin/upscmd
@@ -56,61 +56,61 @@ libdata/pkgconfig/libnutclient.pc
libdata/pkgconfig/libnutscan.pc
libdata/pkgconfig/libupsclient.pc
libdata/pkgconfig/libnutclientstub.pc
-%%NUT_SERIAL%%libexec/nut/al175
-%%NUT_SERIAL%%libexec/nut/apcupsd-ups
-%%NUT_USB%%libexec/nut/nutdrv_atcl_usb
-%%NUT_USB%%libexec/nut/nutdrv_qx
-%%NUT_SERIAL%%libexec/nut/riello_ser
-%%NUT_USB%%libexec/nut/riello_usb
-%%NUT_SERIAL%%libexec/nut/apcsmart
-%%NUT_SERIAL%%libexec/nut/apcsmart-old
-%%NUT_SERIAL%%libexec/nut/bcmxcp
-%%NUT_USB%%libexec/nut/bcmxcp_usb
-%%NUT_SERIAL%%libexec/nut/belkin
-%%NUT_SERIAL%%libexec/nut/belkinunv
-%%NUT_SERIAL%%libexec/nut/bestfcom
-%%NUT_SERIAL%%libexec/nut/bestfortress
-%%NUT_SERIAL%%libexec/nut/bestuferrups
-%%NUT_SERIAL%%libexec/nut/bestups
-%%NUT_SERIAL%%libexec/nut/blazer_ser
-%%NUT_USB%%libexec/nut/blazer_usb
-%%NUT_SERIAL%%libexec/nut/clone
-%%NUT_SERIAL%%libexec/nut/clone-outlet
-%%NUT_SERIAL%%libexec/nut/dummy-ups
-%%NUT_SERIAL%%libexec/nut/etapro
-%%NUT_SERIAL%%libexec/nut/everups
-%%NUT_SERIAL%%libexec/nut/gamatronic
-%%NUT_SERIAL%%libexec/nut/genericups
-%%NUT_SERIAL%%libexec/nut/isbmex
-%%NUT_SERIAL%%libexec/nut/ivtscd
-%%NUT_SERIAL%%libexec/nut/liebert
-%%NUT_SERIAL%%libexec/nut/liebert-esp2
-%%NUT_SERIAL%%libexec/nut/masterguard
-%%NUT_SERIAL%%libexec/nut/metasys
-%%NUT_SERIAL%%libexec/nut/mge-utalk
-%%NUT_SERIAL%%libexec/nut/microdowell
-%%NUT_SERIAL%%libexec/nut/microsol-apc
-%%NUT_SERIAL%%libexec/nut/mge-shut
-%%NUT_NEON%%libexec/nut/netxml-ups
-%%NUT_SERIAL%%libexec/nut/oneac
-%%NUT_SERIAL%%libexec/nut/optiups
-%%NUT_IPMIPSU%%libexec/nut/nut-ipmipsu
-%%NUT_SERIAL%%libexec/nut/nutdrv_siemens-sitop
-%%NUT_SERIAL%%libexec/nut/powercom
-%%NUT_PDU%%libexec/nut/powerman-pdu
-%%NUT_SERIAL%%libexec/nut/powerpanel
-%%NUT_SERIAL%%libexec/nut/rhino
-%%NUT_USB%%libexec/nut/richcomm_usb
-%%NUT_SERIAL%%libexec/nut/safenet
-%%NUT_SERIAL%%libexec/nut/skel
-%%NUT_SNMP%%libexec/nut/snmp-ups
-%%NUT_SERIAL%%libexec/nut/solis
-%%NUT_SERIAL%%libexec/nut/tripplite
-%%NUT_USB%%libexec/nut/tripplite_usb
-%%NUT_SERIAL%%libexec/nut/tripplitesu
-%%NUT_SERIAL%%libexec/nut/upscode2
-%%NUT_USB%%libexec/nut/usbhid-ups
-%%NUT_SERIAL%%libexec/nut/victronups
+%%SERIAL%%libexec/nut/al175
+%%SERIAL%%libexec/nut/apcupsd-ups
+%%USB%%libexec/nut/nutdrv_atcl_usb
+%%USB%%libexec/nut/nutdrv_qx
+%%SERIAL%%libexec/nut/riello_ser
+%%USB%%libexec/nut/riello_usb
+%%SERIAL%%libexec/nut/apcsmart
+%%SERIAL%%libexec/nut/apcsmart-old
+%%SERIAL%%libexec/nut/bcmxcp
+%%USB%%libexec/nut/bcmxcp_usb
+%%SERIAL%%libexec/nut/belkin
+%%SERIAL%%libexec/nut/belkinunv
+%%SERIAL%%libexec/nut/bestfcom
+%%SERIAL%%libexec/nut/bestfortress
+%%SERIAL%%libexec/nut/bestuferrups
+%%SERIAL%%libexec/nut/bestups
+%%SERIAL%%libexec/nut/blazer_ser
+%%USB%%libexec/nut/blazer_usb
+%%SERIAL%%libexec/nut/clone
+%%SERIAL%%libexec/nut/clone-outlet
+%%SERIAL%%libexec/nut/dummy-ups
+%%SERIAL%%libexec/nut/etapro
+%%SERIAL%%libexec/nut/everups
+%%SERIAL%%libexec/nut/gamatronic
+%%SERIAL%%libexec/nut/genericups
+%%SERIAL%%libexec/nut/isbmex
+%%SERIAL%%libexec/nut/ivtscd
+%%SERIAL%%libexec/nut/liebert
+%%SERIAL%%libexec/nut/liebert-esp2
+%%SERIAL%%libexec/nut/masterguard
+%%SERIAL%%libexec/nut/metasys
+%%SERIAL%%libexec/nut/mge-utalk
+%%SERIAL%%libexec/nut/microdowell
+%%SERIAL%%libexec/nut/microsol-apc
+%%SERIAL%%libexec/nut/mge-shut
+%%NEON%%libexec/nut/netxml-ups
+%%SERIAL%%libexec/nut/oneac
+%%SERIAL%%libexec/nut/optiups
+%%IPMIPSU%%libexec/nut/nut-ipmipsu
+%%SERIAL%%libexec/nut/nutdrv_siemens-sitop
+%%SERIAL%%libexec/nut/powercom
+%%PDU%%libexec/nut/powerman-pdu
+%%SERIAL%%libexec/nut/powerpanel
+%%SERIAL%%libexec/nut/rhino
+%%USB%%libexec/nut/richcomm_usb
+%%SERIAL%%libexec/nut/safenet
+%%SERIAL%%libexec/nut/skel
+%%SNMP%%libexec/nut/snmp-ups
+%%SERIAL%%libexec/nut/solis
+%%SERIAL%%libexec/nut/tripplite
+%%USB%%libexec/nut/tripplite_usb
+%%SERIAL%%libexec/nut/tripplitesu
+%%SERIAL%%libexec/nut/upscode2
+%%USB%%libexec/nut/usbhid-ups
+%%SERIAL%%libexec/nut/victronups
man/man3/libnutclient.3.gz
man/man3/libnutclient_commands.3.gz
man/man3/libnutclient_devices.3.gz
@@ -187,19 +187,20 @@ man/man5/upsd.conf.5.gz
man/man5/upsd.users.5.gz
man/man5/upsmon.conf.5.gz
man/man5/upssched.conf.5.gz
-%%NUT_SERIAL%%man/man8/al175.8.gz
-%%NUT_SERIAL%%man/man8/apcupsd-ups.8.gz
-%%NUT_SERIAL%%man/man8/blazer_ser.8.gz
-%%NUT_USB%%man/man8/blazer_usb.8.gz
-%%NUT_NEON%%man/man8/netxml-ups.8.gz
+%%SERIAL%%man/man8/al175.8.gz
+%%SERIAL%%man/man8/apcupsd-ups.8.gz
+%%SERIAL%%man/man8/blazer_ser.8.gz
+%%USB%%man/man8/blazer_usb.8.gz
+%%NEON%%man/man8/netxml-ups.8.gz
man/man8/nut-driver-enumerator.8.gz
man/man8/nut-recorder.8.gz
man/man8/nut-scanner.8.gz
-%%NUT_USB%%man/man8/nutdrv_atcl_usb.8.gz
-%%NUT_USB%%man/man8/nutdrv_qx.8.gz
+%%USB%%man/man8/nutdrv_atcl_usb.8.gz
+%%USB%%man/man8/nutdrv_qx.8.gz
+%%SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
man/man8/nutupsdrv.8.gz
-%%NUT_SERIAL%%man/man8/riello_ser.8.gz
-%%NUT_USB%%man/man8/riello_usb.8.gz
+%%SERIAL%%man/man8/riello_ser.8.gz
+%%USB%%man/man8/riello_usb.8.gz
man/man8/upsc.8.gz
man/man8/upscmd.8.gz
man/man8/upsd.8.gz
@@ -209,55 +210,55 @@ man/man8/upslog.8.gz
man/man8/upsmon.8.gz
man/man8/upsrw.8.gz
man/man8/upssched.8.gz
-%%NUT_CGI%%man/man5/hosts.conf.5.gz
-%%NUT_CGI%%man/man5/upsset.conf.5.gz
-%%NUT_CGI%%man/man5/upsstats.html.5.gz
-%%NUT_CGI%%man/man8/upsset.cgi.8.gz
-%%NUT_CGI%%man/man8/upsstats.cgi.8.gz
-%%NUT_CGI%%man/man8/upsimage.cgi.8.gz
-%%NUT_SERIAL%%man/man8/apcsmart.8.gz
-%%NUT_SERIAL%%man/man8/apcsmart-old.8.gz
-%%NUT_SERIAL%%man/man8/bestfortress.8.gz
-%%NUT_SERIAL%%man/man8/bcmxcp.8.gz
-%%NUT_SERIAL%%man/man8/belkin.8.gz
-%%NUT_SERIAL%%man/man8/belkinunv.8.gz
-%%NUT_SERIAL%%man/man8/bestuferrups.8.gz
-%%NUT_SERIAL%%man/man8/bestups.8.gz
-%%NUT_SERIAL%%man/man8/bestfcom.8.gz
-%%NUT_SERIAL%%man/man8/clone.8.gz
-%%NUT_SERIAL%%man/man8/dummy-ups.8.gz
-%%NUT_SERIAL%%man/man8/etapro.8.gz
-%%NUT_SERIAL%%man/man8/everups.8.gz
-%%NUT_SERIAL%%man/man8/gamatronic.8.gz
-%%NUT_SERIAL%%man/man8/genericups.8.gz
-%%NUT_SERIAL%%man/man8/isbmex.8.gz
-%%NUT_SERIAL%%man/man8/ivtscd.8.gz
-%%NUT_SERIAL%%man/man8/liebert.8.gz
-%%NUT_SERIAL%%man/man8/liebert-esp2.8.gz
-%%NUT_SERIAL%%man/man8/masterguard.8.gz
-%%NUT_SERIAL%%man/man8/metasys.8.gz
-%%NUT_SERIAL%%man/man8/mge-shut.8.gz
-%%NUT_SERIAL%%man/man8/mge-utalk.8.gz
-%%NUT_SERIAL%%man/man8/microdowell.8.gz
-%%NUT_SERIAL%%man/man8/microsol-apc.8.gz
-%%NUT_SERIAL%%man/man8/oneac.8.gz
-%%NUT_SERIAL%%man/man8/optiups.8.gz
-%%NUT_SERIAL%%man/man8/powercom.8.gz
-%%NUT_SERIAL%%man/man8/powerpanel.8.gz
-%%NUT_SERIAL%%man/man8/rhino.8.gz
-%%NUT_SERIAL%%man/man8/safenet.8.gz
-%%NUT_SERIAL%%man/man8/solis.8.gz
-%%NUT_SERIAL%%man/man8/tripplite.8.gz
-%%NUT_SERIAL%%man/man8/tripplitesu.8.gz
-%%NUT_SERIAL%%man/man8/upscode2.8.gz
-%%NUT_SERIAL%%man/man8/victronups.8.gz
-%%NUT_USB%%man/man8/bcmxcp_usb.8.gz
-%%NUT_USB%%man/man8/richcomm_usb.8.gz
-%%NUT_USB%%man/man8/tripplite_usb.8.gz
-%%NUT_USB%%man/man8/usbhid-ups.8.gz
-%%NUT_SNMP%%man/man8/snmp-ups.8.gz
-%%NUT_IPMIPSU%%man/man8/nut-ipmipsu.8.gz
-%%NUT_PDU%%man/man8/powerman-pdu.8.gz
+%%CGI%%man/man5/hosts.conf.5.gz
+%%CGI%%man/man5/upsset.conf.5.gz
+%%CGI%%man/man5/upsstats.html.5.gz
+%%CGI%%man/man8/upsset.cgi.8.gz
+%%CGI%%man/man8/upsstats.cgi.8.gz
+%%CGI%%man/man8/upsimage.cgi.8.gz
+%%SERIAL%%man/man8/apcsmart.8.gz
+%%SERIAL%%man/man8/apcsmart-old.8.gz
+%%SERIAL%%man/man8/bestfortress.8.gz
+%%SERIAL%%man/man8/bcmxcp.8.gz
+%%SERIAL%%man/man8/belkin.8.gz
+%%SERIAL%%man/man8/belkinunv.8.gz
+%%SERIAL%%man/man8/bestuferrups.8.gz
+%%SERIAL%%man/man8/bestups.8.gz
+%%SERIAL%%man/man8/bestfcom.8.gz
+%%SERIAL%%man/man8/clone.8.gz
+%%SERIAL%%man/man8/dummy-ups.8.gz
+%%SERIAL%%man/man8/etapro.8.gz
+%%SERIAL%%man/man8/everups.8.gz
+%%SERIAL%%man/man8/gamatronic.8.gz
+%%SERIAL%%man/man8/genericups.8.gz
+%%SERIAL%%man/man8/isbmex.8.gz
+%%SERIAL%%man/man8/ivtscd.8.gz
+%%SERIAL%%man/man8/liebert.8.gz
+%%SERIAL%%man/man8/liebert-esp2.8.gz
+%%SERIAL%%man/man8/masterguard.8.gz
+%%SERIAL%%man/man8/metasys.8.gz
+%%SERIAL%%man/man8/mge-shut.8.gz
+%%SERIAL%%man/man8/mge-utalk.8.gz
+%%SERIAL%%man/man8/microdowell.8.gz
+%%SERIAL%%man/man8/microsol-apc.8.gz
+%%SERIAL%%man/man8/oneac.8.gz
+%%SERIAL%%man/man8/optiups.8.gz
+%%SERIAL%%man/man8/powercom.8.gz
+%%SERIAL%%man/man8/powerpanel.8.gz
+%%SERIAL%%man/man8/rhino.8.gz
+%%SERIAL%%man/man8/safenet.8.gz
+%%SERIAL%%man/man8/solis.8.gz
+%%SERIAL%%man/man8/tripplite.8.gz
+%%SERIAL%%man/man8/tripplitesu.8.gz
+%%SERIAL%%man/man8/upscode2.8.gz
+%%SERIAL%%man/man8/victronups.8.gz
+%%USB%%man/man8/bcmxcp_usb.8.gz
+%%USB%%man/man8/richcomm_usb.8.gz
+%%USB%%man/man8/tripplite_usb.8.gz
+%%USB%%man/man8/usbhid-ups.8.gz
+%%SNMP%%man/man8/snmp-ups.8.gz
+%%IPMIPSU%%man/man8/nut-ipmipsu.8.gz
+%%PDU%%man/man8/powerman-pdu.8.gz
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index c26af0cd8c2f..2b0bf46bfdf4 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -23,19 +23,22 @@ NUT_GROUP?= uucp
STATEDIR?= /var/db/nut
PLIST_SUB+= NUT_USER=${NUT_USER}
PLIST_SUB+= NUT_GROUP=${NUT_GROUP}
+CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME}
+CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,}
+PLIST_SUB+= CGIDIR="${CGIDIR_REL}"
+PLIST_SUB+= CGIETCDIR="etc/nut/"
-OPTIONS_DEFAULT=SERIAL USB SNMP NEON IPMI_OFF SSL_OFF
-OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI DOCS
+OPTIONS_DEFAULT=SERIAL USB SNMP NEON SSL_OFF
+OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS
OPTIONS_SINGLE= IPMI SSL
-OPTIONS_SINGLE_IPMI= IPMI_OFF IPMIPSU FREEIPMI
OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
+OPTIONS_SUB= yes
SERIAL_DESC= SERIAL support
USB_DESC= USB support
NEON_DESC= NEON XML/HTTP support
PDU_DESC= Powerman PDU support
CGI_DESC= Web CGI interface
-IPMI_OFF_DESC= No IPMI support
FREEIPMI_DESC= freeipmi support
IPMIPSU_DESC= Use nut-ipmipsu support (experimental)
SSL_OFF_DESC= No SSL support
@@ -46,8 +49,6 @@ PLIST_SUB+= STATEDIR=${STATEDIR}
PORTDOCS= *
-.include <bsd.port.options.mk>
-
TMPDIR?= /tmp
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
@@ -69,111 +70,47 @@ LIB_DEPENDS+= libltdl.so:devel/libltdl
BUILD_DEPENDS= asciidoc:textproc/asciidoc
-.if ${PORT_OPTIONS:MCGI}
-LIB_DEPENDS+= libgd.so:graphics/gd
-CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME}
-CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,}
-CONFIGURE_ARGS+= --with-cgi --with-cgipath=${CGIDIR} \
+CGI_LIB_DEPENDS= libgd.so:graphics/gd
+CGI_CONFIGURE_WITH= cgi
+CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
--with-htmlpath=${WWWDIR} \
--with-gd-includes=-I${LOCALBASE}/include \
--with-gd-libs="-L${LOCALBASE}/lib -lgd"
-PLIST_SUB+= NUT_CGI=""
-PLIST_SUB+= CGIDIR="${CGIDIR_REL}"
-PLIST_SUB+= CGIETCDIR="etc/nut/"
-.else
-CONFIGURE_ARGS+= --without-cgi
-PLIST_SUB+= NUT_CGI="@comment "
-.endif
-.if ${PORT_OPTIONS:MSERIAL}
-CONFIGURE_ARGS+= --with-serial
-PLIST_SUB+= NUT_SERIAL=""
-.else
-CONFIGURE_ARGS+= --without-serial
-PLIST_SUB+= NUT_SERIAL="@comment "
-.endif
+SERIAL_CONFIGURE_WITH= serial
-.if ${PORT_OPTIONS:MUSB}
-#EXTRA_PATCHES= ${FILESDIR}/extra-patch-m4_nut_check_libusb.m4
-CONFIGURE_ARGS+= --with-usb=auto
-PLIST_SUB+= NUT_USB=""
-.else
-CONFIGURE_ARGS+= --without-usb
-PLIST_SUB+= NUT_USB="@comment "
-.endif
+USB_CONFIGURE_WITH= usb=auto
-.if ${PORT_OPTIONS:MSNMP}
-LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp
-CONFIGURE_ARGS+= --with-snmp
-PLIST_SUB+= NUT_SNMP=""
-.else
-CONFIGURE_ARGS+= --without-snmp
-PLIST_SUB+= NUT_SNMP="@comment "
-.endif
+SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
+SNMP_CONFIGURE_WITH= snmp
-.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+= libneon.so:www/neon
-CONFIGURE_ARGS+= --with-neon
-PLIST_SUB+= NUT_NEON=""
-.else
-CONFIGURE_ARGS+= --without-neon
-CONFIGURE_ARGS+= --disable-neon
-PLIST_SUB+= NUT_NEON="@comment "
-.endif
+NEON_LIB_DEPENDS+= libneon.so:www/neon
+NEON_CONFIGURE_WITH= neon
-.if ${PORT_OPTIONS:MPDU}
-LIB_DEPENDS+= libpowerman.so:sysutils/powerman
-CONFIGURE_ARGS+= --with-powerman
-PLIST_SUB+= NUT_PDU=""
-.else
-CONFIGURE_ARGS+= --without-powerman
-PLIST_SUB+= NUT_PDU="@comment "
-.endif
+PDU_LIB_DEPENDS+= libpowerman.so:sysutils/powerman
+PDU_CONFIGURE_WITH= powerman
-.if ${PORT_OPTIONS:MBASH}
-BUILD_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
-RUN_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
-PLIST_SUB+= BASH=""
-.else
-PLIST_SUB+= BASH="@comment "
-.endif
+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
-.if ${PORT_OPTIONS:MAVAHI}
-BUILD_DEPENDS+= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
-BUILD_DEPENDS+= avahi-daemon:net/avahi-app
-RUN_DEPENDS+= avahi-daemon:net/avahi-app
-CONFIGURE_ARGS+= --with-avahi
-.else
-CONFIGURE_ARGS+= --without-avahi
-.endif
+AVAHI_BUILD_DEPENDS= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
+AVAHI_BUILD_DEPENDS= avahi-daemon:net/avahi-app
+AVAHI_RUN_DEPENDS= avahi-daemon:net/avahi-app
+AVAHI_CONFIGURE_WITH= avahi
-.if ${PORT_OPTIONS:MFREEIPMI}
-LIB_DEPENDS+= libfreeipmi.so:sysutils/freeipmi
-CONFIGURE_ARGS+= --with-freeipmi
-PLIST_SUB+= NUT_FREEIPMI=""
-.else
-CONFIGURE_ARGS+= --without-freeipmi
-PLIST_SUB+= NUT_FREEIPMI="@comment "
-.endif
+FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
+FREEIPMI_CONFIGURE_WITH=freeipmi
-.if ${PORT_OPTIONS:MIPMIPSU}
-LIB_DEPENDS+= libfreeipmi.so:sysutils/freeipmi
-CONFIGURE_ARGS+= --with-ipmi
-PLIST_SUB+= NUT_IPMIPSU=""
-.else
-CONFIGURE_ARGS+= --without-ipmi
-PLIST_SUB+= NUT_IPMIPSU="@comment "
-.endif
+IPMIPSU_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
+IPMIPSU_CONFIGURE_WITH= ipmi
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+= ssl
-CONFIGURE_ARGS+= --with-openssl
-.elif ${PORT_OPTIONS:MNSS}
-LIB_DEPENDS= libnss3.so:security/nss
-CONFIGURE_ARGS+= --with-nss
-.else
-CONFIGURE_ARGS+= --without-openssl --without-ssl
-.endif
+OPENSSL_USES= ssl
+OPENSSL_CONFIGURE_WITH= openssl
+
+NSS_LIB_DEPENDS= libnss3.so:security/nss
+NSS_CONFIGURE_WITH= nss
+
+.include <bsd.port.pre.mk>
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/bin/env python|${PYTHON_CMD}|'
@@ -204,4 +141,4 @@ post-install:
@${RM} ${STAGEDIR}${PREFIX}/etc/nut/solaris-init/nut
@${RMDIR} ${STAGEDIR}${PREFIX}/etc/nut/solaris-init
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 717336e84b40..b1dac90a6916 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -1,14 +1,14 @@
-%%NUT_CGI%%%%CGIDIR%%/upsimage.cgi
-%%NUT_CGI%%%%CGIDIR%%/upsset.cgi
-%%NUT_CGI%%%%CGIDIR%%/upsstats.cgi
-%%NUT_CGI%%@sample %%CGIETCDIR%%hosts.conf.sample
-%%NUT_CGI%%@sample %%CGIETCDIR%%upsset.conf.sample
-%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats.html.sample
-%%NUT_CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample
-%%NUT_CGI%%%%WWWDIR%%/bottom.html
-%%NUT_CGI%%%%WWWDIR%%/header.html
-%%NUT_CGI%%%%WWWDIR%%/index.html
-%%NUT_CGI%%%%WWWDIR%%/nut-banner.png
+%%CGI%%%%CGIDIR%%/upsimage.cgi
+%%CGI%%%%CGIDIR%%/upsset.cgi
+%%CGI%%%%CGIDIR%%/upsstats.cgi
+%%CGI%%@sample %%CGIETCDIR%%hosts.conf.sample
+%%CGI%%@sample %%CGIETCDIR%%upsset.conf.sample
+%%CGI%%@sample %%CGIETCDIR%%upsstats.html.sample
+%%CGI%%@sample %%CGIETCDIR%%upsstats-single.html.sample
+%%CGI%%%%WWWDIR%%/bottom.html
+%%CGI%%%%WWWDIR%%/header.html
+%%CGI%%%%WWWDIR%%/index.html
+%%CGI%%%%WWWDIR%%/nut-banner.png
%%ETCDIR%%/cmdvartab
%%ETCDIR%%/driver.list
@sample %%ETCDIR%%/nut.conf.sample
@@ -19,7 +19,7 @@
@sample %%ETCDIR%%/upssched.conf.sample
@sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
@sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
-%%NUT_USB%%etc/devd/nut-usb.conf
+%%USB%%etc/devd/nut-usb.conf
bin/nut-scanner
bin/upsc
bin/upscmd
@@ -56,61 +56,61 @@ libdata/pkgconfig/libnutclient.pc
libdata/pkgconfig/libnutscan.pc
libdata/pkgconfig/libupsclient.pc
libdata/pkgconfig/libnutclientstub.pc
-%%NUT_SERIAL%%libexec/nut/al175
-%%NUT_SERIAL%%libexec/nut/apcupsd-ups
-%%NUT_USB%%libexec/nut/nutdrv_atcl_usb
-%%NUT_USB%%libexec/nut/nutdrv_qx
-%%NUT_SERIAL%%libexec/nut/riello_ser
-%%NUT_USB%%libexec/nut/riello_usb
-%%NUT_SERIAL%%libexec/nut/apcsmart
-%%NUT_SERIAL%%libexec/nut/apcsmart-old
-%%NUT_SERIAL%%libexec/nut/bcmxcp
-%%NUT_USB%%libexec/nut/bcmxcp_usb
-%%NUT_SERIAL%%libexec/nut/belkin
-%%NUT_SERIAL%%libexec/nut/belkinunv
-%%NUT_SERIAL%%libexec/nut/bestfcom
-%%NUT_SERIAL%%libexec/nut/bestfortress
-%%NUT_SERIAL%%libexec/nut/bestuferrups
-%%NUT_SERIAL%%libexec/nut/bestups
-%%NUT_SERIAL%%libexec/nut/blazer_ser
-%%NUT_USB%%libexec/nut/blazer_usb
-%%NUT_SERIAL%%libexec/nut/clone
-%%NUT_SERIAL%%libexec/nut/clone-outlet
-%%NUT_SERIAL%%libexec/nut/dummy-ups
-%%NUT_SERIAL%%libexec/nut/etapro
-%%NUT_SERIAL%%libexec/nut/everups
-%%NUT_SERIAL%%libexec/nut/gamatronic
-%%NUT_SERIAL%%libexec/nut/genericups
-%%NUT_SERIAL%%libexec/nut/isbmex
-%%NUT_SERIAL%%libexec/nut/ivtscd
-%%NUT_SERIAL%%libexec/nut/liebert
-%%NUT_SERIAL%%libexec/nut/liebert-esp2
-%%NUT_SERIAL%%libexec/nut/masterguard
-%%NUT_SERIAL%%libexec/nut/metasys
-%%NUT_SERIAL%%libexec/nut/mge-utalk
-%%NUT_SERIAL%%libexec/nut/microdowell
-%%NUT_SERIAL%%libexec/nut/microsol-apc
-%%NUT_SERIAL%%libexec/nut/mge-shut
-%%NUT_NEON%%libexec/nut/netxml-ups
-%%NUT_SERIAL%%libexec/nut/oneac
-%%NUT_SERIAL%%libexec/nut/optiups
-%%NUT_IPMIPSU%%libexec/nut/nut-ipmipsu
-%%NUT_SERIAL%%libexec/nut/nutdrv_siemens-sitop
-%%NUT_SERIAL%%libexec/nut/powercom
-%%NUT_PDU%%libexec/nut/powerman-pdu
-%%NUT_SERIAL%%libexec/nut/powerpanel
-%%NUT_SERIAL%%libexec/nut/rhino
-%%NUT_USB%%libexec/nut/richcomm_usb
-%%NUT_SERIAL%%libexec/nut/safenet
-%%NUT_SERIAL%%libexec/nut/skel
-%%NUT_SNMP%%libexec/nut/snmp-ups
-%%NUT_SERIAL%%libexec/nut/solis
-%%NUT_SERIAL%%libexec/nut/tripplite
-%%NUT_USB%%libexec/nut/tripplite_usb
-%%NUT_SERIAL%%libexec/nut/tripplitesu
-%%NUT_SERIAL%%libexec/nut/upscode2
-%%NUT_USB%%libexec/nut/usbhid-ups
-%%NUT_SERIAL%%libexec/nut/victronups
+%%SERIAL%%libexec/nut/al175
+%%SERIAL%%libexec/nut/apcupsd-ups
+%%USB%%libexec/nut/nutdrv_atcl_usb
+%%USB%%libexec/nut/nutdrv_qx
+%%SERIAL%%libexec/nut/riello_ser
+%%USB%%libexec/nut/riello_usb
+%%SERIAL%%libexec/nut/apcsmart
+%%SERIAL%%libexec/nut/apcsmart-old
+%%SERIAL%%libexec/nut/bcmxcp
+%%USB%%libexec/nut/bcmxcp_usb
+%%SERIAL%%libexec/nut/belkin
+%%SERIAL%%libexec/nut/belkinunv
+%%SERIAL%%libexec/nut/bestfcom
+%%SERIAL%%libexec/nut/bestfortress
+%%SERIAL%%libexec/nut/bestuferrups
+%%SERIAL%%libexec/nut/bestups
+%%SERIAL%%libexec/nut/blazer_ser
+%%USB%%libexec/nut/blazer_usb
+%%SERIAL%%libexec/nut/clone
+%%SERIAL%%libexec/nut/clone-outlet
+%%SERIAL%%libexec/nut/dummy-ups
+%%SERIAL%%libexec/nut/etapro
+%%SERIAL%%libexec/nut/everups
+%%SERIAL%%libexec/nut/gamatronic
+%%SERIAL%%libexec/nut/genericups
+%%SERIAL%%libexec/nut/isbmex
+%%SERIAL%%libexec/nut/ivtscd
+%%SERIAL%%libexec/nut/liebert
+%%SERIAL%%libexec/nut/liebert-esp2
+%%SERIAL%%libexec/nut/masterguard
+%%SERIAL%%libexec/nut/metasys
+%%SERIAL%%libexec/nut/mge-utalk
+%%SERIAL%%libexec/nut/microdowell
+%%SERIAL%%libexec/nut/microsol-apc
+%%SERIAL%%libexec/nut/mge-shut
+%%NEON%%libexec/nut/netxml-ups
+%%SERIAL%%libexec/nut/oneac
+%%SERIAL%%libexec/nut/optiups
+%%IPMIPSU%%libexec/nut/nut-ipmipsu
+%%SERIAL%%libexec/nut/nutdrv_siemens-sitop
+%%SERIAL%%libexec/nut/powercom
+%%PDU%%libexec/nut/powerman-pdu
+%%SERIAL%%libexec/nut/powerpanel
+%%SERIAL%%libexec/nut/rhino
+%%USB%%libexec/nut/richcomm_usb
+%%SERIAL%%libexec/nut/safenet
+%%SERIAL%%libexec/nut/skel
+%%SNMP%%libexec/nut/snmp-ups
+%%SERIAL%%libexec/nut/solis
+%%SERIAL%%libexec/nut/tripplite
+%%USB%%libexec/nut/tripplite_usb
+%%SERIAL%%libexec/nut/tripplitesu
+%%SERIAL%%libexec/nut/upscode2
+%%USB%%libexec/nut/usbhid-ups
+%%SERIAL%%libexec/nut/victronups
man/man3/libnutclient.3.gz
man/man3/libnutclient_commands.3.gz
man/man3/libnutclient_devices.3.gz
@@ -187,20 +187,20 @@ man/man5/upsd.conf.5.gz
man/man5/upsd.users.5.gz
man/man5/upsmon.conf.5.gz
man/man5/upssched.conf.5.gz
-%%NUT_SERIAL%%man/man8/al175.8.gz
-%%NUT_SERIAL%%man/man8/apcupsd-ups.8.gz
-%%NUT_SERIAL%%man/man8/blazer_ser.8.gz
-%%NUT_USB%%man/man8/blazer_usb.8.gz
-%%NUT_NEON%%man/man8/netxml-ups.8.gz
+%%SERIAL%%man/man8/al175.8.gz
+%%SERIAL%%man/man8/apcupsd-ups.8.gz
+%%SERIAL%%man/man8/blazer_ser.8.gz
+%%USB%%man/man8/blazer_usb.8.gz
+%%NEON%%man/man8/netxml-ups.8.gz
man/man8/nut-driver-enumerator.8.gz
man/man8/nut-recorder.8.gz
man/man8/nut-scanner.8.gz
-%%NUT_USB%%man/man8/nutdrv_atcl_usb.8.gz
-%%NUT_USB%%man/man8/nutdrv_qx.8.gz
-%%NUT_SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
+%%USB%%man/man8/nutdrv_atcl_usb.8.gz
+%%USB%%man/man8/nutdrv_qx.8.gz
+%%SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
man/man8/nutupsdrv.8.gz
-%%NUT_SERIAL%%man/man8/riello_ser.8.gz
-%%NUT_USB%%man/man8/riello_usb.8.gz
+%%SERIAL%%man/man8/riello_ser.8.gz
+%%USB%%man/man8/riello_usb.8.gz
man/man8/upsc.8.gz
man/man8/upscmd.8.gz
man/man8/upsd.8.gz
@@ -210,55 +210,55 @@ man/man8/upslog.8.gz
man/man8/upsmon.8.gz
man/man8/upsrw.8.gz
man/man8/upssched.8.gz
-%%NUT_CGI%%man/man5/hosts.conf.5.gz
-%%NUT_CGI%%man/man5/upsset.conf.5.gz
-%%NUT_CGI%%man/man5/upsstats.html.5.gz
-%%NUT_CGI%%man/man8/upsset.cgi.8.gz
-%%NUT_CGI%%man/man8/upsstats.cgi.8.gz
-%%NUT_CGI%%man/man8/upsimage.cgi.8.gz
-%%NUT_SERIAL%%man/man8/apcsmart.8.gz
-%%NUT_SERIAL%%man/man8/apcsmart-old.8.gz
-%%NUT_SERIAL%%man/man8/bestfortress.8.gz
-%%NUT_SERIAL%%man/man8/bcmxcp.8.gz
-%%NUT_SERIAL%%man/man8/belkin.8.gz
-%%NUT_SERIAL%%man/man8/belkinunv.8.gz
-%%NUT_SERIAL%%man/man8/bestuferrups.8.gz
-%%NUT_SERIAL%%man/man8/bestups.8.gz
-%%NUT_SERIAL%%man/man8/bestfcom.8.gz
-%%NUT_SERIAL%%man/man8/clone.8.gz
-%%NUT_SERIAL%%man/man8/dummy-ups.8.gz
-%%NUT_SERIAL%%man/man8/etapro.8.gz
-%%NUT_SERIAL%%man/man8/everups.8.gz
-%%NUT_SERIAL%%man/man8/gamatronic.8.gz
-%%NUT_SERIAL%%man/man8/genericups.8.gz
-%%NUT_SERIAL%%man/man8/isbmex.8.gz
-%%NUT_SERIAL%%man/man8/ivtscd.8.gz
-%%NUT_SERIAL%%man/man8/liebert.8.gz
-%%NUT_SERIAL%%man/man8/liebert-esp2.8.gz
-%%NUT_SERIAL%%man/man8/masterguard.8.gz
-%%NUT_SERIAL%%man/man8/metasys.8.gz
-%%NUT_SERIAL%%man/man8/mge-shut.8.gz
-%%NUT_SERIAL%%man/man8/mge-utalk.8.gz
-%%NUT_SERIAL%%man/man8/microdowell.8.gz
-%%NUT_SERIAL%%man/man8/microsol-apc.8.gz
-%%NUT_SERIAL%%man/man8/oneac.8.gz
-%%NUT_SERIAL%%man/man8/optiups.8.gz
-%%NUT_SERIAL%%man/man8/powercom.8.gz
-%%NUT_SERIAL%%man/man8/powerpanel.8.gz
-%%NUT_SERIAL%%man/man8/rhino.8.gz
-%%NUT_SERIAL%%man/man8/safenet.8.gz
-%%NUT_SERIAL%%man/man8/solis.8.gz
-%%NUT_SERIAL%%man/man8/tripplite.8.gz
-%%NUT_SERIAL%%man/man8/tripplitesu.8.gz
-%%NUT_SERIAL%%man/man8/upscode2.8.gz
-%%NUT_SERIAL%%man/man8/victronups.8.gz
-%%NUT_USB%%man/man8/bcmxcp_usb.8.gz
-%%NUT_USB%%man/man8/richcomm_usb.8.gz
-%%NUT_USB%%man/man8/tripplite_usb.8.gz
-%%NUT_USB%%man/man8/usbhid-ups.8.gz
-%%NUT_SNMP%%man/man8/snmp-ups.8.gz
-%%NUT_IPMIPSU%%man/man8/nut-ipmipsu.8.gz
-%%NUT_PDU%%man/man8/powerman-pdu.8.gz
+%%CGI%%man/man5/hosts.conf.5.gz
+%%CGI%%man/man5/upsset.conf.5.gz
+%%CGI%%man/man5/upsstats.html.5.gz
+%%CGI%%man/man8/upsset.cgi.8.gz
+%%CGI%%man/man8/upsstats.cgi.8.gz
+%%CGI%%man/man8/upsimage.cgi.8.gz
+%%SERIAL%%man/man8/apcsmart.8.gz
+%%SERIAL%%man/man8/apcsmart-old.8.gz
+%%SERIAL%%man/man8/bestfortress.8.gz
+%%SERIAL%%man/man8/bcmxcp.8.gz
+%%SERIAL%%man/man8/belkin.8.gz
+%%SERIAL%%man/man8/belkinunv.8.gz
+%%SERIAL%%man/man8/bestuferrups.8.gz
+%%SERIAL%%man/man8/bestups.8.gz
+%%SERIAL%%man/man8/bestfcom.8.gz
+%%SERIAL%%man/man8/clone.8.gz
+%%SERIAL%%man/man8/dummy-ups.8.gz
+%%SERIAL%%man/man8/etapro.8.gz
+%%SERIAL%%man/man8/everups.8.gz
+%%SERIAL%%man/man8/gamatronic.8.gz
+%%SERIAL%%man/man8/genericups.8.gz
+%%SERIAL%%man/man8/isbmex.8.gz
+%%SERIAL%%man/man8/ivtscd.8.gz
+%%SERIAL%%man/man8/liebert.8.gz
+%%SERIAL%%man/man8/liebert-esp2.8.gz
+%%SERIAL%%man/man8/masterguard.8.gz
+%%SERIAL%%man/man8/metasys.8.gz
+%%SERIAL%%man/man8/mge-shut.8.gz
+%%SERIAL%%man/man8/mge-utalk.8.gz
+%%SERIAL%%man/man8/microdowell.8.gz
+%%SERIAL%%man/man8/microsol-apc.8.gz
+%%SERIAL%%man/man8/oneac.8.gz
+%%SERIAL%%man/man8/optiups.8.gz
+%%SERIAL%%man/man8/powercom.8.gz
+%%SERIAL%%man/man8/powerpanel.8.gz
+%%SERIAL%%man/man8/rhino.8.gz
+%%SERIAL%%man/man8/safenet.8.gz
+%%SERIAL%%man/man8/solis.8.gz
+%%SERIAL%%man/man8/tripplite.8.gz
+%%SERIAL%%man/man8/tripplitesu.8.gz
+%%SERIAL%%man/man8/upscode2.8.gz
+%%SERIAL%%man/man8/victronups.8.gz
+%%USB%%man/man8/bcmxcp_usb.8.gz
+%%USB%%man/man8/richcomm_usb.8.gz
+%%USB%%man/man8/tripplite_usb.8.gz
+%%USB%%man/man8/usbhid-ups.8.gz
+%%SNMP%%man/man8/snmp-ups.8.gz
+%%IPMIPSU%%man/man8/nut-ipmipsu.8.gz
+%%PDU%%man/man8/powerman-pdu.8.gz
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
--
2.35.2
From 20ead05fb0a261545d9738668bb133153b1756b7 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 20:58:24 -0700
Subject: [PATCH 6/9] sysutils/nut: Remove redundant BUILD_DEPENDS
Remove unused asciidoc BUILD_DEPENDS from sysutils/nut as its man pages
are already preformatted.
Also, add a comment to the sysutils/nut-devel port Makefile informing
developers to remove the BUILD_DEPENDS when copying/merging the -devel
port to the main port when a new release of nut is committed.
PR: 263751
Reported by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
---
sysutils/nut-devel/Makefile | 3 +++
sysutils/nut/Makefile | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index 6a12933363b5..b67f23a4dfd3 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -76,6 +76,9 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LIB_DEPENDS+= libltdl.so:devel/libltdl
+# XXX Remove this when copying this port to sysutils/nut. The GA version
+# XXX of nut ships with preformatted files and therefore does not need
+# XXX asciidoc.
BUILD_DEPENDS= asciidoc:textproc/asciidoc
CGI_LIB_DEPENDS= libgd.so:graphics/gd
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 2b0bf46bfdf4..1a9a89ddeec8 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -68,8 +68,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LIB_DEPENDS+= libltdl.so:devel/libltdl
-BUILD_DEPENDS= asciidoc:textproc/asciidoc
-
CGI_LIB_DEPENDS= libgd.so:graphics/gd
CGI_CONFIGURE_WITH= cgi
CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
--
2.35.2
From b3a4b2c41fe738d293edf05885021401f17a27c0 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 21:18:28 -0700
Subject: [PATCH 7/9] sysutils/nut*: Add MANPAGES option
Provide a MANPAGES option to allow users wishing a leaner install to
deselect them.
PR: 263751
Reported by: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
---
sysutils/nut-devel/Makefile | 7 +-
sysutils/nut-devel/pkg-plist | 296 +++++++++++++++++------------------
sysutils/nut/Makefile | 7 +-
sysutils/nut/pkg-plist | 296 +++++++++++++++++------------------
4 files changed, 306 insertions(+), 300 deletions(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index b67f23a4dfd3..bbced16cca75 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -36,8 +36,8 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,}
PLIST_SUB+= CGIDIR="${CGIDIR_REL}"
PLIST_SUB+= CGIETCDIR="etc/nut/"
-OPTIONS_DEFAULT=SERIAL USB SNMP NEON SSL_OFF
-OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS
+OPTIONS_DEFAULT=SERIAL USB SNMP NEON SSL_OFF MANPAGES
+OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES
OPTIONS_SINGLE= SSL
OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
OPTIONS_SUB= yes
@@ -81,6 +81,9 @@ LIB_DEPENDS+= libltdl.so:devel/libltdl
# XXX asciidoc.
BUILD_DEPENDS= asciidoc:textproc/asciidoc
+MANPAGES_CONFIGURE_ON= --with-doc=man=auto
+MANPAGES_CONFIGURE_OFF= --with-doc=no
+
CGI_LIB_DEPENDS= libgd.so:graphics/gd
CGI_CONFIGURE_WITH= cgi
CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist
index b1dac90a6916..013196dd7f5d 100644
--- a/sysutils/nut-devel/pkg-plist
+++ b/sysutils/nut-devel/pkg-plist
@@ -111,154 +111,154 @@ libdata/pkgconfig/libnutclientstub.pc
%%SERIAL%%libexec/nut/upscode2
%%USB%%libexec/nut/usbhid-ups
%%SERIAL%%libexec/nut/victronups
-man/man3/libnutclient.3.gz
-man/man3/libnutclient_commands.3.gz
-man/man3/libnutclient_devices.3.gz
-man/man3/libnutclient_general.3.gz
-man/man3/libnutclient_misc.3.gz
-man/man3/libnutclient_tcp.3.gz
-man/man3/libnutclient_variables.3.gz
-man/man3/nutclient_authenticate.3.gz
-man/man3/nutclient_destroy.3.gz
-man/man3/nutclient_device_forced_shutdown.3.gz
-man/man3/nutclient_device_login.3.gz
-man/man3/nutclient_device_master.3.gz
-man/man3/nutclient_execute_device_command.3.gz
-man/man3/nutclient_get_device_command_description.3.gz
-man/man3/nutclient_get_device_commands.3.gz
-man/man3/nutclient_get_device_description.3.gz
-man/man3/nutclient_get_device_num_logins.3.gz
-man/man3/nutclient_get_device_rw_variables.3.gz
-man/man3/nutclient_get_device_variable_description.3.gz
-man/man3/nutclient_get_device_variable_values.3.gz
-man/man3/nutclient_get_device_variables.3.gz
-man/man3/nutclient_get_devices.3.gz
-man/man3/nutclient_has_device.3.gz
-man/man3/nutclient_has_device_command.3.gz
-man/man3/nutclient_has_device_variable.3.gz
-man/man3/nutclient_logout.3.gz
-man/man3/nutclient_set_device_variable_value.3.gz
-man/man3/nutclient_set_device_variable_values.3.gz
-man/man3/nutclient_tcp_create_client.3.gz
-man/man3/nutclient_tcp_disconnect.3.gz
-man/man3/nutclient_tcp_get_timeout.3.gz
-man/man3/nutclient_tcp_is_connected.3.gz
-man/man3/nutclient_tcp_reconnect.3.gz
-man/man3/nutclient_tcp_set_timeout.3.gz
-man/man3/nutscan.3.gz
-man/man3/nutscan_add_device_to_device.3.gz
-man/man3/nutscan_add_option_to_device.3.gz
-man/man3/nutscan_cidr_to_ip.3.gz
-man/man3/nutscan_display_parsable.3.gz
-man/man3/nutscan_display_ups_conf.3.gz
-man/man3/nutscan_free_device.3.gz
-man/man3/nutscan_get_serial_ports_list.3.gz
-man/man3/nutscan_init.3.gz
-man/man3/nutscan_new_device.3.gz
-man/man3/nutscan_scan_avahi.3.gz
-man/man3/nutscan_scan_eaton_serial.3.gz
-man/man3/nutscan_scan_ipmi.3.gz
-man/man3/nutscan_scan_nut.3.gz
-man/man3/nutscan_scan_snmp.3.gz
-man/man3/nutscan_scan_usb.3.gz
-man/man3/nutscan_scan_xml_http_range.3.gz
-man/man3/upscli_add_host_cert.3.gz
-man/man3/upscli_cleanup.3.gz
-man/man3/upscli_connect.3.gz
-man/man3/upscli_disconnect.3.gz
-man/man3/upscli_fd.3.gz
-man/man3/upscli_get.3.gz
-man/man3/upscli_init.3.gz
-man/man3/upscli_list_next.3.gz
-man/man3/upscli_list_start.3.gz
-man/man3/upscli_readline.3.gz
-man/man3/upscli_readline_timeout.3.gz
-man/man3/upscli_sendline.3.gz
-man/man3/upscli_sendline_timeout.3.gz
-man/man3/upscli_splitaddr.3.gz
-man/man3/upscli_splitname.3.gz
-man/man3/upscli_ssl.3.gz
-man/man3/upscli_strerror.3.gz
-man/man3/upscli_upserror.3.gz
-man/man3/upsclient.3.gz
-man/man5/nut.conf.5.gz
-man/man5/ups.conf.5.gz
-man/man5/upsd.conf.5.gz
-man/man5/upsd.users.5.gz
-man/man5/upsmon.conf.5.gz
-man/man5/upssched.conf.5.gz
-%%SERIAL%%man/man8/al175.8.gz
-%%SERIAL%%man/man8/apcupsd-ups.8.gz
-%%SERIAL%%man/man8/blazer_ser.8.gz
-%%USB%%man/man8/blazer_usb.8.gz
-%%NEON%%man/man8/netxml-ups.8.gz
-man/man8/nut-driver-enumerator.8.gz
-man/man8/nut-recorder.8.gz
-man/man8/nut-scanner.8.gz
-%%USB%%man/man8/nutdrv_atcl_usb.8.gz
-%%USB%%man/man8/nutdrv_qx.8.gz
-%%SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
-man/man8/nutupsdrv.8.gz
-%%SERIAL%%man/man8/riello_ser.8.gz
-%%USB%%man/man8/riello_usb.8.gz
-man/man8/upsc.8.gz
-man/man8/upscmd.8.gz
-man/man8/upsd.8.gz
-man/man8/upsdrvctl.8.gz
-man/man8/upsdrvsvcctl.8.gz
-man/man8/upslog.8.gz
-man/man8/upsmon.8.gz
-man/man8/upsrw.8.gz
-man/man8/upssched.8.gz
-%%CGI%%man/man5/hosts.conf.5.gz
-%%CGI%%man/man5/upsset.conf.5.gz
-%%CGI%%man/man5/upsstats.html.5.gz
-%%CGI%%man/man8/upsset.cgi.8.gz
-%%CGI%%man/man8/upsstats.cgi.8.gz
-%%CGI%%man/man8/upsimage.cgi.8.gz
-%%SERIAL%%man/man8/apcsmart.8.gz
-%%SERIAL%%man/man8/apcsmart-old.8.gz
-%%SERIAL%%man/man8/bestfortress.8.gz
-%%SERIAL%%man/man8/bcmxcp.8.gz
-%%SERIAL%%man/man8/belkin.8.gz
-%%SERIAL%%man/man8/belkinunv.8.gz
-%%SERIAL%%man/man8/bestuferrups.8.gz
-%%SERIAL%%man/man8/bestups.8.gz
-%%SERIAL%%man/man8/bestfcom.8.gz
-%%SERIAL%%man/man8/clone.8.gz
-%%SERIAL%%man/man8/dummy-ups.8.gz
-%%SERIAL%%man/man8/etapro.8.gz
-%%SERIAL%%man/man8/everups.8.gz
-%%SERIAL%%man/man8/gamatronic.8.gz
-%%SERIAL%%man/man8/genericups.8.gz
-%%SERIAL%%man/man8/isbmex.8.gz
-%%SERIAL%%man/man8/ivtscd.8.gz
-%%SERIAL%%man/man8/liebert.8.gz
-%%SERIAL%%man/man8/liebert-esp2.8.gz
-%%SERIAL%%man/man8/masterguard.8.gz
-%%SERIAL%%man/man8/metasys.8.gz
-%%SERIAL%%man/man8/mge-shut.8.gz
-%%SERIAL%%man/man8/mge-utalk.8.gz
-%%SERIAL%%man/man8/microdowell.8.gz
-%%SERIAL%%man/man8/microsol-apc.8.gz
-%%SERIAL%%man/man8/oneac.8.gz
-%%SERIAL%%man/man8/optiups.8.gz
-%%SERIAL%%man/man8/powercom.8.gz
-%%SERIAL%%man/man8/powerpanel.8.gz
-%%SERIAL%%man/man8/rhino.8.gz
-%%SERIAL%%man/man8/safenet.8.gz
-%%SERIAL%%man/man8/solis.8.gz
-%%SERIAL%%man/man8/tripplite.8.gz
-%%SERIAL%%man/man8/tripplitesu.8.gz
-%%SERIAL%%man/man8/upscode2.8.gz
-%%SERIAL%%man/man8/victronups.8.gz
-%%USB%%man/man8/bcmxcp_usb.8.gz
-%%USB%%man/man8/richcomm_usb.8.gz
-%%USB%%man/man8/tripplite_usb.8.gz
-%%USB%%man/man8/usbhid-ups.8.gz
-%%SNMP%%man/man8/snmp-ups.8.gz
-%%IPMIPSU%%man/man8/nut-ipmipsu.8.gz
-%%PDU%%man/man8/powerman-pdu.8.gz
+%%MANPAGES%%man/man3/libnutclient.3.gz
+%%MANPAGES%%man/man3/libnutclient_commands.3.gz
+%%MANPAGES%%man/man3/libnutclient_devices.3.gz
+%%MANPAGES%%man/man3/libnutclient_general.3.gz
+%%MANPAGES%%man/man3/libnutclient_misc.3.gz
+%%MANPAGES%%man/man3/libnutclient_tcp.3.gz
+%%MANPAGES%%man/man3/libnutclient_variables.3.gz
+%%MANPAGES%%man/man3/nutclient_authenticate.3.gz
+%%MANPAGES%%man/man3/nutclient_destroy.3.gz
+%%MANPAGES%%man/man3/nutclient_device_forced_shutdown.3.gz
+%%MANPAGES%%man/man3/nutclient_device_login.3.gz
+%%MANPAGES%%man/man3/nutclient_device_master.3.gz
+%%MANPAGES%%man/man3/nutclient_execute_device_command.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_command_description.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_commands.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_description.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_num_logins.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_rw_variables.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_variable_description.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_variable_values.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_variables.3.gz
+%%MANPAGES%%man/man3/nutclient_get_devices.3.gz
+%%MANPAGES%%man/man3/nutclient_has_device.3.gz
+%%MANPAGES%%man/man3/nutclient_has_device_command.3.gz
+%%MANPAGES%%man/man3/nutclient_has_device_variable.3.gz
+%%MANPAGES%%man/man3/nutclient_logout.3.gz
+%%MANPAGES%%man/man3/nutclient_set_device_variable_value.3.gz
+%%MANPAGES%%man/man3/nutclient_set_device_variable_values.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_create_client.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_disconnect.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_get_timeout.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_is_connected.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_reconnect.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_set_timeout.3.gz
+%%MANPAGES%%man/man3/nutscan.3.gz
+%%MANPAGES%%man/man3/nutscan_add_device_to_device.3.gz
+%%MANPAGES%%man/man3/nutscan_add_option_to_device.3.gz
+%%MANPAGES%%man/man3/nutscan_cidr_to_ip.3.gz
+%%MANPAGES%%man/man3/nutscan_display_parsable.3.gz
+%%MANPAGES%%man/man3/nutscan_display_ups_conf.3.gz
+%%MANPAGES%%man/man3/nutscan_free_device.3.gz
+%%MANPAGES%%man/man3/nutscan_get_serial_ports_list.3.gz
+%%MANPAGES%%man/man3/nutscan_init.3.gz
+%%MANPAGES%%man/man3/nutscan_new_device.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_avahi.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_eaton_serial.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_ipmi.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_nut.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_snmp.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_usb.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_xml_http_range.3.gz
+%%MANPAGES%%man/man3/upscli_add_host_cert.3.gz
+%%MANPAGES%%man/man3/upscli_cleanup.3.gz
+%%MANPAGES%%man/man3/upscli_connect.3.gz
+%%MANPAGES%%man/man3/upscli_disconnect.3.gz
+%%MANPAGES%%man/man3/upscli_fd.3.gz
+%%MANPAGES%%man/man3/upscli_get.3.gz
+%%MANPAGES%%man/man3/upscli_init.3.gz
+%%MANPAGES%%man/man3/upscli_list_next.3.gz
+%%MANPAGES%%man/man3/upscli_list_start.3.gz
+%%MANPAGES%%man/man3/upscli_readline.3.gz
+%%MANPAGES%%man/man3/upscli_readline_timeout.3.gz
+%%MANPAGES%%man/man3/upscli_sendline.3.gz
+%%MANPAGES%%man/man3/upscli_sendline_timeout.3.gz
+%%MANPAGES%%man/man3/upscli_splitaddr.3.gz
+%%MANPAGES%%man/man3/upscli_splitname.3.gz
+%%MANPAGES%%man/man3/upscli_ssl.3.gz
+%%MANPAGES%%man/man3/upscli_strerror.3.gz
+%%MANPAGES%%man/man3/upscli_upserror.3.gz
+%%MANPAGES%%man/man3/upsclient.3.gz
+%%MANPAGES%%man/man5/nut.conf.5.gz
+%%MANPAGES%%man/man5/ups.conf.5.gz
+%%MANPAGES%%man/man5/upsd.conf.5.gz
+%%MANPAGES%%man/man5/upsd.users.5.gz
+%%MANPAGES%%man/man5/upsmon.conf.5.gz
+%%MANPAGES%%man/man5/upssched.conf.5.gz
+%%MANPAGES%%%%SERIAL%%man/man8/al175.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/apcupsd-ups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/blazer_ser.8.gz
+%%MANPAGES%%%%USB%%man/man8/blazer_usb.8.gz
+%%MANPAGES%%%%NEON%%man/man8/netxml-ups.8.gz
+%%MANPAGES%%man/man8/nut-driver-enumerator.8.gz
+%%MANPAGES%%man/man8/nut-recorder.8.gz
+%%MANPAGES%%man/man8/nut-scanner.8.gz
+%%MANPAGES%%%%USB%%man/man8/nutdrv_atcl_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/nutdrv_qx.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
+%%MANPAGES%%man/man8/nutupsdrv.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/riello_ser.8.gz
+%%MANPAGES%%%%USB%%man/man8/riello_usb.8.gz
+%%MANPAGES%%man/man8/upsc.8.gz
+%%MANPAGES%%man/man8/upscmd.8.gz
+%%MANPAGES%%man/man8/upsd.8.gz
+%%MANPAGES%%man/man8/upsdrvctl.8.gz
+%%MANPAGES%%man/man8/upsdrvsvcctl.8.gz
+%%MANPAGES%%man/man8/upslog.8.gz
+%%MANPAGES%%man/man8/upsmon.8.gz
+%%MANPAGES%%man/man8/upsrw.8.gz
+%%MANPAGES%%man/man8/upssched.8.gz
+%%MANPAGES%%%%CGI%%man/man5/hosts.conf.5.gz
+%%MANPAGES%%%%CGI%%man/man5/upsset.conf.5.gz
+%%MANPAGES%%%%CGI%%man/man5/upsstats.html.5.gz
+%%MANPAGES%%%%CGI%%man/man8/upsset.cgi.8.gz
+%%MANPAGES%%%%CGI%%man/man8/upsstats.cgi.8.gz
+%%MANPAGES%%%%CGI%%man/man8/upsimage.cgi.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/apcsmart.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/apcsmart-old.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestfortress.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bcmxcp.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/belkin.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/belkinunv.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestuferrups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestfcom.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/clone.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/dummy-ups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/etapro.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/everups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/gamatronic.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/genericups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/isbmex.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/ivtscd.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/liebert.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/liebert-esp2.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/masterguard.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/metasys.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/mge-shut.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/mge-utalk.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/microdowell.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/microsol-apc.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/oneac.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/optiups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/powercom.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/powerpanel.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/rhino.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/safenet.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/solis.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/tripplite.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/tripplitesu.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/upscode2.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/victronups.8.gz
+%%MANPAGES%%%%USB%%man/man8/bcmxcp_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/richcomm_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/tripplite_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/usbhid-ups.8.gz
+%%MANPAGES%%%%SNMP%%man/man8/snmp-ups.8.gz
+%%MANPAGES%%%%IPMIPSU%%man/man8/nut-ipmipsu.8.gz
+%%MANPAGES%%%%PDU%%man/man8/powerman-pdu.8.gz
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 1a9a89ddeec8..7b9aaaebf21e 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -28,8 +28,8 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,}
PLIST_SUB+= CGIDIR="${CGIDIR_REL}"
PLIST_SUB+= CGIETCDIR="etc/nut/"
-OPTIONS_DEFAULT=SERIAL USB SNMP NEON SSL_OFF
-OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS
+OPTIONS_DEFAULT=SERIAL USB SNMP NEON SSL_OFF MANPAGES
+OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES
OPTIONS_SINGLE= IPMI SSL
OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS
OPTIONS_SUB= yes
@@ -68,6 +68,9 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LIB_DEPENDS+= libltdl.so:devel/libltdl
+MANPAGES_CONFIGURE_ON= --with-doc=man=auto
+MANPAGES_CONFIGURE_OFF= --with-doc=no
+
CGI_LIB_DEPENDS= libgd.so:graphics/gd
CGI_CONFIGURE_WITH= cgi
CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index b1dac90a6916..013196dd7f5d 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -111,154 +111,154 @@ libdata/pkgconfig/libnutclientstub.pc
%%SERIAL%%libexec/nut/upscode2
%%USB%%libexec/nut/usbhid-ups
%%SERIAL%%libexec/nut/victronups
-man/man3/libnutclient.3.gz
-man/man3/libnutclient_commands.3.gz
-man/man3/libnutclient_devices.3.gz
-man/man3/libnutclient_general.3.gz
-man/man3/libnutclient_misc.3.gz
-man/man3/libnutclient_tcp.3.gz
-man/man3/libnutclient_variables.3.gz
-man/man3/nutclient_authenticate.3.gz
-man/man3/nutclient_destroy.3.gz
-man/man3/nutclient_device_forced_shutdown.3.gz
-man/man3/nutclient_device_login.3.gz
-man/man3/nutclient_device_master.3.gz
-man/man3/nutclient_execute_device_command.3.gz
-man/man3/nutclient_get_device_command_description.3.gz
-man/man3/nutclient_get_device_commands.3.gz
-man/man3/nutclient_get_device_description.3.gz
-man/man3/nutclient_get_device_num_logins.3.gz
-man/man3/nutclient_get_device_rw_variables.3.gz
-man/man3/nutclient_get_device_variable_description.3.gz
-man/man3/nutclient_get_device_variable_values.3.gz
-man/man3/nutclient_get_device_variables.3.gz
-man/man3/nutclient_get_devices.3.gz
-man/man3/nutclient_has_device.3.gz
-man/man3/nutclient_has_device_command.3.gz
-man/man3/nutclient_has_device_variable.3.gz
-man/man3/nutclient_logout.3.gz
-man/man3/nutclient_set_device_variable_value.3.gz
-man/man3/nutclient_set_device_variable_values.3.gz
-man/man3/nutclient_tcp_create_client.3.gz
-man/man3/nutclient_tcp_disconnect.3.gz
-man/man3/nutclient_tcp_get_timeout.3.gz
-man/man3/nutclient_tcp_is_connected.3.gz
-man/man3/nutclient_tcp_reconnect.3.gz
-man/man3/nutclient_tcp_set_timeout.3.gz
-man/man3/nutscan.3.gz
-man/man3/nutscan_add_device_to_device.3.gz
-man/man3/nutscan_add_option_to_device.3.gz
-man/man3/nutscan_cidr_to_ip.3.gz
-man/man3/nutscan_display_parsable.3.gz
-man/man3/nutscan_display_ups_conf.3.gz
-man/man3/nutscan_free_device.3.gz
-man/man3/nutscan_get_serial_ports_list.3.gz
-man/man3/nutscan_init.3.gz
-man/man3/nutscan_new_device.3.gz
-man/man3/nutscan_scan_avahi.3.gz
-man/man3/nutscan_scan_eaton_serial.3.gz
-man/man3/nutscan_scan_ipmi.3.gz
-man/man3/nutscan_scan_nut.3.gz
-man/man3/nutscan_scan_snmp.3.gz
-man/man3/nutscan_scan_usb.3.gz
-man/man3/nutscan_scan_xml_http_range.3.gz
-man/man3/upscli_add_host_cert.3.gz
-man/man3/upscli_cleanup.3.gz
-man/man3/upscli_connect.3.gz
-man/man3/upscli_disconnect.3.gz
-man/man3/upscli_fd.3.gz
-man/man3/upscli_get.3.gz
-man/man3/upscli_init.3.gz
-man/man3/upscli_list_next.3.gz
-man/man3/upscli_list_start.3.gz
-man/man3/upscli_readline.3.gz
-man/man3/upscli_readline_timeout.3.gz
-man/man3/upscli_sendline.3.gz
-man/man3/upscli_sendline_timeout.3.gz
-man/man3/upscli_splitaddr.3.gz
-man/man3/upscli_splitname.3.gz
-man/man3/upscli_ssl.3.gz
-man/man3/upscli_strerror.3.gz
-man/man3/upscli_upserror.3.gz
-man/man3/upsclient.3.gz
-man/man5/nut.conf.5.gz
-man/man5/ups.conf.5.gz
-man/man5/upsd.conf.5.gz
-man/man5/upsd.users.5.gz
-man/man5/upsmon.conf.5.gz
-man/man5/upssched.conf.5.gz
-%%SERIAL%%man/man8/al175.8.gz
-%%SERIAL%%man/man8/apcupsd-ups.8.gz
-%%SERIAL%%man/man8/blazer_ser.8.gz
-%%USB%%man/man8/blazer_usb.8.gz
-%%NEON%%man/man8/netxml-ups.8.gz
-man/man8/nut-driver-enumerator.8.gz
-man/man8/nut-recorder.8.gz
-man/man8/nut-scanner.8.gz
-%%USB%%man/man8/nutdrv_atcl_usb.8.gz
-%%USB%%man/man8/nutdrv_qx.8.gz
-%%SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
-man/man8/nutupsdrv.8.gz
-%%SERIAL%%man/man8/riello_ser.8.gz
-%%USB%%man/man8/riello_usb.8.gz
-man/man8/upsc.8.gz
-man/man8/upscmd.8.gz
-man/man8/upsd.8.gz
-man/man8/upsdrvctl.8.gz
-man/man8/upsdrvsvcctl.8.gz
-man/man8/upslog.8.gz
-man/man8/upsmon.8.gz
-man/man8/upsrw.8.gz
-man/man8/upssched.8.gz
-%%CGI%%man/man5/hosts.conf.5.gz
-%%CGI%%man/man5/upsset.conf.5.gz
-%%CGI%%man/man5/upsstats.html.5.gz
-%%CGI%%man/man8/upsset.cgi.8.gz
-%%CGI%%man/man8/upsstats.cgi.8.gz
-%%CGI%%man/man8/upsimage.cgi.8.gz
-%%SERIAL%%man/man8/apcsmart.8.gz
-%%SERIAL%%man/man8/apcsmart-old.8.gz
-%%SERIAL%%man/man8/bestfortress.8.gz
-%%SERIAL%%man/man8/bcmxcp.8.gz
-%%SERIAL%%man/man8/belkin.8.gz
-%%SERIAL%%man/man8/belkinunv.8.gz
-%%SERIAL%%man/man8/bestuferrups.8.gz
-%%SERIAL%%man/man8/bestups.8.gz
-%%SERIAL%%man/man8/bestfcom.8.gz
-%%SERIAL%%man/man8/clone.8.gz
-%%SERIAL%%man/man8/dummy-ups.8.gz
-%%SERIAL%%man/man8/etapro.8.gz
-%%SERIAL%%man/man8/everups.8.gz
-%%SERIAL%%man/man8/gamatronic.8.gz
-%%SERIAL%%man/man8/genericups.8.gz
-%%SERIAL%%man/man8/isbmex.8.gz
-%%SERIAL%%man/man8/ivtscd.8.gz
-%%SERIAL%%man/man8/liebert.8.gz
-%%SERIAL%%man/man8/liebert-esp2.8.gz
-%%SERIAL%%man/man8/masterguard.8.gz
-%%SERIAL%%man/man8/metasys.8.gz
-%%SERIAL%%man/man8/mge-shut.8.gz
-%%SERIAL%%man/man8/mge-utalk.8.gz
-%%SERIAL%%man/man8/microdowell.8.gz
-%%SERIAL%%man/man8/microsol-apc.8.gz
-%%SERIAL%%man/man8/oneac.8.gz
-%%SERIAL%%man/man8/optiups.8.gz
-%%SERIAL%%man/man8/powercom.8.gz
-%%SERIAL%%man/man8/powerpanel.8.gz
-%%SERIAL%%man/man8/rhino.8.gz
-%%SERIAL%%man/man8/safenet.8.gz
-%%SERIAL%%man/man8/solis.8.gz
-%%SERIAL%%man/man8/tripplite.8.gz
-%%SERIAL%%man/man8/tripplitesu.8.gz
-%%SERIAL%%man/man8/upscode2.8.gz
-%%SERIAL%%man/man8/victronups.8.gz
-%%USB%%man/man8/bcmxcp_usb.8.gz
-%%USB%%man/man8/richcomm_usb.8.gz
-%%USB%%man/man8/tripplite_usb.8.gz
-%%USB%%man/man8/usbhid-ups.8.gz
-%%SNMP%%man/man8/snmp-ups.8.gz
-%%IPMIPSU%%man/man8/nut-ipmipsu.8.gz
-%%PDU%%man/man8/powerman-pdu.8.gz
+%%MANPAGES%%man/man3/libnutclient.3.gz
+%%MANPAGES%%man/man3/libnutclient_commands.3.gz
+%%MANPAGES%%man/man3/libnutclient_devices.3.gz
+%%MANPAGES%%man/man3/libnutclient_general.3.gz
+%%MANPAGES%%man/man3/libnutclient_misc.3.gz
+%%MANPAGES%%man/man3/libnutclient_tcp.3.gz
+%%MANPAGES%%man/man3/libnutclient_variables.3.gz
+%%MANPAGES%%man/man3/nutclient_authenticate.3.gz
+%%MANPAGES%%man/man3/nutclient_destroy.3.gz
+%%MANPAGES%%man/man3/nutclient_device_forced_shutdown.3.gz
+%%MANPAGES%%man/man3/nutclient_device_login.3.gz
+%%MANPAGES%%man/man3/nutclient_device_master.3.gz
+%%MANPAGES%%man/man3/nutclient_execute_device_command.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_command_description.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_commands.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_description.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_num_logins.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_rw_variables.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_variable_description.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_variable_values.3.gz
+%%MANPAGES%%man/man3/nutclient_get_device_variables.3.gz
+%%MANPAGES%%man/man3/nutclient_get_devices.3.gz
+%%MANPAGES%%man/man3/nutclient_has_device.3.gz
+%%MANPAGES%%man/man3/nutclient_has_device_command.3.gz
+%%MANPAGES%%man/man3/nutclient_has_device_variable.3.gz
+%%MANPAGES%%man/man3/nutclient_logout.3.gz
+%%MANPAGES%%man/man3/nutclient_set_device_variable_value.3.gz
+%%MANPAGES%%man/man3/nutclient_set_device_variable_values.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_create_client.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_disconnect.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_get_timeout.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_is_connected.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_reconnect.3.gz
+%%MANPAGES%%man/man3/nutclient_tcp_set_timeout.3.gz
+%%MANPAGES%%man/man3/nutscan.3.gz
+%%MANPAGES%%man/man3/nutscan_add_device_to_device.3.gz
+%%MANPAGES%%man/man3/nutscan_add_option_to_device.3.gz
+%%MANPAGES%%man/man3/nutscan_cidr_to_ip.3.gz
+%%MANPAGES%%man/man3/nutscan_display_parsable.3.gz
+%%MANPAGES%%man/man3/nutscan_display_ups_conf.3.gz
+%%MANPAGES%%man/man3/nutscan_free_device.3.gz
+%%MANPAGES%%man/man3/nutscan_get_serial_ports_list.3.gz
+%%MANPAGES%%man/man3/nutscan_init.3.gz
+%%MANPAGES%%man/man3/nutscan_new_device.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_avahi.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_eaton_serial.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_ipmi.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_nut.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_snmp.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_usb.3.gz
+%%MANPAGES%%man/man3/nutscan_scan_xml_http_range.3.gz
+%%MANPAGES%%man/man3/upscli_add_host_cert.3.gz
+%%MANPAGES%%man/man3/upscli_cleanup.3.gz
+%%MANPAGES%%man/man3/upscli_connect.3.gz
+%%MANPAGES%%man/man3/upscli_disconnect.3.gz
+%%MANPAGES%%man/man3/upscli_fd.3.gz
+%%MANPAGES%%man/man3/upscli_get.3.gz
+%%MANPAGES%%man/man3/upscli_init.3.gz
+%%MANPAGES%%man/man3/upscli_list_next.3.gz
+%%MANPAGES%%man/man3/upscli_list_start.3.gz
+%%MANPAGES%%man/man3/upscli_readline.3.gz
+%%MANPAGES%%man/man3/upscli_readline_timeout.3.gz
+%%MANPAGES%%man/man3/upscli_sendline.3.gz
+%%MANPAGES%%man/man3/upscli_sendline_timeout.3.gz
+%%MANPAGES%%man/man3/upscli_splitaddr.3.gz
+%%MANPAGES%%man/man3/upscli_splitname.3.gz
+%%MANPAGES%%man/man3/upscli_ssl.3.gz
+%%MANPAGES%%man/man3/upscli_strerror.3.gz
+%%MANPAGES%%man/man3/upscli_upserror.3.gz
+%%MANPAGES%%man/man3/upsclient.3.gz
+%%MANPAGES%%man/man5/nut.conf.5.gz
+%%MANPAGES%%man/man5/ups.conf.5.gz
+%%MANPAGES%%man/man5/upsd.conf.5.gz
+%%MANPAGES%%man/man5/upsd.users.5.gz
+%%MANPAGES%%man/man5/upsmon.conf.5.gz
+%%MANPAGES%%man/man5/upssched.conf.5.gz
+%%MANPAGES%%%%SERIAL%%man/man8/al175.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/apcupsd-ups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/blazer_ser.8.gz
+%%MANPAGES%%%%USB%%man/man8/blazer_usb.8.gz
+%%MANPAGES%%%%NEON%%man/man8/netxml-ups.8.gz
+%%MANPAGES%%man/man8/nut-driver-enumerator.8.gz
+%%MANPAGES%%man/man8/nut-recorder.8.gz
+%%MANPAGES%%man/man8/nut-scanner.8.gz
+%%MANPAGES%%%%USB%%man/man8/nutdrv_atcl_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/nutdrv_qx.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/nutdrv_siemens_sitop.8.gz
+%%MANPAGES%%man/man8/nutupsdrv.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/riello_ser.8.gz
+%%MANPAGES%%%%USB%%man/man8/riello_usb.8.gz
+%%MANPAGES%%man/man8/upsc.8.gz
+%%MANPAGES%%man/man8/upscmd.8.gz
+%%MANPAGES%%man/man8/upsd.8.gz
+%%MANPAGES%%man/man8/upsdrvctl.8.gz
+%%MANPAGES%%man/man8/upsdrvsvcctl.8.gz
+%%MANPAGES%%man/man8/upslog.8.gz
+%%MANPAGES%%man/man8/upsmon.8.gz
+%%MANPAGES%%man/man8/upsrw.8.gz
+%%MANPAGES%%man/man8/upssched.8.gz
+%%MANPAGES%%%%CGI%%man/man5/hosts.conf.5.gz
+%%MANPAGES%%%%CGI%%man/man5/upsset.conf.5.gz
+%%MANPAGES%%%%CGI%%man/man5/upsstats.html.5.gz
+%%MANPAGES%%%%CGI%%man/man8/upsset.cgi.8.gz
+%%MANPAGES%%%%CGI%%man/man8/upsstats.cgi.8.gz
+%%MANPAGES%%%%CGI%%man/man8/upsimage.cgi.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/apcsmart.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/apcsmart-old.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestfortress.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bcmxcp.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/belkin.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/belkinunv.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestuferrups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/bestfcom.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/clone.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/dummy-ups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/etapro.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/everups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/gamatronic.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/genericups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/isbmex.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/ivtscd.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/liebert.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/liebert-esp2.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/masterguard.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/metasys.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/mge-shut.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/mge-utalk.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/microdowell.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/microsol-apc.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/oneac.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/optiups.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/powercom.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/powerpanel.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/rhino.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/safenet.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/solis.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/tripplite.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/tripplitesu.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/upscode2.8.gz
+%%MANPAGES%%%%SERIAL%%man/man8/victronups.8.gz
+%%MANPAGES%%%%USB%%man/man8/bcmxcp_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/richcomm_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/tripplite_usb.8.gz
+%%MANPAGES%%%%USB%%man/man8/usbhid-ups.8.gz
+%%MANPAGES%%%%SNMP%%man/man8/snmp-ups.8.gz
+%%MANPAGES%%%%IPMIPSU%%man/man8/nut-ipmipsu.8.gz
+%%MANPAGES%%%%PDU%%man/man8/powerman-pdu.8.gz
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
--
2.35.2
From 64888efc4f2a96e5357b14be41ec2c7030155d4b Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 21:43:05 -0700
Subject: [PATCH 8/9] sysutils/nut*: Pet portlint
Adjust Makefile as suggested by portlint.
PR: 263751
---
sysutils/nut-devel/Makefile | 2 +-
sysutils/nut/Makefile | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index bbced16cca75..b6bd0978997d 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -23,8 +23,8 @@ NUT_COMMIT_DATE= 2022.04.27
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build
+USE_LDCONFIG= yes
NUT_USER?= uucp
NUT_GROUP?= uucp
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 7b9aaaebf21e..4ba9a55ed23d 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 2.8.0
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
COMMENT= Network UPS Tools
@@ -15,8 +14,8 @@ LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build
+USE_LDCONFIG= yes
NUT_USER?= uucp
NUT_GROUP?= uucp
--
2.35.2
From 5e3b7408b9553a5bde87327d0b965dfada420fbc Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 3 May 2022 21:47:27 -0700
Subject: [PATCH 9/9] sysutils/nut*: Register conflicts
sysutils/nut and sysutils/nut-devel conflict with each other.
---
sysutils/nut-devel/Makefile | 2 ++
sysutils/nut/Makefile | 2 ++
2 files changed, 4 insertions(+)
diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile
index b6bd0978997d..9bafcd1fd295 100644
--- a/sysutils/nut-devel/Makefile
+++ b/sysutils/nut-devel/Makefile
@@ -16,6 +16,8 @@ LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
+CONFLICTS= nut-[0-9]*
+
USE_GITHUB= yes
GH_ACCOUNT= networkupstools
GH_TAGNAME= 9cb8de681
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 4ba9a55ed23d..4bec09e14685 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -13,6 +13,8 @@ LICENSE= GPLv2+ GPLv3+ ART10 GPLv1+
LICENSE_COMB= multi
LICENSE_FILE= ${WRKSRC}/COPYING
+CONFLICTS= nut-devel-*
+
GNU_CONFIGURE= yes
USES= autoreconf:build compiler:c11 gmake libtool pkgconfig python:build
USE_LDCONFIG= yes
--
2.35.2