Update to 1.0.22:

New with 1.0.22, released 2011-02-13:

* New backends: kvs20xx (Panasonic KV-S20xx),
  magicolor (Konica-Minolta )
* Significant enhancements to several backends.
* More than 80 new scanner models supported.
* Support many more networked scanners.
* Added -A option to scanimage
* Improved build system.
* Improved USB support.
* Improved udev rules.
* Documentation updates.
* Bugfixes.

6 files changed, 53 insertions, 30 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index e5185ef7e7a..07fc8c6f5f8 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2010/12/27 15:07:52 adam Exp $
+# $NetBSD: Makefile,v 1.49 2011/07/12 12:19:40 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PKGREVISION=	1
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers etc.
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 6f34711fb19..f2ab2d44eff 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2010/09/19 15:06:18 wiz Exp $
+# $NetBSD: Makefile.common,v 1.28 2011/07/12 12:19:40 wiz Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
@@ -15,7 +15,7 @@ LICENSE=	gnu-gpl-v2
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	21
+SANE_MICRO?=	22
 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/PLIST b/graphics/sane-backends/PLIST
index ef809150e20..e99d6a51881 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2010/12/27 15:07:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2011/07/12 12:19:40 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -44,9 +44,11 @@ lib/sane/libsane-hs2p.la
 lib/sane/libsane-ibm.la
 lib/sane/libsane-kodak.la
 lib/sane/libsane-kvs1025.la
+lib/sane/libsane-kvs20xx.la
 lib/sane/libsane-leo.la
 lib/sane/libsane-lexmark.la
 lib/sane/libsane-ma1509.la
+lib/sane/libsane-magicolor.la
 lib/sane/libsane-matsushita.la
 lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek2.la
@@ -124,9 +126,11 @@ man/man5/sane-hs2p.5
 man/man5/sane-ibm.5
 man/man5/sane-kodak.5
 man/man5/sane-kvs1025.5
+man/man5/sane-kvs20xx.5
 man/man5/sane-leo.5
 man/man5/sane-lexmark.5
 man/man5/sane-ma1509.5
+man/man5/sane-magicolor.5
 man/man5/sane-matsushita.5
 man/man5/sane-microtek.5
 man/man5/sane-microtek2.5
@@ -287,6 +291,7 @@ share/examples/sane/kodak.conf
 share/examples/sane/leo.conf
 share/examples/sane/lexmark.conf
 share/examples/sane/ma1509.conf
+share/examples/sane/magicolor.conf
 share/examples/sane/matsushita.conf
 share/examples/sane/microtek.conf
 share/examples/sane/microtek2.conf
@@ -320,6 +325,25 @@ share/examples/sane/umax.conf
 share/examples/sane/umax1220u.conf
 share/examples/sane/umax_pp.conf
 share/examples/sane/xerox_mfp.conf
+share/locale/bg/LC_MESSAGES/sane-backends.mo
+share/locale/cs/LC_MESSAGES/sane-backends.mo
+share/locale/da/LC_MESSAGES/sane-backends.mo
+share/locale/de/LC_MESSAGES/sane-backends.mo
+share/locale/en_GB/LC_MESSAGES/sane-backends.mo
+share/locale/eo/LC_MESSAGES/sane-backends.mo
+share/locale/es/LC_MESSAGES/sane-backends.mo
+share/locale/fi/LC_MESSAGES/sane-backends.mo
+share/locale/fr/LC_MESSAGES/sane-backends.mo
+share/locale/gl/LC_MESSAGES/sane-backends.mo
+share/locale/it/LC_MESSAGES/sane-backends.mo
+share/locale/ja/LC_MESSAGES/sane-backends.mo
+share/locale/nb/LC_MESSAGES/sane-backends.mo
+share/locale/nl/LC_MESSAGES/sane-backends.mo
+share/locale/pl/LC_MESSAGES/sane-backends.mo
+share/locale/pt/LC_MESSAGES/sane-backends.mo
+share/locale/ru/LC_MESSAGES/sane-backends.mo
+share/locale/sv/LC_MESSAGES/sane-backends.mo
+share/locale/uk/LC_MESSAGES/sane-backends.mo
 @pkgdir share/sane/snapscan
 @pkgdir share/sane/gt68xx
 @pkgdir share/sane/epjitsu
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index ac737bb3e12..79b9345657b 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.31 2011/01/30 18:04:23 rumko Exp $
+$NetBSD: distinfo,v 1.32 2011/07/12 12:19:40 wiz Exp $
 
