Well, RELLY upgrade to 1.0.4, I make some fault on last commit. sorry.

Submitted by:	"KATO Tsuguru" <tkato@prontomail.ne.jp>

6 files changed, 36 insertions, 167 deletions

diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 7e6768f3ed42..a82fae94b272 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:	sane
+# New ports collection makefile for:	sane-frontends
 # Date created:			Sat Jul 19 16:23:10 MET DST 1997
 # Whom:				gary@hotlava.com
 #
 # $FreeBSD$
 #
 
-PORTNAME=	sane
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTNAME=	sane-frontends
+PORTVERSION=	1.0.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.mostang.com/pub/sane/
@@ -15,30 +14,29 @@ MASTER_SITE_SUBDIR=	apps/graphics/capture
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	sane.1:${PORTSDIR}/graphics/sane-backends
 
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
 USE_GTK=	yes
-INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=	saned.1 scanimage.1 xcam.1 xscanimage.1
-MAN5=	sane-abaton.5 sane-agfafocus.5 sane-apple.5 sane-artec.5 \
-	sane-avision.5 sane-canon.5 sane-coolscan.5 sane-dc210.5 \
-	sane-dc25.5 sane-dll.5 sane-dmc.5 sane-epson.5 \
-	sane-fujitsu.5 sane-hp.5 sane-microtek.5 sane-microtek2.5 \
-	sane-mustek.5 sane-mustek_pp.5 sane-net.5 sane-pint.5 \
-	sane-plustek.5 sane-pnm.5 sane-qcam.5 sane-ricoh.5 \
-	sane-s9036.5 sane-scsi.5 sane-sharp.5 sane-snapscan.5 \
-	sane-st400.5 sane-tamarack.5 sane-umax.5 sane-v4l.5
+.if defined(WITH_GIMP)
+LIB_DEPENDS+=	gimp.1:${PORTSDIR}/graphics/gimp1
+CONFIGURE_ARGS+=	--enable-gimp
+.else
+CONFIGURE_ARGS+=	--disable-gimp
+.endif
+
+MAN1=	xcam.1 xscanimage.1
 
 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."
+.if !defined(WITH_GIMP)
+	@${ECHO_MSG} "*** Note: xscanimage can be built with a standalone"
+	@${ECHO_MSG} "*** X scanner interface as well as a GIMP plug-in."
+	@${ECHO_MSG} "*** If you wish to do this, hit Ctrl-C now and use"
+	@${ECHO_MSG} "*** \"WITH_GIMP=yes\""
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/graphics/sane-frontends/distinfo b/graphics/sane-frontends/distinfo
index 5c98b7de3911..6f80721c1812 100644
--- a/graphics/sane-frontends/distinfo
+++ b/graphics/sane-frontends/distinfo
@@ -1 +1 @@
-MD5 (sane-1.0.3.tar.gz) = c1c2e08358e0196109724ecdbe316c7b
+MD5 (sane-frontends-1.0.4.tar.gz) = f8d1d0afba88f1d1604c67e14738b74d
diff --git a/graphics/sane-frontends/pkg-comment b/graphics/sane-frontends/pkg-comment
index f02bb57b04cf..487ef93179df 100644
--- a/graphics/sane-frontends/pkg-comment
+++ b/graphics/sane-frontends/pkg-comment
@@ -1 +1 @@
-API for access to scanners, digitals camera, frame grabbers etc
+Tools for access to scanners, digitals camera, frame grabbers etc
diff --git a/graphics/sane-frontends/pkg-descr b/graphics/sane-frontends/pkg-descr
index ea85009d7c4a..5854ede3952f 100644
--- a/graphics/sane-frontends/pkg-descr
+++ b/graphics/sane-frontends/pkg-descr
@@ -1,9 +1,15 @@
-SANE is a universal scanner interface. The value of such a universal
-interface is that it allows writing just one driver per image acquisition
-device rather than one driver for each device and application. So, if you
-have three applications and four devices, traditionally you'd have had to
-write 12 different programs. With SANE, this number is reduced to seven:
-the three applications plus the four drivers. Of course, the savings get
-even bigger as more and more drivers and/or applications are added. 
+SANE ("Scanner Access Now Easy") is a universal scanner interface.
+The value of such a universal interface is that it allows writing
+just one driver per image acquisition device rather than one driver
+for each device and application. So, if you have three applications
+and four devices, traditionally you'd have had to write 12 different
+programs.  With SANE, this number is reduced to seven: the three
+applications plus the four drivers. Of course, the savings get even
+bigger as more and more drivers and/or applications are added.
+
+sane-frontends contains frontends to SANE including xscanimage and
+xcam. Xscanimage is a GTK-based application for scanning images that
+can also be used as a GIMP-plugin, and Xcam is used to get images
+from cameras supported by SANE.
 
 WWW: http://www.mostang.com/sane/
