print/cups

[Robert Swindells]

I needed the following extra patch and diffs to get cups to build
with the libusb and dnssd options disabled.

Robert Swindells

---- patches/patch-scheduler_dirsvc.c
$NetBSD$

--- scheduler/dirsvc.c.orig 2014-03-05 21:11:32.000000000 +0000
+++ scheduler/dirsvc.c
@@ -237,11 +237,13 @@ cupsdStartBrowsing(void)
if (BrowseLocalProtocols & BROWSE_SMB)
update_smb(1);

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
/*
* Register the individual printers
*/

dnssdRegisterAllPrinters(0);
+#endif
}


@@ -255,6 +257,7 @@ cupsdStopBrowsing(void)
if (!Browsing || !BrowseLocalProtocols)
return;

+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
/*
* De-register the individual printers
*/
@@ -265,7 +268,6 @@ cupsdStopBrowsing(void)
* Shut down browsing sockets...
*/

-#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDMaster)
dnssdStop();
#endif /* HAVE_DNSSD || HAVE_AVAHI */
-------

Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/PLIST,v
retrieving revision 1.41
diff -u -r1.41 PLIST
--- PLIST 7 Jun 2014 07:34:05 -0000 1.41
+++ PLIST 7 Jun 2014 11:08:46 -0000
@@ -891,7 +891,7 @@
share/cups/templates/test-page.tmpl
share/cups/templates/trailer.tmpl
share/cups/templates/users.tmpl
-share/cups/usb/org.cups.usb-quirks
+${PLIST.libusb}share/cups/usb/org.cups.usb-quirks
share/doc/cups/LICENSE.txt
share/doc/cups/README.txt
share/doc/cups/ca/index.html
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/distinfo,v
retrieving revision 1.100
diff -u -r1.100 distinfo
--- distinfo 7 Jun 2014 07:34:05 -0000 1.100
+++ distinfo 7 Jun 2014 11:08:46 -0000
@@ -17,3 +17,4 @@
SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa
SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448
SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4
+SHA1 (patch-scheduler_dirsvc.c) = 07ee610726e345a78a4e8d6ee48487b859ca33e8
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups/options.mk,v
retrieving revision 1.16
diff -u -r1.16 options.mk
--- options.mk 8 Oct 2012 12:47:23 -0000 1.16
+++ options.mk 7 Jun 2014 11:08:46 -0000
@@ -55,11 +55,13 @@
CONFIGURE_ARGS+= --disable-gssapi
.endif

+PLIST_VARS+= libusb
.if !empty(PKG_OPTIONS:Mlibusb)
.include "../../devel/libusb1/buildlink3.mk"
CONFIGURE_ARGS+= --enable-libusb
MESSAGE_SRC+= ${PKGDIR}/MESSAGE.libusb
USE_TOOLS+= pkg-config
+PLIST.libusb= yes
.else
CONFIGURE_ARGS+= --disable-libusb
.endif

[Thomas Klausner]

Post by Robert Swindells
I needed the following extra patch and diffs to get cups to build
with the libusb and dnssd options disabled.

Committed, thanks. Can you please send the patch upstream?

Thanks,
Thomas