Update sane-backends to 1.0.7. Changes include bugfixes, a number of

additional supported scanners, and new backends for Mustek USB scanners.
While at it, split out common "sane" definitions into a Makefile.common
for sane-frontents (and possibly others) to use.

6 files changed, 189 insertions, 171 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index e5a6fa84ca4..87fe6702564 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/10/19 21:31:09 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/02/10 00:50:41 rh Exp $
 
-DISTNAME=       sane-backends-1.0.5
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/sane-1.0.5/ \
-		ftp://ftp.mostang.com/pub/sane/old-versions/sane-1.0.5/ \
-		ftp://gd.tuwien.ac.at/hci/sane/sane-1.0.5/ \
-		ftp://ftp.informatik.uni-oldenburg.de/pub/sane/sane-1.0.5/
+.include "Makefile.common"
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.mostang.com/sane/
-COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
-
-CONFLICTS+=	sane<=1.0.3
+DISTNAME=       sane-backends-${SANE_VERSION}
 
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
new file mode 100644
index 00000000000..9c35585bf76
--- /dev/null
+++ b/graphics/sane-backends/Makefile.common
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile.common,v 1.1 2002/02/10 00:50:42 rh Exp $
+
+CATEGORIES?=	graphics
+MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/sane-${SANE_VERSION}/ \
+		ftp://ftp.mostang.com/pub/sane/old-versions/sane-${SANE_VERSION}/ \
+		ftp://gd.tuwien.ac.at/hci/sane/sane-${SANE_VERSION}/ \
+		ftp://ftp.informatik.uni-oldenburg.de/pub/sane/sane-${SANE_VERSION}/
+
+MAINTAINER?=	packages@netbsd.org
+HOMEPAGE?=	http://www.mostang.com/sane/
+COMMENT?=	API for access to scanners, digitals camera, frame grabbers etc.
+
+SANE_MAJOR=	1
+SANE_MINOR=	0
+SANE_MICRO=	7
+SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
+PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR}
+PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR}
+PLIST_SUBST+=	SANE_MICRO=${SANE_MICRO}
+PLIST_SUBST+=	SANE_VERSION=${SANE_VERSION}
+
+CONFLICTS+=	sane<=1.0.3
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 5add8d3f182..753a51046cd 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:52 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/10 00:50:42 rh Exp $
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
@@ -22,6 +22,7 @@ etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
 etc/sane.d/mustek_pp.conf
+etc/sane.d/mustek_usb.conf
 etc/sane.d/nec.conf
 etc/sane.d/net.conf
 etc/sane.d/pie.conf
@@ -35,194 +36,205 @@ etc/sane.d/sp15c.conf
 etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
+etc/sane.d/umax1220u.conf
 etc/sane.d/umax_pp.conf
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.a
 lib/libsane.la
 lib/libsane.so
-lib/libsane.so.1
-lib/libsane.so.1.5
+lib/libsane.so.${SANE_MAJOR}
+lib/libsane.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-abaton.a
 lib/sane/libsane-abaton.la
 lib/sane/libsane-abaton.so
-lib/sane/libsane-abaton.so.1
-lib/sane/libsane-abaton.so.1.5
+lib/sane/libsane-abaton.so.${SANE_MAJOR}
+lib/sane/libsane-abaton.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-agfafocus.a
 lib/sane/libsane-agfafocus.la
 lib/sane/libsane-agfafocus.so
-lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-agfafocus.so.1.5
+lib/sane/libsane-agfafocus.so.${SANE_MAJOR}
+lib/sane/libsane-agfafocus.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-apple.a
 lib/sane/libsane-apple.la
 lib/sane/libsane-apple.so
-lib/sane/libsane-apple.so.1
-lib/sane/libsane-apple.so.1.5
+lib/sane/libsane-apple.so.${SANE_MAJOR}
+lib/sane/libsane-apple.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-artec.a
 lib/sane/libsane-artec.la
 lib/sane/libsane-artec.so
