Update graphics/sane-backends to sane-backends-1.0.24.

ok wiz@.

Changes:
* Significant enhancements to pixma, genesys, kodakaio, fujitsu, canon_dr.
* Minor updates, bugfixes or scanners added in several backends.
* Added new testsuite
* 51 new scanner models supported.
* USB support improvements.
* Improved build system (mingw64, bug fixes, default pthread on Linux).
* Documentation updates.
* Bugfixes.

5 files changed, 16 insertions, 15 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 0c16e763be5..cd58c46bb67 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2015/01/09 16:34:19 rumko Exp $
+# $NetBSD: Makefile,v 1.62 2015/08/16 20:24:23 leot Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers, etc
@@ -63,7 +63,8 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 
 .include "options.mk"
 .if (${OPSYS} != "SunOS")
-. include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-libusb_1_0
 .endif
 .if (${OPSYS} == "Linux")
 .include "../../graphics/libv4l/buildlink3.mk"
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 5d300e6ad23..fdf0713c515 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2012/12/10 12:06:50 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.31 2015/08/16 20:24:23 leot Exp $
 # used by graphics/sane-frontends/Makefile
 
 CATEGORIES?=	graphics
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v2
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	23
+SANE_MICRO?=	24
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR:Q}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR:Q}
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index c5967e020b7..f786c991d96 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2012/12/10 12:06:50 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2015/08/16 20:24:23 leot Exp $
 
 BUILDLINK_TREE+=	sane-backends
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if (${OPSYS} != "SunOS")
-. include "../../devel/libusb/buildlink3.mk"
+. include "../../devel/libusb1/buildlink3.mk"
 .endif
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 3683741c1bb..875a5d60ae7 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.35 2012/12/11 16:32:36 ryoon Exp $
+$NetBSD: distinfo,v 1.36 2015/08/16 20:24:23 leot Exp $
 
-SHA1 (sane-backends-1.0.23.tar.gz) = 62fc65736879f0bdb2fda20a31ee10d1ed335ae7
-RMD160 (sane-backends-1.0.23.tar.gz) = af41f4b2d34aa6dae9dfc88d1dedd630f6584737
-Size (sane-backends-1.0.23.tar.gz) = 5342350 bytes
+SHA1 (sane-backends-1.0.24.tar.gz) = c10bcb30a1b092b2c2fe5a86d6a5efc29123ccf9
+RMD160 (sane-backends-1.0.24.tar.gz) = 7a05c5b3d4fc4a88564cb862d4a1b46843026105
+Size (sane-backends-1.0.24.tar.gz) = 5778749 bytes
 SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
 SHA1 (patch-ab) = 0462997912869fe3083e1b385a478a31bc3deec0
 SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474
@@ -13,6 +13,6 @@ SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 SHA1 (patch-ai) = 74f27b5a66e3dfd96337cb00a4ff3bc48804256b
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
-SHA1 (patch-backend_kodakaio.c) = ce1f8b34f4d6128bb8fa311dd11b175fc0eefbfc
+SHA1 (patch-backend_kodakaio.c) = d15cb7af0a5cc506fc42e3a71fa0998329e6eef9
 SHA1 (patch-backend_magicolor.c) = e6cbb54a0ea0e688b0189b3d07d1dff34070a179
 SHA1 (patch-backend_xerox__mfp-tcp.c) = 3818b623217f15ed7f30724d1d70b1614befb88f
diff --git a/graphics/sane-backends/patches/patch-backend_kodakaio.c b/graphics/sane-backends/patches/patch-backend_kodakaio.c
index 7d68277273e..f0200d198de 100644
--- a/graphics/sane-backends/patches/patch-backend_kodakaio.c
+++ b/graphics/sane-backends/patches/patch-backend_kodakaio.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-backend_kodakaio.c,v 1.1 2012/12/11 16:32:36 ryoon Exp $
+$NetBSD: patch-backend_kodakaio.c,v 1.2 2015/08/16 20:24:23 leot Exp $
 
---- backend/kodakaio.c.orig	2012-08-10 00:33:29.000000000 +0000
+--- backend/kodakaio.c.orig	2013-08-25 21:22:58.000000000 +0000
 +++ backend/kodakaio.c
-@@ -165,6 +165,7 @@ normal levels. This system is a plan rat
+@@ -181,6 +181,7 @@ normal levels. This system is a plan rat
  #include <math.h>
  #include <poll.h>
  #include <time.h>
 +#include <sys/socket.h>
  
- #if HAVE_CUPS
+ #if WITH_AVAHI
  /* used for auto detecting network printers  */