12 files changed, 375 insertions, 249 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 2e0f73bb88e6..28b053db7372 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	sane
-# Version required:     0.72
+# Version required:     0.73
 # Date created:         Sat Jul 19 16:23:10 MET DST 1997
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1998/03/11 13:17:05 obrien Exp $
+# $Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp $
 #
 
-DISTNAME=       sane-0.72
+DISTNAME=       sane-0.73
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/
 
@@ -21,9 +21,16 @@ 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 sane-dmc.5 \
-		sane-epson.5 sane-microtek.5
+		sane-epson.5 sane-microtek.5 sane-microtek2.5
+
+pre-configure:
+	@${ECHO} "*** Note: SANE can be built with an X scanner interface"
+	@${ECHO} "*** (xscanimage) as well as a GIMP plug-in.  If you wish"
+	@${ECHO} "*** to do this, hit Ctrl-C right now and build/install"
+	@${ECHO} "*** the GIMP and GTK packages/ports."
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 2a12d332fee5..55f24953f8a1 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1 +1 @@
-MD5 (sane-0.72.tar.gz) = 17740676be8bce35871b0415002bf57a
+MD5 (sane-0.73.tar.gz) = 6d4c7c6c9e51cabc0dc5edd899312e18
diff --git a/graphics/sane-backends/pkg-message b/graphics/sane-backends/pkg-message
new file mode 100644
index 000000000000..83451c2636de
--- /dev/null
+++ b/graphics/sane-backends/pkg-message
@@ -0,0 +1,11 @@
+Congratulations, SANE is now installed.
+
+If you built it with GIMP and GTK packages/ports installed, you can
+use SANE as a GIMP plug-in.  To do this, as root, type:
+
+ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/plug-ins/xscanimage
+
+Then run the GIMP, and a new "Acquire" menu item should appear in the
+"Xtras" menu.  Use this to access your scanner.
+
+Have fun!
diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist
index 216326e81481..a62e5b2fe497 100644
--- a/graphics/sane-backends/pkg-plist
+++ b/graphics/sane-backends/pkg-plist
@@ -1,21 +1,21 @@
 bin/scanimage
-bin/xcam
 bin/xscanimage
+bin/xcam
 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/microtek2.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
+etc/sane.d/tamarack.conf
+@dirrm etc/sane.d
 include/sane/sane.h
 include/sane/sanei.h
 include/sane/sanei_backend.h
@@ -26,91 +26,115 @@ 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
+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/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.so.0
+lib/sane/libsane-artec.so.0
+lib/sane/libsane-canon.so.0
+lib/sane/libsane-coolscan.so.0
+lib/sane/libsane-dmc.so.0
+lib/sane/libsane-epson.so.0
+lib/sane/libsane-hp.so.0
+lib/sane/libsane-microtek.so.0
+lib/sane/libsane-microtek2.so.0
+lib/sane/libsane-mustek.so.0
+lib/sane/libsane-net.so.0
+lib/sane/libsane-pnm.so.0
+lib/sane/libsane-s9036.so.0
+lib/sane/libsane-snapscan.so.0
+lib/sane/libsane-tamarack.so.0
+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.72
+lib/libsane.so.0
+lib/libsane.so.0.73
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R
+man/man1/saned.1.gz
 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-microtek2.5.gz
 man/man5/sane-pnm.5.gz
-man/man5/sane-pint.5.gz
 man/man5/sane-qcam.5.gz
-man/man5/sane-umax.5.gz
 man/man5/sane-scsi.5.gz
+man/man5/sane-dmc.5.gz
+man/man5/sane-epson.5.gz
+man/man5/sane-dll.5.gz
+man/man5/sane-mustek.5.gz
+man/man5/sane-pint.5.gz
+man/man5/sane-umax.5.gz
 sbin/saned
 share/sane-style.rc
-@dirrm include/sane
-@dirrm etc/sane.d
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 2e0f73bb88e6..28b053db7372 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	sane
-# Version required:     0.72
+# Version required:     0.73
 # Date created:         Sat Jul 19 16:23:10 MET DST 1997
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1998/03/11 13:17:05 obrien Exp $
+# $Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp $
 #
 
