From owner-svn-ports-head@freebsd.org  Fri Mar 18 09:48:05 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F449AD48DF;
 Fri, 18 Mar 2016 09:48:05 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 21CFB1247;
 Fri, 18 Mar 2016 09:48:05 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2I9m4rg078198;
 Fri, 18 Mar 2016 09:48:04 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2I9m4Rf078196;
 Fri, 18 Mar 2016 09:48:04 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201603180948.u2I9m4Rf078196@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Fri, 18 Mar 2016 09:48:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411335 - head/print/cups
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2016 09:48:05 -0000

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@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