aboutsummaryrefslogtreecommitdiffstats
path: root/print/cups-base
diff options
context:
space:
mode:
Diffstat (limited to 'print/cups-base')
-rw-r--r--print/cups-base/Makefile7
-rw-r--r--print/cups-base/pkg-message4
-rw-r--r--print/cups-base/pkg-plist5
3 files changed, 15 insertions, 1 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 7be17a2cec90..df3a67c70d38 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -173,8 +173,13 @@ CONFIGURE_ARGS+= --disable-dbus
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}>800062
+CPPFLAGS+= -I/usr/include
+LDFLAGS+= -L/usr/lib
+.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LIBUSB) && ${OSVERSION}<800063
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
+.else
+CONFIGURE_ARGS+= --disable-libusb
.endif
.if defined(CUPS_CLIENT)
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index f38b15740d09..92281a53bbec 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -24,4 +24,8 @@ To enable printing under Gimp and MS-Windows clients do the following:
1) Uncomment application/octet-stream line in mime.types
2) Uncomment application/octet-stream line in mime.convs
3) Restart cupsd
+
+If you are using libusb, it is important that no device driver, e.g.
+ulpt(4) is attached to the device you wish to use. In this case please
+ensure the cups user and group has read/write access to /dev/ugen*
======================================================================
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index f57ed35bd193..c0d618851008 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -20,6 +20,11 @@
%%OVERWRITE%%@exec if test -e /usr/bin/lpr; then chmod -h 0 /usr/bin/lpr; fi
%%OVERWRITE%%@exec if test -e /usr/bin/lprm; then chmod -h 0 /usr/bin/lprm; fi
%%OVERWRITE%%@exec if test -e /usr/sbin/lpc; then chmod -h 0 /usr/sbin/lpc; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lp; then chmod -h 0555 /usr/bin/lp; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lpq; then chmod -h 06555 /usr/bin/lpq; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lpr; then chmod -h 06555 /usr/bin/lpr; fi
+%%OVERWRITE%%@unexec if test -e /usr/bin/lprm; then chmod -h 06555 /usr/bin/lprm; fi
+%%OVERWRITE%%@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