-DISTNAME=       sane-0.72
+DISTNAME=       sane-0.73
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/
 
@@ -21,9 +21,16 @@ 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 sane-dmc.5 \
-		sane-epson.5 sane-microtek.5
+		sane-epson.5 sane-microtek.5 sane-microtek2.5
+
+pre-configure:
+	@${ECHO} "*** Note: SANE can be built with an X scanner interface"
+	@${ECHO} "*** (xscanimage) as well as a GIMP plug-in.  If you wish"
+	@${ECHO} "*** to do this, hit Ctrl-C right now and build/install"
+	@${ECHO} "*** the GIMP and GTK packages/ports."
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-frontends/distinfo b/graphics/sane-frontends/distinfo
index 2a12d332fee5..55f24953f8a1 100644
--- a/graphics/sane-frontends/distinfo
+++ b/graphics/sane-frontends/distinfo
@@ -1 +1 @@
-MD5 (sane-0.72.tar.gz) = 17740676be8bce35871b0415002bf57a
+MD5 (sane-0.73.tar.gz) = 6d4c7c6c9e51cabc0dc5edd899312e18
diff --git a/graphics/sane-frontends/pkg-message b/graphics/sane-frontends/pkg-message
new file mode 100644
index 000000000000..83451c2636de
--- /dev/null
+++ b/graphics/sane-frontends/pkg-message
@@ -0,0 +1,11 @@
+Congratulations, SANE is now installed.
+
+If you built it with GIMP and GTK packages/ports installed, you can
+use SANE as a GIMP plug-in.  To do this, as root, type:
+
+ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/plug-ins/xscanimage
+
+Then run the GIMP, and a new "Acquire" menu item should appear in the
+"Xtras" menu.  Use this to access your scanner.
+
+Have fun!
diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist
index 216326e81481..a62e5b2fe497 100644
--- a/graphics/sane-frontends/pkg-plist
+++ b/graphics/sane-frontends/pkg-plist
@@ -1,21 +1,21 @@
 bin/scanimage
-bin/xcam
 bin/xscanimage
+bin/xcam
 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/microtek2.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
+etc/sane.d/tamarack.conf
+@dirrm etc/sane.d
 include/sane/sane.h
 include/sane/sanei.h
 include/sane/sanei_backend.h
@@ -26,91 +26,115 @@ 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
+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/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.so.0
+lib/sane/libsane-artec.so.0
+lib/sane/libsane-canon.so.0
+lib/sane/libsane-coolscan.so.0
+lib/sane/libsane-dmc.so.0
+lib/sane/libsane-epson.so.0
+lib/sane/libsane-hp.so.0
+lib/sane/libsane-microtek.so.0
+lib/sane/libsane-microtek2.so.0
+lib/sane/libsane-mustek.so.0
+lib/sane/libsane-net.so.0
+lib/sane/libsane-pnm.so.0
+lib/sane/libsane-s9036.so.0
+lib/sane/libsane-snapscan.so.0
+lib/sane/libsane-tamarack.so.0
+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.72
+lib/libsane.so.0
+lib/libsane.so.0.73
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R
+man/man1/saned.1.gz
 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-microtek2.5.gz
 man/man5/sane-pnm.5.gz
-man/man5/sane-pint.5.gz
 man/man5/sane-qcam.5.gz
-man/man5/sane-umax.5.gz
 man/man5/sane-scsi.5.gz
+man/man5/sane-dmc.5.gz
+man/man5/sane-epson.5.gz
+man/man5/sane-dll.5.gz
+man/man5/sane-mustek.5.gz
+man/man5/sane-pint.5.gz
+man/man5/sane-umax.5.gz
 sbin/saned
 share/sane-style.rc
-@dirrm include/sane
-@dirrm etc/sane.d
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 2e0f73bb88e6..28b053db7372 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	sane
-# Version required:     0.72
+# Version required:     0.73
 # Date created:         Sat Jul 19 16:23:10 MET DST 1997
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1998/03/11 13:17:05 obrien Exp $
+# $Id: Makefile,v 1.3 1998/04/30 02:38:03 obrien Exp $
 #
 