-lib/sane/libsane-artec.so.1
-lib/sane/libsane-artec.so.1.5
+lib/sane/libsane-artec.so.${SANE_MAJOR}
+lib/sane/libsane-artec.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-as6e.a
 lib/sane/libsane-as6e.la
 lib/sane/libsane-as6e.so
-lib/sane/libsane-as6e.so.1
-lib/sane/libsane-as6e.so.1.5
+lib/sane/libsane-as6e.so.${SANE_MAJOR}
+lib/sane/libsane-as6e.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-avision.a
 lib/sane/libsane-avision.la
 lib/sane/libsane-avision.so
-lib/sane/libsane-avision.so.1
-lib/sane/libsane-avision.so.1.5
+lib/sane/libsane-avision.so.${SANE_MAJOR}
+lib/sane/libsane-avision.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-bh.a
 lib/sane/libsane-bh.la
 lib/sane/libsane-bh.so
-lib/sane/libsane-bh.so.1
-lib/sane/libsane-bh.so.1.5
+lib/sane/libsane-bh.so.${SANE_MAJOR}
+lib/sane/libsane-bh.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-canon.a
 lib/sane/libsane-canon.la
 lib/sane/libsane-canon.so
-lib/sane/libsane-canon.so.1
-lib/sane/libsane-canon.so.1.5
+lib/sane/libsane-canon.so.${SANE_MAJOR}
+lib/sane/libsane-canon.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan.so
-lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-coolscan.so.1.5
+lib/sane/libsane-coolscan.so.${SANE_MAJOR}
+lib/sane/libsane-coolscan.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-dc210.a
 lib/sane/libsane-dc210.la
 lib/sane/libsane-dc210.so
-lib/sane/libsane-dc210.so.1
-lib/sane/libsane-dc210.so.1.5
+lib/sane/libsane-dc210.so.${SANE_MAJOR}
+lib/sane/libsane-dc210.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-dc240.a
 lib/sane/libsane-dc240.la
 lib/sane/libsane-dc240.so
-lib/sane/libsane-dc240.so.1
-lib/sane/libsane-dc240.so.1.5
+lib/sane/libsane-dc240.so.${SANE_MAJOR}
+lib/sane/libsane-dc240.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.la
 lib/sane/libsane-dc25.so
-lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dc25.so.1.5
+lib/sane/libsane-dc25.so.${SANE_MAJOR}
+lib/sane/libsane-dc25.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-dll.a
 lib/sane/libsane-dll.la
 lib/sane/libsane-dll.so
-lib/sane/libsane-dll.so.1
-lib/sane/libsane-dll.so.1.5
+lib/sane/libsane-dll.so.${SANE_MAJOR}
+lib/sane/libsane-dll.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-dmc.a
 lib/sane/libsane-dmc.la
 lib/sane/libsane-dmc.so
-lib/sane/libsane-dmc.so.1
-lib/sane/libsane-dmc.so.1.5
+lib/sane/libsane-dmc.so.${SANE_MAJOR}
+lib/sane/libsane-dmc.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-epson.a
 lib/sane/libsane-epson.la
 lib/sane/libsane-epson.so
-lib/sane/libsane-epson.so.1
-lib/sane/libsane-epson.so.1.5
+lib/sane/libsane-epson.so.${SANE_MAJOR}
+lib/sane/libsane-epson.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-hp.a
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp.so
-lib/sane/libsane-hp.so.1
-lib/sane/libsane-hp.so.1.5
+lib/sane/libsane-hp.so.${SANE_MAJOR}
+lib/sane/libsane-hp.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-m3096g.a
 lib/sane/libsane-m3096g.la
 lib/sane/libsane-m3096g.so
-lib/sane/libsane-m3096g.so.1
-lib/sane/libsane-m3096g.so.1.5
+lib/sane/libsane-m3096g.so.${SANE_MAJOR}
+lib/sane/libsane-m3096g.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-microtek.a
 lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek.so
-lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek.so.1.5
+lib/sane/libsane-microtek.so.${SANE_MAJOR}
+lib/sane/libsane-microtek.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-microtek2.a
 lib/sane/libsane-microtek2.la
 lib/sane/libsane-microtek2.so
-lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-microtek2.so.1.5
+lib/sane/libsane-microtek2.so.${SANE_MAJOR}
+lib/sane/libsane-microtek2.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek.so
-lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek.so.1.5
+lib/sane/libsane-mustek.so.${SANE_MAJOR}
+lib/sane/libsane-mustek.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-mustek_pp.a
 lib/sane/libsane-mustek_pp.la
 lib/sane/libsane-mustek_pp.so
-lib/sane/libsane-mustek_pp.so.1
-lib/sane/libsane-mustek_pp.so.1.5
+lib/sane/libsane-mustek_pp.so.${SANE_MAJOR}
+lib/sane/libsane-mustek_pp.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-mustek_usb.a
+lib/sane/libsane-mustek_usb.la
+lib/sane/libsane-mustek_usb.so
+lib/sane/libsane-mustek_usb.so.${SANE_MAJOR}
+lib/sane/libsane-mustek_usb.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-nec.a
 lib/sane/libsane-nec.la
 lib/sane/libsane-nec.so
-lib/sane/libsane-nec.so.1
-lib/sane/libsane-nec.so.1.5
+lib/sane/libsane-nec.so.${SANE_MAJOR}
+lib/sane/libsane-nec.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-net.a
 lib/sane/libsane-net.la
 lib/sane/libsane-net.so
-lib/sane/libsane-net.so.1
-lib/sane/libsane-net.so.1.5
+lib/sane/libsane-net.so.${SANE_MAJOR}
+lib/sane/libsane-net.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-pie.a
 lib/sane/libsane-pie.la
 lib/sane/libsane-pie.so
-lib/sane/libsane-pie.so.1
-lib/sane/libsane-pie.so.1.5
+lib/sane/libsane-pie.so.${SANE_MAJOR}
+lib/sane/libsane-pie.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-pint.a
 lib/sane/libsane-pint.la
 lib/sane/libsane-pint.so
-lib/sane/libsane-pint.so.1
-lib/sane/libsane-pint.so.1.5
+lib/sane/libsane-pint.so.${SANE_MAJOR}
+lib/sane/libsane-pint.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-plustek.a
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek.so
-lib/sane/libsane-plustek.so.1
-lib/sane/libsane-plustek.so.1.5
+lib/sane/libsane-plustek.so.${SANE_MAJOR}
+lib/sane/libsane-plustek.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-ricoh.a
 lib/sane/libsane-ricoh.la
 lib/sane/libsane-ricoh.so
-lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-ricoh.so.1.5
+lib/sane/libsane-ricoh.so.${SANE_MAJOR}
+lib/sane/libsane-ricoh.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.la
 lib/sane/libsane-s9036.so
-lib/sane/libsane-s9036.so.1
-lib/sane/libsane-s9036.so.1.5
+lib/sane/libsane-s9036.so.${SANE_MAJOR}
+lib/sane/libsane-s9036.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-sharp.a
 lib/sane/libsane-sharp.la
 lib/sane/libsane-sharp.so
-lib/sane/libsane-sharp.so.1
-lib/sane/libsane-sharp.so.1.5
+lib/sane/libsane-sharp.so.${SANE_MAJOR}
+lib/sane/libsane-sharp.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-sm3600.a
 lib/sane/libsane-sm3600.la
 lib/sane/libsane-sm3600.so
