diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-08-17 21:35:14 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-08-17 21:35:14 +0000 |
| commit | 754b95fb9544a8a0d9a63054a74ed1392cb2d462 (patch) | |
| tree | a851f285fd48cdb8ba81368a2877ebaf7739b976 /print | |
| parent | Add BJC250 driver. (diff) | |
Update the cups usb backend to cvs version. This gives the user the choice of
using /dev/ulptN or /dev/unlptN as is appropriate for the printer being set up.
Since this is significant, and necessary, new functionality, the PORTREVISION
is bumped.
Notes
Notes:
svn path=/head/; revision=64614
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups-base/Makefile | 2 | ||||
| -rw-r--r-- | print/cups-base/files/patch-backend-usb.c | 22 | ||||
| -rw-r--r-- | print/cups-base/files/patch-backend-usb.c-1.1.16 | 55 |
3 files changed, 56 insertions, 23 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 6db3a1ecac59..30c62d10b201 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= cups-base PORTVERSION= ${CUPS_PORTVER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= print MAINTAINER= jah4007@cs.rit.edu diff --git a/print/cups-base/files/patch-backend-usb.c b/print/cups-base/files/patch-backend-usb.c deleted file mode 100644 index 2acdfa389eeb..000000000000 --- a/print/cups-base/files/patch-backend-usb.c +++ /dev/null @@ -1,22 +0,0 @@ ---- backend/usb.c.orig Thu May 16 09:44:50 2002 -+++ backend/usb.c Thu Aug 8 11:37:20 2002 -@@ -433,18 +433,7 @@ - #elif defined(__sun) - #elif defined(__hpux) - #elif defined(__osf) --#elif defined(__FreeBSD__) -- int i; /* Looping var */ -- char device[255]; /* Device filename */ -- -- -- for (i = 0; i < 3; i ++) -- { -- sprintf(device, "/dev/unlpt%d", i); -- if (!access(device, 0)) -- printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1); -- } --#elif defined(__NetBSD__) || defined(__OpenBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - int i; /* Looping var */ - char device[255]; /* Device filename */ - diff --git a/print/cups-base/files/patch-backend-usb.c-1.1.16 b/print/cups-base/files/patch-backend-usb.c-1.1.16 new file mode 100644 index 000000000000..a4c618fb2f98 --- /dev/null +++ b/print/cups-base/files/patch-backend-usb.c-1.1.16 @@ -0,0 +1,55 @@ +--- backend/usb.c.orig Thu May 16 09:44:50 2002 ++++ backend/usb.c Sat Aug 17 17:21:33 2002 +@@ -1,5 +1,5 @@ + /* +- * "$Id: usb.c,v 1.30 2002/05/16 13:44:50 mike Exp $" ++ * "$Id: usb.c,v 1.32 2002/08/09 00:19:20 mike Exp $" + * + * USB port backend for the Common UNIX Printing System (CUPS). + * +@@ -431,34 +431,37 @@ + } + #elif defined(__sgi) + #elif defined(__sun) +-#elif defined(__hpux) +-#elif defined(__osf) +-#elif defined(__FreeBSD__) + int i; /* Looping var */ + char device[255]; /* Device filename */ + + +- for (i = 0; i < 3; i ++) ++ for (i = 0; i < 8; i ++) + { +- sprintf(device, "/dev/unlpt%d", i); ++ sprintf(device, "/dev/usb/printer%d", i); + if (!access(device, 0)) + printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1); + } +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#elif defined(__hpux) ++#elif defined(__osf) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + int i; /* Looping var */ + char device[255]; /* Device filename */ + + +- for (i = 0; i < 3; i ++) ++ for (i = 0; i < 8; i ++) + { + sprintf(device, "/dev/ulpt%d", i); + if (!access(device, 0)) + printf("direct usb:%s \"Unknown\" \"USB Printer #%d\"\n", device, i + 1); ++ ++ sprintf(device, "/dev/unlpt%d", i); ++ if (!access(device, 0)) ++ printf("direct usb:%s \"Unknown\" \"USB Printer #%d\" (no reset)\n", device, i + 1); + } + #endif + } + + + /* +- * End of "$Id: usb.c,v 1.30 2002/05/16 13:44:50 mike Exp $". ++ * End of "$Id: usb.c,v 1.32 2002/08/09 00:19:20 mike Exp $". + */ |