cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- split the netxml-ups driver into a separate package (nut-xml),

Browse Source 
as was already done with the snmp-ups driver, to reduce dependencies
for the common case

- rewrite the various DESCR files
This commit is contained in:
sthen 2011-03-09 23:32:20 +00:00
parent 180dff3a0d
commit 750233cdf7
7 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sysutils/nut/Makefile
View File

@ -1,15 +1,19 @@
# $OpenBSD: Makefile,v 1.44 2011/03/09 12:55:04 sthen Exp $
# $OpenBSD: Makefile,v 1.45 2011/03/09 23:32:20 sthen Exp $
COMMENT-main= UPS monitoring program supporting many brands
COMMENT-cgi= CGIs for monitoring Nut-based UPSs
COMMENT-snmp= driver for monitoring UPSs via SNMP
COMMENT-snmp= driver for monitoring UPS via SNMP
COMMENT-xml= driver for monitoring UPS via XML/HTTP
DISTNAME= nut-2.6.0
REVISION-main= 0
REVISION-main= 1
REVISION-snmp= 0
REVISION-cgi= 0
PKGNAME-main= ${DISTNAME}
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}
PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}
PKGNAME-xml= ${DISTNAME:S/-/-xml-/}
CATEGORIES= sysutils
HOMEPAGE= http://www.networkupstools.org/
@ -24,10 +28,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB-main += ${WANTLIB} c crypto expat m ssl z asn1 gssapi krb5 neon usb
WANTLIB-cgi += ${WANTLIB} c crypto X11 Xau Xdmcp c crypto expat fontconfig
COMMON = c crypto
WANTLIB-main += ${COMMON} m ssl usb
WANTLIB-xml += ${COMMON} ${WANTLIB} asn1 expat gssapi krb5 neon ssl z
WANTLIB-cgi += ${COMMON} ${WANTLIB} X11 Xau Xdmcp expat fontconfig
WANTLIB-cgi += freetype gd jpeg m png pthread-stubs ssl upsclient xcb z
WANTLIB-snmp += c crypto netsnmp
WANTLIB-snmp += ${COMMON} netsnmp
MASTER_SITES= ${HOMEPAGE}source/2.6/
@ -40,7 +46,7 @@ WEB_ROOT= /var/www
NUT_USER= _ups
NUT_ID= 529
SUBST_VARS= WEB_ROOT NUT_USER NUT_ID
USE_GROFF = Yes
USE_GROFF= Yes
CONFIGURE_STYLE= gnu old
CONFIGURE_ARGS+= A2X=${LOCALBASE}/bin/a2x.py \
@ -53,36 +59,46 @@ CONFIGURE_ARGS+= A2X=${LOCALBASE}/bin/a2x.py \
--with-user=${NUT_USER} \
--with-group=${NUT_USER}
PSEUDO_FLAVORS= no_snmp
PSEUDO_FLAVORS= no_snmp no_xml
FLAVOR?=
MULTI_PACKAGES= -main -cgi
.if ${FLAVOR:L:Mno_snmp}
CONFIGURE_ARGS+= --without-snmp
.else
MULTI_PACKAGES+= -snmp
.endif
.if ${FLAVOR:L:Mno_xml}
CONFIGURE_ARGS+= --without-neon
.else
MULTI_PACKAGES+= -xml
.endif
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
devel/libusb \
net/neon
devel/libusb
RUN_DEPENDS-main= # empty
PREFIX-cgi= ${WEB_ROOT}
LIB_DEPENDS-xml= net/neon
RUN_DEPENDS-xml= ${RUN_DEPENDS} \
sysutils/nut
LIB_DEPENDS-snmp= net/net-snmp
RUN_DEPENDS-snmp= sysutils/nut,-main
RUN_DEPENDS-snmp= sysutils/nut
LIB_DEPENDS-cgi= ${LIB_DEPENDS} \
graphics/jpeg \
graphics/gd \
sysutils/nut,-main
RUN_DEPENDS-cgi= # empty
sysutils/nut
.if ${MULTI_PACKAGES:M-cgi}
BUILD_DEPENDS+= graphics/gd>=1.8.3
CONFIGURE_ARGS+= --with-cgi \
--with-cgipath="${WEB_ROOT}/cgi-bin/nut" \
--with-gd-libs="-L/usr/X11R6/lib -L${PREFIX}/lib \
--with-gd-libs="-L${X11BASE}/lib -L${PREFIX}/lib \
-lgd -lpng -lz -ljpeg -lm -lfreetype -lX11" \
--with-gd-includes="-I${PREFIX}/include"
.endif
@ -100,10 +116,10 @@ post-install:
${INSTALL_DATA_DIR} ${WRKINST}${WEB_ROOT}/conf/nut/
.for file in hosts.conf upsset.conf upsstats.html upsstats-single.html
${INSTALL_DATA} ${WRKBUILD}/conf/${file}.sample \
${WRKINST}${WEB_ROOT}/conf/nut/${file}.sample
${WRKINST}${WEB_ROOT}/conf/nut/
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nut/
cd ${WRKSRC}/docs; cp -R ../[A-LN-Z]* ../MAINTAINERS \
*html cables images ${PREFIX}/share/doc/nut/
.endfor
.include <bsd.port.mk>

