Upgrade to 0.74, and use gtk11 now.

3 files changed, 89 insertions, 83 deletions

diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 0ab33bfde01d..05e2a1baeaf4 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	sane
-# Version required:     0.73
+# Version required:     0.74
 # Date created:         Sat Jul 19 16:23:10 MET DST 1997
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1998/07/12 22:31:09 steve Exp $
+# $Id: Makefile,v 1.6 1998/08/07 23:56:27 asami Exp $
 #
 
-DISTNAME=       sane-0.73
+DISTNAME=       sane-0.74
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 		ftp://ftp.lahn.de/pub/platforms/linux/libs/
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/sane/distinfo b/graphics/sane/distinfo
index 55f24953f8a1..0291f079d843 100644
--- a/graphics/sane/distinfo
+++ b/graphics/sane/distinfo
@@ -1 +1 @@
-MD5 (sane-0.73.tar.gz) = 6d4c7c6c9e51cabc0dc5edd899312e18
+MD5 (sane-0.74.tar.gz) = 6837f35e51966121208c77349a9cdde8
diff --git a/graphics/sane/pkg-plist b/graphics/sane/pkg-plist
index 581647302e3f..c23fbb7e7174 100644
--- a/graphics/sane/pkg-plist
+++ b/graphics/sane/pkg-plist
@@ -1,9 +1,10 @@
 bin/scanimage
-bin/xscanimage
 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
@@ -13,10 +14,11 @@ 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/umax.conf
 etc/sane.d/tamarack.conf
-@dirrm etc/sane.d
+etc/sane.d/umax.conf
+include/sane/config.h
 include/sane/sane.h
 include/sane/sanei.h
 include/sane/sanei_backend.h
@@ -27,99 +29,103 @@ include/sane/sanei_net.h
 include/sane/sanei_scsi.h
 include/sane/sanei_wire.h
 include/sane/saneopts.h
-include/sane/config.h
-@dirrm include/sane
-lib/sane/libsane-apple.so.0.73
-lib/sane/libsane-apple.so
-lib/sane/libsane-apple.la
+lib/libsane.a
+lib/libsane.so
+lib/libsane.so.0
+lib/libsane.so.0.74
 lib/sane/libsane-apple.a
-lib/sane/libsane-artec.so.0.73
-lib/sane/libsane-artec.so
-lib/sane/libsane-artec.la
-lib/sane/libsane-artec.a
-lib/sane/libsane-canon.so.0.73
-lib/sane/libsane-canon.so
-lib/sane/libsane-canon.la
-lib/sane/libsane-canon.a
-lib/sane/libsane-coolscan.so.0.73
-lib/sane/libsane-coolscan.so
-lib/sane/libsane-coolscan.la
-lib/sane/libsane-coolscan.a
-lib/sane/libsane-dmc.so.0.73
-lib/sane/libsane-dmc.so
-lib/sane/libsane-dmc.la
-lib/sane/libsane-dmc.a
-lib/sane/libsane-epson.so.0.73
-lib/sane/libsane-epson.so
-lib/sane/libsane-epson.la
-lib/sane/libsane-epson.a
-lib/sane/libsane-hp.so.0.73
-lib/sane/libsane-hp.so
-lib/sane/libsane-hp.la
-lib/sane/libsane-hp.a
-lib/sane/libsane-microtek.so.0.73
-lib/sane/libsane-microtek.so
-lib/sane/libsane-microtek.la
-lib/sane/libsane-microtek.a
-lib/sane/libsane-microtek2.so.0.73
-lib/sane/libsane-microtek2.so
-lib/sane/libsane-microtek2.la
-lib/sane/libsane-microtek2.a
-lib/sane/libsane-mustek.so.0.73
-lib/sane/libsane-mustek.so
-lib/sane/libsane-mustek.la
-lib/sane/libsane-mustek.a
-lib/sane/libsane-net.so.0.73
-lib/sane/libsane-net.so
-lib/sane/libsane-net.la
-lib/sane/libsane-net.a
-lib/sane/libsane-pnm.so.0.73
-lib/sane/libsane-pnm.so
-lib/sane/libsane-pnm.la
-lib/sane/libsane-pnm.a
-lib/sane/libsane-s9036.so.0.73
-lib/sane/libsane-s9036.so
-lib/sane/libsane-s9036.la
-lib/sane/libsane-s9036.a
-lib/sane/libsane-snapscan.so.0.73
-lib/sane/libsane-snapscan.so
-lib/sane/libsane-snapscan.la
-lib/sane/libsane-snapscan.a
-lib/sane/libsane-tamarack.so.0.73
-lib/sane/libsane-tamarack.so
-lib/sane/libsane-tamarack.la
-lib/sane/libsane-tamarack.a
-lib/sane/libsane-umax.so.0.73
-lib/sane/libsane-umax.so
-lib/sane/libsane-umax.la
-lib/sane/libsane-umax.a
-lib/sane/libsane-dll.so.0.73
-lib/sane/libsane-dll.so
-lib/sane/libsane-dll.la
-lib/sane/libsane-dll.a
+lib/sane/libsane-apple.la
+lib/sane/libsane-apple.so
 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
 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
 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
 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
+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
+lib/sane/libsane-dll.so.0.73
+lib/sane/libsane-dmc.a
+lib/sane/libsane-dmc.la
+lib/sane/libsane-dmc.so
 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
 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
 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
 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
 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
 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
 lib/sane/libsane-net.so.0
+lib/sane/libsane-net.so.0.74
+lib/sane/libsane-pnm.a
+lib/sane/libsane-pnm.la
+lib/sane/libsane-pnm.so
 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
 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
 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
 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
 lib/sane/libsane-umax.so.0
-lib/sane/libsane-dll.so.0
-@dirrm lib/sane
-lib/libsane.a
-lib/libsane.so
-lib/libsane.so.0
-lib/libsane.so.0.73
+lib/sane/libsane-umax.so.0.74
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R
 sbin/saned
 share/sane-style.rc
+@dirrm lib/sane
+@dirrm include/sane
+@dirrm etc/sane.d