-SHA1 (sane-backends-1.0.21.tar.gz) = 4a2789ea9dae1ece090d016abd14b0f2450d9bdb
-RMD160 (sane-backends-1.0.21.tar.gz) = 000ae42ffd6484c54389a9468bdde1dcfc758dde
-Size (sane-backends-1.0.21.tar.gz) = 5050344 bytes
+SHA1 (sane-backends-1.0.22.tar.gz) = dc04d6e6fd18791d8002c3fdb23e89fef3327135
+RMD160 (sane-backends-1.0.22.tar.gz) = 524713474a819331d0179fa642fef710d073f1d1
+Size (sane-backends-1.0.22.tar.gz) = 5150661 bytes
 SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
-SHA1 (patch-ab) = ab1f77b2f6e7cb691fe4e97aa6d0c8d8e4f46bc9
+SHA1 (patch-ab) = 9ce48e03a70ae0c1c31a27e09f3745773fa9b898
 SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474
 SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
 SHA1 (patch-af) = db4ba80826d76363ad28c22eea325e19868fd1e4
 SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
-SHA1 (patch-ai) = d04bc976f02e755b107fca1a29b00596e6c1ef54
+SHA1 (patch-ai) = 74f27b5a66e3dfd96337cb00a4ff3bc48804256b
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index cd48819e13b..a7cd0fd161d 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,34 +1,34 @@
-$NetBSD: patch-ab,v 1.11 2010/09/19 15:06:18 wiz Exp $
+$NetBSD: patch-ab,v 1.12 2011/07/12 12:19:41 wiz Exp $
 
---- configure.orig	2010-04-26 00:57:49.000000000 +0000
+--- configure.orig	2011-02-14 01:27:52.000000000 +0000
 +++ configure
-@@ -11687,13 +11687,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+@@ -7202,13 +7202,13 @@ if test "x$ac_cv_header_pthread_h" = x""
+ #define HAVE_PTHREAD_H 1
  _ACEOF
  
--       { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+       { $as_echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
 +$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
 +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -11753,7 +11753,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -7239,7 +7239,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
  $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
+ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
 -  PTHREAD_LIBS="-lpthread"
 +  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  fi
  
         have_pthread=yes
-@@ -34541,14 +34541,14 @@ for be in ${BACKENDS}; do
+@@ -17092,14 +17092,14 @@ for be in ${BACKENDS}; do
      ;;
  
      mustek_pp)
diff --git a/graphics/sane-backends/patches/patch-ai b/graphics/sane-backends/patches/patch-ai
index 8efcc36ade4..96860fa92e1 100644
--- a/graphics/sane-backends/patches/patch-ai
+++ b/graphics/sane-backends/patches/patch-ai
@@ -1,19 +1,19 @@
-$NetBSD: patch-ai,v 1.1 2010/12/27 15:07:52 adam Exp $
+$NetBSD: patch-ai,v 1.2 2011/07/12 12:19:41 wiz Exp $
 
 Avoid duplicate symbols in libepson and libepson2.
 
---- backend/epson_usb.c.orig	2010-12-27 14:37:39.000000000 +0000
+--- backend/epson_usb.c.orig	2011-01-16 01:01:28.000000000 +0000
 +++ backend/epson_usb.c
-@@ -3,7 +3,7 @@
- #include "epson_usb.h"
+@@ -4,7 +4,7 @@
  
+ /* generated with epson2usb.pl doc/descriptions/epson2.desc */
  
 -SANE_Word sanei_epson_usb_product_ids[] = {
 +static SANE_Word sanei_epson_usb_product_ids[] = {
    0x101, /* GT-7000U, Perfection 636U */
    0x103, /* GT-6600U, Perfection 610 */
    0x104, /* GT-7600U, GT-7600UF, Perfection 1200U, Perfection 1200U PHOTO */
-@@ -79,7 +79,7 @@ SANE_Word sanei_epson_usb_product_ids[] 
+@@ -85,7 +85,7 @@ SANE_Word sanei_epson_usb_product_ids[] 
  				   in the config file as "usb <vendor> <product>" */
  };