Update sane to 1.00.

6 files changed, 115 insertions, 62 deletions

diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 90f36c18a6d..444e6a5ec4d 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1998/11/21 22:56:53 tron Exp $
+# $NetBSD: Makefile,v 1.9 1998/11/28 20:59:58 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
 #
 
-DISTNAME=       sane-0.74
+DISTNAME=       sane-1.00
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/
 
@@ -10,11 +10,15 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.mostang.com/sane/
 
 DEPENDS+=	gtk+-1.0.6:../../x11/gtk10
+DEPENDS+=	gimp-1.0.2:../../graphics/gimp
 
-CONFLICTS+=	sane-0.72
+CONFLICTS+=	sane-0.72 sane-0.74
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
 
+# -O to workaorund bug with -O2 and egcs.
+CFLAGS=		-O -I${LOCALBASE}/include
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sane/files/md5 b/graphics/sane/files/md5
index 2a611ea9148..f798fe28b57 100644
--- a/graphics/sane/files/md5
+++ b/graphics/sane/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:21:37 agc Exp $
+$NetBSD: md5,v 1.4 1998/11/28 20:59:58 frueauf Exp $
 
-MD5 (sane-0.74.tar.gz) = 6837f35e51966121208c77349a9cdde8
+MD5 (sane-1.00.tar.gz) = 0723e78ab57c7340a0b8180a546c3871
diff --git a/graphics/sane/patches/patch-ab b/graphics/sane/patches/patch-ab
index 9a1b28fdc20..f84ff6239f1 100644
--- a/graphics/sane/patches/patch-ab
+++ b/graphics/sane/patches/patch-ab
@@ -1,13 +1,24 @@
-$NetBSD: patch-ab,v 1.3 1998/10/25 21:25:48 frueauf Exp $
+$NetBSD: patch-ab,v 1.4 1998/11/28 20:59:58 frueauf Exp $
 
---- configure-orig	Tue Jul 28 07:28:14 1998
-+++ configure	Sun Oct 25 22:14:03 1998
-@@ -1620,7 +1620,7 @@
+--- configure.orig	Sun Nov 22 05:04:59 1998
++++ configure	Sat Nov 28 12:09:07 1998
+@@ -1621,7 +1621,7 @@
  EOF
- if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
+@@ -3676,8 +3676,8 @@
+   echo "disabling DC210 backend (failed to find JPEG library)"
+   DC210=
+ else
+-  echo "enabling DC210 backend"
+-  DC210=dc210
++  echo "disabling DC210 backend (does not compile on NetBSD yet)"
++  DC210=
+ fi
+ 
+ if test "${ac_cv_header_sys_scanio_h}" = "no"; then
diff --git a/graphics/sane/patches/patch-ac b/graphics/sane/patches/patch-ac
index c01324887c8..c26369ece62 100644
--- a/graphics/sane/patches/patch-ac
+++ b/graphics/sane/patches/patch-ac
@@ -1,13 +1,21 @@
-$NetBSD: patch-ac,v 1.3 1998/08/07 10:40:53 agc Exp $
+$NetBSD: patch-ac,v 1.4 1998/11/28 20:59:58 frueauf Exp $
 
---- frontend/Makefile.in.orig	Fri May 15 08:18:10 1998
-+++ frontend/Makefile.in	Thu Aug  6 22:51:32 1998
-@@ -28,7 +28,7 @@
+--- backend/snapscan.c-orig	Thu Oct 29 08:02:29 1998
++++ backend/snapscan.c	Sat Nov 28 12:16:28 1998
+@@ -55,7 +55,6 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <values.h>
+ #include <limits.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -3150,7 +3149,7 @@
  
- CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \
--	@INCLUDES@
-+	@INCLUDES@ -I${prefix}/lib/glib/include
- DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@
+ 	{
+ 	  int result = write (pss->tfd, other_buf, pss->read_bytes);
+-	  if (result < 0 || result == MAXINT)
++	  if (result < 0 || result == INT_MAX)
+ 	    {
+ 	      DBG (DL_MAJOR_ERROR, "%s: write of test data to file failed.\n",
+ 		   me);
diff --git a/graphics/sane/patches/patch-ad b/graphics/sane/patches/patch-ad
new file mode 100644
index 00000000000..512af8c3c34
--- /dev/null
+++ b/graphics/sane/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 1998/11/28 20:59:58 frueauf Exp $
+
+--- backend/abaton.c-orig	Sun Nov 22 03:54:14 1998
++++ backend/abaton.c	Sat Nov 28 11:20:23 1998
+@@ -1113,7 +1113,7 @@
+ 
+ 	case OPT_Y_RESOLUTION:
+ 	  if (s->val[OPT_PREVIEW].w || s->val[OPT_RESOLUTION_BIND].w) {
+-	    s->val[OPT_X_RESOLUTION] = *(SANE_Word *)val;
++	    s->val[OPT_X_RESOLUTION].w = *(SANE_Word *)val;
+ 	    if (info)
+ 	      *info |= SANE_INFO_RELOAD_OPTIONS;
+ 	  }
diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST
index b3586e873fd..e5d64c88390 100644
--- a/graphics/sane/pkg/PLIST
+++ b/graphics/sane/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 1998/07/29 10:00:12 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.4 1998/11/28 20:59:58 frueauf Exp $
 bin/scanimage
 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/coolscan.conf
@@ -14,6 +16,7 @@ etc/sane.d/microtek.conf
 etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
 etc/sane.d/net.conf
+etc/sane.d/ricoh.conf
 etc/sane.d/s9036.conf
 etc/sane.d/saned.conf
 etc/sane.d/snapscan.conf
@@ -30,89 +33,103 @@ include/sane/sanei_net.h
 include/sane/sanei_scsi.h
 include/sane/sanei_wire.h
 include/sane/saneopts.h
+lib/sane/libsane-abaton.a
+lib/sane/libsane-abaton.la
+lib/sane/libsane-abaton.so.1
+lib/sane/libsane-abaton.so.1.0
+lib/sane/libsane-agfafocus.a
+lib/sane/libsane-agfafocus.la
+lib/sane/libsane-agfafocus.so.1
+lib/sane/libsane-agfafocus.so.1.0
 lib/sane/libsane-apple.a
 lib/sane/libsane-apple.la
-lib/sane/libsane-apple.so.0
-lib/sane/libsane-apple.so.0.74
+lib/sane/libsane-apple.so.1
+lib/sane/libsane-apple.so.1.0
 lib/sane/libsane-artec.a
 lib/sane/libsane-artec.la
-lib/sane/libsane-artec.so.0
-lib/sane/libsane-artec.so.0.74
+lib/sane/libsane-artec.so.1
+lib/sane/libsane-artec.so.1.0
 lib/sane/libsane-canon.a
 lib/sane/libsane-canon.la
-lib/sane/libsane-canon.so.0
-lib/sane/libsane-canon.so.0.74
+lib/sane/libsane-canon.so.1
+lib/sane/libsane-canon.so.1.0
 lib/sane/libsane-coolscan.a
 lib/sane/libsane-coolscan.la
-lib/sane/libsane-coolscan.so.0
-lib/sane/libsane-coolscan.so.0.74
+lib/sane/libsane-coolscan.so.1
+lib/sane/libsane-coolscan.so.1.0
 lib/sane/libsane-dc25.a
 lib/sane/libsane-dc25.la
-lib/sane/libsane-dc25.so.0
-lib/sane/libsane-dc25.so.0.74
+lib/sane/libsane-dc25.so.1
+lib/sane/libsane-dc25.so.1.0
 lib/sane/libsane-dll.a
 lib/sane/libsane-dll.la
-lib/sane/libsane-dll.so.0
-lib/sane/libsane-dll.so.0.74
+lib/sane/libsane-dll.so.1
+lib/sane/libsane-dll.so.1.0
 lib/sane/libsane-dmc.a
 lib/sane/libsane-dmc.la
-lib/sane/libsane-dmc.so.0
-lib/sane/libsane-dmc.so.0.74
+lib/sane/libsane-dmc.so.1
+lib/sane/libsane-dmc.so.1.0
 lib/sane/libsane-epson.a
 lib/sane/libsane-epson.la
-lib/sane/libsane-epson.so.0
-lib/sane/libsane-epson.so.0.74
+lib/sane/libsane-epson.so.1
+lib/sane/libsane-epson.so.1.0
 lib/sane/libsane-hp.a
 lib/sane/libsane-hp.la
-lib/sane/libsane-hp.so.0
-lib/sane/libsane-hp.so.0.74
+lib/sane/libsane-hp.so.1
+lib/sane/libsane-hp.so.1.0
 lib/sane/libsane-microtek.a
 lib/sane/libsane-microtek.la
-lib/sane/libsane-microtek.so.0
-lib/sane/libsane-microtek.so.0.74
+lib/sane/libsane-microtek.so.1
+lib/sane/libsane-microtek.so.1.0
 lib/sane/libsane-microtek2.a
 lib/sane/libsane-microtek2.la
-lib/sane/libsane-microtek2.so.0
-lib/sane/libsane-microtek2.so.0.74
+lib/sane/libsane-microtek2.so.1
+lib/sane/libsane-microtek2.so.1.0
 lib/sane/libsane-mustek.a
 lib/sane/libsane-mustek.la
-lib/sane/libsane-mustek.so.0
-lib/sane/libsane-mustek.so.0.74
+lib/sane/libsane-mustek.so.1
+lib/sane/libsane-mustek.so.1.0
 lib/sane/libsane-net.a
 lib/sane/libsane-net.la
-lib/sane/libsane-net.so.0
-lib/sane/libsane-net.so.0.74
+lib/sane/libsane-net.so.1
+lib/sane/libsane-net.so.1.0
 lib/sane/libsane-pint.a
 lib/sane/libsane-pint.la
-lib/sane/libsane-pint.so.0
-lib/sane/libsane-pint.so.0.74
+lib/sane/libsane-pint.so.1
+lib/sane/libsane-pint.so.1.0
 lib/sane/libsane-pnm.a
 lib/sane/libsane-pnm.la
-lib/sane/libsane-pnm.so.0
-lib/sane/libsane-pnm.so.0.74
+lib/sane/libsane-pnm.so.1
+lib/sane/libsane-pnm.so.1.0
+lib/sane/libsane-ricoh.a
+lib/sane/libsane-ricoh.la
+lib/sane/libsane-ricoh.so.1
+lib/sane/libsane-ricoh.so.1.0
 lib/sane/libsane-s9036.a
 lib/sane/libsane-s9036.la
-lib/sane/libsane-s9036.so.0
-lib/sane/libsane-s9036.so.0.74
+lib/sane/libsane-s9036.so.1
+lib/sane/libsane-s9036.so.1.0
 lib/sane/libsane-snapscan.a
 lib/sane/libsane-snapscan.la
-lib/sane/libsane-snapscan.so.0
-lib/sane/libsane-snapscan.so.0.74
+lib/sane/libsane-snapscan.so.1
+lib/sane/libsane-snapscan.so.1.0
 lib/sane/libsane-tamarack.a
 lib/sane/libsane-tamarack.la
-lib/sane/libsane-tamarack.so.0
-lib/sane/libsane-tamarack.so.0.74
+lib/sane/libsane-tamarack.so.1
+lib/sane/libsane-tamarack.so.1.0
 lib/sane/libsane-umax.a
 lib/sane/libsane-umax.la
-lib/sane/libsane-umax.so.0
-lib/sane/libsane-umax.so.0.74
+lib/sane/libsane-umax.so.1
+lib/sane/libsane-umax.so.1.0
 lib/libsane.a
 lib/libsane.so
-lib/libsane.so.0.74
-lib/libsane.so.0
+lib/libsane.so.1.0
+lib/libsane.so.1
 man/man1/saned.1.gz
 man/man1/scanimage.1.gz
 man/man1/xscanimage.1.gz
+man/man5/sane-abaton.5.gz
+man/man5/sane-agfafocus.5.gz
 man/man5/sane-apple.5.gz
 man/man5/sane-dc25.5.gz
 man/man5/sane-dll.5.gz