-DISTNAME=       sane-0.72
+DISTNAME=       sane-0.73
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/
 
@@ -21,9 +21,16 @@ 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 sane-dmc.5 \
-		sane-epson.5 sane-microtek.5
+		sane-epson.5 sane-microtek.5 sane-microtek2.5
+
+pre-configure:
+	@${ECHO} "*** Note: SANE can be built with an X scanner interface"
+	@${ECHO} "*** (xscanimage) as well as a GIMP plug-in.  If you wish"
+	@${ECHO} "*** to do this, hit Ctrl-C right now and build/install"
+	@${ECHO} "*** the GIMP and GTK packages/ports."
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/graphics/sane/distinfo b/graphics/sane/distinfo
index 2a12d332fee5..55f24953f8a1 100644
--- a/graphics/sane/distinfo
+++ b/graphics/sane/distinfo
@@ -1 +1 @@
-MD5 (sane-0.72.tar.gz) = 17740676be8bce35871b0415002bf57a
+MD5 (sane-0.73.tar.gz) = 6d4c7c6c9e51cabc0dc5edd899312e18
diff --git a/graphics/sane/pkg-message b/graphics/sane/pkg-message
new file mode 100644
index 000000000000..83451c2636de
--- /dev/null
+++ b/graphics/sane/pkg-message
@@ -0,0 +1,11 @@
+Congratulations, SANE is now installed.
+
+If you built it with GIMP and GTK packages/ports installed, you can
+use SANE as a GIMP plug-in.  To do this, as root, type:
+
+ln -sf /usr/local/bin/xscanimage /usr/X11R6/libexec/gimp/plug-ins/xscanimage
+
+Then run the GIMP, and a new "Acquire" menu item should appear in the
+"Xtras" menu.  Use this to access your scanner.
+
+Have fun!
diff --git a/graphics/sane/pkg-plist b/graphics/sane/pkg-plist
index 216326e81481..a62e5b2fe497 100644
--- a/graphics/sane/pkg-plist
+++ b/graphics/sane/pkg-plist
@@ -1,21 +1,21 @@
 bin/scanimage
-bin/xcam
 bin/xscanimage
+bin/xcam
 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/microtek2.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
+etc/sane.d/tamarack.conf
+@dirrm etc/sane.d
 include/sane/sane.h
 include/sane/sanei.h
 include/sane/sanei_backend.h
@@ -26,91 +26,115 @@ 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
+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/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.so.0
+lib/sane/libsane-artec.so.0
+lib/sane/libsane-canon.so.0
+lib/sane/libsane-coolscan.so.0
+lib/sane/libsane-dmc.so.0
+lib/sane/libsane-epson.so.0
+lib/sane/libsane-hp.so.0
+lib/sane/libsane-microtek.so.0
+lib/sane/libsane-microtek2.so.0
+lib/sane/libsane-mustek.so.0
+lib/sane/libsane-net.so.0
+lib/sane/libsane-pnm.so.0
+lib/sane/libsane-s9036.so.0
+lib/sane/libsane-snapscan.so.0
+lib/sane/libsane-tamarack.so.0
+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.72
+lib/libsane.so.0
+lib/libsane.so.0.73
 @exec /sbin/ldconfig -m %D/lib
 @unexec /sbin/ldconfig -R
+man/man1/saned.1.gz
 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-microtek2.5.gz
 man/man5/sane-pnm.5.gz
-man/man5/sane-pint.5.gz
 man/man5/sane-qcam.5.gz
-man/man5/sane-umax.5.gz
 man/man5/sane-scsi.5.gz
+man/man5/sane-dmc.5.gz
+man/man5/sane-epson.5.gz
+man/man5/sane-dll.5.gz
+man/man5/sane-mustek.5.gz
+man/man5/sane-pint.5.gz
+man/man5/sane-umax.5.gz
 sbin/saned
 share/sane-style.rc
-@dirrm include/sane
-@dirrm etc/sane.d