-lib/sane/libsane-sm3600.so.1
-lib/sane/libsane-sm3600.so.1.5
+lib/sane/libsane-sm3600.so.${SANE_MAJOR}
+lib/sane/libsane-sm3600.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-snapscan.so
-lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-snapscan.so.1.5
+lib/sane/libsane-snapscan.so.${SANE_MAJOR}
+lib/sane/libsane-snapscan.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-sp15c.a
 lib/sane/libsane-sp15c.la
 lib/sane/libsane-sp15c.so
-lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-sp15c.so.1.5
+lib/sane/libsane-sp15c.so.${SANE_MAJOR}
+lib/sane/libsane-sp15c.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-st400.a
 lib/sane/libsane-st400.la
 lib/sane/libsane-st400.so
-lib/sane/libsane-st400.so.1
-lib/sane/libsane-st400.so.1.5
+lib/sane/libsane-st400.so.${SANE_MAJOR}
+lib/sane/libsane-st400.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.la
 lib/sane/libsane-tamarack.so
-lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-tamarack.so.1.5
+lib/sane/libsane-tamarack.so.${SANE_MAJOR}
+lib/sane/libsane-tamarack.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-umax.a
 lib/sane/libsane-umax.la
 lib/sane/libsane-umax.so
-lib/sane/libsane-umax.so.1
-lib/sane/libsane-umax.so.1.5
+lib/sane/libsane-umax.so.${SANE_MAJOR}
+lib/sane/libsane-umax.so.${SANE_MAJOR}.${SANE_MICRO}
+lib/sane/libsane-umax1220u.a
+lib/sane/libsane-umax1220u.la
+lib/sane/libsane-umax1220u.so
+lib/sane/libsane-umax1220u.so.${SANE_MAJOR}
+lib/sane/libsane-umax1220u.so.${SANE_MAJOR}.${SANE_MICRO}
 lib/sane/libsane-umax_pp.a
 lib/sane/libsane-umax_pp.la
 lib/sane/libsane-umax_pp.so
-lib/sane/libsane-umax_pp.so.1
-lib/sane/libsane-umax_pp.so.1.5
+lib/sane/libsane-umax_pp.so.${SANE_MAJOR}
+lib/sane/libsane-umax_pp.so.${SANE_MAJOR}.${SANE_MICRO}
 man/man1/sane-find-scanner.1
 man/man1/saned.1
 man/man1/scanimage.1
@@ -242,11 +254,13 @@ man/man5/sane-dll.5
 man/man5/sane-dmc.5
 man/man5/sane-epson.5
 man/man5/sane-fujitsu.5
+man/man5/sane-gphoto2.5
 man/man5/sane-hp.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-nec.5
 man/man5/sane-net.5
 man/man5/sane-pie.5
@@ -263,69 +277,73 @@ man/man5/sane-snapscan.5
 man/man5/sane-st400.5
 man/man5/sane-tamarack.5
 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/man7/sane.7
 sbin/saned
