Update "sane-backends" package to version 1.0.9. Changes since version 1.0.8:

- New backends: hpsj5s (Hewlett-Packard ScanJet 5S parport scanner),
  teco2 (some Relisys/Primax SCSI flatbed scanners, models VM3575, VM6565,
  VM6586 and VM6575), teco3 (some Relisys/Piotech/Trust/Plustek SCSI
  flatbed scanners, model VM3552).
- Updated backends: avision, canon_pp, coolscan2, dc240, dc25, epson, fujitsu,
  hp, leo, microtek, mustek, mustek_usb, pie, plustek, snapscan, teco1, test,
  umax, umax_pp, v4l.
- sane-find-scanner finds more scanners and has more verbosity options now.
- New tool to create gamma tables (gamma4scanimage).
- Support for ICC profiles for scanimage.
- USB scanner should work on all systems supported by libusb now.
- Portability fixes (especially for big-endian sytems, Irix, OpenStep, OS/2,
  Solaris).
- New and updated translations for various backends.
- New system for generating lists of manufacturers/backends.
- Various documentation updates.
- Bugfixes.

5 files changed, 50 insertions, 23 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 00a21b28da2..ca03c9149ff 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,18 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2002/11/09 13:45:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/12/16 17:59:05 tron Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
 
 DISTNAME=       sane-backends-${SANE_VERSION}
 
-USE_BUILDLINK2=		YES
-GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
-USE_LIBTOOL=		YES
-
 .include "../../devel/libusb/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-# -O to work around a bug with -O2 and egcs.
-CFLAGS+=	-O
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 68362f137bd..8491991b087 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2002/11/09 13:45:58 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2002/12/16 17:59:05 tron Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \
@@ -11,7 +11,7 @@ HOMEPAGE?=	http://www.mostang.com/sane/
 
 SANE_MAJOR=	1
 SANE_MINOR=	0
-SANE_MICRO=	8
+SANE_MICRO=	9
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR}
@@ -20,4 +20,14 @@ PLIST_SUBST+=	SANE_VERSION=${SANE_VERSION}
 
 CONFLICTS+=	sane<=1.0.3
 
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+.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 ab169cd156a..c90f5992c79 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2002/09/22 17:14:59 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/12/16 17:59:05 tron Exp $
+bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
@@ -41,6 +42,8 @@ etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/teco1.conf
+etc/sane.d/teco2.conf
+etc/sane.d/teco3.conf
 etc/sane.d/test.conf
 etc/sane.d/umax.conf
 etc/sane.d/umax1220u.conf
@@ -257,6 +260,16 @@ lib/sane/libsane-teco1.la
 lib/sane/libsane-teco1.so
 lib/sane/libsane-teco1.so.${SANE_MAJOR}
 lib/sane/libsane-teco1.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-teco2.a
+lib/sane/libsane-teco2.la
+lib/sane/libsane-teco2.so
+lib/sane/libsane-teco2.so.${SANE_MAJOR}
+lib/sane/libsane-teco2.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-teco3.a
+lib/sane/libsane-teco3.la
+lib/sane/libsane-teco3.so
+lib/sane/libsane-teco3.so.${SANE_MAJOR}
+lib/sane/libsane-teco3.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-test.a
 lib/sane/libsane-test.la
 lib/sane/libsane-test.so
@@ -277,9 +290,14 @@ lib/sane/libsane-umax_pp.la
 lib/sane/libsane-umax_pp.so
 lib/sane/libsane-umax_pp.so.${SANE_MAJOR}
 lib/sane/libsane-umax_pp.so.${SANE_MAJOR}.${SANE_MICRO}
+man/man1/gamma4scanimage.1
+man/man1/sane-config.1
 man/man1/sane-find-scanner.1
 man/man1/saned.1
 man/man1/scanimage.1
+man/man5/sane-hpsj5s.5
+man/man5/sane-teco2.5
+man/man5/sane-teco3.5
 man/man5/sane-abaton.5
 man/man5/sane-agfafocus.5
 man/man5/sane-apple.5
