Update to 1.0.20, set LICENSE.

New with 1.0.20, released 2009-05-03:

* New backends: canon_dr (Canon DR-series), coolscan3 (Nikon LS & Coolscan),
  rts8891 (Umax & HP 44xx), xerox_mfp (Samsung/Xerox/Dell MFPs)
* Many backends updated.
* 75 more scanner models supported.
* New build system (thanks Chris and Olaf).
* Avahi support (thanks Julien).
* More network scanners supported
* Epson backend deprecated, use epson2
* Coolscan2 backend deprecated, use coolscan3
* Internal SCSI, USB, threading, TCP & UDP code updates.
* Updated HAL and udev support.
* Improved saned configuration.
* Scanimage updates.
* Updated translations.
* Documentation updates.
* Bugfixes.

6 files changed, 59 insertions, 48 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 7138cfd8371..55a70d9ef01 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/06/20 01:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2009/08/15 17:53:11 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -37,18 +37,19 @@ OWN_DIRS+=	${PKG_SYSCONFDIR}/sane.d
 EGDIR=		${PREFIX}/share/examples/sane
 .for f in abaton.conf agfafocus.conf apple.conf artec.conf \
 artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
-cardscan.conf coolscan.conf coolscan2.conf \
+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 \
 ma1509.conf matsushita.conf \
-microtek.conf microtek2.conf mustek.conf mustek_usb.conf nec.conf \
-net.conf pie.conf plustek.conf plustek_pp.conf ricoh.conf s9036.conf \
-saned.conf sceptre.conf sharp.conf sm3840.conf snapscan.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 \
+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 \
-test.conf u12.conf umax.conf umax1220u.conf umax_pp.conf
+test.conf u12.conf umax.conf umax1220u.conf umax_pp.conf xerox_mfp.conf
 CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .endfor
 
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 19d7060b663..27666f5fa96 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2008/04/13 21:43:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2009/08/15 17:53:11 wiz Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
@@ -11,10 +11,11 @@ MASTER_SITES?=	ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	http://www.sane-project.org/
+LICENSE=	gnu-gpl-v2
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	19
+SANE_MICRO?=	20
 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 f9516331412..942a19042e7 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/06/14 20:05:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/08/15 17:53:11 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -16,9 +16,11 @@ lib/sane/libsane-avision.la
 lib/sane/libsane-bh.la
 lib/sane/libsane-canon.la
 lib/sane/libsane-canon630u.la
+lib/sane/libsane-canon_dr.la
 lib/sane/libsane-cardscan.la
 lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan2.la
+lib/sane/libsane-coolscan3.la
 lib/sane/libsane-dc210.la
 lib/sane/libsane-dc240.la
 lib/sane/libsane-dc25.la
@@ -57,6 +59,7 @@ lib/sane/libsane-pixma.la
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek_pp.la
 lib/sane/libsane-ricoh.la
+lib/sane/libsane-rts8891.la
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
 lib/sane/libsane-sharp.la
@@ -75,6 +78,7 @@ lib/sane/libsane-u12.la
 lib/sane/libsane-umax.la
 lib/sane/libsane-umax1220u.la
 lib/sane/libsane-umax_pp.la
+lib/sane/libsane-xerox_mfp.la
 man/man1/gamma4scanimage.1
 man/man1/sane-config.1
 man/man1/sane-find-scanner.1
@@ -89,10 +93,11 @@ man/man5/sane-avision.5
 man/man5/sane-bh.5
 man/man5/sane-canon.5
 man/man5/sane-canon630u.5
-man/man5/sane-canon_pp.5
+man/man5/sane-canon_dr.5
 man/man5/sane-cardscan.5
 man/man5/sane-coolscan.5
 man/man5/sane-coolscan2.5
+man/man5/sane-coolscan3.5
 man/man5/sane-dc210.5
 man/man5/sane-dc240.5
 man/man5/sane-dc25.5
@@ -100,9 +105,9 @@ man/man5/sane-dll.5
 man/man5/sane-dmc.5
 man/man5/sane-epjitsu.5
 man/man5/sane-epson.5
+man/man5/sane-epson2.5
 man/man5/sane-fujitsu.5
 man/man5/sane-genesys.5
-man/man5/sane-gphoto2.5
 man/man5/sane-gt68xx.5
 man/man5/sane-hp.5
 man/man5/sane-hp3500.5
@@ -111,7 +116,6 @@ man/man5/sane-hp4200.5
 man/man5/sane-hp5400.5
 man/man5/sane-hp5590.5
 man/man5/sane-hpljm1005.5
-man/man5/sane-hpsj5s.5
 man/man5/sane-hs2p.5
 man/man5/sane-ibm.5
 man/man5/sane-leo.5
@@ -121,7 +125,6 @@ man/man5/sane-matsushita.5
 man/man5/sane-microtek.5
 man/man5/sane-microtek2.5
 man/man5/sane-mustek.5
-man/man5/sane-mustek_pp.5
 man/man5/sane-mustek_usb.5
 man/man5/sane-mustek_usb2.5
 man/man5/sane-nec.5
