summaryrefslogtreecommitdiff
path: root/print/cups
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2007-04-02 12:11:01 +0000
committergdt <gdt@pkgsrc.org>2007-04-02 12:11:01 +0000
commit117d156cb168f19cb7cef74a6008ea7bac4d39c5 (patch)
tree7475b3473595899d5290ffce4f856333799dd2f8 /print/cups
parent883648963d9e4484b82e56a3db9282e6c51dd2c8 (diff)
downloadpkgsrc-117d156cb168f19cb7cef74a6008ea7bac4d39c5.tar.gz
Add patch to disable the use of the back channel for USB on NetBSD.
This is based on a suggestion by Yorick Hardy, who reports that it improved behavior. Without the patch, the cups usb driver tries to read status from ulpt(4) (for most printers), and this results in no output.
Diffstat (limited to 'print/cups')
-rw-r--r--print/cups/Makefile3
-rw-r--r--print/cups/distinfo3
-rw-r--r--print/cups/patches/patch-au16
3 files changed, 20 insertions, 2 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 2e6fda8db7e..443d552b633 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2007/03/22 12:44:22 markd Exp $
+# $NetBSD: Makefile,v 1.121 2007/04/02 12:11:01 gdt Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -6,6 +6,7 @@
DISTNAME= cups-${DIST_VERS}-source
PKGNAME= cups-${VERS}
+PKGREVISION= 1
BASE_VERS= 1.2.10
DIST_VERS= ${BASE_VERS}
VERS= ${DIST_VERS:S/-/./g}
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 6c7ef6d32b2..42a1415df22 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2007/03/22 12:44:22 markd Exp $
+$NetBSD: distinfo,v 1.49 2007/04/02 12:11:01 gdt Exp $
SHA1 (cups-1.2.10-source.tar.bz2) = 241d7a3c52370fb08ed2ffc3fd8f59673d158299
RMD160 (cups-1.2.10-source.tar.bz2) = 85b3bbd46a6fc097891c571ffad8e5e46693743f
@@ -11,3 +11,4 @@ SHA1 (patch-ae) = 161bcbbbe4c065c44177082e675119a9d7c11374
SHA1 (patch-an) = 4c5271b0f4a262e782e3de8396870498125675bd
SHA1 (patch-ao) = 5cb88810f316ffad2a004d13e65b70108c8234b2
SHA1 (patch-at) = eea32b989402c353f5f1644348c1042a3d4ddfa1
+SHA1 (patch-au) = 25470b105653f22138f67571d201c0470b163a63
diff --git a/print/cups/patches/patch-au b/print/cups/patches/patch-au
new file mode 100644
index 00000000000..b30aab44f60
--- /dev/null
+++ b/print/cups/patches/patch-au
@@ -0,0 +1,16 @@
+$NetBSD: patch-au,v 1.6 2007/04/02 12:11:01 gdt Exp $
+
+--- backend/usb-unix.c.orig 2007-02-20 08:41:07.000000000 -0500
++++ backend/usb-unix.c
+@@ -90,6 +90,11 @@ print_device(const char *uri, /* I - De
+ strcasecmp(hostname, "Konica Minolta") &&
+ strcasecmp(hostname, "Minolta");
+
++#ifdef __NetBSD__
++ /* XXX Use configure test to see if reading from ulpt(4) works. */
++ use_bc = 0;
++#endif
++
+ if ((device_fd = open_device(uri, &use_bc)) == -1)
+ {
+ if (getenv("CLASS") != NULL)