diff options
| author | wiz <wiz> | 2014-06-07 11:54:54 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-06-07 11:54:54 +0000 |
| commit | 1a906a68f73963516cb086106ad0698b652c9e89 (patch) | |
| tree | 24b0d969cb04d9359fb7de62b5439ce0cd4fc40f /print/cups | |
| parent | 55df1d25cb58e7e02852bd9caf7e76f81fadb9c4 (diff) | |
| download | pkgsrc-1a906a68f73963516cb086106ad0698b652c9e89.tar.gz | |
Fixes for usb and dnssd options, from Robert Swindells.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/PLIST | 4 | ||||
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/options.mk | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-scheduler_dirsvc.c | 34 |
4 files changed, 41 insertions, 4 deletions
diff --git a/print/cups/PLIST b/print/cups/PLIST index e2eec9808bf..10350ec55f3 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.41 2014/06/07 07:34:05 wiz Exp $ +@comment $NetBSD: PLIST,v 1.42 2014/06/07 11:54:54 wiz Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -891,7 +891,7 @@ share/cups/templates/subscription-canceled.tmpl 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 diff --git a/print/cups/distinfo b/print/cups/distinfo index 00851109e8c..90a7e0adce1 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.100 2014/06/07 07:34:05 wiz Exp $ +$NetBSD: distinfo,v 1.101 2014/06/07 11:54:54 wiz Exp $ SHA1 (cups-1.7.3-source.tar.bz2) = 8b967f64224eaa7f8e1241560dcf93a723c4b54a RMD160 (cups-1.7.3-source.tar.bz2) = ecc5803ffa2b78b04f617ef43819395410dc182b @@ -17,3 +17,4 @@ SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f130 SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448 SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4 +SHA1 (patch-scheduler_dirsvc.c) = a4967c2c5841a8b51c24becd5a0f796daa3c5be2 diff --git a/print/cups/options.mk b/print/cups/options.mk index aa73bd0543d..f4f1bd9ab87 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2012/10/08 12:47:23 marino Exp $ +# $NetBSD: options.mk,v 1.17 2014/06/07 11:54:54 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_OPTIONS_REQUIRED_GROUPS= pdftops @@ -55,11 +55,13 @@ CONFIGURE_ARGS+= --enable-gssapi 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 diff --git a/print/cups/patches/patch-scheduler_dirsvc.c b/print/cups/patches/patch-scheduler_dirsvc.c new file mode 100644 index 00000000000..e9d1b2a39ba --- /dev/null +++ b/print/cups/patches/patch-scheduler_dirsvc.c @@ -0,0 +1,34 @@ +$NetBSD: patch-scheduler_dirsvc.c,v 1.3 2014/06/07 11:54:54 wiz Exp $ + +--- 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 */ |