svn commit: r411335 - head/print/cups
Tijl Coosemans
tijl at FreeBSD.org
Fri Mar 18 09:48:05 UTC 2016
Author: tijl
Date: Fri Mar 18 09:48:04 2016
New Revision: 411335
URL: https://svnweb.freebsd.org/changeset/ports/411335
Log:
Support systems with WITHOUT_USB in /etc/src.conf.
Reported by: dweimer at dweimer.net
Modified:
head/print/cups/Makefile
head/print/cups/pkg-plist
Modified: head/print/cups/Makefile
==============================================================================
--- head/print/cups/Makefile Fri Mar 18 08:53:36 2016 (r411334)
+++ head/print/cups/Makefile Fri Mar 18 09:48:04 2016 (r411335)
@@ -78,6 +78,12 @@ PLIST_SUB+= OVERWRITE=""
PLIST_SUB+= OVERWRITE="@comment "
.endif
+.if exists(/usr/lib/libusb.so)
+PLIST_SUB+= USB=""
+.else
+PLIST_SUB+= USB="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if empty(ICONV_LIB)
Modified: head/print/cups/pkg-plist
==============================================================================
--- head/print/cups/pkg-plist Fri Mar 18 08:53:36 2016 (r411334)
+++ head/print/cups/pkg-plist Fri Mar 18 09:48:04 2016 (r411335)
@@ -68,7 +68,7 @@ libexec/cups/backend/ipps
libexec/cups/backend/lpd
libexec/cups/backend/snmp
libexec/cups/backend/socket
-libexec/cups/backend/usb
+%%USB%%libexec/cups/backend/usb
%%AVAHI%%libexec/cups/backend/dnssd
libexec/cups/cgi-bin/admin.cgi
libexec/cups/cgi-bin/classes.cgi
@@ -561,7 +561,7 @@ sbin/reject
%%DATADIR%%/templates/test-page.tmpl
%%DATADIR%%/templates/trailer.tmpl
%%DATADIR%%/templates/users.tmpl
-%%DATADIR%%/usb/org.cups.usb-quirks
+%%USB%%%%DATADIR%%/usb/org.cups.usb-quirks
%%DOCSDIR%%/apple-touch-icon.png
%%DOCSDIR%%/cups-printable.css
%%DOCSDIR%%/cups.css
More information about the svn-ports-head
mailing list