Update sane to 0.74.

4 files changed, 92 insertions, 68 deletions

diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index ada1bf366cd..af81171aaaf 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.4 1998/07/15 11:27:52 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/07/29 10:00:10 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp
 #
 
-DISTNAME=       sane-0.72
+DISTNAME=       sane-0.74
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/
 
 MAINTAINER=	packages@netbsd.org
 
-DEPENDS+=	gtk+-1.0.0:../../x11/gtk
+DEPENDS+=	gtk+-1.0.4:../../x11/gtk
+
+CONFLICTS+=	sane-0.72
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/sane/files/md5 b/graphics/sane/files/md5
index 2a12d332fee..0291f079d84 100644
--- a/graphics/sane/files/md5
+++ b/graphics/sane/files/md5
@@ -1 +1 @@
-MD5 (sane-0.72.tar.gz) = 17740676be8bce35871b0415002bf57a
+MD5 (sane-0.74.tar.gz) = 6837f35e51966121208c77349a9cdde8
diff --git a/graphics/sane/patches/patch-ab b/graphics/sane/patches/patch-ab
deleted file mode 100644
index b59cfa1cc90..00000000000
--- a/graphics/sane/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/sane/sanei_pio.h.orig	Tue Apr  7 06:44:32 1998
-+++ include/sane/sanei_pio.h	Thu Apr 30 21:24:04 1998
-@@ -46,7 +46,7 @@
- 
- #include <sane/sane.h>
- 
--extern SANE_Status	sanei_pio_open  (const char * dev, int * fd);
-+extern int		sanei_pio_open  (const char * dev, SANE_Status * fd);
- extern void		sanei_pio_close (int fd);
- extern int		sanei_pio_read  (int fd, u_char * buf, int n);
- extern int		sanei_pio_write (int fd, const u_char * buf, int n);
diff --git a/graphics/sane/pkg/PLIST b/graphics/sane/pkg/PLIST
index bd9ccc13591..b3586e873fd 100644
--- a/graphics/sane/pkg/PLIST
+++ b/graphics/sane/pkg/PLIST
@@ -1,18 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 1998/07/15 11:27:53 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/07/29 10:00:12 frueauf Exp $
 bin/scanimage
 bin/xcam
 bin/xscanimage
 etc/sane.d/apple.conf
 etc/sane.d/artec.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/microtek.conf
+etc/sane.d/microtek2.conf
 etc/sane.d/mustek.conf
 etc/sane.d/net.conf
 etc/sane.d/s9036.conf
+etc/sane.d/saned.conf
 etc/sane.d/snapscan.conf
 etc/sane.d/tamarack.conf
 etc/sane.d/umax.conf
@@ -27,68 +30,97 @@ include/sane/sanei_net.h
 include/sane/sanei_scsi.h
 include/sane/sanei_wire.h
 include/sane/saneopts.h
-lib/libsane-apple.a
-lib/libsane-apple.la
-lib/libsane-apple.so.0.72
-lib/libsane-artec.a
-lib/libsane-artec.la
-lib/libsane-artec.so.0.72
-lib/libsane-canon.a
-lib/libsane-canon.la
-lib/libsane-canon.so.0.72
-lib/libsane-coolscan.a
-lib/libsane-coolscan.la
-lib/libsane-coolscan.so.0.72
-lib/libsane-dll.a
-lib/libsane-dll.la
-lib/libsane-dll.so.0.72
-lib/libsane-dmc.a
-lib/libsane-dmc.la
-lib/libsane-dmc.so.0.72
-lib/libsane-epson.a
-lib/libsane-epson.la
-lib/libsane-epson.so.0.72
-lib/libsane-hp.a
-lib/libsane-hp.la
-lib/libsane-hp.so.0.72
-lib/libsane-microtek.a
-lib/libsane-microtek.la
-lib/libsane-microtek.so.0.72
-lib/libsane-mustek.a
-lib/libsane-mustek.la
-lib/libsane-mustek.so.0.72
-lib/libsane-net.a
-lib/libsane-net.la
-lib/libsane-net.so.0.72
-lib/libsane-pint.a
-lib/libsane-pint.la
-lib/libsane-pint.so.0.72
-lib/libsane-pnm.a
-lib/libsane-pnm.la
-lib/libsane-pnm.so.0.72
-lib/libsane-s9036.a
-lib/libsane-s9036.la
-lib/libsane-s9036.so.0.72
-lib/libsane-snapscan.a
-lib/libsane-snapscan.la
-lib/libsane-snapscan.so.0.72
-lib/libsane-tamarack.a
-lib/libsane-tamarack.la
-lib/libsane-tamarack.so.0.72
-lib/libsane-umax.a
-lib/libsane-umax.la
-lib/libsane-umax.so.0.72
+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-artec.a
+lib/sane/libsane-artec.la
+lib/sane/libsane-artec.so.0
+lib/sane/libsane-artec.so.0.74
+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-coolscan.a
+lib/sane/libsane-coolscan.la
+lib/sane/libsane-coolscan.so.0
+lib/sane/libsane-coolscan.so.0.74
+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-dll.a
+lib/sane/libsane-dll.la
+lib/sane/libsane-dll.so.0
+lib/sane/libsane-dll.so.0.74
+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-epson.a
+lib/sane/libsane-epson.la
+lib/sane/libsane-epson.so.0
+lib/sane/libsane-epson.so.0.74
+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-microtek.a
+lib/sane/libsane-microtek.la
+lib/sane/libsane-microtek.so.0
+lib/sane/libsane-microtek.so.0.74
+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-mustek.a
+lib/sane/libsane-mustek.la
+lib/sane/libsane-mustek.so.0
+lib/sane/libsane-mustek.so.0.74
+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-pint.a
+lib/sane/libsane-pint.la
+lib/sane/libsane-pint.so.0
+lib/sane/libsane-pint.so.0.74
+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-s9036.a
+lib/sane/libsane-s9036.la
+lib/sane/libsane-s9036.so.0
+lib/sane/libsane-s9036.so.0.74
+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-tamarack.a
+lib/sane/libsane-tamarack.la
+lib/sane/libsane-tamarack.so.0
+lib/sane/libsane-tamarack.so.0.74
+lib/sane/libsane-umax.a
+lib/sane/libsane-umax.la
+lib/sane/libsane-umax.so.0
+lib/sane/libsane-umax.so.0.74
 lib/libsane.a
 lib/libsane.so
-lib/libsane.so.0.72
+lib/libsane.so.0.74
+lib/libsane.so.0
 man/man1/saned.1.gz
 man/man1/scanimage.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
@@ -100,3 +132,4 @@ sbin/saned
 share/sane-style.rc
 @dirrm include/sane
 @dirrm etc/sane.d
+@dirrm lib/sane