@@ -344,8 +362,13 @@ share/doc/sane-${SANE_VERSION}/PROBLEMS
 share/doc/sane-${SANE_VERSION}/PROJECTS
 share/doc/sane-${SANE_VERSION}/README
 share/doc/sane-${SANE_VERSION}/README.aix
+share/doc/sane-${SANE_VERSION}/README.beos
+share/doc/sane-${SANE_VERSION}/README.darwin
 share/doc/sane-${SANE_VERSION}/README.hp-ux
 share/doc/sane-${SANE_VERSION}/README.linux
+share/doc/sane-${SANE_VERSION}/README.freebsd
+share/doc/sane-${SANE_VERSION}/README.netbsd
+share/doc/sane-${SANE_VERSION}/README.openbsd
 share/doc/sane-${SANE_VERSION}/README.os2
 share/doc/sane-${SANE_VERSION}/README.solaris
 share/doc/sane-${SANE_VERSION}/README.unixware2
@@ -360,6 +383,8 @@ 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}/sceptre/s1200.txt
 share/doc/sane-${SANE_VERSION}/teco/teco1.txt
+share/doc/sane-${SANE_VERSION}/teco/teco2.txt
+share/doc/sane-${SANE_VERSION}/teco/teco3.txt
 share/doc/sane-${SANE_VERSION}/umax/sane-logo.jpg
 share/doc/sane-${SANE_VERSION}/umax/sane-logo2.jpg
 share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced-options-doc.html
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index af47a12a3db..07b587437aa 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2002/08/25 19:22:54 jlam Exp $
+$NetBSD: distinfo,v 1.11 2002/12/16 17:59:05 tron Exp $
 
-SHA1 (sane-backends-1.0.8.tar.gz) = b442f500e6aa21184abeb74dc6b83246e01b383a
-Size (sane-backends-1.0.8.tar.gz) = 2169657 bytes
-SHA1 (patch-aa) = ace1112377c0a330d80183193bf15b8ffbff2da3
+SHA1 (sane-backends-1.0.9.tar.gz) = cbfcf4abb805065821f4c9aef64765b0563255aa
+Size (sane-backends-1.0.9.tar.gz) = 2289976 bytes
+SHA1 (patch-aa) = 32070ca6afef7f96a1fa291857598cf116cbeeae
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index a96762d63eb..20cc7ea7bdb 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2002/08/25 19:22:54 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2002/12/16 17:59:06 tron Exp $
 
---- doc/Makefile.in.orig	Sun May  5 16:59:45 2002
-+++ doc/Makefile.in	Sat Jul 13 03:15:58 2002
+--- doc/Makefile.in.orig	Tue Oct 15 13:52:38 2002
++++ doc/Makefile.in	Mon Dec 16 18:15:37 2002
 @@ -24,7 +24,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -11,16 +11,16 @@ $NetBSD: patch-aa,v 1.6 2002/08/25 19:22:54 jlam Exp $
  
  MKDIR = $(top_srcdir)/mkinstalldirs
  INSTALL = @INSTALL@
-@@ -54,7 +54,7 @@
- READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
-           PROJECTS README README.aix README.hp-ux README.linux README.os2 \
+@@ -56,7 +56,7 @@
+           PROJECTS README README.aix README.beos README.darwin README.freebsd \
+           README.hp-ux README.linux README.netbsd README.openbsd README.os2 \
            README.solaris README.unixware2 README.unixware7 TODO
 -DOCS    = backend-writing.txt sane.ps sane.dvi
 +DOCS    = backend-writing.txt
  BACKDIRS= canon matsushita mustek mustek_usb umax sceptre teco
  LATEX	= TEXINPUTS=$(srcdir):$$TEXINPUTS latex
  DLH	= TEXINPUTS=$(srcdir):$$TEXINPUTS dlh
-@@ -89,7 +89,7 @@
+@@ -92,7 +92,7 @@
  .PHONY: all clean depend dist distclean html html-man install \
    install-mostang sane-html uninstall