Update xsane to 0.80.

Change the Makefile to use the x11/gtk buildlink.mk.

xsane-0.79 -> 0.80:
-------------------

 - moved setting of medium gamma correction values from xsane_set_medium_callback in xsane.c
   to xsane_set_medium in xsane-gamma.c
 - xsane_set_medium is called in xsane_scan_dialog and in preview_scan
 - replaced predefined areas 10x14 cm and 14x10 cm by 10x15 cm and 15x10 cm
 - updated documentation (partly)
 - correcting image height when canceling conversion to jpeg format,
   program does not crash any more
 - added russian translation - thanks to John Profic <profic@lrn.ru>
 - solved problem with lineart image saved as png (wrong byte width)
 - moved medium selection menue from preferences menu to xsane main dialog
 - inactive backend options are not saved to the device-rc file
 - added progress_bar to the paramter list of xsane_save_*
 - added xsane-viewer.c and xsane-viewer.h to the src directory
 - added fflush(outfile); to end of rotation routine, this seems to
   solve a problem of incomplete files when rotating the image file
 - added routine xsane_read_pnm_header to get correct header offset
   and read geometrie values
 - for saving routines now the header offset and geometrie values of
   xsane_load_pnm_header are used instead of xsane´s internal values
 - changed handling of color identification:
   old: xsane_color  == 0 => grayscale/lineart
   new: xsane_colors == 1 => grayscale/lineart
 - when image is saved as postscript file (not copy mode etc)
   then the bounding box exactly surrounds the image now.
   Removed psfile parts from setup and preferences.
 - xsane_widget_test_uposition(gtk_window) does wait now until
   gtk_window is realized before gtk_widget_set/get_uposition
   test is done
 - for hpux added include of alloca.h to sane.h
 - added function xsane_debug_message that is used for DBG when
   gcc is not used because defines with variable arguments is
   not ANSI.
 - updated translations: cs, de, fr, ja, ru, tr

3 files changed, 14 insertions, 7 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 031ccf5328d..34d0d3bfc6d 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2001/09/27 23:18:14 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2001/10/15 21:28:42 veego Exp $
 #
 
-DISTNAME=	xsane-0.79
+DISTNAME=	xsane-0.80
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.xsane.org/download/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -18,8 +18,8 @@ HOMEPAGE=	http://www.xsane.org/
 COMMENT=	New improved frontend for SANE
 
 BUILD_USES_MSGFMT=	yes
+BUILDLINK_DEPENDS.gtk?= gtk+>=1.2.5
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	gtk+>=1.2.5:../../x11/gtk
 DEPENDS+=	png>=1.0.11:../../graphics/png
 DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
 DEPENDS+=	gimp>=1.0.4:../../graphics/gimp
@@ -34,4 +34,5 @@ LDFLAGS+=	-L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane
 CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
 LIBS=		-lintl
 
+.include "../../x11/gtk/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo
index 5653bbb4d44..3dd609ce80a 100644
--- a/graphics/xsane/distinfo
+++ b/graphics/xsane/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/08/28 14:32:22 rh Exp $
+$NetBSD: distinfo,v 1.4 2001/10/15 21:28:42 veego Exp $
 
-SHA1 (xsane-0.79.tar.gz) = f1d08f6a0b1e418167a9df0cdeaa70bd2b4e138a
-Size (xsane-0.79.tar.gz) = 1257493 bytes
+SHA1 (xsane-0.80.tar.gz) = da176c70271ab22666ab79fa7b2af61a3037fd4c
+Size (xsane-0.80.tar.gz) = 1364632 bytes
diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST
index dc373db97e7..6e08fb9a68d 100644
--- a/graphics/xsane/pkg/PLIST
+++ b/graphics/xsane/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2001/08/28 14:32:22 rh Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/10/15 21:28:43 veego Exp $
 bin/xsane
 man/man1/xsane.1
 share/locale/cs/LC_MESSAGES/xsane.mo
@@ -6,6 +6,7 @@ share/locale/de/LC_MESSAGES/xsane.mo
 share/locale/fr/LC_MESSAGES/xsane.mo
 share/locale/it/LC_MESSAGES/xsane.mo
 share/locale/ja/LC_MESSAGES/xsane.mo
+share/locale/ru/LC_MESSAGES/xsane.mo
 share/locale/sl/LC_MESSAGES/xsane.mo
 share/locale/sv/LC_MESSAGES/xsane.mo
 share/locale/tr/LC_MESSAGES/xsane.mo
@@ -29,6 +30,7 @@ share/sane/sane-xsane-setup-display-doc.html
 share/sane/sane-xsane-setup-enhancement-doc.html
 share/sane/sane-xsane-setup-fax-doc.html
 share/sane/sane-xsane-setup-image-doc.html
+share/sane/sane-xsane-setup-mail-doc.html
 share/sane/sane-xsane-setup-save-doc.html
 share/sane/sane-xsane-standard-doc.html
 share/sane/xsane-advanced.jpg
@@ -39,6 +41,7 @@ share/sane/xsane-colormode.jpg
 share/sane/xsane-contrast.jpg
 share/sane/xsane-copy.jpg
 share/sane/xsane-default.jpg
+share/sane/xsane-delete-preview-cache.jpg
 share/sane/xsane-disk.jpg
 share/sane/xsane-fax-project.jpg
 share/sane/xsane-fax.jpg
@@ -50,6 +53,7 @@ share/sane/xsane-negative.jpg
 share/sane/xsane-pipette-black.jpg
 share/sane/xsane-pipette-gray.jpg
 share/sane/xsane-pipette-white.jpg
+share/sane/xsane-preferences.jpg
 share/sane/xsane-preset-area.jpg
 share/sane/xsane-preview.jpg
 share/sane/xsane-printer.jpg
@@ -63,6 +67,7 @@ share/sane/xsane-setup-display.jpg
 share/sane/xsane-setup-enhancement.jpg
 share/sane/xsane-setup-fax.jpg
 share/sane/xsane-setup-image.jpg
+share/sane/xsane-setup-mail.jpg
 share/sane/xsane-setup-save.jpg
 share/sane/xsane-standard.jpg
 share/sane/xsane-store.jpg
@@ -74,6 +79,7 @@ share/sane/xsane-zoom-out.jpg
 share/sane/xsane-zoom-undo.jpg
 share/sane/xsane-zoom.jpg
 share/sane/xsane.jpg
+share/sane/xsane/Mustek-logo.xpm
 share/sane/xsane/UMAX-logo.xpm
 share/sane/xsane/sane-epson-logo.xpm
 share/sane/xsane/sane-hp-logo.xpm