On Sunday 06 Dec 2009 12:00:23 freebsd-ports-requ...@freebsd.org wrote: > On Sunday 06 Dec 2009 00:00:03 freebsd-ports-requ...@freebsd.org wrote: > > > An option WITH_LIBUSB was added to the cups-base/Makefile. That's > > > probably what Dirk meant. > > > > > > Thanks for the explanation, Gary. I have it set with make config > > but just hardcoded it into the Makefile and am recompiling but I > > doubt it will change but there is still hope. ;) > > The attached patch works on 8.0-RELEASE for me, restoring the > non-libusb functionality. Leave the libusb option disabled and just > compile as normal.
The attached couple of patches fix this port in all cases, tested with tinderbox. Since libusb is in base for FBSD>8 it needs handling differently. Note well that if you use libusb, you need to NOT attach the ulpt* driver to the device, i.e. remove ulpt from your kernel or don't load it at boot. Also fixed is the CUPS_OVERWRITE_BASE case deinstall, restoring the correct permissions to lp and friends. -- Matt Dawson MTD15-RIPE m...@chronos.org.uk
--- ./ports/print/cups-base/Makefile.orig 2009-12-06 11:02:46.000000000 +0000
+++ ./ports/print/cups-base/Makefile 2009-12-06 12:21:21.000000000 +0000
@@ -173,8 +173,13 @@
RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils
.endif
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LIBUSB)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LIBUSB) && ${OSVERSION}>800000
+CPPFLAGS+= -I/usr/include
+LDFLAGS+= -L/usr/lib
+.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LIBUSB) && ${OSVERSION}<799999
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
+.else
+CONFIGURE_ARGS+= --disable-libusb
.endif
.if defined(CUPS_CLIENT)
--- ./ports/print/cups-base/pkg-plist.orig 2009-12-06 12:23:00.000000000 +0000 +++ ./ports/print/cups-base/pkg-plist 2009-12-06 12:24:18.000000000 +0000 @@ -20,6 +20,11 @@ %%overwrit...@exec if test -e /usr/bin/lpr; then chmod -h 0 /usr/bin/lpr; fi %%overwrit...@exec if test -e /usr/bin/lprm; then chmod -h 0 /usr/bin/lprm; fi %%overwrit...@exec if test -e /usr/sbin/lpc; then chmod -h 0 /usr/sbin/lpc; fi +%%overwrit...@unexec if test -e /usr/bin/lp; then chmod -h 0555 /usr/bin/lp; fi +%%overwrit...@unexec if test -e /usr/bin/lpq; then chmod -h 06555 /usr/bin/lpq; fi +%%overwrit...@unexec if test -e /usr/bin/lpr; then chmod -h 06555 /usr/bin/lpr; fi +%%overwrit...@unexec if test -e /usr/bin/lprm; then chmod -h 06555 /usr/bin/lprm; fi +%%overwrit...@unexec if test -e /usr/sbin/lpc; then chmod -h 02555 /usr/sbin/lpc; fi @unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi etc/cups/cupsd.conf.N @exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi
signature.asc
Description: This is a digitally signed message part.
