Date: Sun, 7 Mar 2010 10:45:37 +0200 From: Ion-Mihai Tetcu <itetcu@FreeBSD.org> To: Max Brazhnikov <makc@issp.ac.ru> Cc: freebsd-ports@freebsd.org Subject: Re: [CFT] sysutils/apcupsd update to 3.14.8 Message-ID: <20100307104537.688c31be@it.buh.tecnik93.com> In-Reply-To: <201003071134.51728.makc@issp.ac.ru> References: <20100306203826.4db78a39@it.buh.tecnik93.com> <201003071113.29794.makc@issp.ac.ru> <201003071134.51728.makc@issp.ac.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/kSWF8+9=0f.jpAUP5BUBHgj Content-Type: multipart/mixed; boundary="MP_/8EvY=vkMdq70P29X8XV7f0Y" --MP_/8EvY=vkMdq70P29X8XV7f0Y Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sun, 7 Mar 2010 11:34:51 +0300 Max Brazhnikov <makc@issp.ac.ru> wrote: > On Sat, 6 Mar 2010 20:38:26 +0200, Ion-Mihai Tetcu wrote: > > Attached diff updates apcupsd to the latest stable version. > > The change logs are here: > > http://apcupsd.cvs.sourceforge.net/viewvc/*checkout*/apcupsd/apcupsd/Re= le > > as eNotes?pathrev=3DRelease-3_14_8 > >=20 > > AFAIK this should fix all reported problems. > >=20 > > I'd be grateful if you could test it and report back successes or > > failures (I'm badly missing non-production UPSes to test on). >=20 > =3D=3D=3D> Applying FreeBSD patches for apcupsd-3.14.8 > No file to patch. Skipping... > 1 out of 1 hunks ignored--saving rejects to ./src/powerflute.c.rej > =3D> Patch patch-src__powerflute.c failed to apply cleanly. > =3D> Patch(es) patch-configure patch-src__apcaccess.c applied cleanly. > *** Error code 1 >=20 > Assuming the patch was staled I've removed it and compiled port. No > regression for me. Yes, powerflute has been disabled for some time, and now completely removed. I forgot to pass -N to cvs diff. Updated patch attached. Thanks for your report. --=20 IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" FreeBSD committer -> itetcu@FreeBSD.org, PGP Key ID 057E9F8B493A297B --MP_/8EvY=vkMdq70P29X8XV7f0Y Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=apcupsd_3.14.5_to_3.14.8.diff ? apcupsd_3.14.5_to_3.14.8.diff Index: 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 RCS file: /home/pcvs/ports/sysutils/apcupsd/Makefile,v retrieving revision 1.64 diff -u -r1.64 Makefile --- Makefile 22 Aug 2009 00:35:10 -0000 1.64 +++ Makefile 7 Mar 2010 08:43:11 -0000 @@ -6,8 +6,8 @@ # =20 PORTNAME=3D apcupsd -PORTVERSION=3D 3.14.5 -PORTREVISION=3D 1 +PORTVERSION=3D 3.14.8 +PORTREVISION=3D 0 CATEGORIES=3D sysutils MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}:src= _sf \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \ @@ -37,7 +37,8 @@ CFLAGS=3D"-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ LDFLAGS=3D"-L${LOCALBASE}/lib" =20 -MAN8=3D apcupsd.8 +MAN5=3D apcupsd.conf.5 +MAN8=3D apcaccess.8 apccontrol.8 apctest.8 apcupsd.8 =20 OPTIONS=3D APCSMART_DRV "Compile APC SmartUPS serial driver" on \ APCDUMB_DRV "Compile dumb UPS driver" on \ @@ -46,10 +47,10 @@ PCNET_DRV "Compile PowerChute Network Shutdown driver" on \ USB "Compile with USB Support driver" on \ SNMP_DRV "Compile with SNMP driver" on \ + SNMP_DRV_OLD "Compile with old SNMP driver" off \ TCP_WRAPPERS "Compile with TCP_WRAPPERS support" on\ TEST_DRV "Compile TEST driver" off \ GAPCMON "Build GTK GUI front-end" off -# POWERFLUTE "Compile powerflute program" off =20 PORTDOCS=3D ${PORTNAME}.pdf =20 @@ -96,26 +97,23 @@ CONFIGURE_ARGS+=3D --disable-pcnet .endif =20 -# disabled upstream -.ifdef(WITH_POWERFLUTE) -CONFIGURE_ARGS+=3D --enable-powerflute -CONFIGURE_ENV+=3D LIBS+=3D"-lcurses -lmenu" -PLIST_SUB+=3D POWERFL=3D"" -.else -PLIST_SUB+=3D POWERFL=3D"@comment " -.endif - .ifdef(WITH_USB) CONFIGURE_ARGS+=3D --enable-usb .endif =20 .ifdef(WITH_SNMP_DRV) -LIB_DEPENDS+=3D netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=3D --enable-snmp .else CONFIGURE_ARGS+=3D --disable-snmp .endif =20 +.ifdef(WITH_SNMP_DRV_OLD) +LIB_DEPENDS+=3D netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp +CONFIGURE_ARGS+=3D --enable-net-snmp +.else +CONFIGURE_ARGS+=3D --disable-net-snmp +.endif + .ifdef(WITH_TCP_WRAPPERS) CONFIGURE_ARGS+=3D --with-libwrap=3Dyes .endif @@ -145,12 +143,9 @@ @${FALSE} .endif =20 -post-configure: - @${REINPLACE_CMD} -e "s|%PREFIX%|${PREFIX}|g" ${WRKSRC}/doc/apcupsd.man - post-install: -# If the files presaved are identical with the new one, include then in -# the package list. So the port could be removed without problems +# If the files presaved are identical with the new one, include them in +# the package list, so the port can be removed without problems for na in apccontrol commfailure mainsback mastertimeout \ changeme commok masterconnect onbattery; do \ if [ -f ${ETCDIR}/$$na.orig ]; then \ Index: distinfo =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 RCS file: /home/pcvs/ports/sysutils/apcupsd/distinfo,v retrieving revision 1.26 diff -u -r1.26 distinfo --- distinfo 16 Feb 2009 22:56:48 -0000 1.26 +++ distinfo 7 Mar 2010 08:43:11 -0000 @@ -1,5 +1,5 @@ -MD5 (apcupsd-3.14.5.tar.gz) =3D 4ac73ec91d8ab56f3fac894e172567c4 -SHA256 (apcupsd-3.14.5.tar.gz) =3D f48a75139d5701d13444128da6f9f6feea04da8= 524e8ba3bce2c21bdbedba49e -SIZE (apcupsd-3.14.5.tar.gz) =3D 4172931 +MD5 (apcupsd-3.14.8.tar.gz) =3D cd17f0a903dc2220e55ed54e242359d2 +SHA256 (apcupsd-3.14.8.tar.gz) =3D 8e7f2574d3abaf6637da3e790860c3f9ba64fab= 1ec7e50bb080de4439441c5a7 +SIZE (apcupsd-3.14.8.tar.gz) =3D 1317601 MD5 (apcupsd.pdf) =3D IGNORE SHA256 (apcupsd.pdf) =3D IGNORE Index: 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 RCS file: /home/pcvs/ports/sysutils/apcupsd/pkg-plist,v retrieving revision 1.22 diff -u -r1.22 pkg-plist --- pkg-plist 10 Jul 2008 20:03:47 -0000 1.22 +++ pkg-plist 7 Mar 2010 08:43:11 -0000 @@ -2,7 +2,6 @@ sbin/apcaccess sbin/apctest sbin/smtp -%%POWERFL%%sbin/powerflute @unexec if cmp -s %D/%%ETCDIR%%/apcupsd.conf.sample %D/%%ETCDIR%%/apcupsd.= conf; then rm -f %D/%%ETCDIR%%/apcupsd.conf; fi %%ETCDIR%%/apcupsd.conf.sample %%ETCDIR%%/apccontrol Index: files/patch-src__powerflute.c =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 RCS file: files/patch-src__powerflute.c diff -N files/patch-src__powerflute.c --- files/patch-src__powerflute.c 10 Jul 2008 20:03:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- ./src/powerflute.c.orig 2008-01-27 18:22:57.000000000 +0200 -+++ ./src/powerflute.c 2008-06-29 14:16:28.000000000 +0300 -@@ -28,12 +28,12 @@ - #ifdef HAVE_POWERFLUTE -=20 - #ifdef HAVE_NCURSES_MENU_H --# include <ncurses/curses.h> -+# include <ncurses/ncurses.h> - # include <ncurses/panel.h> - # include <ncurses/menu.h> - #else - # ifdef HAVE_MENU_H --# include <curses.h> -+# include <ncurses.h> - # include <panel.h> - # include <menu.h> - # else --MP_/8EvY=vkMdq70P29X8XV7f0Y-- --Sig_/kSWF8+9=0f.jpAUP5BUBHgj Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkuTZ7cACgkQJ7GIuiH/oeVPSwCfQI2NOP0WkiG1P9Ub0TDE87w2 ykMAniSXCwu7SuHUWw9GXIARmnFXxrMg =0A8a -----END PGP SIGNATURE----- --Sig_/kSWF8+9=0f.jpAUP5BUBHgj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100307104537.688c31be>