Update to 1.0.18.

Reanem hp3900 option to sane-backends-hp3900, and add legacy
handling for the old option name.

New with 1.0.18, released 2006-07-02:

* New backends: dell1600n_net (Dell 1600n), hp3500 (HP ScanJet 3500 series),
  pixma (Canon Pixma series), stv680 (Aiptek Pencam and similar).
* Updated backends: avision, canon, dll, epson, fujitsu, genesys, gt68xx,
  microtek2, mustek_pp, niash, plustek, snapscan, sp15c, test, u12, umax1220u.
* Scanimage batch mode fixes.
* Scanner lists contain USB vendor/product ids and some statistics now.
* Udev/hotplug lists are generated autmatically from the .desc files now.
* Portability fixes (especially for DragonFlyBSD and HP/UX).
* Build system updates.
* Updated translations.
* Documentation updates.
* Bugfixes.

10 files changed, 44 insertions, 81 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 364c735c16c..25d7fe085a4 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2006/06/27 12:27:06 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/08/05 22:41:49 wiz Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
 
 DISTNAME=       sane-backends-${SANE_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-PKGREVISION=	3
 
 USE_TOOLS+=		msgfmt
 USE_PKGLOCALEDIR=	YES
@@ -37,7 +36,8 @@ 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 \
-sp15c.conf st400.conf tamarack.conf teco1.conf teco2.conf teco3.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
 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 49ee914791f..4c0bb0dcd95 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2006/03/04 21:29:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.23 2006/08/05 22:41:49 wiz Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \
@@ -11,7 +11,7 @@ HOMEPAGE?=	http://www.sane-project.org/
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	17
+SANE_MICRO?=	18
 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 15e6fe18c78..ff3383d4987 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/06/08 14:14:11 ben Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/08/05 22:41:49 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -28,6 +28,7 @@ lib/sane/libsane-fujitsu.la
 lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.la
+lib/sane/libsane-hp3500.la
 ${SANE_HP3900}lib/sane/libsane-hp3900.la
 lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp5400.la
@@ -46,6 +47,7 @@ lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
 lib/sane/libsane-pie.la
 ${SANE_PINT}lib/sane/libsane-pint.la
+lib/sane/libsane-pixma.la
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek_pp.la
 lib/sane/libsane-ricoh.la
@@ -57,6 +59,7 @@ lib/sane/libsane-sm3840.la
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-sp15c.la
 lib/sane/libsane-st400.la
+lib/sane/libsane-stv680.la
 lib/sane/libsane-tamarack.la
 lib/sane/libsane-teco1.la
 lib/sane/libsane-teco2.la
@@ -67,9 +70,6 @@ lib/sane/libsane-umax.la
 lib/sane/libsane-umax1220u.la
 lib/sane/libsane-umax_pp.la
 man/man1/gamma4scanimage.1
-man/man5/sane-hp4200.5
-man/man5/sane-lexmark.5
-man/man5/sane-mustek_usb2.5
 man/man1/sane-config.1
 man/man1/sane-find-scanner.1
 man/man1/scanimage.1
@@ -97,11 +97,14 @@ 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
 ${SANE_HP3900}man/man5/sane-hp3900.5
+man/man5/sane-hp4200.5
 man/man5/sane-hp5400.5
 man/man5/sane-hpsj5s.5
 man/man5/sane-ibm.5
 man/man5/sane-leo.5
+man/man5/sane-lexmark.5
 man/man5/sane-ma1509.5
 man/man5/sane-matsushita.5
 man/man5/sane-microtek.5
@@ -109,11 +112,13 @@ 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
 man/man5/sane-net.5
 man/man5/sane-niash.5
 man/man5/sane-pie.5
 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
@@ -128,6 +133,7 @@ man/man5/sane-sm3840.5
 man/man5/sane-snapscan.5
 man/man5/sane-sp15c.5
 man/man5/sane-st400.5
+man/man5/sane-stv680.5
 man/man5/sane-tamarack.5
 man/man5/sane-teco1.5
 man/man5/sane-teco2.5
@@ -272,6 +278,7 @@ share/examples/sane/sm3840.conf
 share/examples/sane/snapscan.conf
 share/examples/sane/sp15c.conf
 share/examples/sane/st400.conf
+share/examples/sane/stv680.conf
 share/examples/sane/tamarack.conf
 share/examples/sane/teco1.conf
 share/examples/sane/teco2.conf
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index bb367af269d..5d4034102ba 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.21 2006/06/27 12:27:06 joerg Exp $
+$NetBSD: distinfo,v 1.22 2006/08/05 22:41:49 wiz Exp $
 
-SHA1 (sane-backends-1.0.17.tar.gz) = a73e01575458a5fb7dc265cea50c6740555e1711
-RMD160 (sane-backends-1.0.17.tar.gz) = 43e440712e9da676e235dc6148c5dda347c30e22
-Size (sane-backends-1.0.17.tar.gz) = 3588993 bytes
-SHA1 (hp3900-sane1017_src_0.5.tar.gz) = 4a45100faae2572b2763253659f5cbfc8f5d31ea
-RMD160 (hp3900-sane1017_src_0.5.tar.gz) = d37163c66888de11fff41a0d0af09b9439dda34e
-Size (hp3900-sane1017_src_0.5.tar.gz) = 119430 bytes
-SHA1 (patch-aa) = fe4f9771d72512ac6a6c246971cb5940fba184cb
-SHA1 (patch-ab) = e9ed0b400458308a5c6a2631bda475c59e9a4abd
-SHA1 (patch-ac) = dc7e9a4c8b53af7a9054ac5228f0179cd5b2a7c7
-SHA1 (patch-ad) = 386bd03ba2816bfcc630aa5899dda07fc7c34292
-SHA1 (patch-ae) = 22a5311a745fb3adf6fb5f472a6bd6a6af9f9c73
+SHA1 (sane-backends-1.0.18.tar.gz) = f4c360b87ced287e4015a0dafd766ad885c539e1
+RMD160 (sane-backends-1.0.18.tar.gz) = aa863adff417d7c33cbb85c193878aa54a056100
+Size (sane-backends-1.0.18.tar.gz) = 3789493 bytes
+SHA1 (patch-aa) = ab6c283a929763dc9292371349bcebc4aed537ea
+SHA1 (patch-ab) = afb6766afbbfc165bab25fe74c7210d9177b46ef
+SHA1 (patch-ac) = 7e4e710b0a570e677bdca6054ace3df07bbb909a
+SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index f3b50b95905..2202917e54c 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.1 2006/06/08 14:14:11 ben Exp $
+# $NetBSD: options.mk,v 1.2 2006/08/05 22:41:49 wiz Exp $
 
 PKG_OPTIONS_VAR=                PKG_OPTIONS.sane-backends
-PKG_SUPPORTED_OPTIONS=          hp3900
+PKG_SUPPORTED_OPTIONS=          sane-backends-hp3900
 PKG_SUGGESTED_OPTIONS=		#defined
+# Remove after 2006Q3
+PKG_OPTIONS_LEGACY_OPTS+=	hp3900:sane-backends-hp3900
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 20ff722b358..c1ba006cff7 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2005/12/31 00:03:24 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2006/08/05 22:41:49 wiz Exp $
 
---- backend/Makefile.in.orig	2005-12-18 14:32:31.000000000 +0100
+--- backend/Makefile.in.orig	2006-06-11 11:10:59.000000000 +0000
 +++ backend/Makefile.in
-@@ -25,7 +25,7 @@ infodir = @infodir@
+@@ -26,7 +26,7 @@ infodir = @infodir@
  mandir = @mandir@
  includedir = @includedir@
  oldincludedir = /usr/include
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index a343b416abc..61cd95e34f7 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.8 2006/01/12 13:08:21 joerg Exp $
+$NetBSD: patch-ab,v 1.9 2006/08/05 22:41:49 wiz Exp $
 
---- configure.orig	2006-01-12 00:55:20.000000000 +0000
+--- configure.orig	2006-07-02 22:22:09.000000000 +0000
 +++ configure
-@@ -6145,13 +6145,13 @@ if test `eval echo '${'$as_ac_Header'}'`
+@@ -7289,13 +7289,13 @@ if test `eval echo '${'$as_ac_Header'}'`
  _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
+-{ 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; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.8 2006/01/12 13:08:21 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6213,7 +6213,7 @@ if test $ac_cv_lib_pthread_pthread_creat
+@@ -7371,7 +7371,7 @@ if test $ac_cv_lib_pthread_pthread_creat
  #define HAVE_LIBPTHREAD 1
  _ACEOF
  
diff --git a/graphics/sane-backends/patches/patch-ac b/graphics/sane-backends/patches/patch-ac
index 3dbe8f35f87..62605aca205 100644
--- a/graphics/sane-backends/patches/patch-ac
+++ b/graphics/sane-backends/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2006/06/27 12:27:06 joerg Exp $
+$NetBSD: patch-ac,v 1.4 2006/08/05 22:41:49 wiz Exp $
 
---- sanei/sanei_ab306.c.orig	2006-06-20 01:54:43.000000000 -0700
+--- sanei/sanei_ab306.c.orig	2003-09-09 15:04:45.000000000 +0000
 +++ sanei/sanei_ab306.c
 @@ -78,7 +78,7 @@ inb (u_long port)
  #include "sane/sanei.h"
diff --git a/graphics/sane-backends/patches/patch-ad b/graphics/sane-backends/patches/patch-ad
deleted file mode 100644
index f112d7eff4f..00000000000
--- a/graphics/sane-backends/patches/patch-ad
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/06/27 12:27:06 joerg Exp $
-
---- sanei/sanei_usb.c.orig	2006-06-20 02:00:41.000000000 -0700
-+++ sanei/sanei_usb.c
-@@ -91,6 +91,10 @@ struct usb_descriptor_header *GetNextDes
- #include <dev/usb/usb.h>
- #endif /* __FreeBSD__ */
- 
-+#if defined(__DragonFly__)
-+#include <bus/usb/usb.h>
-+#endif
-+
- #define BACKEND_NAME	sanei_usb
- #include "../include/sane/sane.h"
- #include "../include/sane/sanei_debug.h"
-@@ -249,7 +253,7 @@ kernel_get_vendor_product (int fd, const
-     *vendorID = vendor;
-     *productID = product;
-   }
--#elif defined (__FreeBSD__)
-+#elif defined (__FreeBSD__) || defined(__DragonFly__)
-   {
-     int controller;
-     int ctrl_fd;
-@@ -301,7 +305,7 @@ sanei_usb_init (void)
- #if defined(__linux__)
-     "/dev/", "usbscanner",
-     "/dev/usb/", "scanner",
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
-     "/dev/", "uscanner",
- #elif defined(__BEOS__)
-     "/dev/scanner/usb/", "",
diff --git a/graphics/sane-backends/patches/patch-ae b/graphics/sane-backends/patches/patch-ae
index 8f65ed61952..10ab250c31b 100644
--- a/graphics/sane-backends/patches/patch-ae
+++ b/graphics/sane-backends/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2006/06/27 12:27:06 joerg Exp $
+$NetBSD: patch-ae,v 1.5 2006/08/05 22:41:49 wiz Exp $
 
---- tools/sane-find-scanner.c.orig	2006-06-20 02:06:59.000000000 -0700
+--- tools/sane-find-scanner.c.orig	2006-03-11 12:45:29.000000000 +0000
 +++ tools/sane-find-scanner.c
-@@ -1356,7 +1356,7 @@ main (int argc, char **argv)
+@@ -1359,7 +1359,7 @@ main (int argc, char **argv)
  	"/dev/scanner", "/dev/scanner0", "/dev/scanner1",
  	"/dev/pass0", "/dev/pass1", "/dev/pass2", "/dev/pass3",
  	"/dev/pass4", "/dev/pass5", "/dev/pass6", "/dev/pass7",
@@ -11,12 +11,3 @@ $NetBSD: patch-ae,v 1.4 2006/06/27 12:27:06 joerg Exp $
  	"/dev/uk0", "/dev/uk1", "/dev/uk2", "/dev/uk3", "/dev/uk4",
  	"/dev/uk5", "/dev/uk6",
  #elif defined(__NetBSD__)
-@@ -1391,7 +1391,7 @@ main (int argc, char **argv)
- 	"/dev/usbscanner10", "/dev/usbscanner11",
- 	"/dev/usbscanner12", "/dev/usbscanner13",
- 	"/dev/usbscanner14", "/dev/usbscanner15",
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	"/dev/uscanner",
- 	"/dev/uscanner0", "/dev/uscanner1",
- 	"/dev/uscanner2", "/dev/uscanner3",