diff --git a/graphics/sane-frontends/pkg-message b/graphics/sane-frontends/pkg-message
index 2990a3c62111..f71412d36130 100644
--- a/graphics/sane-frontends/pkg-message
+++ b/graphics/sane-frontends/pkg-message
@@ -3,7 +3,7 @@ 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/1.1/plug-ins/xscanimage
+ln -sf %%LOCALBASE%%/bin/xscanimage %%X11BASE%%/libexec/gimp/1.1/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.
diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist
index e6f6d114695d..0baedc8dec5b 100644
--- a/graphics/sane-frontends/pkg-plist
+++ b/graphics/sane-frontends/pkg-plist
@@ -1,139 +1,4 @@
-bin/sane-config
-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/avision.conf
-etc/sane.d/coolscan.conf
-etc/sane.d/dc210.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/m3096g.conf
-etc/sane.d/microtek.conf
-etc/sane.d/microtek2.conf
-etc/sane.d/mustek.conf
-etc/sane.d/mustek_pp.conf
-etc/sane.d/net.conf
-etc/sane.d/plustek.conf
-etc/sane.d/ricoh.conf
-etc/sane.d/s9036.conf
-etc/sane.d/saned.conf
-etc/sane.d/sharp.conf
-etc/sane.d/snapscan.conf
-etc/sane.d/sp15c.conf
-etc/sane.d/st400.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_pa4s2.h
-include/sane/sanei_scsi.h
-include/sane/sanei_wire.h
-include/sane/saneopts.h
-lib/libsane.a
-lib/libsane.so
-lib/libsane.so.1
-lib/sane/libsane-abaton.a
-lib/sane/libsane-abaton.so
-lib/sane/libsane-abaton.so.1
-lib/sane/libsane-agfafocus.a
-lib/sane/libsane-agfafocus.so
-lib/sane/libsane-agfafocus.so.1
-lib/sane/libsane-apple.a
-lib/sane/libsane-apple.so
-lib/sane/libsane-apple.so.1
-lib/sane/libsane-artec.a
-lib/sane/libsane-artec.so
-lib/sane/libsane-artec.so.1
-lib/sane/libsane-avision.a
-lib/sane/libsane-avision.so
-lib/sane/libsane-avision.so.1
-lib/sane/libsane-canon.a
-lib/sane/libsane-canon.so
-lib/sane/libsane-canon.so.1
-lib/sane/libsane-coolscan.a
-lib/sane/libsane-coolscan.so
-lib/sane/libsane-coolscan.so.1
-lib/sane/libsane-dc210.a
-lib/sane/libsane-dc210.so
-lib/sane/libsane-dc210.so.1
-lib/sane/libsane-dc25.a
-lib/sane/libsane-dc25.so
-lib/sane/libsane-dc25.so.1
-lib/sane/libsane-dll.a
-lib/sane/libsane-dll.so
-lib/sane/libsane-dll.so.1
-lib/sane/libsane-dmc.a
-lib/sane/libsane-dmc.so
-lib/sane/libsane-dmc.so.1
-lib/sane/libsane-epson.a
-lib/sane/libsane-epson.so
-lib/sane/libsane-epson.so.1
-lib/sane/libsane-hp.a
-lib/sane/libsane-hp.so
-lib/sane/libsane-hp.so.1
-lib/sane/libsane-m3096g.a
-lib/sane/libsane-m3096g.so
-lib/sane/libsane-m3096g.so.1
-lib/sane/libsane-microtek.a
-lib/sane/libsane-microtek.so
-lib/sane/libsane-microtek.so.1
-lib/sane/libsane-microtek2.a
-lib/sane/libsane-microtek2.so
-lib/sane/libsane-microtek2.so.1
-lib/sane/libsane-mustek.a
-lib/sane/libsane-mustek.so
-lib/sane/libsane-mustek.so.1
-lib/sane/libsane-mustek_pp.a
-lib/sane/libsane-mustek_pp.so
-lib/sane/libsane-mustek_pp.so.1
-lib/sane/libsane-net.a
-lib/sane/libsane-net.so
-lib/sane/libsane-net.so.1
-lib/sane/libsane-plustek.a
-lib/sane/libsane-plustek.so
-lib/sane/libsane-plustek.so.1
-lib/sane/libsane-pnm.a
-lib/sane/libsane-pnm.so
-lib/sane/libsane-pnm.so.1
-lib/sane/libsane-ricoh.a
-lib/sane/libsane-ricoh.so
-lib/sane/libsane-ricoh.so.1
-lib/sane/libsane-s9036.a
-lib/sane/libsane-s9036.so
-lib/sane/libsane-s9036.so.1
-lib/sane/libsane-sharp.a
-lib/sane/libsane-sharp.so
-lib/sane/libsane-sharp.so.1
-lib/sane/libsane-snapscan.a
-lib/sane/libsane-snapscan.so
-lib/sane/libsane-snapscan.so.1
-lib/sane/libsane-sp15c.a
-lib/sane/libsane-sp15c.so
-lib/sane/libsane-sp15c.so.1
-lib/sane/libsane-st400.a
-lib/sane/libsane-st400.so
-lib/sane/libsane-st400.so.1
-lib/sane/libsane-tamarack.a
-lib/sane/libsane-tamarack.so
-lib/sane/libsane-tamarack.so.1
-lib/sane/libsane-umax.a
-lib/sane/libsane-umax.so
-lib/sane/libsane-umax.so.1
-sbin/saned
-share/sane-style.rc
-@dirrm lib/sane
-@dirrm include/sane
-@dirrm etc/sane.d
+share/sane/sane-style.rc
+@dirrm share/sane