Update sane to 1.0.3. Changes include:

* New backends: mustek_pp, plustek, st400, v4l.
* Updated backends: Artec (v0.5.14), Coolscan (v0.4.3), Epson (v0.1.33),
  HP (v0.88), Mustek (v1.0-96), Sharp (v0.31), UMAX (v1.0-21).
* Removed backend info sagitta.desc due to lack of interest.
* Installing no longer depends on 'rev'.
* Added and structured documentation.
* Every backend has a man page now.
* Debug messages are now sent to syslog if stderr is a socket.
* New 16 bit support to scanimage.
* Aliased and hidden backend support.
* Port to UnixWare 2.x and UnixWare 7.
* New script 'sane-config' to help frontend developers.
* Added Ricoh IS50 support.
* Updated backends: Artec (v0.5.13), CANON (v991108), DC-25 (1.2), HP
  (v0.86), Microtek (0.12.0), Microtek2 (v0.8), UMAX (v1.0-build-18),
  Epson (v0.1.15), Sharp (v0.30), sp15c (1.12) and m3096g (1.11).
* Automatic document feeder support for scanimage.
* New backend for Avision AV 630 CS.
* New Linux SCSI Generic driver.
* Upgraded to libtool 1.3.4
* GIMP compatibility patch.
* OS/2 patches.
* Bugfixes.

7 files changed, 201 insertions, 157 deletions

diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index adfe171b5cc..929c22c1569 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2000/05/17 21:52:22 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/28 15:18:53 rh Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
 #
 
-DISTNAME=       sane-1.0.1
+DISTNAME=       sane-1.0.3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 		ftp://gd.tuwien.ac.at/hci/sane/ \
@@ -15,11 +15,13 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.mostang.com/sane/
 
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	gimp>=1.0.4:../../graphics/gimp
+DEPENDS+=	gimp>=1.0.4:../../graphics/gimp-current
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X11BASE=	yes
+USE_LIBTOOL=	yes
+LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 
 # -O to workaorund bug with -O2 and egcs.
 CFLAGS=		-O -I${LOCALBASE}/include
diff --git a/graphics/sane/files/md5 b/graphics/sane/files/md5
index 455d5d6ecfd..7ce8acf948c 100644
--- a/graphics/sane/files/md5
+++ b/graphics/sane/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/05/03 16:20:01 rh Exp $
+$NetBSD: md5,v 1.6 2000/08/28 15:18:54 rh Exp $
 
-MD5 (sane-1.0.1.tar.gz) = d7989b2b18505c72b8568d11b56bb97a
+MD5 (sane-1.0.3.tar.gz) = c1c2e08358e0196109724ecdbe316c7b
diff --git a/graphics/sane/files/patch-sum b/graphics/sane/files/patch-sum
index 8d3e0141a7a..f8be29fb4fa 100644
--- a/graphics/sane/files/patch-sum
+++ b/graphics/sane/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/05/17 21:52:23 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/28 15:18:54 rh Exp $
 
-MD5 (patch-aa) = a98114db4f2cef1b570314cf950d729f
-MD5 (patch-ab) = 6684bff447363003e74ff05c4b43b1c4
-MD5 (patch-ac) = 1fce580a2771d283bca7e59597dc364d
+MD5 (patch-aa) = 92931980b8f644b698a5ae8dcbb0ad8b
+MD5 (patch-ab) = 94a70c16258c033418094e8dc14dec51
+MD5 (patch-ac) = 6ff46739fc3bffb80a66b3e9cb016eb6
diff --git a/graphics/sane/patches/patch-aa b/graphics/sane/patches/patch-aa
index 092594c29bf..00eb94a2cde 100644
--- a/graphics/sane/patches/patch-aa
+++ b/graphics/sane/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 1999/05/03 16:20:01 rh Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/28 15:18:54 rh Exp $
 
---- backend/Makefile.in.orig	Sun Apr  4 01:00:44 1999
-+++ backend/Makefile.in	Wed Apr 21 21:04:33 1999
+--- backend/Makefile.in.orig	Sat Aug 12 16:47:55 2000
++++ backend/Makefile.in
 @@ -33,7 +33,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
