Update to 1.0.21:

New with 1.0.21, released 2010-04-25:

* New backends: kodak (Kodak i18xx), kvs1025 (Panasonic KV-S10xx),
  p5 (Primax PagePartner)
* 224 more scanner models supported.
* Many backends updated.
* Improved compilation on uncommon platforms.
* More consistent option naming.
* Scanimage no longer writes image to tty.
* Modern translation infrastructure.
* Improved saned network daemon.
* Internal SCSI, USB, threading, TCP & UDP code updates.
* Updated HAL and udev support.
* New sanei_magic image processing library.
* Documentation updates.
* Bugfixes.

7 files changed, 47 insertions, 54 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 9b07ae8d3b8..a0d7e430229 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/09/19 15:06:18 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,6 @@ COMMENT=	API for access to scanners, digital cameras, frame grabbers etc.
 
 DISTNAME=	sane-backends-${SANE_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-PKGREVISION=	4
 
 # lib/Makefile.in builds .o files and then .a, but rules for shlibs,
 # while apparently independent, cause libtool to create .o again,
@@ -15,7 +14,7 @@ PKGREVISION=	4
 # the .o
 MAKE_JOBS_SAFE=		NO
 
-USE_TOOLS+=		msgfmt
+USE_TOOLS+=		msgfmt msgmerge
 USE_PKGLOCALEDIR=	YES
 
 CONFIGURE_ARGS+=	--with-gphoto2=no
@@ -42,11 +41,12 @@ canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
 dc210.conf dc240.conf dc25.conf dll.conf dmc.conf \
 epson.conf epjitsu.conf epson2.conf fujitsu.conf \
 genesys.conf gt68xx.conf hp.conf hp3900.conf \
-hp4200.conf hp5400.conf hs2p.conf ibm.conf leo.conf lexmark.conf \
+hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf leo.conf lexmark.conf \
 ma1509.conf matsushita.conf \
 microtek.conf microtek2.conf mustek.conf mustek_usb.conf \
 nec.conf net.conf \
-pie.conf pixma.conf plustek.conf plustek_pp.conf ricoh.conf rts8891.conf \
+p5.conf pie.conf pixma.conf plustek.conf plustek_pp.conf \
+ricoh.conf rts8891.conf \
 s9036.conf saned.conf sceptre.conf sharp.conf sm3840.conf snapscan.conf \
 sp15c.conf st400.conf stv680.conf \
 tamarack.conf teco1.conf teco2.conf teco3.conf \
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 27666f5fa96..6f34711fb19 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2009/08/15 17:53:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.27 2010/09/19 15:06:18 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?=	20
+SANE_MICRO?=	21
 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 37793b7efda..4b14c76e5e1 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/08/20 03:53:20 hasso Exp $
+@comment $NetBSD: PLIST,v 1.25 2010/09/19 15:06:18 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -41,6 +41,8 @@ lib/sane/libsane-hp5590.la
 lib/sane/libsane-hpljm1005.la
 lib/sane/libsane-hs2p.la
 lib/sane/libsane-ibm.la
+lib/sane/libsane-kodak.la
+lib/sane/libsane-kvs1025.la
 lib/sane/libsane-leo.la
 lib/sane/libsane-lexmark.la
 lib/sane/libsane-ma1509.la
@@ -49,10 +51,10 @@ lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek2.la
 lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek_usb.la
-lib/sane/libsane-mustek_usb2.la
 lib/sane/libsane-nec.la
 lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
+lib/sane/libsane-p5.la
 lib/sane/libsane-pie.la
 ${PLIST.pint}lib/sane/libsane-pint.la
 lib/sane/libsane-pixma.la
@@ -118,6 +120,8 @@ man/man5/sane-hp5590.5
 man/man5/sane-hpljm1005.5
 man/man5/sane-hs2p.5
 man/man5/sane-ibm.5
+man/man5/sane-kodak.5
+man/man5/sane-kvs1025.5
 man/man5/sane-leo.5
 man/man5/sane-lexmark.5
 man/man5/sane-ma1509.5
@@ -126,10 +130,10 @@ man/man5/sane-microtek.5
 man/man5/sane-microtek2.5
 man/man5/sane-mustek.5
 man/man5/sane-mustek_usb.5
-man/man5/sane-mustek_usb2.5
 man/man5/sane-nec.5
 man/man5/sane-net.5
 man/man5/sane-niash.5
+man/man5/sane-p5.5
 man/man5/sane-pie.5
 ${PLIST.pint}man/man5/sane-pint.5
 man/man5/sane-pixma.5
@@ -275,6 +279,7 @@ share/examples/sane/hp4200.conf
 share/examples/sane/hp5400.conf
 share/examples/sane/hs2p.conf
 share/examples/sane/ibm.conf
+share/examples/sane/kodak.conf
 share/examples/sane/leo.conf
 share/examples/sane/lexmark.conf
 share/examples/sane/ma1509.conf
@@ -285,6 +290,7 @@ share/examples/sane/mustek.conf
 share/examples/sane/mustek_usb.conf
 share/examples/sane/nec.conf
 share/examples/sane/net.conf
+share/examples/sane/p5.conf
 share/examples/sane/pie.conf
 share/examples/sane/pixma.conf
 share/examples/sane/plustek.conf
@@ -310,22 +316,6 @@ 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/it/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
 @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 6052a78697e..fb7d18ffd42 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.26 2009/09/04 23:09:06 wiz Exp $
+$NetBSD: distinfo,v 1.27 2010/09/19 15:06:18 wiz Exp $
 
-SHA1 (sane-backends-1.0.20.tar.gz) = 3b4d2ecde8be404bb44269771cf5dc6e4c10b086
-RMD160 (sane-backends-1.0.20.tar.gz) = b80c0a15a75b3bce07060d65aecdcaf7860c323b
-Size (sane-backends-1.0.20.tar.gz) = 4760873 bytes
+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 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
-SHA1 (patch-ab) = 2fcf0110d53639ef0268a8a31d25e625b5264c11
-SHA1 (patch-ac) = 7e4e710b0a570e677bdca6054ace3df07bbb909a
+SHA1 (patch-ab) = ab1f77b2f6e7cb691fe4e97aa6d0c8d8e4f46bc9
+SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474
 SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
-SHA1 (patch-af) = f2b74ea5f61591c426158ff11f07ba36a90c5acc
 SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index 1ff1770d48e..cd48819e13b 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2009/08/15 17:53:11 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2010/09/19 15:06:18 wiz Exp $
 
---- configure.orig	2009-05-03 16:59:22.000000000 +0000
+--- configure.orig	2010-04-26 00:57:49.000000000 +0000
 +++ configure
-@@ -11606,13 +11606,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
+@@ -11687,13 +11687,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.10 2009/08/15 17:53:11 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -11672,7 +11672,7 @@ fi
+@@ -11753,7 +11753,7 @@ fi
  { $as_echo "$as_me:$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
@@ -28,3 +28,20 @@ $NetBSD: patch-ab,v 1.10 2009/08/15 17:53:11 wiz Exp $
  fi
  
         have_pthread=yes
+@@ -34541,14 +34541,14 @@ for be in ${BACKENDS}; do
+     ;;
+ 
+     mustek_pp)
+-    if test "${sane_cv_use_libieee1284}" != "yes" && test "${enable_parport_directio}" != "yes"; then
++    if test "${sane_cv_use_libieee1284}" != "yes" || test "${enable_parport_directio}" != "yes"; then
+       echo "*** $be backend requires libieee1284 and paraport-directio libraries - $DISABLE_MSG"
+       backend_supported="no"
+     fi
+     ;;
+ 
+     dell1600n_net)
+-    if test "${sane_cv_use_libjpeg}" != "yes" || test "${sane_cv_use_libtiff}" != "yes"; then
++    if test "${sane_cv_use_libjpeg}" != "yes" && test "${sane_cv_use_libtiff}" != "yes"; then
+       echo "*** $be backend requires JPEG and/or TIFF library - $DISABLE_MSG"
+       backend_supported="no"
+     fi
diff --git a/graphics/sane-backends/patches/patch-ac b/graphics/sane-backends/patches/patch-ac
index 62605aca205..d226ac17e63 100644
--- a/graphics/sane-backends/patches/patch-ac
+++ b/graphics/sane-backends/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2006/08/05 22:41:49 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2010/09/19 15:06:18 wiz Exp $
 
