From owner-freebsd-ports@FreeBSD.ORG Tue Jul 1 11:14:27 2008 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 801AA1065671 for ; Tue, 1 Jul 2008 11:14:27 +0000 (UTC) (envelope-from itetcu@FreeBSD.org) Received: from it.buh.tecnik93.com (it.buh.tecnik93.com [81.196.204.98]) by mx1.freebsd.org (Postfix) with ESMTP id ED80B8FC17 for ; Tue, 1 Jul 2008 11:14:26 +0000 (UTC) (envelope-from itetcu@FreeBSD.org) Received: from it.buh.tecnik93.com (localhost [127.0.0.1]) by it.buh.tecnik93.com (Postfix) with ESMTP id 637D72C50D02; Tue, 1 Jul 2008 14:14:25 +0300 (EEST) Date: Tue, 1 Jul 2008 14:14:17 +0300 From: Ion-Mihai Tetcu To: Stefan Lambrev Message-ID: <20080701141417.156aa1a3@it.buh.tecnik93.com> In-Reply-To: <486A0939.3090107@moneybookers.com> References: <20080629195422.4d96e014@it.buh.tecnik93.com> <486A0939.3090107@moneybookers.com> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.10; i386-portbld-freebsd7.0) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/F_3rZeQ598HJNd_T7cVkTM="; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: freebsd-ports@freebsd.org Subject: Re: please test sysutlis/apcupsd update X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jul 2008 11:14:27 -0000 --Sig_/F_3rZeQ598HJNd_T7cVkTM= Content-Type: multipart/mixed; boundary="MP_/gwfN2wRJa8Lh9dpX1/16K1P" --MP_/gwfN2wRJa8Lh9dpX1/16K1P Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Tue, 01 Jul 2008 13:38:49 +0300 Stefan Lambrev wrote: [ .. ] > =3D=3D=3D> Patching for apcupsd-3.14.4 > =3D=3D=3D> Applying FreeBSD patches for apcupsd-3.14.4 > Ignoring previously applied (or reversed) patch. > 3 out of 3 hunks ignored--saving rejects to=20 > ./src/drivers/usb/bsd/bsd-usb.c.rej > =3D> Patch patch-src__drivers__usb__bsd__bsd-usb.c failed to apply > cleanly. ** Command failed [exit code 1]: /usr/bin/script -qa=20 > /tmp/portupgrade.54579.0 env UPGRADE_TOOL=3Dportupgrade=20 > UPGRADE_PORT=3Dapcupsd-3.14.3_1 UPGRADE_PORT_VER=3D3.14.3_1 make > ** Fix the problem and try again. > ** Listing the failed packages (-:ignored / *:skipped / !:failed) > ! sysutils/apcupsd (apcupsd-3.14.3_1) (patch error) >=20 > Can you please send me tar of your port? May be the diff is broken? That file was removed as it was integrated upstream; I did diff -u instead of diff -uN. Thanks for catching this. Try the one attached or just rm the file. --=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_/gwfN2wRJa8Lh9dpX1/16K1P Content-Type: text/x-patch; name=apcupsd.diff Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=apcupsd.diff ? apcupsd.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.57 diff -u -r1.57 Makefile --- Makefile 6 Jun 2008 14:33:39 -0000 1.57 +++ Makefile 1 Jul 2008 11:11:09 -0000 @@ -6,8 +6,7 @@ # =20 PORTNAME=3D apcupsd -PORTVERSION=3D 3.14.3 -PORTREVISION=3D 2 +PORTVERSION=3D 3.14.4 CATEGORIES=3D sysutils MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE:S/$/:src_sf/g} \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \ @@ -22,12 +21,11 @@ MAINTAINER=3D itetcu@FreeBSD.org COMMENT=3D Set of programs for controlling APC UPS =20 -BUILD_DEPENDS=3D makedepend:${PORTSDIR}/devel/makedepend - USE_RC_SUBR=3D apcupsd SUB_FILES=3D pkg-message =20 GNU_CONFIGURE=3D yes +USE_GMAKE=3D yes CONFIGURE_ARGS=3D --sbindir=3D${PREFIX}/sbin \ --with-nologin=3D/var/run \ --disable-install-distdir \ @@ -44,18 +42,17 @@ APCDUMB_DRV "Compile dumb UPS driver" on \ CLIENT_ONLY "Only NIS client (no network server or drivers)" off \ CGI "Compile with CGI programms to show status" off \ - NLS "Enable Native Language Support" off \ PCNET_DRV "Compile PowerChute Network Shutdown driver" on \ - POWERFLUTE "Compile powerflute program" on \ USB "Compile with USB Support driver" on \ SNMP_DRV "Compile with SNMP driver" on \ TCP_WRAPPERS "Compile with TCP_WRAPPERS support" on\ TEST_DRV "Compile TEST driver" off \ -# GAPCMON "Build GTK GUI front-end" off + GAPCMON "Build GTK GUI front-end" off +# POWERFLUTE "Compile powerflute program" off =20 PORTDOCS=3D ${PORTNAME}.pdf =20 -.include +.include =20 .ifdef(WITH_APCSMART_DRV) CONFIGURE_ARGS+=3D --enable-apcsmart @@ -83,16 +80,12 @@ PLIST_SUB+=3D CGI=3D"@comment " .endif =20 -#.ifdef(WITH_GAPCMON) -#CONFIGURE_ARGS+=3D --enable-gapcmon -#.endif - -.ifndef(WITHOUT_NLS) -USE_GETTEXT=3D yes -CONFIGURE_ARGS+=3D --enable-nls -PLIST_SUB+=3D NLS=3D"" +.ifdef(WITH_GAPCMON) +CONFIGURE_ARGS+=3D --enable-gapcmon +USE_GNOME+=3D gconf2 +PLIST_SUB+=3D GAPCMON=3D"" .else -PLIST_SUB+=3D NLS=3D"@comment " +PLIST_SUB+=3D GAPCMON=3D"@comment " .endif =20 .ifdef(WITH_PCNET_DRV) @@ -101,6 +94,7 @@ CONFIGURE_ARGS+=3D --disable-pcnet .endif =20 +# disabled upstream .ifdef(WITH_POWERFLUTE) CONFIGURE_ARGS+=3D --enable-powerflute CONFIGURE_ENV+=3D LIBS+=3D"-lcurses -lmenu" @@ -132,6 +126,8 @@ #CONFIGURE_ENV+=3D LIBS=3D"-lcurses -lmenu" #PLIST_SUB+=3D POWERFL=3D"" =20 +.include + pre-configure: .if defined(WITH_CLIENT_ONLY) && ( defined(WITH_APCSMART_DRV) || \ defined(WITH_APCDUMB_DRV) || defined(WITH_PCNET_DRV) || \ @@ -171,7 +167,7 @@ done .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - cd ${DISTDIR} && ${INSTALL_DATA} ${PORTNAME}.pdf ${DOCSDIR} + ${INSTALL_DATA} ${DISTDIR}/${PORTNAME}.pdf ${DOCSDIR} .endif @${CAT} ${PKGMESSAGE} =20 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.22 diff -u -r1.22 distinfo --- distinfo 31 Mar 2008 17:21:57 -0000 1.22 +++ distinfo 1 Jul 2008 11:11:09 -0000 @@ -1,6 +1,6 @@ -MD5 (apcupsd-3.14.3.tar.gz) =3D a212351d21828e9344264614c7ad8ba1 -SHA256 (apcupsd-3.14.3.tar.gz) =3D 01b8f4219ff91044600afd78842ac93cb40f034= cf00cd25144fe918db80eed88 -SIZE (apcupsd-3.14.3.tar.gz) =3D 4350109 +MD5 (apcupsd-3.14.4.tar.gz) =3D 78811129db1a882b9a2b9afd540470b3 +SHA256 (apcupsd-3.14.4.tar.gz) =3D c76f0967f665474c774a77f5f3a99bf1f24505b= e24418fca76bb1dbd0a925596 +SIZE (apcupsd-3.14.4.tar.gz) =3D 4196027 MD5 (apcupsd.pdf) =3D d81946b0b2c2e8cc651fb217e521f4bf SHA256 (apcupsd.pdf) =3D 3fde7947a45bf65572c1c84dfd6df6ca9f9ce24e559c50cf3= e5e53172ab17c97 SIZE (apcupsd.pdf) =3D 1074251 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.21 diff -u -r1.21 pkg-plist --- pkg-plist 21 Oct 2007 10:39:38 -0000 1.21 +++ pkg-plist 1 Jul 2008 11:11:09 -0000 @@ -22,4 +22,13 @@ %%CGI%%%%ETCDIR%%/cgi/upsimage.cgi %%CGI%%%%ETCDIR%%/cgi/upsstats.cgi %%CGI%%@dirrm %%ETCDIR%%/cgi +%%GAPCMON%%bin/gapcmon +%%GAPCMON%%share/applications/gapcmon.desktop +%%GAPCMON%%share/pixmaps/apcupsd.png +%%GAPCMON%%share/pixmaps/charging.png +%%GAPCMON%%share/pixmaps/gapc_prefs.png +%%GAPCMON%%share/pixmaps/onbatt.png +%%GAPCMON%%share/pixmaps/online.png +%%GAPCMON%%share/pixmaps/unplugged.png +%%GAPCMON%%@dirrmtry share/applications @dirrmtry %%ETCDIR%% Index: files/patch-src__apcaccess.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: /home/pcvs/ports/sysutils/apcupsd/files/patch-src__apcaccess.c,v retrieving revision 1.1 diff -u -r1.1 patch-src__apcaccess.c --- files/patch-src__apcaccess.c 31 Mar 2008 17:21:57 -0000 1.1 +++ files/patch-src__apcaccess.c 1 Jul 2008 11:11:09 -0000 @@ -1,6 +1,6 @@ ---- src/apcaccess.c.orig 2007-08-03 18:17:38.000000000 +0300 -+++ src/apcaccess.c 2008-02-27 09:30:39.352400647 +0200 -@@ -62,11 +62,19 @@ +--- ./src/apcaccess.c.orig 2008-01-27 18:22:58.000000000 +0200 ++++ ./src/apcaccess.c 2008-06-29 14:17:12.000000000 +0300 +@@ -68,11 +68,19 @@ int main(int argc, char **argv) { int mode =3D 0; @@ -20,7 +20,7 @@ if (argc < 2) { /* Assume user wants "status" */ mode =3D 2; -@@ -87,6 +95,20 @@ +@@ -94,8 +102,23 @@ *p++ =3D 0; port =3D atoi(p); } @@ -40,9 +40,12 @@ + } } =20 ++ if (!*host || strcmp(host, "0.0.0.0") =3D=3D 0) -@@ -101,5 +123,7 @@ - Error_abort0(_("Strange mode\n")); + host =3D "localhost"; +=20 +@@ -108,5 +131,7 @@ + return 1; } =20 + detach_ups(ups); Index: files/patch-src__drivers__usb__bsd__bsd-usb.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__drivers__usb__bsd__bsd-usb.c diff -N files/patch-src__drivers__usb__bsd__bsd-usb.c --- files/patch-src__drivers__usb__bsd__bsd-usb.c 31 Mar 2008 17:21:57 -000= 0 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ ---- ./src/drivers/usb/bsd/bsd-usb.c.orig 2007-10-27 20:15:14.000000000 +03= 00 -+++ ./src/drivers/usb/bsd/bsd-usb.c 2008-03-29 20:21:50.000000000 +0200 -@@ -351,9 +351,9 @@ -=20 - int pusb_ups_get_capabilities(UPSINFO *ups, const struct s_known_info *kn= own_info) - { -- int i, rc, ci, phys; -+ int i, ci, phys, input, feature; - USB_DATA *my_data =3D (USB_DATA *)ups->driver_internal_data; -- hid_item_t item; -+ hid_item_t item, witem; - USB_INFO *info; -=20 - write_lock(ups); -@@ -506,7 +506,7 @@ -=20 - // Store a (possibly truncated) copy of the floating point value in= the - // integer field as well. -- val.iValue =3D val.dValue; -+ val.iValue =3D (int) val.dValue; -=20 - Dmsg4(200, "Def val=3D%d exp=3D%d dVal=3D%f ci=3D%d\n", info->value, - exponent, val.dValue, info->ci); -@@ -775,7 +775,7 @@ - return true; - } -=20 --int pusb_write_int_to_ups(UPSINFO *ups, int ci, int value, char *name) -+int pusb_write_int_to_ups(UPSINFO *ups, int ci, int value, const char *na= me) - { - USB_DATA *my_data =3D (USB_DATA *)ups->driver_internal_data; - USB_INFO *info; 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: /home/pcvs/ports/sysutils/apcupsd/files/patch-src__powerflute.c,v retrieving revision 1.1 diff -u -r1.1 patch-src__powerflute.c --- files/patch-src__powerflute.c 5 Apr 2008 13:42:04 -0000 1.1 +++ files/patch-src__powerflute.c 1 Jul 2008 11:11:09 -0000 @@ -1,5 +1,5 @@ ---- ./src/powerflute.c.orig 2008-04-05 15:12:15.000000000 +0300 -+++ ./src/powerflute.c 2008-04-05 15:12:29.000000000 +0300 +--- ./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 --MP_/gwfN2wRJa8Lh9dpX1/16K1P-- --Sig_/F_3rZeQ598HJNd_T7cVkTM= Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) iEYEARECAAYFAkhqEZAACgkQJ7GIuiH/oeUvUgCfRWf/3FGtCxFPl/38CnJhyvdK wiUAnik1oSc5b0oCzd9OGIn/APmNHHa9 =IPVT -----END PGP SIGNATURE----- --Sig_/F_3rZeQ598HJNd_T7cVkTM=--