@@ -11,3 +11,36 @@ $NetBSD: patch-aa,v 1.4 1999/05/03 16:20:01 rh Exp $
  
  CC = @CC@
  INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include
+@@ -92,7 +92,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)
+@@ -100,10 +100,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`; \
+@@ -115,7 +119,7 @@
+ 	  nn=`echo $$n | sed 's,^libsane-dll,libsane,'`; \
+ 	  (cd ..; $(LN_S) sane/$$n $$nn); \
+ 	done || exit 1
+-	$(INSTALL_PROGRAM) libsane.la $(libdir)/libsane.la
++	$(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/patches/patch-ab b/graphics/sane/patches/patch-ab
index 26e69c09ebf..de806b54730 100644
--- a/graphics/sane/patches/patch-ab
+++ b/graphics/sane/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.5 1999/11/27 22:27:38 rh Exp $
+$NetBSD: patch-ab,v 1.6 2000/08/28 15:18:54 rh Exp $
 
---- configure.orig	Sat Apr 17 22:22:38 1999
-+++ configure	Sat Nov 27 23:25:39 1999
-@@ -1622,7 +1622,7 @@
+--- configure.orig	Sat Aug 12 16:47:33 2000
++++ configure
+@@ -2109,7 +2109,7 @@
  EOF
- if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ if { (eval echo configure:2111: \"$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"
  else
    echo "configure: failed program was:" >&5
    cat conftest.$ac_ext >&5
-@@ -3680,8 +3680,8 @@
+@@ -4501,8 +4501,8 @@
    echo "disabling DC210 backend (failed to find JPEG library)"
    DC210=
  else
diff --git a/graphics/sane/patches/patch-ac b/graphics/sane/patches/patch-ac
deleted file mode 100644
index ba4a3b59c5b..00000000000
--- a/graphics/sane/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/05/17 21:52:23 wiz Exp $
-
---- frontend/xscanimage.c.orig	Sat Apr  3 06:07:57 1999
-+++ frontend/xscanimage.c	Mon May 15 16:09:50 2000
-@@ -75,7 +75,7 @@
- 
- enum
-   {
--    STANDALONE, GIMP_EXTENSION
-+    STANDALONE, GIMP_EXTENSION_2
-   };
- 
- static struct
-@@ -301,7 +301,7 @@
-   int nargs;
- 
-   run_mode = param[0].data.d_int32;
--  scan_win.mode = GIMP_EXTENSION;
-+  scan_win.mode = GIMP_EXTENSION_2;
- 
-   *nreturn_vals = 1;
-   *return_vals = values;
-@@ -456,7 +456,7 @@
-   sane_exit ();
-   gtk_main_quit ();
- #ifdef HAVE_LIBGIMP_GIMP_H
--  if (scan_win.mode == GIMP_EXTENSION)
-+  if (scan_win.mode == GIMP_EXTENSION_2)
-     gimp_quit ();
- #endif
-   exit (0);
-@@ -803,7 +803,7 @@
-   gsg_set_sensitivity (dialog, FALSE);
- 
- #ifdef HAVE_LIBGIMP_GIMP_H
--  if (scan_win.mode == GIMP_EXTENSION && scan_win.tile)
-+  if (scan_win.mode == GIMP_EXTENSION_2 && scan_win.tile)
-     {
-       int height, remaining;
- 
diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST
index 4d728a2df21..7b51b745c27 100644
--- a/graphics/sane/pkg/PLIST
+++ b/graphics/sane/pkg/PLIST
@@ -1,28 +1,36 @@
-@comment $NetBSD: PLIST,v 1.5 1999/05/03 16:20:01 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/08/28 15:18:55 rh Exp $
+bin/sane-config
 bin/scanimage
-bin/xscanimage
 bin/xcam
+bin/xscanimage
 etc/sane.d/abaton.conf
 etc/sane.d/agfafocus.conf
 etc/sane.d/apple.conf
 etc/sane.d/artec.conf
+etc/sane.d/avision.conf
 etc/sane.d/coolscan.conf
 etc/sane.d/dc25.conf
+etc/sane.d/dll.conf
 etc/sane.d/dmc.conf
 etc/sane.d/epson.conf
 etc/sane.d/hp.conf
+etc/sane.d/m3096g.conf
 etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
+etc/sane.d/mustek_pp.conf
 etc/sane.d/net.conf
+etc/sane.d/plustek.conf
 etc/sane.d/ricoh.conf
 etc/sane.d/s9036.conf
+etc/sane.d/saned.conf
 etc/sane.d/sharp.conf
 etc/sane.d/snapscan.conf
+etc/sane.d/sp15c.conf
+etc/sane.d/st400.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
-etc/sane.d/dll.conf
-etc/sane.d/saned.conf
+include/sane/config.h
 include/sane/sane.h
 include/sane/sanei.h
 include/sane/sanei_backend.h
@@ -30,128 +38,169 @@ include/sane/sanei_codec_ascii.h
 include/sane/sanei_codec_bin.h
 include/sane/sanei_debug.h
 include/sane/sanei_net.h
+include/sane/sanei_pa4s2.h
 include/sane/sanei_scsi.h
 include/sane/sanei_wire.h
 include/sane/saneopts.h
-include/sane/config.h
-lib/sane/libsane-abaton.so.1.1
-lib/sane/libsane-abaton.la
+lib/libsane.a
+lib/libsane.la
+lib/libsane.so
+lib/libsane.so.1
+lib/libsane.so.1.3
 lib/sane/libsane-abaton.a
-lib/sane/libsane-agfafocus.so.1.1
-lib/sane/libsane-agfafocus.la
-lib/sane/libsane-agfafocus.a
-lib/sane/libsane-apple.so.1.1
-lib/sane/libsane-apple.la
-lib/sane/libsane-apple.a
-lib/sane/libsane-artec.so.1.1
-lib/sane/libsane-artec.la
-lib/sane/libsane-artec.a
-lib/sane/libsane-canon.so.1.1
-lib/sane/libsane-canon.la
-lib/sane/libsane-canon.a
-lib/sane/libsane-coolscan.so.1.1
-lib/sane/libsane-coolscan.la
-lib/sane/libsane-coolscan.a
-lib/sane/libsane-dc25.so.1.1
-lib/sane/libsane-dc25.la
-lib/sane/libsane-dc25.a
-lib/sane/libsane-dmc.so.1.1
-lib/sane/libsane-dmc.la
-lib/sane/libsane-dmc.a
-lib/sane/libsane-epson.so.1.1
-lib/sane/libsane-epson.la
-lib/sane/libsane-epson.a
-lib/sane/libsane-hp.so.1.1
-lib/sane/libsane-hp.la
-lib/sane/libsane-hp.a
-lib/sane/libsane-microtek.so.1.1
-lib/sane/libsane-microtek.la
-lib/sane/libsane-microtek.a
-lib/sane/libsane-microtek2.so.1.1
-lib/sane/libsane-microtek2.la
-lib/sane/libsane-microtek2.a
-lib/sane/libsane-mustek.so.1.1
-lib/sane/libsane-mustek.la
-lib/sane/libsane-mustek.a
-lib/sane/libsane-net.so.1.1
-lib/sane/libsane-net.la
-lib/sane/libsane-net.a
-lib/sane/libsane-pint.so.1.1
-lib/sane/libsane-pint.la
-lib/sane/libsane-pint.a
-lib/sane/libsane-pnm.so.1.1
-lib/sane/libsane-pnm.la
-lib/sane/libsane-pnm.a
-lib/sane/libsane-ricoh.so.1.1
-lib/sane/libsane-ricoh.la
-lib/sane/libsane-ricoh.a
-lib/sane/libsane-s9036.so.1.1
-lib/sane/libsane-s9036.la
-lib/sane/libsane-s9036.a
-lib/sane/libsane-sharp.so.1.1
-lib/sane/libsane-sharp.la
-lib/sane/libsane-sharp.a
-lib/sane/libsane-snapscan.so.1.1
-lib/sane/libsane-snapscan.la
-lib/sane/libsane-snapscan.a
-lib/sane/libsane-tamarack.so.1.1
-lib/sane/libsane-tamarack.la
-lib/sane/libsane-tamarack.a
-lib/sane/libsane-umax.so.1.1
-lib/sane/libsane-umax.la
-lib/sane/libsane-umax.a
-lib/sane/libsane-dll.so.1.1
-lib/sane/libsane-dll.la
-lib/sane/libsane-dll.a
+lib/sane/libsane-abaton.la
 lib/sane/libsane-abaton.so.1
+lib/sane/libsane-abaton.so.1.3
+lib/sane/libsane-agfafocus.a
+lib/sane/libsane-agfafocus.la
 lib/sane/libsane-agfafocus.so.1
+lib/sane/libsane-agfafocus.so.1.3
+lib/sane/libsane-apple.a
+lib/sane/libsane-apple.la
 lib/sane/libsane-apple.so.1
+lib/sane/libsane-apple.so.1.3
+lib/sane/libsane-artec.a
+lib/sane/libsane-artec.la
 lib/sane/libsane-artec.so.1
+lib/sane/libsane-artec.so.1.3
+lib/sane/libsane-avision.a
+lib/sane/libsane-avision.la
+lib/sane/libsane-avision.so.1
+lib/sane/libsane-avision.so.1.3
+lib/sane/libsane-canon.a
+lib/sane/libsane-canon.la
 lib/sane/libsane-canon.so.1
+lib/sane/libsane-canon.so.1.3
+lib/sane/libsane-coolscan.a
+lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan.so.1
+lib/sane/libsane-coolscan.so.1.3
+lib/sane/libsane-dc25.a
+lib/sane/libsane-dc25.la
 lib/sane/libsane-dc25.so.1
+lib/sane/libsane-dc25.so.1.3
+lib/sane/libsane-dll.a
+lib/sane/libsane-dll.la
+lib/sane/libsane-dll.so.1
+lib/sane/libsane-dll.so.1.3
+lib/sane/libsane-dmc.a
+lib/sane/libsane-dmc.la
 lib/sane/libsane-dmc.so.1
+lib/sane/libsane-dmc.so.1.3
+lib/sane/libsane-epson.a
+lib/sane/libsane-epson.la
 lib/sane/libsane-epson.so.1
+lib/sane/libsane-epson.so.1.3
+lib/sane/libsane-hp.a
+lib/sane/libsane-hp.la
 lib/sane/libsane-hp.so.1
+lib/sane/libsane-hp.so.1.3
+lib/sane/libsane-m3096g.a
+lib/sane/libsane-m3096g.la
+lib/sane/libsane-m3096g.so.1
+lib/sane/libsane-m3096g.so.1.3
+lib/sane/libsane-microtek.a
+lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek.so.1
+lib/sane/libsane-microtek.so.1.3
+lib/sane/libsane-microtek2.a
+lib/sane/libsane-microtek2.la
 lib/sane/libsane-microtek2.so.1
+lib/sane/libsane-microtek2.so.1.3
+lib/sane/libsane-mustek.a
+lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek.so.1
+lib/sane/libsane-mustek.so.1.3
+lib/sane/libsane-mustek_pp.so.1
+lib/sane/libsane-mustek_pp.so.1.3
+lib/sane/libsane-mustek_pp.la
+lib/sane/libsane-mustek_pp.a
+lib/sane/libsane-net.a
+lib/sane/libsane-net.la
 lib/sane/libsane-net.so.1
+lib/sane/libsane-net.so.1.3
+lib/sane/libsane-pint.a
+lib/sane/libsane-pint.la
 lib/sane/libsane-pint.so.1
+lib/sane/libsane-pint.so.1.3
+lib/sane/libsane-plustek.so.1
+lib/sane/libsane-plustek.so.1.3
+lib/sane/libsane-plustek.la
+lib/sane/libsane-plustek.a
+lib/sane/libsane-pnm.a
+lib/sane/libsane-pnm.la
 lib/sane/libsane-pnm.so.1
+lib/sane/libsane-pnm.so.1.3
+lib/sane/libsane-ricoh.a
+lib/sane/libsane-ricoh.la
 lib/sane/libsane-ricoh.so.1
+lib/sane/libsane-ricoh.so.1.3
+lib/sane/libsane-s9036.a
+lib/sane/libsane-s9036.la
 lib/sane/libsane-s9036.so.1
+lib/sane/libsane-s9036.so.1.3
+lib/sane/libsane-sharp.a
+lib/sane/libsane-sharp.la
 lib/sane/libsane-sharp.so.1
+lib/sane/libsane-sharp.so.1.3
+lib/sane/libsane-snapscan.a
+lib/sane/libsane-snapscan.la
 lib/sane/libsane-snapscan.so.1
+lib/sane/libsane-snapscan.so.1.3
+lib/sane/libsane-sp15c.a
+lib/sane/libsane-sp15c.la
+lib/sane/libsane-sp15c.so.1
+lib/sane/libsane-sp15c.so.1.3
+lib/sane/libsane-st400.so.1
+lib/sane/libsane-st400.so.1.3
+lib/sane/libsane-st400.la
+lib/sane/libsane-st400.a
+lib/sane/libsane-tamarack.a
+lib/sane/libsane-tamarack.la
 lib/sane/libsane-tamarack.so.1
+lib/sane/libsane-tamarack.so.1.3
+lib/sane/libsane-umax.a
+lib/sane/libsane-umax.la
 lib/sane/libsane-umax.so.1
-lib/sane/libsane-dll.so.1
-lib/libsane.a
-lib/libsane.so
-lib/libsane.so.1
-lib/libsane.so.1.1
-man/man1/scanimage.1.gz
-man/man1/saned.1.gz
-man/man1/xscanimage.1.gz
-man/man5/sane-apple.5.gz
-man/man5/sane-dc25.5.gz
-man/man5/sane-dll.5.gz
-man/man5/sane-dmc.5.gz
-man/man5/sane-epson.5.gz
-man/man5/sane-hp.5.gz
-man/man5/sane-microtek.5.gz
-man/man5/sane-microtek2.5.gz
-man/man5/sane-mustek.5.gz
-man/man5/sane-net.5.gz
-man/man5/sane-pnm.5.gz
-man/man5/sane-qcam.5.gz
-man/man5/sane-scsi.5.gz
-man/man5/sane-abaton.5.gz
-man/man5/sane-agfafocus.5.gz
-man/man5/sane-pint.5.gz
-man/man5/sane-umax.5.gz
+lib/sane/libsane-umax.so.1.3
+man/man1/saned.1
+man/man1/scanimage.1
+man/man1/xcam.1
+man/man1/xscanimage.1
+man/man5/sane-abaton.5
+man/man5/sane-agfafocus.5
+man/man5/sane-apple.5
+man/man5/sane-artec.5
+man/man5/sane-avision.5
+man/man5/sane-canon.5
+man/man5/sane-coolscan.5
+man/man5/sane-dc210.5
+man/man5/sane-dc25.5
+man/man5/sane-dll.5
+man/man5/sane-dmc.5
+man/man5/sane-epson.5
+man/man5/sane-fujitsu.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-net.5
+man/man5/sane-pint.5
+man/man5/sane-plustek.5
+man/man5/sane-pnm.5
+man/man5/sane-qcam.5
+man/man5/sane-ricoh.5
+man/man5/sane-s9036.5
+man/man5/sane-scsi.5
+man/man5/sane-sharp.5
+man/man5/sane-snapscan.5
+man/man5/sane-st400.5
+man/man5/sane-tamarack.5
+man/man5/sane-umax.5
+man/man5/sane-v4l.5
 sbin/saned
 share/sane-style.rc
-@dirrm include/sane
 @dirrm etc/sane.d
+@dirrm include/sane
 @dirrm lib/sane