> Your patch doesn't apply cleanly to cups-1.7.5, which is now in the
> tree:

It applies fine here. How did you patch the port?



> 
> root@poseidon:[cups]> make extract
> ===>  Checking files for cups-1.7.5-source
> `/usr/ports/distfiles/cups-1.7.5-source.tar.bz2' is up to date.
> >> (SHA256) cups-1.7.5-source.tar.bz2: OK
> ===> cups-1.7.5 depends on: avahi-* -> avahi-0.6.31p13
> ===> cups-1.7.5 depends on: libusb1-* -> libusb1-1.0.9p8
> ===> cups-1.7.5 depends on: bzip2-* -> bzip2-1.0.6p1
> ===> cups-1.7.5 depends on: gmake-* -> gmake-4.0p0
> ===> cups-1.7.5 depends on: autoconf-2.68 -> autoconf-2.68p0
> ===> cups-1.7.5 depends on: automake->=1.9,<1.10 -> automake-1.9.6p11
> ===> cups-1.7.5 depends on: metaauto-* -> metaauto-1.0p1
> ===>  Verifying specs:  avahi-client avahi-common crypto m pthread ssl stdc++ 
> z c cups cupscgi cupsimage cupsmime cupsppdc dbus-1 usb-1.0 avahi-client 
> avahi-common crypto m pthread ssl stdc++ z
> ===>  found avahi-client.0.0 avahi-common.0.0 crypto.30.0 m.9.0 pthread.18.0 
> ssl.27.0 stdc++.57.0 z.5.0 c.77.0 cups.6.1 cupscgi.1.0 cupsimage.5.0 
> cupsmime.1.0 cupsppdc.1.0 dbus-1.11.0 usb-1.0.1.0
> ===>  Extracting for cups-1.7.5-source
> root@poseidon:[cups]> make patch
> ===>  Patching for cups-1.7.5-source
> 1 out of 1 hunks failed--saving rejects to backend/usb-libusb.c.rej
> ***>   patch-backend_usb-libusb_c did not apply cleanly
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2687 
> '/usr/obj/ports/cups-1.7.5-source/.patch_done': @if cd 
> /usr/ports/mystuff/pr...)
> *** Error 2 in /usr/ports/mystuff/print/cups 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2488 'patch')
> 
> Maybe you were working on 1.7.4 (which is in the package tree)? Is there
> a quick way to revert the port tree to the older version (I'm not an
> expert CVS user...)?
> 
> Let me know
> 
> -- 
> Alessandro DE LAURENZIS
> [mailto:just22....@gmail.com]
> LinkedIn: http://it.linkedin.com/in/delaurenzis

-- 
Antoine

Reply via email to