Update to 1.0.17:

New with 1.0.17, released 2005-12-18:

* New backends: hp4200 (HP ScanJet 4200), lexmark (Lexmark X1100 series),
  mustek_usb2 (Mustek BearPaw 2448 TA Pro)
* Updated backends: artec_eplus48u, avision, canon, epson, fujitsu, genesys,
  gt68xx, microtek2, mustek_pp, plustek, plustek_pp, sm3600, snapscan, umax_pp.
* Hotplug/udev updates.
* scanimage fixes.
* sane-find-scanner finds more chipsets.
* Build system fixes/updates. make now calls makedepend.
* Several fixes in SANE internal functions (sanei).
* Portability fixes (especially for MacOSX, FreeBSD, OpenBSD, OS/2).
* Updated translations.
* Documentation updates.
* Bugfixes.

6 files changed, 40 insertions, 42 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 3e7e295a35b..59d9cad4408 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:45 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/31 00:03:24 wiz Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
@@ -11,6 +11,8 @@ USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--with-gphoto2=no
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if (${OPSYS} == "SunOS")
 PLIST_SUBST+=	SANE_PINT="@comment "
 PLIST_SUBST+=	SANE_SM3600="@comment "
@@ -28,7 +30,8 @@ EGDIR=		${PREFIX}/share/examples/sane
 artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
 coolscan.conf coolscan2.conf dc210.conf dc240.conf dc25.conf dll.conf \
 dmc.conf epson.conf fujitsu.conf genesys.conf gt68xx.conf hp.conf \
-hp5400.conf ibm.conf leo.conf ma1509.conf matsushita.conf \
+hp4200.conf hp5400.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 \
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index f466764d2a5..8dee3c0edde 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:50:22 rillig Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/12/31 00:03:24 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?=	16
+SANE_MICRO?=	17
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR:Q}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR:Q}
@@ -24,9 +24,3 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 CONFIGURE_ENV+=		ac_cv_path_LATEX="no"
-
-.include "../../mk/bsd.prefs.mk"
-# -O to work around a bug with -O2 and egcs.
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.[45]*-*)
-CFLAGS=	-O
-.endif
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index ddc8e955e48..9a3fafd5f24 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/09/27 09:29:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/12/31 00:03:24 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -28,15 +28,18 @@ lib/sane/libsane-fujitsu.la
 lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.la
+lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp5400.la
 lib/sane/libsane-ibm.la
 lib/sane/libsane-leo.la
+lib/sane/libsane-lexmark.la
 lib/sane/libsane-ma1509.la
 lib/sane/libsane-matsushita.la
 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
@@ -63,6 +66,9 @@ 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
@@ -167,6 +173,8 @@ share/doc/sane-${SANE_VERSION}/matsushita/matsushita.txt
 share/doc/sane-${SANE_VERSION}/mustek/mustek.CHANGES
 share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.CHANGES
 share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.TODO
+share/doc/sane-${SANE_VERSION}/mustek_usb2/mustek_usb2.CHANGES
+share/doc/sane-${SANE_VERSION}/mustek_usb2/mustek_usb2.TODO
 share/doc/sane-${SANE_VERSION}/niash/niash.TODO
 share/doc/sane-${SANE_VERSION}/plustek/FAQ
 share/doc/sane-${SANE_VERSION}/plustek/MakeModule.sh
@@ -236,9 +244,11 @@ share/examples/sane/fujitsu.conf
 share/examples/sane/genesys.conf
 share/examples/sane/gt68xx.conf
 share/examples/sane/hp.conf
+share/examples/sane/hp4200.conf
 share/examples/sane/hp5400.conf
 share/examples/sane/ibm.conf
 share/examples/sane/leo.conf
+share/examples/sane/lexmark.conf
 share/examples/sane/ma1509.conf
 share/examples/sane/matsushita.conf
 share/examples/sane/microtek.conf