-share/doc/sane-1.0.5/AUTHORS
-share/doc/sane-1.0.5/COPYING
-share/doc/sane-1.0.5/ChangeLog
-share/doc/sane-1.0.5/LEVEL2
-share/doc/sane-1.0.5/LICENSE
-share/doc/sane-1.0.5/NEWS
-share/doc/sane-1.0.5/PROBLEMS
-share/doc/sane-1.0.5/PROJECTS
-share/doc/sane-1.0.5/README
-share/doc/sane-1.0.5/README.aix
-share/doc/sane-1.0.5/README.hp-ux
-share/doc/sane-1.0.5/README.linux
-share/doc/sane-1.0.5/README.os2
-share/doc/sane-1.0.5/README.solaris
-share/doc/sane-1.0.5/README.unixware2
-share/doc/sane-1.0.5/README.unixware7
-share/doc/sane-1.0.5/TODO
-share/doc/sane-1.0.5/backend-writing.txt
-share/doc/sane-1.0.5/canon/canon.changes
-share/doc/sane-1.0.5/canon/canon.install2700F.txt
-share/doc/sane-1.0.5/mustek/mustek.CHANGES
-share/doc/sane-1.0.5/umax/negative-types.txt
-share/doc/sane-1.0.5/umax/sane-logo.jpg
-share/doc/sane-1.0.5/umax/sane-logo2.jpg
-share/doc/sane-1.0.5/umax/sane-umax-advanced-options-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-advanced.jpg
-share/doc/sane-1.0.5/umax/sane-umax-astra-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-config-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-doc.dvi
-share/doc/sane-1.0.5/umax/sane-umax-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-doc.tex
-share/doc/sane-1.0.5/umax/sane-umax-histogram.jpg
-share/doc/sane-1.0.5/umax/sane-umax-mailinglist.html
-share/doc/sane-1.0.5/umax/sane-umax-mirage-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-not-listed-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-old-scanners-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-options-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-others-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-parport-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-powerlook-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-scanner-clones-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-scanners-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-speed-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-standard-options-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-standard.jpg
-share/doc/sane-1.0.5/umax/sane-umax-text.jpg
-share/doc/sane-1.0.5/umax/sane-umax-text2.jpg
-share/doc/sane-1.0.5/umax/sane-umax-text4.jpg
-share/doc/sane-1.0.5/umax/sane-umax-uc-doc.html
-share/doc/sane-1.0.5/umax/sane-umax-vista-doc.html
-share/doc/sane-1.0.5/umax/sane-umax.jpg
-share/doc/sane-1.0.5/umax/umax.BUGS
-share/doc/sane-1.0.5/umax/umax.CHANGES
-share/doc/sane-1.0.5/umax/umax.FAQ
-share/doc/sane-1.0.5/umax/umax.TODO
-@dirrm share/doc/sane-1.0.5/umax
-@dirrm share/doc/sane-1.0.5/mustek
-@dirrm share/doc/sane-1.0.5/canon
-@dirrm share/doc/sane-1.0.5
+share/doc/sane-${SANE_VERSION}/AUTHORS
+share/doc/sane-${SANE_VERSION}/COPYING
+share/doc/sane-${SANE_VERSION}/ChangeLog
+share/doc/sane-${SANE_VERSION}/LEVEL2
+share/doc/sane-${SANE_VERSION}/LICENSE
+share/doc/sane-${SANE_VERSION}/NEWS
+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.hp-ux
+share/doc/sane-${SANE_VERSION}/README.linux
+share/doc/sane-${SANE_VERSION}/README.os2
+share/doc/sane-${SANE_VERSION}/README.solaris
+share/doc/sane-${SANE_VERSION}/README.unixware2
+share/doc/sane-${SANE_VERSION}/README.unixware7
+share/doc/sane-${SANE_VERSION}/TODO
+share/doc/sane-${SANE_VERSION}/backend-writing.txt
+share/doc/sane-${SANE_VERSION}/canon/canon.changes
+share/doc/sane-${SANE_VERSION}/canon/canon.install2700F.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}/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
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced.jpg
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-astra-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-config-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.dvi
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.tex
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-histogram.jpg
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-mailinglist.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-mirage-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-not-listed-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-old-scanners-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-options-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-others-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-parport-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-powerlook-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-scanner-clones-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-scanners-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-speed-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-standard-options-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-standard.jpg
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-text.jpg
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-text2.jpg
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-text4.jpg
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-uc-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax-vista-doc.html
+share/doc/sane-${SANE_VERSION}/umax/sane-umax.jpg
+share/doc/sane-${SANE_VERSION}/umax/umax.BUGS
+share/doc/sane-${SANE_VERSION}/umax/umax.CHANGES
+share/doc/sane-${SANE_VERSION}/umax/umax.FAQ
+share/doc/sane-${SANE_VERSION}/umax/umax.TODO
+@dirrm share/doc/sane-${SANE_VERSION}/umax
+@dirrm share/doc/sane-${SANE_VERSION}/mustek_usb
+@dirrm share/doc/sane-${SANE_VERSION}/mustek
+@dirrm share/doc/sane-${SANE_VERSION}/canon
+@dirrm share/doc/sane-${SANE_VERSION}
 @dirrm lib/sane
 @dirrm include/sane
 @dirrm etc/sane.d
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 3c5a2f097c1..2ee308c5bce 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2001/10/19 21:31:09 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/02/10 00:50:42 rh Exp $
 
