Fixes to sane.

Submitted by:	Vanill I. Shu <vanilla@MinJe.com.TW>

3 files changed, 111 insertions, 62 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index df51bb972f8d..2e0f73bb88e6 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,27 +1,27 @@
 # New ports collection makefile for:	sane
-# Version required:     0.61
+# Version required:     0.72
 # Date created:         Sat Jul 19 16:23:10 MET DST 1997
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/01 00:44:58 obrien Exp $
+# $Id: Makefile,v 1.2 1998/03/11 13:17:05 obrien Exp $
 #
 
-DISTNAME=       sane-0.65
+DISTNAME=       sane-0.72
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/graphics/capture
+MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/
 
 MAINTAINER=	gary@hotlava.com
 
-BROKEN=	"X front end doesn't build right agaist our gtk port"
+LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11/gtk
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-MAN1=	scanimage.1 xscanimage.1 saned.1
-MAN5=	sane-dll.5 sane-hp.5 sane-mustek.5 sane-net.5 sane-pnm.5 sane-pint.5  \
-	sane-qcam.5 sane-umax.5 sane-scsi.5
+MAN1=		scanimage.1 xscanimage.1 saned.1
+MAN5=		sane-dll.5 sane-hp.5 sane-mustek.5 sane-net.5 sane-pnm.5 \
+		sane-pint.5 sane-qcam.5 sane-umax.5 sane-scsi.5 sane-dmc.5 \
+		sane-epson.5 sane-microtek.5
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 837f2daf81a0..2a12d332fee5 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-0.65.tar.gz) = 8b6f612002e521651291b95eac76bd05
+MD5 (sane-0.72.tar.gz) = 17740676be8bce35871b0415002bf57a
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 88a9669a1ac1..494b77bbe97f 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -1,10 +1,107 @@
 bin/scanimage
-sbin/saned
+bin/xcam
+bin/xscanimage
+etc/sane.d/apple.conf
+etc/sane.d/artec.conf
+etc/sane.d/coolscan.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/mustek.conf
+etc/sane.d/net.conf
+etc/sane.d/s9036.conf
+etc/sane.d/snapscan.conf
+etc/sane.d/tamarack.conf
+etc/sane.d/umax.conf
+include/sane/config.h
+include/sane/sane.h
+include/sane/sanei.h
+include/sane/sanei_backend.h
+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_scsi.h
+include/sane/sanei_wire.h
+include/sane/saneopts.h
+lib/libsane-apple.a
+lib/libsane-apple.la
+lib/libsane-apple.so
+lib/libsane-apple.so.0.72
+lib/libsane-artec.a
+lib/libsane-artec.la
+lib/libsane-artec.so
+lib/libsane-artec.so.0.72
+lib/libsane-canon.a
+lib/libsane-canon.la
+lib/libsane-canon.so
+lib/libsane-canon.so.0.72
+lib/libsane-coolscan.a
+lib/libsane-coolscan.la
+lib/libsane-coolscan.so
+lib/libsane-coolscan.so.0.72
+lib/libsane-dll.a
+lib/libsane-dll.la
+lib/libsane-dll.so
+lib/libsane-dll.so.0.72
+lib/libsane-dmc.a
+lib/libsane-dmc.la
+lib/libsane-dmc.so
+lib/libsane-dmc.so.0.72
+lib/libsane-epson.a
+lib/libsane-epson.la
+lib/libsane-epson.so
+lib/libsane-epson.so.0.72
+lib/libsane-hp.a
+lib/libsane-hp.la
+lib/libsane-hp.so
+lib/libsane-hp.so.0.72
+lib/libsane-microtek.a
+lib/libsane-microtek.la
+lib/libsane-microtek.so
+lib/libsane-microtek.so.0.72
+lib/libsane-mustek.a
+lib/libsane-mustek.la
+lib/libsane-mustek.so
+lib/libsane-mustek.so.0.72
+lib/libsane-net.a
+lib/libsane-net.la
+lib/libsane-net.so
+lib/libsane-net.so.0.72
+lib/libsane-pnm.a
+lib/libsane-pnm.la
+lib/libsane-pnm.so
+lib/libsane-pnm.so.0.72
+lib/libsane-s9036.a
+lib/libsane-s9036.la
+lib/libsane-s9036.so
+lib/libsane-s9036.so.0.72
+lib/libsane-snapscan.a
+lib/libsane-snapscan.la
+lib/libsane-snapscan.so
+lib/libsane-snapscan.so.0.72
+lib/libsane-tamarack.a
+lib/libsane-tamarack.la
+lib/libsane-tamarack.so
+lib/libsane-tamarack.so.0.72
+lib/libsane-umax.a
+lib/libsane-umax.la
+lib/libsane-umax.so
+lib/libsane-umax.so.0.72
+lib/libsane.a
+lib/libsane.so
+lib/libsane.so.0.72
+@exec /sbin/ldconfig -m %D/lib
 man/man1/scanimage.1.gz
 man/man1/xscanimage.1.gz
 man/man1/saned.1.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-mustek.5.gz
 man/man5/sane-net.5.gz
 man/man5/sane-pnm.5.gz
@@ -12,55 +109,7 @@ man/man5/sane-pint.5.gz
 man/man5/sane-qcam.5.gz
 man/man5/sane-umax.5.gz
 man/man5/sane-scsi.5.gz
-lib/libsane-epson.so.0.65
-lib/libsane-epson.so
-lib/libsane-epson.la
-lib/libsane-epson.a
-lib/libsane-hp.so.0.65
-lib/libsane-hp.so
-lib/libsane-hp.la
-lib/libsane-hp.a
-lib/libsane-microtek.so.0.65
-lib/libsane-microtek.so
-lib/libsane-microtek.la
-lib/libsane-microtek.a
-lib/libsane-mustek.so.0.65
-lib/libsane-mustek.so
-lib/libsane-mustek.la
-lib/libsane-mustek.a
-lib/libsane-net.so.0.65
-lib/libsane-net.so
-lib/libsane-net.la
-lib/libsane-net.a
-lib/libsane-pnm.so.0.65
-lib/libsane-pnm.so
-lib/libsane-pnm.la
-lib/libsane-pnm.a
-lib/libsane-umax.so.0.65
-lib/libsane-umax.so
-lib/libsane-umax.la
-lib/libsane-umax.a
-lib/libsane-dll.so.0.65
-lib/libsane-dll.so
-lib/libsane-dll.la
-lib/libsane-dll.a
-lib/libsane.so
-lib/libsane.a
-@exec /sbin/ldconfig -m %D/lib
+sbin/saned
 share/sane-style.rc
-include/sane/sane.h
-include/sane/sanei.h
-include/sane/sanei_codec_bin.h
-include/sane/sanei_debug.h
-include/sane/sanei_net.h
-include/sane/sanei_scsi.h
-include/sane/sanei_wire.h
-include/sane/saneopts.h
-include/sane/config.h
-include/sane/sanei_backend.h
-include/sane/sanei_codec_ascii.h
-etc/sane.d/mustek.conf
-etc/sane.d/net.conf
-etc/sane.d/umax.conf
-etc/sane.d/dll.conf
-etc/sane.d/hp.conf
+@dirrm include/sane
+@dirrm etc/sane.d