Date: Tue, 8 Jul 2014 20:33:55 +0000 From: Steve Wills <swills@freebsd.org> To: Cy Schubert <cy@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r361279 - head/sysutils/nut Message-ID: <20140708203355.GB33736@mouf.net> In-Reply-To: <201407081948.s68JmYR8055169@svn.freebsd.org> References: <201407081948.s68JmYR8055169@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--MnLPg7ZWsaic7Fhd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, This seems to have an issue: https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default= /593/logs/errors/nut-2.7.2_3.log =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<phase= : check-sanity >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D> You must select one and only one option from the IPMI single *** Error code 1 Could you take a look? Thanks, Steve On Tue, Jul 08, 2014 at 07:48:34PM +0000, Cy Schubert wrote: > Author: cy > Date: Tue Jul 8 19:48:34 2014 > New Revision: 361279 > URL: http://svnweb.freebsd.org/changeset/ports/361279 > QAT: https://qat.redports.org/buildarchive/r361279/ >=20 > Log: > Add avahi, ipmi, and openssl options. >=20 > Modified: > head/sysutils/nut/Makefile > head/sysutils/nut/pkg-plist >=20 > Modified: head/sysutils/nut/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/nut/Makefile Tue Jul 8 19:00:02 2014 (r361278) > +++ head/sysutils/nut/Makefile Tue Jul 8 19:48:34 2014 (r361279) > @@ -3,7 +3,7 @@ > =20 > PORTNAME=3D nut > PORTVERSION=3D 2.7.2 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D sysutils > MASTER_SITES=3D http://www.networkupstools.org/source/${PORTVERSION:R}/ > DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig > @@ -15,7 +15,7 @@ COMMENT=3D Network UPS Tools > USE_AUTOTOOLS=3D autoconf > GNU_CONFIGURE=3D yes > USE_LDCONFIG=3D yes > -USES=3D gmake pkgconfig > +USES=3D gmake pkgconfig libtool > =20 > NUT_USER?=3D uucp > NUT_GROUP?=3D uucp > @@ -23,8 +23,10 @@ STATEDIR?=3D /var/db/nut > PLIST_SUB+=3D NUT_USER=3D${NUT_USER} > PLIST_SUB+=3D NUT_GROUP=3D${NUT_GROUP} > =20 > -OPTIONS_DEFINE=3D SERIAL USB SNMP NEON PDU CGI BASH > OPTIONS_DEFAULT=3DSERIAL USB SNMP NEON > +OPTIONS_DEFINE=3D ${OPTIONS_DEFAULT} PDU CGI BASH AVAHI OPENSSL > +OPTIONS_SINGLE=3D IPMI > +OPTIONS_SINGLE_IPMI=3D IPMI_OFF IPMIPSU FREEIPMI > =20 > SERIAL_DESC=3D SERIAL support > USB_DESC=3D USB support > @@ -33,6 +35,10 @@ NEON_DESC=3D NEON XML/HTTP support > PDU_DESC=3D Powerman PDU support > CGI_DESC=3D Web CGI interface > BASH_DESC=3D Bash Completion support > +AVAHI_DESC=3D Avahi support > +IPMI_OFF_DESC=3D No IPMI support > +FREEIPMI_DESC=3D freeipmi support > +IPMIPSU_DESC=3D Use nut-ipmipsu support (experimental) > =20 > USE_RC_SUBR=3D nut nut_upsmon nut_upslog > SUB_LIST+=3D STATEDIR=3D${STATEDIR} > @@ -123,6 +129,38 @@ PLIST_SUB+=3D BASH=3D"" > PLIST_SUB+=3D BASH=3D"@comment " > .endif > =20 > +.if ${PORT_OPTIONS:MAVAHI} > +BUILD_DEPENDS+=3D ${LOCALBASE}/include/avahi-ui/avahi-ui.h:${PORTSDIR}/n= et/avahi-header > +RUN_DEPENDS+=3D avahi-daemon:${PORTSDIR}/net/avaha-app > +CONFIGURE_ARGS+=3D --with-avahi > +.else > +CONFIGURE_ARGS+=3D --without-avahi > +.endif > + > +.if ${PORT_OPTIONS:MFREEIPMI} > +LIB_DEPENDS+=3D libfreeipmi.so:${PORTSDIR}/sysutils/freeipmi > +CONFIGURE_ARGS+=3D --with-freeipmi > +PLIST_SUB+=3D NUT_FREEIPMI=3D"" > +.else > +CONFIGURE_ARGS+=3D --without-freeipmi > +PLIST_SUB+=3D NUT_FREEIPMI=3D"@comment " > +.endif > + > +.if ${PORT_OPTIONS:MIPMIPSU} > +CONFIGURE_ARGS+=3D --with-ipmi > +PLIST_SUB+=3D NUT_IPMIPSU=3D"" > +.else > +CONFIGURE_ARGS+=3D --without-ipmi > +PLIST_SUB+=3D NUT_IPMIPSU=3D"@comment " > +.endif > + > +.if ${PORT_OPTIONS:MOPENSSL} > +USE_OPENSSL=3D yes > +CONFIGURE_ARGS+=3D --with-openssl > +.else > +CONFIGURE_ARGS+=3D --without-openssl --without-ssl > +.endif > + > pre-install: > @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut > =20 >=20 > Modified: head/sysutils/nut/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sysutils/nut/pkg-plist Tue Jul 8 19:00:02 2014 (r361278) > +++ head/sysutils/nut/pkg-plist Tue Jul 8 19:48:34 2014 (r361279) > @@ -35,13 +35,13 @@ include/nutscan-ip.h > include/parseconf.h > include/upsclient.h > lib/libnutclient.a > -lib/libnutclient.la > lib/libnutclient.so > lib/libnutclient.so.0 > +lib/libnutclient.so.0.0.0 > lib/libupsclient.a > -lib/libupsclient.la > lib/libupsclient.so > lib/libupsclient.so.4 > +lib/libupsclient.so.4.0.0 > libdata/pkgconfig/libnutclient.pc > libdata/pkgconfig/libnutscan.pc > libdata/pkgconfig/libupsclient.pc > @@ -83,6 +83,7 @@ libdata/pkgconfig/libupsclient.pc > %%NUT_SERIAL%%libexec/nut/oldmge-shut > %%NUT_SERIAL%%libexec/nut/oneac > %%NUT_SERIAL%%libexec/nut/optiups > +%%NUT_IPMIPSU%%libexec/nut/nut-ipmipsu > %%NUT_SERIAL%%libexec/nut/powercom > %%NUT_PDU%%libexec/nut/powerman-pdu > %%NUT_SERIAL%%libexec/nut/powerpanel > @@ -238,6 +239,7 @@ man/man8/upssched.8.gz > %%NUT_USB%%man/man8/usbhid-ups.8.gz > %%NUT_SNMP%%man/man8/snmp-ups.8.gz > %%NUT_NEON%%man/man8/netxml-ups.8.gz > +%%NUT_IPMIPSU%%man/man8/nut-ipmipsu.8.gz > %%NUT_PDU%%man/man8/powerman-pdu.8.gz > sbin/upsd > sbin/upsdrvctl --MnLPg7ZWsaic7Fhd Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJTvFWyAAoJEPXPYrMgexuhnBcH/jsmScV2C/nHjSF2qCe8D8kb RkGj2wxXpQC9PfWQslWy2xBgZTkCoRx4W5Q0/tB6XB8qiAw6VDYClQE8SOptS4J/ aNAY1Snc51O28NgOPD6QuH7vIGbawqFzOmdmK+Z/vjIdHa0myEx4qKh6cBF+44kq t1hkjWGL96T/vYSa4qrCL5JZr6mWS2bP737ln0FqtqXPxHvV9QcKTeGNdFAgN/Vq 9xi9flAfP2dPfX/XS/8h2gkCCDLGP7uWaPNC+LvnyU2vlaM5unJNYkzwnu4U1bfk 541KoUN0OYYsD1+zhyiVMedYXCDOUje6jzF8t40g/jWfbZ55eV+L8jBtBvVkXOY= =Mb1+ -----END PGP SIGNATURE----- --MnLPg7ZWsaic7Fhd--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140708203355.GB33736>