---- sanei/sanei_ab306.c.orig	2003-09-09 15:04:45.000000000 +0000
+--- sanei/sanei_ab306.c.orig	2010-04-05 13:18:05.000000000 +0000
 +++ sanei/sanei_ab306.c
 @@ -78,7 +78,7 @@ inb (u_long port)
- #include "sane/sanei.h"
- #include "sane/sanei_ab306.h"
+ #include "../include/sane/sanei.h"
+ #include "../include/sane/sanei_ab306.h"
  
 -#if (defined(HAVE_IOPERM) || defined(__FreeBSD__)) && !defined(IO_SUPPORT_MISSING)
 +#if (defined(HAVE_IOPERM) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(IO_SUPPORT_MISSING)
diff --git a/graphics/sane-backends/patches/patch-af b/graphics/sane-backends/patches/patch-af
deleted file mode 100644
index e08714f4595..00000000000
--- a/graphics/sane-backends/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2009/08/20 03:53:20 hasso Exp $
-
---- tools/Makefile.in.orig	2009-08-18 22:45:01 +0300
-+++ tools/Makefile.in	2009-08-18 22:45:38 +0300
-@@ -270,7 +270,7 @@ sane_find_scanner_SOURCES = sane-find-sc
- 			    ../backend/sane_strstatus.c
- 
- sane_find_scanner_LDADD = ../sanei/libsanei.la ../lib/liblib.la \
--			  @USB_LIBS@ @IEEE1284_LIBS@
-+			  @USB_LIBS@ @IEEE1284_LIBS@ @SCSI_LIBS@
- 
- gamma4scanimage_SOURCES = gamma4scanimage.c
- gamma4scanimage_LDADD = @MATH_LIB@