diff options
-rw-r--r-- | sysutils/nut/Makefile | 25 | ||||
-rw-r--r-- | sysutils/nut/distinfo | 12 | ||||
-rw-r--r-- | sysutils/nut/pkg-plist | 8 | ||||
-rw-r--r-- | sysutils/nut22/Makefile | 25 | ||||
-rw-r--r-- | sysutils/nut22/distinfo | 12 | ||||
-rw-r--r-- | sysutils/nut22/pkg-plist | 8 |
6 files changed, 58 insertions, 32 deletions
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 3783c61bec61..6bd0e774c7fe 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 #PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -30,6 +30,7 @@ OPTIONS= SERIAL "SERIAL support" on \ USB "USB support" on \ SNMP "SNMP support" on \ NEON "NEON XML/HTTP support" on \ + PDU "Powerman PDU support" off \ HAL "HAL support" off \ IPV6 "IPV6 support" on \ DEVEL "Install header files" off \ @@ -43,7 +44,7 @@ MAN5= ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \ upssched.conf.5 MAN8= nutupsdrv.8 upsc.8 upscmd.8 upsd.8 upsdrvctl.8 \ - upslog.8 upsmon.8 upsrw.8 upssched.8 + upslog.8 upsmon.8 upsrw.8 upssched.8 blazer.8 PORTDOCS= * @@ -58,7 +59,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-altpidpath=${STATEDIR} \ --with-pidpath=${STATEDIR} \ --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \ - --with-linux-hiddev=no \ --with-user=${NUT_USER} \ --with-group=${NUT_GROUP} @@ -82,11 +82,11 @@ PLIST_SUB+= NUT_CGI="@comment " .if !defined(WITHOUT_SERIAL) CONFIGURE_ARGS+= --with-serial -MAN8+= al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \ - bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \ +MAN8+= apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \ + bestuferrups.8 bestups.8 bestfcom.8 cyberpower.8 \ dummy-ups.8 etapro.8 everups.8 gamatronic.8 genericups.8 \ isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \ - mge-shut.8 mge-utalk.8 nitram.8 nutupsdrv.8 oneac.8 optiups.8 \ + mge-shut.8 mge-utalk.8 oneac.8 optiups.8 \ powercom.8 powerpanel.8 rhino.8 safenet.8 solis.8 tripplite.8 \ tripplitesu.8 upscode2.8 victronups.8 PLIST_SUB+= NUT_SERIAL="" @@ -98,7 +98,8 @@ PLIST_SUB+= NUT_SERIAL="@comment " .if !defined(WITHOUT_USB) LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb CONFIGURE_ARGS+= --with-usb=auto -MAN8+= bcmxcp_usb.8 megatec_usb.8 tripplite_usb.8 usbhid-ups.8 +MAN8+= bcmxcp_usb.8 megatec_usb.8 richcomm_usb.8 tripplite_usb.8 \ + usbhid-ups.8 PLIST_SUB+= NUT_USB="" .else CONFIGURE_ARGS+= --without-usb @@ -129,6 +130,16 @@ CONFIGURE_ARGS+= --without-neonxml PLIST_SUB+= NUT_NEON="@comment " .endif +.if defined(WITH_PDU) +LIB_DEPENDS+= powerman.0:${PORTSDIR}/sysutils/powerman +CONFIGURE_ARGS+= --with-powerman +MAN8+= powerman-pdu.8 +PLIST_SUB+= NUT_PDU="" +.else +CONFIGURE_ARGS+= --without-powerman +PLIST_SUB+= NUT_PDU="@comment " +.endif + .if defined(WITH_HAL) . if defined(WITHOUT_USB) BROKEN= HAL is only usable with USB support enabled. Run 'make config' again! diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo index 430e505e1878..06e0504bac67 100644 --- a/sysutils/nut/distinfo +++ b/sysutils/nut/distinfo @@ -1,6 +1,6 @@ -MD5 (nut-2.2.2.tar.gz) = 677a84a83e9be7bc93610413ee696375 -SHA256 (nut-2.2.2.tar.gz) = 599d0024bcc116137a3eb65030d3dbc7132a64f30a7717f76a8254d8543422eb -SIZE (nut-2.2.2.tar.gz) = 1184406 -MD5 (nut-2.2.2.tar.gz.sig) = 2664e2b5bd2a7e7cd2939cb3f43d8e3d -SHA256 (nut-2.2.2.tar.gz.sig) = 17f420125e63368f127b6802aa60c3be6a99737276bf82163fc694c2d186fe22 -SIZE (nut-2.2.2.tar.gz.sig) = 65 +MD5 (nut-2.4.0.tar.gz) = f21a32382886214f1688fae6b426618b +SHA256 (nut-2.4.0.tar.gz) = 186bdce4c86dbaaa89ef265b6c20776675f67f80dbee7cc6d4eab32b01bd18d3 +SIZE (nut-2.4.0.tar.gz) = 1106716 +MD5 (nut-2.4.0.tar.gz.sig) = cff5b63529fc3f31a2324c8cd18038b0 +SHA256 (nut-2.4.0.tar.gz.sig) = a6fb5b41d045e6cb8c30fb0cdec243d085bb969a3adf621fc86d28a064def1ab +SIZE (nut-2.4.0.tar.gz.sig) = 72 diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index f18971be7baf..3e652c54350f 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -8,6 +8,7 @@ bin/upsrw bin/upssched-cmd etc/nut/cmdvartab etc/nut/driver.list +etc/nut/nut.conf.sample etc/nut/ups.conf.sample etc/nut/upsd.conf.sample etc/nut/upsd.users.sample @@ -22,7 +23,6 @@ lib/libupsclient.la %%NUT_HAL%%libexec/hald-addon-megatec_usb %%NUT_HAL%%libexec/hald-addon-tripplite_usb %%NUT_HAL%%libexec/hald-addon-usbhid-ups -%%NUT_SERIAL%%libexec/nut/al175 %%NUT_SERIAL%%libexec/nut/apcsmart %%NUT_SERIAL%%libexec/nut/bcmxcp %%NUT_USB%%libexec/nut/bcmxcp_usb @@ -31,7 +31,8 @@ lib/libupsclient.la %%NUT_SERIAL%%libexec/nut/bestfcom %%NUT_SERIAL%%libexec/nut/bestuferrups %%NUT_SERIAL%%libexec/nut/bestups -%%NUT_SERIAL%%libexec/nut/cpsups +%%NUT_SERIAL%%libexec/nut/blazer_ser +%%NUT_USB%%libexec/nut/blazer_usb %%NUT_SERIAL%%libexec/nut/cyberpower %%NUT_SERIAL%%libexec/nut/dummy-ups %%NUT_SERIAL%%libexec/nut/etapro @@ -48,12 +49,13 @@ lib/libupsclient.la %%NUT_SERIAL%%libexec/nut/mge-utalk %%NUT_NEON%%libexec/nut/netxml-ups %%NUT_SERIAL%%libexec/nut/newmge-shut -%%NUT_SERIAL%%libexec/nut/nitram %%NUT_SERIAL%%libexec/nut/oneac %%NUT_SERIAL%%libexec/nut/optiups %%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_SNMP%%libexec/nut/snmp-ups %%NUT_SERIAL%%libexec/nut/skel diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile index 3783c61bec61..6bd0e774c7fe 100644 --- a/sysutils/nut22/Makefile +++ b/sysutils/nut22/Makefile @@ -6,7 +6,7 @@ # PORTNAME= nut -PORTVERSION= 2.2.2 +PORTVERSION= 2.4.0 #PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ @@ -30,6 +30,7 @@ OPTIONS= SERIAL "SERIAL support" on \ USB "USB support" on \ SNMP "SNMP support" on \ NEON "NEON XML/HTTP support" on \ + PDU "Powerman PDU support" off \ HAL "HAL support" off \ IPV6 "IPV6 support" on \ DEVEL "Install header files" off \ @@ -43,7 +44,7 @@ MAN5= ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \ upssched.conf.5 MAN8= nutupsdrv.8 upsc.8 upscmd.8 upsd.8 upsdrvctl.8 \ - upslog.8 upsmon.8 upsrw.8 upssched.8 + upslog.8 upsmon.8 upsrw.8 upssched.8 blazer.8 PORTDOCS= * @@ -58,7 +59,6 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ --with-altpidpath=${STATEDIR} \ --with-pidpath=${STATEDIR} \ --with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \ - --with-linux-hiddev=no \ --with-user=${NUT_USER} \ --with-group=${NUT_GROUP} @@ -82,11 +82,11 @@ PLIST_SUB+= NUT_CGI="@comment " .if !defined(WITHOUT_SERIAL) CONFIGURE_ARGS+= --with-serial -MAN8+= al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \ - bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \ +MAN8+= apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \ + bestuferrups.8 bestups.8 bestfcom.8 cyberpower.8 \ dummy-ups.8 etapro.8 everups.8 gamatronic.8 genericups.8 \ isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \ - mge-shut.8 mge-utalk.8 nitram.8 nutupsdrv.8 oneac.8 optiups.8 \ + mge-shut.8 mge-utalk.8 oneac.8 optiups.8 \ powercom.8 powerpanel.8 rhino.8 safenet.8 solis.8 tripplite.8 \ tripplitesu.8 upscode2.8 victronups.8 PLIST_SUB+= NUT_SERIAL="" @@ -98,7 +98,8 @@ PLIST_SUB+= NUT_SERIAL="@comment " .if !defined(WITHOUT_USB) LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb CONFIGURE_ARGS+= --with-usb=auto -MAN8+= bcmxcp_usb.8 megatec_usb.8 tripplite_usb.8 usbhid-ups.8 +MAN8+= bcmxcp_usb.8 megatec_usb.8 richcomm_usb.8 tripplite_usb.8 \ + usbhid-ups.8 PLIST_SUB+= NUT_USB="" .else CONFIGURE_ARGS+= --without-usb @@ -129,6 +130,16 @@ CONFIGURE_ARGS+= --without-neonxml PLIST_SUB+= NUT_NEON="@comment " .endif +.if defined(WITH_PDU) +LIB_DEPENDS+= powerman.0:${PORTSDIR}/sysutils/powerman +CONFIGURE_ARGS+= --with-powerman +MAN8+= powerman-pdu.8 +PLIST_SUB+= NUT_PDU="" +.else +CONFIGURE_ARGS+= --without-powerman +PLIST_SUB+= NUT_PDU="@comment " +.endif + .if defined(WITH_HAL) . if defined(WITHOUT_USB) BROKEN= HAL is only usable with USB support enabled. Run 'make config' again! diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo index 430e505e1878..06e0504bac67 100644 --- a/sysutils/nut22/distinfo +++ b/sysutils/nut22/distinfo @@ -1,6 +1,6 @@ -MD5 (nut-2.2.2.tar.gz) = 677a84a83e9be7bc93610413ee696375 -SHA256 (nut-2.2.2.tar.gz) = 599d0024bcc116137a3eb65030d3dbc7132a64f30a7717f76a8254d8543422eb -SIZE (nut-2.2.2.tar.gz) = 1184406 -MD5 (nut-2.2.2.tar.gz.sig) = 2664e2b5bd2a7e7cd2939cb3f43d8e3d -SHA256 (nut-2.2.2.tar.gz.sig) = 17f420125e63368f127b6802aa60c3be6a99737276bf82163fc694c2d186fe22 -SIZE (nut-2.2.2.tar.gz.sig) = 65 +MD5 (nut-2.4.0.tar.gz) = f21a32382886214f1688fae6b426618b +SHA256 (nut-2.4.0.tar.gz) = 186bdce4c86dbaaa89ef265b6c20776675f67f80dbee7cc6d4eab32b01bd18d3 +SIZE (nut-2.4.0.tar.gz) = 1106716 +MD5 (nut-2.4.0.tar.gz.sig) = cff5b63529fc3f31a2324c8cd18038b0 +SHA256 (nut-2.4.0.tar.gz.sig) = a6fb5b41d045e6cb8c30fb0cdec243d085bb969a3adf621fc86d28a064def1ab +SIZE (nut-2.4.0.tar.gz.sig) = 72 diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist index f18971be7baf..3e652c54350f 100644 --- a/sysutils/nut22/pkg-plist +++ b/sysutils/nut22/pkg-plist @@ -8,6 +8,7 @@ bin/upsrw bin/upssched-cmd etc/nut/cmdvartab etc/nut/driver.list +etc/nut/nut.conf.sample etc/nut/ups.conf.sample etc/nut/upsd.conf.sample etc/nut/upsd.users.sample @@ -22,7 +23,6 @@ lib/libupsclient.la %%NUT_HAL%%libexec/hald-addon-megatec_usb %%NUT_HAL%%libexec/hald-addon-tripplite_usb %%NUT_HAL%%libexec/hald-addon-usbhid-ups -%%NUT_SERIAL%%libexec/nut/al175 %%NUT_SERIAL%%libexec/nut/apcsmart %%NUT_SERIAL%%libexec/nut/bcmxcp %%NUT_USB%%libexec/nut/bcmxcp_usb @@ -31,7 +31,8 @@ lib/libupsclient.la %%NUT_SERIAL%%libexec/nut/bestfcom %%NUT_SERIAL%%libexec/nut/bestuferrups %%NUT_SERIAL%%libexec/nut/bestups -%%NUT_SERIAL%%libexec/nut/cpsups +%%NUT_SERIAL%%libexec/nut/blazer_ser +%%NUT_USB%%libexec/nut/blazer_usb %%NUT_SERIAL%%libexec/nut/cyberpower %%NUT_SERIAL%%libexec/nut/dummy-ups %%NUT_SERIAL%%libexec/nut/etapro @@ -48,12 +49,13 @@ lib/libupsclient.la %%NUT_SERIAL%%libexec/nut/mge-utalk %%NUT_NEON%%libexec/nut/netxml-ups %%NUT_SERIAL%%libexec/nut/newmge-shut -%%NUT_SERIAL%%libexec/nut/nitram %%NUT_SERIAL%%libexec/nut/oneac %%NUT_SERIAL%%libexec/nut/optiups %%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_SNMP%%libexec/nut/snmp-ups %%NUT_SERIAL%%libexec/nut/skel |