On Tue, 01 Jul 2008 15:19:29 +0300 Stefan Lambrev <[EMAIL PROTECTED]> wrote:
> Greetings Ion-Mihai, > > Ion-Mihai Tetcu wrote: > > On Tue, 01 Jul 2008 13:38:49 +0300 > > Stefan Lambrev <[EMAIL PROTECTED]> wrote: > > > > [ .. ] > > > > > >> ===> Patching for apcupsd-3.14.4 > >> ===> Applying FreeBSD patches for apcupsd-3.14.4 > >> Ignoring previously applied (or reversed) patch. > >> 3 out of 3 hunks ignored--saving rejects to > >> ./src/drivers/usb/bsd/bsd-usb.c.rej > >> => Patch patch-src__drivers__usb__bsd__bsd-usb.c failed to apply > >> cleanly. ** Command failed [exit code 1]: /usr/bin/script -qa > >> /tmp/portupgrade.54579.0 env UPGRADE_TOOL=portupgrade > >> UPGRADE_PORT=apcupsd-3.14.3_1 UPGRADE_PORT_VER=3.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? > >> > > > > 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. > > > > > > > Removing the old patch fix the compilation problem. > The new version of apcups (usb) works fine with: ugen0: <American > 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 > network too. > 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, -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" FreeBSD committer -> [EMAIL PROTECTED], PGP Key ID 057E9F8B493A297B
signature.asc
Description: PGP signature
