The usb-backend-both-usblp-and-libusb.dpatch does not make an allowance for

"--disable-libusb", fix that!

Bump PKGREVISION.

4 files changed, 33 insertions, 117 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index a883a45df6e..3e7573bd73f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2010/06/05 23:03:15 sbd Exp $
+# $NetBSD: Makefile,v 1.164 2010/06/09 09:01:43 sbd 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:
@@ -8,7 +8,7 @@ DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${DIST_VERS:S/-/./g}
 BASE_VERS=	1.4.3
 DIST_VERS=	${BASE_VERS}
-PKGREVISION=	2
+PKGREVISION=	3
 
 CATEGORIES=	print
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 766381459a9..e91345617dc 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.71 2010/06/05 23:03:15 sbd Exp $
+$NetBSD: distinfo,v 1.72 2010/06/09 09:01:43 sbd Exp $
 
 SHA1 (cups-1.4.3-source.tar.bz2) = 0dd9e3d709614d26cce77728b9263556c94c9559
 RMD160 (cups-1.4.3-source.tar.bz2) = 6c5ab282405d6a1132163c727583f3a572307d88
@@ -13,9 +13,9 @@ SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
 SHA1 (patch-ah) = 763220bdbc01c9ab323c62b7bc601a3082bd03e2
 SHA1 (patch-ai) = fae5b2b5e54ea947d92c89c0bdcdd86c7e3bad12
 SHA1 (patch-aj) = 471a2738bd7bd6a00596dbeb120084ac37840b31
-SHA1 (patch-ak) = 25b923d85e34d42f41d9d7747c22e1a452b9bf4e
+SHA1 (patch-ak) = 0e8acff2df0034b741ef49093aca773174abb96b
 SHA1 (patch-al) = b5dd793efed46fc950f08bfbd5fb92180ba3be77
-SHA1 (patch-am) = e719b1f2666ee843a7f834aa37db61e88bcbdbf7
+SHA1 (patch-am) = b2cc09ac01e45c96247558667f875fd4a95b125f
 SHA1 (patch-an) = 231c871e31db279e8aeafba71506f93330e0a971
 SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7
 SHA1 (patch-ap) = 70c5fa4a19ca2812818844180ca9db9cb7cfd601
diff --git a/print/cups/patches/patch-ak b/print/cups/patches/patch-ak
index 0b9966db857..f327e275de9 100644
--- a/print/cups/patches/patch-ak
+++ b/print/cups/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.13 2010/06/05 23:09:29 sbd Exp $
+$NetBSD: patch-ak,v 1.14 2010/06/09 09:01:43 sbd Exp $
 
 Incorporate
 usb-backend-both-usblp-and-libusb.dpatch by  <till.kamppeter@gmail.com>
 http://www.cups.org/str.php?L3357
 
---- backend/usb-hybrid.c.orig	2010-06-05 02:02:53.089601743 +0000
+--- backend/usb-hybrid.c.orig	2010-06-06 00:29:57.033597544 +0000
 +++ backend/usb-hybrid.c
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,88 @@
 +/*
 + * "Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike "
 + *
@@ -41,6 +41,7 @@ http://www.cups.org/str.php?L3357
 + * Include the two USB implementations used under Linux ...
 + */
 +
++#define USB_HYBRID 1
 +#include "usb-libusb.c"
 +#include "usb-unix.c"
 +
diff --git a/print/cups/patches/patch-am b/print/cups/patches/patch-am
index 3ab3f71d9db..0c83df1326a 100644
--- a/print/cups/patches/patch-am
+++ b/print/cups/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.9 2010/06/05 23:09:29 sbd Exp $
+$NetBSD: patch-am,v 1.10 2010/06/09 09:01:43 sbd Exp $
 
 Incorporate
 usb-backend-both-usblp-and-libusb.dpatch by  <till.kamppeter@gmail.com>
@@ -6,54 +6,22 @@ http://www.cups.org/str.php?L3357
 
 --- backend/usb-unix.c.orig	2009-12-08 02:13:42.000000000 +0000
 +++ backend/usb-unix.c