@@ -132,9 +135,8 @@ man/man5/sane-pint.5
 man/man5/sane-pixma.5
 man/man5/sane-plustek.5
 man/man5/sane-plustek_pp.5
-man/man5/sane-pnm.5
-man/man5/sane-qcam.5
 man/man5/sane-ricoh.5
+man/man5/sane-rts8891.5
 man/man5/sane-s9036.5
 man/man5/sane-sceptre.5
 man/man5/sane-scsi.5
@@ -155,7 +157,7 @@ man/man5/sane-umax.5
 man/man5/sane-umax1220u.5
 man/man5/sane-umax_pp.5
 man/man5/sane-usb.5
-man/man5/sane-v4l.5
+man/man5/sane-xerox_mfp.5
 man/man7/sane.7
 man/man8/saned.8
 sbin/saned
@@ -251,9 +253,11 @@ share/examples/sane/avision.conf
 share/examples/sane/bh.conf
 share/examples/sane/canon.conf
 share/examples/sane/canon630u.conf
+share/examples/sane/canon_dr.conf
 share/examples/sane/cardscan.conf
 share/examples/sane/coolscan.conf
 share/examples/sane/coolscan2.conf
+share/examples/sane/coolscan3.conf
 share/examples/sane/dc210.conf
 share/examples/sane/dc240.conf
 share/examples/sane/dc25.conf
@@ -282,9 +286,11 @@ share/examples/sane/mustek_usb.conf
 share/examples/sane/nec.conf
 share/examples/sane/net.conf
 share/examples/sane/pie.conf
+share/examples/sane/pixma.conf
 share/examples/sane/plustek.conf
 share/examples/sane/plustek_pp.conf
 share/examples/sane/ricoh.conf
+share/examples/sane/rts8891.conf
 share/examples/sane/s9036.conf
 share/examples/sane/saned.conf
 share/examples/sane/sceptre.conf
@@ -303,10 +309,12 @@ share/examples/sane/u12.conf
 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
@@ -322,3 +330,4 @@ share/locale/sv/LC_MESSAGES/sane-backends.mo
 @pkgdir share/sane/gt68xx
 @pkgdir share/sane/epjitsu
 @pkgdir share/sane/artec_eplus48u
+@pkgdir share/examples/sane/dll.d
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index b19fc407f74..d58fd97c62f 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2008/04/13 21:43:39 wiz Exp $
+$NetBSD: distinfo,v 1.24 2009/08/15 17:53:11 wiz Exp $
 
-SHA1 (sane-backends-1.0.19.tar.gz) = 3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5
-RMD160 (sane-backends-1.0.19.tar.gz) = 1aaf304cbfeb3d6c95f6081d04225441a87b6644
-Size (sane-backends-1.0.19.tar.gz) = 4293184 bytes
-SHA1 (patch-aa) = ab6c283a929763dc9292371349bcebc4aed537ea
-SHA1 (patch-ab) = afb6766afbbfc165bab25fe74c7210d9177b46ef
+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 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
+SHA1 (patch-ab) = 2fcf0110d53639ef0268a8a31d25e625b5264c11
 SHA1 (patch-ac) = 7e4e710b0a570e677bdca6054ace3df07bbb909a
 SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index c1ba006cff7..a3b13a6f9c7 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.11 2006/08/05 22:41:49 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2009/08/15 17:53:11 wiz Exp $
 
---- backend/Makefile.in.orig	2006-06-11 11:10:59.000000000 +0000
+--- backend/Makefile.in.orig	2009-04-30 13:41:18.000000000 +0000
 +++ backend/Makefile.in
-@@ -26,7 +26,7 @@ infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--configdir = ${sysconfdir}/sane.d
+@@ -1444,7 +1444,7 @@ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ builddir = @builddir@
+-configdir = @configdir@
 +configdir = ${PREFIX}/share/examples/sane
- BEOS_ADDONDIR = @BEOS_ADDONDIR@
- 
- V_MAJOR = @V_MAJOR@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index 61cd95e34f7..1ff1770d48e 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.9 2006/08/05 22:41:49 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2009/08/15 17:53:11 wiz Exp $
 
---- configure.orig	2006-07-02 22:22:09.000000000 +0000
+--- configure.orig	2009-05-03 16:59:22.000000000 +0000
 +++ configure
-@@ -7289,13 +7289,13 @@ if test `eval echo '${'$as_ac_Header'}'`
+@@ -11606,13 +11606,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
- 
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
+-       { $as_echo "$as_me:$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_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
@@ -19,12 +19,12 @@ $NetBSD: patch-ab,v 1.9 2006/08/05 22:41:49 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7371,7 +7371,7 @@ if test $ac_cv_lib_pthread_pthread_creat
- #define HAVE_LIBPTHREAD 1
- _ACEOF
- 
--  LIBS="-lpthread $LIBS"
-+  LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
- 
+@@ -11672,7 +11672,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
+-  PTHREAD_LIBS="-lpthread"
++  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  fi
  
+        have_pthread=yes