@@ -255,8 +265,8 @@ share/examples/sane/s9036.conf
 share/examples/sane/saned.conf
 share/examples/sane/sceptre.conf
 share/examples/sane/sharp.conf
-share/examples/sane/snapscan.conf
 share/examples/sane/sm3840.conf
+share/examples/sane/snapscan.conf
 share/examples/sane/sp15c.conf
 share/examples/sane/st400.conf
 share/examples/sane/tamarack.conf
@@ -282,8 +292,12 @@ ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sane-backends.mo
+@exec ${MKDIR} %D/share/sane/snapscan
+@dirrm share/sane/snapscan
 @exec ${MKDIR} %D/share/sane/gt68xx
 @dirrm share/sane/gt68xx
+@exec ${MKDIR} %D/share/sane/artec_eplus48u
+@dirrm share/sane/artec_eplus48u
 @dirrm share/sane
 @dirrm share/examples/sane
 @dirrm share/doc/sane-${SANE_VERSION}/umax
@@ -292,6 +306,7 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sane-backends.mo
 @dirrm share/doc/sane-${SANE_VERSION}/sceptre
 @dirrm share/doc/sane-${SANE_VERSION}/plustek
 @dirrm share/doc/sane-${SANE_VERSION}/niash
+@dirrm share/doc/sane-${SANE_VERSION}/mustek_usb2
 @dirrm share/doc/sane-${SANE_VERSION}/mustek_usb
 @dirrm share/doc/sane-${SANE_VERSION}/mustek
 @dirrm share/doc/sane-${SANE_VERSION}/matsushita
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 8dac90490aa..b6aae8db9b0 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.17 2005/09/27 09:29:56 wiz Exp $
+$NetBSD: distinfo,v 1.18 2005/12/31 00:03:24 wiz Exp $
 
-SHA1 (sane-backends-1.0.16.tar.gz) = 38e2bf7aef648f3ea19bd6c89af2c2fdd8b6eeb1
-RMD160 (sane-backends-1.0.16.tar.gz) = 694030faddf3b14035b6d4cee0151aa48f71049d
-Size (sane-backends-1.0.16.tar.gz) = 3409799 bytes
-SHA1 (patch-aa) = 211eb2cef3f623de612dd5d94291e151f66e1255
-SHA1 (patch-ab) = 0bc5e7899683c3962a186a7155a5d4c9011b6a3d
+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 (patch-aa) = fe4f9771d72512ac6a6c246971cb5940fba184cb
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index eca28b8da10..20ff722b358 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2005/09/27 09:29:56 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2005/12/31 00:03:24 wiz Exp $
 
---- include/sane/sanei_backend.h.orig	2004-11-13 21:50:48.000000000 +0100
-+++ include/sane/sanei_backend.h
-@@ -16,7 +16,7 @@
-  * Compiler related options
-  */
+--- backend/Makefile.in.orig	2005-12-18 14:32:31.000000000 +0100
++++ backend/Makefile.in
+@@ -25,7 +25,7 @@ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-configdir = ${sysconfdir}/sane.d
++configdir = ${PREFIX}/share/examples/sane
+ BEOS_ADDONDIR = @BEOS_ADDONDIR@
  
--#ifdef __GNUC__
-+#if defined(__GNUC__) && !defined(__NetBSD__)
- 
- /* __unused tells the compiler a variable is unused, so the
-  * compiler doesn't spit a warning. */
+ V_MAJOR = @V_MAJOR@
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
deleted file mode 100644
index d4958bd1a10..00000000000
--- a/graphics/sane-backends/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2005/09/27 09:29:56 wiz Exp $
-
---- backend/Makefile.in.orig	2005-07-30 14:28:10.000000000 +0200
-+++ backend/Makefile.in
-@@ -25,7 +25,7 @@ infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--configdir = ${sysconfdir}/sane.d
-+configdir = ${prefix}/share/examples/sane
- BEOS_ADDONDIR = @BEOS_ADDONDIR@
- 
- V_MAJOR = @V_MAJOR@