-SHA1 (sane-backends-1.0.5.tar.gz) = d9f43e1df14de410a47fbed5a6403d61df551eb3
-Size (sane-backends-1.0.5.tar.gz) = 1623024 bytes
-SHA1 (patch-aa) = 631ff8b3f24daa73a8a8902756ae6c7ee645c76c
-SHA1 (patch-ad) = 5ce224b90802658a7861c7acb7e48971ece40286
+SHA1 (sane-backends-1.0.7.tar.gz) = 5e527b62d067b50965155d9e0836c207139307e5
+Size (sane-backends-1.0.7.tar.gz) = 1867577 bytes
+SHA1 (patch-aa) = c17cbd11a05dcf62d0c2183859eeeac259a0026a
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 0de0554f42f..d4b76c6b251 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2001/10/19 21:31:10 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2002/02/10 00:50:42 rh Exp $
 
---- doc/Makefile.in.orig	Sun Jun 10 14:20:55 2001
+--- doc/Makefile.in.orig	Sat Jan 19 17:58:06 2002
 +++ doc/Makefile.in
-@@ -20,7 +20,7 @@
+@@ -24,7 +24,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
  configdir = ${sysconfdir}/sane.d
@@ -11,18 +11,18 @@ $NetBSD: patch-aa,v 1.3 2001/10/19 21:31:10 jlam Exp $
  
  MKDIR = $(top_srcdir)/mkinstalldirs
  INSTALL = @INSTALL@
-@@ -45,7 +45,7 @@
+@@ -51,7 +51,7 @@
  READMES = README AUTHORS COPYING ChangeLog LEVEL2 LICENSE NEWS PROBLEMS \
            PROJECTS README README.aix README.hp-ux README.linux README.os2 \
            README.solaris README.unixware2 README.unixware7 TODO
 -DOCS    = backend-writing.txt sane.ps sane.dvi
 +DOCS    = backend-writing.txt
- BACKDIRS= canon mustek umax
+ BACKDIRS= canon mustek mustek_usb umax
  LATEX	= TEXINPUTS=$(srcdir):$$TEXINPUTS latex
  DLH	= TEXINPUTS=$(srcdir):$$TEXINPUTS dlh
-@@ -55,7 +55,7 @@
- EMACS   = xemacs
- WWW_PATH= /home/httpd/html/sane/
+@@ -82,7 +82,7 @@
+ .PHONY: all clean depend dist distclean html html-man install \
+   install-mostang sane-backends.html sane-html uninstall
  
 -all: sane.ps $(MANPAGES) 
 +all: $(MANPAGES) 
diff --git a/graphics/sane-backends/patches/patch-ad b/graphics/sane-backends/patches/patch-ad
deleted file mode 100644
index 2f19a215881..00000000000
--- a/graphics/sane-backends/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/10/15 21:27:19 veego Exp $
-
---- backend/snapscan.h-orig	Sun May 27 12:20:22 2001
-+++ backend/snapscan.h	Sun Oct 14 12:49:03 2001
-@@ -101,6 +101,7 @@
-     {"FlatbedScanner_9",	PRISA620S},
-     {"FlatbedScanner13",	PRISA620S},
-     {"FlatbedScanner16",	PRISA620S},
-+    {"FlatbedScanner17",	PRISA620S},
-     {"FlatbedScanner18",	PRISA620S},
-     {"FlatbedScanner19",        PRISA620S},        /* Acer ScanPrisa 1240UT */
-     {"FlatbedScanner20",	PRISA620S},