Update sane-backends to 1.0.5.

New with 1.0.5, released 2001-07-01:
* New backends: bh (Bell+Howell Copiscan II series), dc240 (Kodak DC240
  Digital Camera), sm3600 (Microtek ScanMaker 3600), umax_pp (Umax paralell
  port scanners).
* Updated backends: artec (v0.5.16), dc25 (v1.2), dll (v1.0.3),
  epson (v0.2.08), hp (v0.94), microtek (v0.12.3), microtek2(v0.9),
  mustek (v1.0-107), nec (v0.12), net (v1.0.3), plustek (v0.39), pnm (v1.0.1),
  snapscan (v1.2), tamarack (v0.5), umax (v1.0-28).
* Fixed security bug in saned.c that allowed access to scanner without
  password.
* pnm isn't installed by default anymore due to security risks
* Linux-part of sanei_scsi.c was updated concerning buffersizes, devfs, and
  kernel 2.4. More debug output.
* sanei_scsi_find_devices works on FreeBSD now.
* Added support for Solaris sgen SCSI driver.
* find-scanner was renamed to sane-find-scanner and is installed now. Further
  more it has a man page now.
* There is a testsuite for sane, but only one test is implemented yet.
* Better output about versions of backends and frontends.
* There is a man page for SANE now (sane(7)).
* Install all available documentation.
* Bugfixes.

4 files changed, 12 insertions, 71 deletions

diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
deleted file mode 100644
index 05dce7cbcd9..00000000000
--- a/graphics/sane-backends/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/21 19:53:27 veego Exp $
-
---- backend/Makefile.in	Thu Nov 30 21:05:49 2000
-+++ backend/Makefile.in	Sun Feb 18 16:30:49 2001
-@@ -33,7 +33,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- RANLIB = @RANLIB@
--LN_S = @LN_S@
-+LN_S = @LN_S@ -f
- 
- CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
-@@ -93,7 +93,7 @@
- 	$(MKDIR) $(libdir) $(libsanedir) $(configdir)
- 	@list="$(LIBS)"; for be in $$list; do \
- 	  echo installing $${be} in $(libsanedir)...; \
--	  $(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) $${be} $(libsanedir)/$${be} \
-+	  $(LIBTOOL) $(MINST) $(INSTALL_DATA) $${be} $(libsanedir)/$${be} \
- 	    || exit 1; \
- 	done
- 	@$(LIBTOOL) $(MINST) --finish $(libsanedir)
-@@ -101,10 +101,14 @@
- 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
- 	list="$(ALL_BACKENDS)"; cd $(libsanedir) && for be in $$list; do \
- 	  file=libsane-$${be}.$$dllend.$(V_MAJOR); \
-+	  lnkf=libsane-$${be}.so.$(V_MAJOR); \
- 	  lib=`grep dlname= libsane-$${be}.la | cut -f2 -d"'"`; \
- 	  if test ! -f $${file} -a -n "$${lib}"; then \
- 	    $(LN_S) $${lib} $${file}; \
- 	  fi; \
-+	  if test ! -f $${lnkf} -a -n "$${lib}"; then \
-+	    $(LN_S) $${lib} $${lnkf}; \
-+	  fi; \
- 	done
- 	@# Assume the dll name without any versions is last
- 	@dllend=`../tools/libtool-get-dll-ext libsane-dll.la`; \
-@@ -116,7 +120,7 @@
- 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
- 	  (cd ..; $(LN_S) sane/$$n $$nn); \
- 	done || exit 1
--	$(LIBTOOL) $(MINST) $(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
-+	$(LIBTOOL) $(MINST) $(INSTALL_DATA) libsane.la $(libdir)/libsane.la
- 	@list="$(CONFIGS)"; for cfg in $$list; do \
- 	  if test ! -r $(srcdir)/$${cfg}; then continue; fi; \
- 	  if test -f $(configdir)/$${cfg}; then \
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index 6c56e71969d..869b9b159b0 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/21 19:53:27 veego Exp $
+$NetBSD: patch-ab,v 1.2 2001/10/15 21:27:19 veego Exp $
 
---- configure	Thu Dec 21 23:22:15 2000
-+++ configure	Sun Feb 18 16:29:25 2001
-@@ -2434,7 +2434,7 @@
+--- configure-orig	Sun Oct 14 12:34:54 2001
++++ configure	Sun Oct 14 12:46:23 2001
+@@ -2642,7 +2642,7 @@
  EOF
- if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ if { (eval echo configure:2644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
 +  eval "ac_cv_lib_$ac_lib_var=no"
diff --git a/graphics/sane-backends/patches/patch-ac b/graphics/sane-backends/patches/patch-ac
deleted file mode 100644
index c4d1c6f5909..00000000000
--- a/graphics/sane-backends/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/21 19:53:27 veego Exp $
-
---- tools/Makefile.in.orig	Sun Mar  5 14:45:19 2000
-+++ tools/Makefile.in	Mon Jul  3 17:13:09 2000
-@@ -65,7 +65,7 @@
- all:	$(DESTINATIONS)
- 
- install: sane-config
--	$(INSTALL_PROGRAM) sane-config $(bindir)/sane-config
-+	${BSD_INSTALL_SCRIPT} sane-config ${bindir}/sane-config
- 
- sane-config: sane-config.in $(top_builddir)/config.status 
- 	cd $(top_builddir) \
diff --git a/graphics/sane-backends/patches/patch-ad b/graphics/sane-backends/patches/patch-ad
index 96d80305b30..2f19a215881 100644
--- a/graphics/sane-backends/patches/patch-ad
+++ b/graphics/sane-backends/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2001/06/02 20:32:00 tron Exp $
+$NetBSD: patch-ad,v 1.2 2001/10/15 21:27:19 veego Exp $
 
---- backend/snapscan.h.orig	Sat Aug 12 17:09:37 2000
-+++ backend/snapscan.h	Sat Jun  2 20:50:01 2001
-@@ -90,6 +90,7 @@
+--- 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},
-     {"SNAPSCAN 1236",		SNAPSCAN1236S},
-     {"SNAPSCAN 310",		SNAPSCAN310},
-     {"SNAPSCAN 600",		SNAPSCAN600},
+     {"FlatbedScanner18",	PRISA620S},
+     {"FlatbedScanner19",        PRISA620S},        /* Acer ScanPrisa 1240UT */
+     {"FlatbedScanner20",	PRISA620S},