From owner-freebsd-ports@FreeBSD.ORG Tue Jul 1 18:22:01 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 D73031065684 for ; Tue, 1 Jul 2008 18:22:01 +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 8AD5A8FC0C for ; Tue, 1 Jul 2008 18:22:01 +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 1B6422C50D1C; Tue, 1 Jul 2008 21:22:00 +0300 (EEST) Date: Tue, 1 Jul 2008 21:21:52 +0300 From: Ion-Mihai Tetcu To: Stefan Lambrev Message-ID: <20080701212152.32075fef@it.buh.tecnik93.com> In-Reply-To: <486A20D1.4020501@moneybookers.com> References: <20080629195422.4d96e014@it.buh.tecnik93.com> <486A0939.3090107@moneybookers.com> <20080701141417.156aa1a3@it.buh.tecnik93.com> <486A20D1.4020501@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_/98GV.TOdN140SEB29VM+gyZ"; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: rofug@RoFUG.ro, 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 18:22:01 -0000 --Sig_/98GV.TOdN140SEB29VM+gyZ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 01 Jul 2008 15:19:29 +0300 Stefan Lambrev wrote: > Greetings Ion-Mihai, >=20 > Ion-Mihai Tetcu wrote: > > On Tue, 01 Jul 2008 13:38:49 +0300 > > Stefan Lambrev wrote: > > > > [ .. ] > > > > =20 > >> =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) > >> > >> Can you please send me tar of your port? May be the diff is broken? > >> =20 > > > > 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 > Removing the old patch fix the compilation problem. > The new version of apcups (usb) works fine with: ugen0: Power Conversion Back-UPS CS 500 FW:808.q7.I USB FW:q7, class 0/0, > rev 1.10/0.06, addr 2> on uhub0 > I hope to find time to test and with Smart-UPS 3000 RM (serial) and=20 > network too. >=20 I missed -N to cvs diff. The patch is no longer useful since it has been incorporated upstream. I uploaded the good patch: http://t32.tecnik93.com/FreeBSD/ports/apcupsd/port/apcupsd-3.14.3_2-to-3.14= .4.diff Thanks, --=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 --Sig_/98GV.TOdN140SEB29VM+gyZ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (FreeBSD) iEYEARECAAYFAkhqdccACgkQJ7GIuiH/oeXZFgCfbofiTW6ZketONk+I73YrHh37 joYAoLREHrx3KN4vRgo4YL+OpMpbc+5q =lT5f -----END PGP SIGNATURE----- --Sig_/98GV.TOdN140SEB29VM+gyZ--