-@@ -18,10 +18,10 @@
-  *
-  * Contents:
-  *
-- *   print_device() - Print a file to a USB device.
-- *   list_devices() - List all USB devices.
-- *   open_device()  - Open a USB device...
-- *   side_cb()      - Handle side-channel requests...
-+ *   print_device_unix() - Print a file to a USB device.
-+ *   list_devices_unix() - List all USB devices.
-+ *   open_device_unix()  - Open a USB device...
-+ *   side_cb_unix()      - Handle side-channel requests...
-  */
- 
- /*
-@@ -35,17 +35,17 @@
-  * Local functions...
-  */
- 
--static int	open_device(const char *uri, int *use_bc);
--static int	side_cb(int print_fd, int device_fd, int snmp_fd,
-+static int	open_device_unix(const char *uri, int *use_bc);
-+static int	side_cb_unix(int print_fd, int device_fd, int snmp_fd,
- 		        http_addr_t *addr, int use_bc);
- 
+@@ -26,4 +26,14 @@
  
  /*
-- * 'print_device()' - Print a file to a USB device.
-+ * 'print_device_unix()' - Print a file to a USB device.
++ *   If USB_HYBRID is define append "_unix" to functions.
++ */
++#ifdef USB_HYBRID
++# define print_device	print_device_unix
++# define list_devices	list_devices_unix
++# define open_device	open_device_unix
++# define side_cb	side_cb_unix
++#endif
++
++/*
+  * Include necessary headers.
   */
- 
- int					/* O - Exit status */
--print_device(const char *uri,		/* I - Device URI */
-+print_device_unix(const char *uri,		/* I - Device URI */
-              const char *hostname,	/* I - Hostname/manufacturer */
-              const char *resource,	/* I - Resource/modelname */
- 	     char       *options,	/* I - Device options/serial number */
-@@ -102,7 +102,7 @@ print_device(const char *uri,		/* I - De
-              strncasecmp(hostname, "Minolta", 7);
- #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
- 
--    if ((device_fd = open_device(uri, &use_bc)) == -1)
-+    if ((device_fd = open_device_unix(uri, &use_bc)) == -1)
-     {
-       if (getenv("CLASS") != NULL)
-       {
-@@ -132,6 +132,10 @@ print_device(const char *uri,		/* I - De
- 	              _("INFO: Printer busy; will retry in 10 seconds...\n"));
+@@ -133,4 +143,8 @@ print_device(const char *uri,		/* I - De
  	sleep(10);
        }
 +#ifdef HAVE_USB_H
@@ -62,54 +30,13 @@ http://www.cups.org/str.php?L3357
 +#else
        else if (errno == ENXIO || errno == EIO || errno == ENOENT ||
                 errno == ENODEV)
-       {
-@@ -147,6 +151,7 @@ print_device(const char *uri,		/* I - De
- 			resource, strerror(errno));
+@@ -148,4 +162,5 @@ print_device(const char *uri,		/* I - De
  	return (CUPS_BACKEND_FAILED);
        }
 +#endif
      }
    }
-   while (device_fd < 0);
-@@ -190,7 +195,7 @@ print_device(const char *uri,		/* I - De
-     tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL);
- 
- #else
--    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb);
-+    tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb_unix);
- #endif /* __sun */
- 
-     if (print_fd != 0 && tbytes >= 0)
-@@ -214,11 +219,11 @@ print_device(const char *uri,		/* I - De
- 
- 
- /*
-- * 'list_devices()' - List all USB devices.
-+ * 'list_devices_unix()' - List all USB devices.
-  */
- 
- void
--list_devices(void)
-+list_devices_unix(void)
- {
- #ifdef __linux
-   int	i;				/* Looping var */
-@@ -320,11 +325,11 @@ list_devices(void)
- 
- 
- /*
-- * 'open_device()' - Open a USB device...
-+ * 'open_device_unix()' - Open a USB device...
-  */
- 
- static int				/* O - File descriptor or -1 on error */
--open_device(const char *uri,		/* I - Device URI */
-+open_device_unix(const char *uri,		/* I - Device URI */
-             int        *use_bc)		/* O - Set to 0 for unidirectional */
- {
-   int	fd;				/* File descriptor */
-@@ -357,9 +362,12 @@ open_device(const char *uri,		/* I - Dev
-     char	device[255],		/* Device filename */
+@@ -358,6 +373,8 @@ open_device(const char *uri,		/* I - Dev
  		device_id[1024],	/* Device ID string */
  		make_model[1024],	/* Make and model */
 -		device_uri[1024];	/* Device URI string */
@@ -119,12 +46,8 @@ http://www.cups.org/str.php?L3357
 +		*str1,
 +		*str2;
  
-+    
     /*
-     * Find the correct USB device...
-     */
-@@ -407,7 +415,55 @@ open_device(const char *uri,		/* I - Dev
- 	  device_uri[0] = '\0';
+@@ -408,5 +425,53 @@ open_device(const char *uri,		/* I - Dev
          }
  
 -        if (!strcmp(uri, device_uri))
@@ -179,9 +102,7 @@ http://www.cups.org/str.php?L3357
 +        if (!strcmp(requested_uri, device_uri))
  	{
  	 /*
- 	  * Yes, return this file descriptor...
-@@ -433,10 +489,14 @@ open_device(const char *uri,		/* I - Dev
-       */
+@@ -434,8 +499,12 @@ open_device(const char *uri,		/* I - Dev
  
        if (busy)
 +      {
@@ -195,18 +116,12 @@ http://www.cups.org/str.php?L3357
 +	return -1;
      }
    }
- #elif defined(__sun) && defined(ECPPIOC_GETDEVID)
-@@ -557,11 +617,11 @@ open_device(const char *uri,		/* I - Dev
+@@ -626,4 +695,8 @@ side_cb(int         print_fd,		/* I - Pr
+ }
  
++#undef print_device
++#undef list_devices
++#undef open_device
++#undef side_cb
  
  /*
-- * 'side_cb()' - Handle side-channel requests...
-+ * 'side_cb_unix()' - Handle side-channel requests...
-  */
- 
- static int				/* O - 0 on success, -1 on error */
--side_cb(int         print_fd,		/* I - Print file */
-+side_cb_unix(int         print_fd,		/* I - Print file */
-         int         device_fd,		/* I - Device file */
-         int         snmp_fd,		/* I - SNMP socket (unused) */
- 	http_addr_t *addr,		/* I - Device address (unused) */