6
sysutils/nut/pkg/DESCR-cgi
View File

@ -1,7 +1,7 @@
A set of CGI scripts that can query a Nut based UPS and display information
and statistics on a web page.
These CGI scripts can connect to NUT to query UPS information and
statistics and display them on a web page.
By default the Nut CGIs are designed to work within OpenBSD's chrooted
By default these scripts are designed to work within OpenBSD's chrooted
Apache webserver. If you disable the chroot feature you can use Apache's
SetEnv directive to override the configuration file location by setting
the NUT_CGICONFPATH environment variable.

30
sysutils/nut/pkg/DESCR-main
View File

@ -1,9 +1,21 @@
Network UPS Tools is a suite of programs that can be used to monitor
the status of an Uninterruptible Power Supply. Nut tries to support
"every kind of UPS with sufficient interest behind it." Most decent
UPSs have a serial port for access to status information. The primary
use of Nut is to notify the machine in the event of a power failure so
that scripts may be run to properly shutdown your machine. Nut also
has a network communications layer that allows other machines to
coordinate shutdowns with the machine that is physically attached to
the UPS.
Network UPS Tools is a collection of programs which provide a common
interface for monitoring and administering Uninterruptible Power
Supply (UPS), Power Distribution Unit (PDU), and Solar Controller
Device (SCD) hardware. It uses a layered approach to connect all
of the parts.
Drivers are provided for a wide assortment of equipment. They
understand the specific language of each device and map it back to
a compatibility layer. This means both an expensive high end UPS,
a simple "power strip" PDU, or any other power device can be handled
transparently with a uniform management interface.
This information is cached by the network server upsd, which then
answers queries from the clients. upsd contains a number of access
control features to limit the abilities of the clients. Only
authorized hosts may monitor or control your hardware if you wish.
Since the notion of monitoring over the network is built into the
software, you can hang many systems off one large UPS, and they
will all shut down together. You can also use NUT to power on, off
or cycle your data center nodes, individually or globally through
PDU outlets.

14
sysutils/nut/pkg/DESCR-snmp
View File

@ -1,11 +1,3 @@
Experimental driver for monitoring UPSs via SNMP. Supports a wide
range of devices by loading various MIBS, including:
ietf: UPS that is RFC 1628 (UPS MIB) compliant, ie MGE
UPS SYSTEMS, Liebert, perhaps others (default)
mge: MGE UPS SYSTEMS devices with SNMP cards (ref 66062,
66045, 66074 and 66244)
apcc: APC AP9606 APC Web/SNMP management card, perhaps
others
This NUT driver allows you to monitor UPS devices via SNMP. It automatically
detects and supports a wide range of devices by loading various MIBS, including
various Eaton, MGE, APC, Liebert, Powerware and other devices.

12
sysutils/nut/pkg/DESCR-xml Normal file
View File

@ -0,0 +1,12 @@
This NUT driver provides support for recent Eaton / MGE models which use
a Network Management Card or Proxy (MGE XML/HTTP protocol based), e.g.
o NMC Minislot (Ref 66102, firmware EA or newer),
o SNMP/Web Minislot card (Ref 66244)
o NMC Transverse (Ref 66074),
o NMC & Modbus/JBus (Ref 66103),
o Network Management Proxy,
o ePDU Monitored (newer version).
Older models, such as SNMP card (Ref 66062 and Ref 66045), use the SNMP
protocol and should use snmp-ups(8) from the nut-snmp package.

4
sysutils/nut/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2011/03/09 11:00:55 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.9 2011/03/09 23:32:20 sthen Exp $
@conflict upsd-*
@pkgpath sysutils/nut
@pkgpath sysutils/nut,no_cgi
@ -34,7 +34,6 @@
@bin bin/mge-shut
@bin bin/mge-utalk
@bin bin/microdowell
@bin bin/netxml-ups
@bin bin/newmge-shut
@bin bin/oneac
@bin bin/optiups
@ -99,7 +98,6 @@ lib/pkgconfig/
@man man/man8/mge-shut.8
@man man/man8/mge-utalk.8
@man man/man8/microdowell.8
@man man/man8/netxml-ups.8
@man man/man8/nutupsdrv.8
@man man/man8/oneac.8
@man man/man8/optiups.8

4
sysutils/nut/pkg/PLIST-xml Normal file
View File

@ -0,0 +1,4 @@
@comment $OpenBSD: PLIST-xml,v 1.1 2011/03/09 23:32:20 sthen Exp $
@conflict nut-<2.6.0p1
@bin bin/netxml-ups
@man man/man8/netxml-ups.8