Update xsane to 0.61. Changes are:

xsane-0.51 -> 0.52:
-------------------

 - changed gimp_install_procedure(...) for specified device: "RGB, GRAY"
   -> 0

 - in xsane-scan.c and xsane-preview.c added " | GDK_INPUT_EXCEPTION" to
   gdk_input_add(fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
   preview_read_image_data, p);

 - added static int xsane_set_modus_defaults(void)
   zoomfactor is set to 1.0 if copy mode is selected
   full preview area is selected if copy or fax mode is selected

 - removed a second xsane_device_preferences_restore(); in static void
   xsane_device_dialog(void)

 - zoom factor keeps unchanged when printer is changed

 - added psfile-geometry to setup/saving options, it is used when saving
   postscript in scanmode

 - moved exisiting routines to open functions to xsane-front-gtk.c:
   void xsane_define_output_filename(void);
   void xsane_identify_output_format(char **ext);

 - define_maximum_output_size is called in each routine that changes
   filename or fileextension because the output frame is also drawn in
   scanmode with filetype postscript now

 - included Stanislav Brabec's <utx@penguin.cz> sed-scripts and changes
   for Makefile.in in xsane-*/po

 - added creation of newlanguage.po in po/Makefile.in

 - updated german translation file de.po

 - updated czech translation file cs.po - thanks to Stanislav Brabec
   <utx@k332.feld.cvut.cz>

 - updated french translation file fr.po


xsane-0.52 -> 0.53:
-------------------

 - added test if vendor, model and type strings do exists (pointer != 0)
   otherwise "no vendor",... is printed

 - changed
     ext = &extension;
   to
     if (extension)
     {
       *ext = strdup(extension);
     }
     else
     {
       *ext = 0;
     }
   in xsane_identify_output_format - bad thing, I get old ;-)

 - added new routine xsane_find_best_resolution that makes sure that the
   selected resolution fits into range/quantization given by backend.
   This is used by xsane_set_resolution and when resolution_list is
   created.

 - added xsane_set_all_resolutions to xsane_set_modus_defaults

 - xsane resolution can be changed by backend now


xsane-0.53 -> 0.54:
-------------------

 - updated french translation table

 - updated german translation table

 - changed type of umask in preferences from mode_t to int because
   sizeof(mode_t) is on some machines only 2 bytes what cause problems.
   all calls of umask(foo) are changed to umask((mode_t) foo)

 - changed preferences update_policy from GtkUpdateType to int.

 - selection box can not be moved out of the preview window, the
   size of the selection keeps unchanged in that case now.

 - removed some gtk_main_iteration and reordered some selection drawing
   routines.

 - removed unused files/directories from package:
   sanei, include/sane/sanei_(some).h, po_old


xsane-0.54 -> 0.55:
-------------------

 - added preview support for 16 bpp (transformed to 8bpp)

 - added copyright line in devcie selection dialog

 - preview selection frame is only active when backend supports coordinate
   selection

 - added preview oversampling factor (multiplier for calculated preview
   resolution)

 - added lineart enhancement: preview can be done in grayscale now,
   threshold value change is displayed without a new preview scan.

 - added "device options" to setup dialog:
   - Scanner dependant options for grayscale->lineart conversion have
     to be entered there.

 - a color preview is now displayed gray when grayscale mode is selected

 - updated de.po, cs.po, fr.po

 - updated po/xsane-pot.sed


xsane-0.55 -> 0.56:
-------------------

 - added hold timer to preview (update-policy=delayed)

 - added hold timer to xsane_slider (update-policy=delayed)

 - moved help menu from file to help

 - added swedish (sv) translation - thanks to Johan Bengtsson
   <johanb@lls.se>

 - removed bug in xsane_rc_io_w_string, it returns EINVAL now each time
   when the string does not begin with "


xsane-0.56 -> 0.57:
-------------------

 - made xsane_choose_device return type to void (was gint32)

 - arranged device-preferences in struct xsane in the order they are used
   as device preferences, made sure that all variable types are correct:
   - changed type of xsane.mode from gint32 to int
   - changed type of xsane.lineart_mode from gint32 to int
   - changed type of xsane.show_preview from SANE_Bool to int
   - changed type of xsane.enhancement_rgb_default from SANE_Bool to int
   - changed type of xsane.fax_finemode from SANE_Bool to int

 - added mask for *_lock in preview motion_notify_event handling
   Preview selection can be done with locks activated now

 - histogram is cleared before/redrawn after saving/loading device settings

 - added xsane_control_option() that tests if option >= 0 and returns
   SANE_STATUS_INVAL if not

 - added xsane_get_option_descriptor() that tests if option >= 0 and
   returns NULL if not

 - changed parameters of preview_area_resize and added
   preview_area_resize_handler

 - removed a lot of gtk_main_iterations from xsane_preview.c
   they make problems in the redrawing order and can cause display
   problems


xsane-0.57 -> 0.58:
-------------------

 - split the preview_event_handler into
   - preview_press_button_event_handler
   - preview_motion_event_handler
   - preview_release_button_event_handler

 - the preview_expose_event_handler now is called twice,
   the second call has been placed in the preview_event_handler_before

 - reactivated gtk_main_iteration after at the end of motion_event

 - added warning window when xsane is started as root

 - added selection of temporary directory in preferences/setup/saving
   options

 - added gdk_input_remove(xsane.input_tag); before xsane_start_scan is
   called in 3-pass scanning mode (suggestion from
   Heiko_Schroeder@t-online.de)

 - changed output of "xsane -v"

 - in xsane_scan_done moved xsane.header_size = 0; before test for ADF
   Thanks to Russell Coggrave for the info about it.

 - added gtk_set_locale() before gtk_init()

 - added copyright sign "(c)" to translated texts because it is not
   available on all charsets

 - temporary filenames are created random and unique (mktemp + random
   number) due to security problems with fixed/calculateable tempfiles.

 - the preview-files are created (empty) at program startup now

 - when program exits the previews are erased
   there is no way to store the preview images any more when the program
   is closed

 - preview_restore_image() creates the xsane-startimage if no preview is
   stored

 - renamed directory frontend to src

 - create xsane-help script that opens online helpfile


xsane-0.58 -> 0.59:
-------------------

 - preview_do_gamma_correction does test for 3 pass scanner color mode

 - changed fax x-resolution and standard resolution from 98 ppi to 204 ppi
   and with of faxpage from 210.0 to 215.7 (so we get 1728 pixels in
   x direction, hylafax-faq says that is the correct size)

 - split preferences.printer[..].resolution -> lineart, grayscale and
   color_resolution

 - added setlocale(LC_NUMERIC, "C"); in xsane_init() and #include
   <locale.h> in xsane.h this should solve the problems with empty
   images (100%transparent) with gimp and other problems that were caused
   by local settings (1.3 <=> 1,3).

 - added setup-option "disable gimp preview gamma"

 - added selection (preferences/setup/enhancement options) if
   autoenhancement changes gamma value

 - renamed Preferences/Setup/"Device options" to "Enhancement options"

 - removed xsane internal callbacks from dialog struct, the functions are
   called directly now

 - changed the reading of the preview image header. The last newline
   character before the image data starts again made some problems, this
   seems to depend on the data that follows. So I added a fgets() command
   to skip the newline character - this seems to work.

 - changed increase_filename_in_counter, does work now if the only
   character of the base-filename is the counter

 - reduced size of src/xsane-startimage.pnm (1MB => 0.6MB)


xsane-0.59 -> 0.60:
-------------------

 - after filename counter is increased the cursor in the outputfilename
   entry is moved to the right

 - in preview_read_image_data when image is complete:
    preview_update_surface(p, 0);
   is called before
    preview_display_image(p);
   this way the geometry of the first preview scan is correct.

 - moved xsane_set_all_resolutions in xsane_update_xsane_callback(),
   it now also is called when the backend only uses one reesolution

 - added calibration image (xsane-calibration.pnm) that is loaded when
   setup window is created.
   The xsane enhancement functions are disabled in calibration mode, the
   image can not be resized (xscale = yscale = 1.0).
   The previsous image is reloaded when the setup window is closed again.

 - enviornment variable SANE_DEFAULT_DEVICE is used to activate the
   radiobutton in the device selection menu

 - removed unused item "custom" from preview surface menu

 - changed preview surface menu items:
   A3  -> A3P (portrait)
   A4  -> A4P (portrait)
   A4H -> A4L (landscape)
   A5  -> A5P (portrait)
   A5H -> A5L (landscape)

 - removed script xsane-help, necessary command now is listed in
   xsane.PROBLEMS

 - after filename counter is increased the cursor in the outputfilename entry is moved to the right


xsane-0.60 -> 0.61:
-------------------

 - added debug output function and messages

 - moved all global variables and struct GSGdialog to global struct xsane

 - cleaned up some variable names

 - added free gamma curve dialog (not ready)

 - prepared xsane for win32:
   - when BUGGY_GDK_INPUT_EXCEPTION is defined only blocking mode is used
     (needed because GDK input exception does not work on win32)
   - on win32 you cannot get a homedirectory, for this
     XSANE_FIXED_HOME_PATH has to be set to the path that shall be
     used as homedirectory
   - replaced all gtk_dialog_new by gtk_window_new and added hbox and
     vbox to the window (gtk_dialog_new does not work on WIN32)
   - added xsane.WIN32 and xsane.WIN32-compilation that describes how xsane
     is build on WIN32 with CYGWIN
   - replaced "/" in all paths, added label SLASH that is predefined to
     '/' if it is not defined by compiler option. For WIN32 it is set to
     '\' by compiler option
   - all fopen functions use argument "rb" or "wb" now (b=binary). This
     is needed for WIN32 and the b is ignored on unix systems.
   - published binary version xsane-win32-0v01 and xsane-win32-0v02 based
     on xsane-pre0.61 versions

 - removed an ugly bug: in struct Preferences there was predefined a
   string ("/tmp/") that caused a bad memory state when the string memory
   was freed, instead the string is defined in xsane_pref_restore now

 - changes for tiff format:
   - added support for 16 bit tiff format.
   - predefined tiff-compression is changed from 5 to PACKBITS(16bit),
     JPEG(8bit), FAXG3(1bit).
   - add resoultion-tags and datetime-tag to tiff files.

 - added "change directory" entry to preferences menu

 - added "scanning for devices" dialog

6 files changed, 33 insertions, 37 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 053d345fab0..09b29ad5abb 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2000/08/14 21:55:25 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/28 16:00:18 rh Exp $
 #
 
-DISTNAME=	xsane-0.51
+DISTNAME=	xsane-0.61
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.wolfsburg.de/~rauch/sane/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
@@ -18,13 +18,15 @@ HOMEPAGE=	http://www.wolfsburg.de/~rauch/sane/sane-xsane.html
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png>=1.0.6:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
-DEPENDS+=	gtk+>=1.2.7:../../x11/gtk
-DEPENDS+=	sane-1.0.1:../../graphics/sane
+DEPENDS+=	sane>=1.0.3:../../graphics/sane
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_X11BASE=	YES
 
-CPPFLAGS+=	-I${PREFIX}/include -I${LOCALBASE}/include
+LDFLAGS+=	-L${PREFIX}/lib/sane -Wl,-R${PREFIX}/lib/sane
+INCLUDES=	-I${PREFIX}/include -I${LOCALBASE}/include
+CPPFLAGS+=	${INCLUDES}
+CONFIGURE_ENV+=	INCLUDES="${INCLUDES}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xsane/files/md5 b/graphics/xsane/files/md5
index 7ab66d82963..6697687ddec 100644
--- a/graphics/xsane/files/md5
+++ b/graphics/xsane/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.9 2000/01/26 22:03:19 rh Exp $
+$NetBSD: md5,v 1.10 2000/08/28 16:00:19 rh Exp $
 
-MD5 (xsane-0.51.tar.gz) = 5fb6e376f041960935ebcf9c98dd7d91
+MD5 (xsane-0.61.tar.gz) = 1464d82315c15deb5f4f3d9d392d6285
diff --git a/graphics/xsane/files/patch-sum b/graphics/xsane/files/patch-sum
index f95bb2e6e60..b0c13968ff3 100644
--- a/graphics/xsane/files/patch-sum
+++ b/graphics/xsane/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.6 2000/05/02 18:48:40 danw Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/28 16:00:19 rh Exp $
 
-MD5 (patch-aa) = 25ffddb17d5a34043c5626ac58adf882
-MD5 (patch-ab) = d180e1bee83c3ec706effb9901113fb0
+MD5 (patch-aa) = 470319e5e948f5c75a583cbb9a05a79e
diff --git a/graphics/xsane/patches/patch-aa b/graphics/xsane/patches/patch-aa
index 93523ee3db7..044ea2b8195 100644
--- a/graphics/xsane/patches/patch-aa
+++ b/graphics/xsane/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/05/02 18:48:41 danw Exp $
+$NetBSD: patch-aa,v 1.5 2000/08/28 16:00:19 rh Exp $
 
---- configure.orig	Wed Nov  3 19:39:12 1999
-+++ configure	Thu Nov 11 12:36:07 1999
+--- configure.orig	Thu Jul 27 14:59:24 2000
++++ configure
 @@ -9,7 +9,7 @@
  
  # Defaults:
@@ -11,7 +11,15 @@ $NetBSD: patch-aa,v 1.4 2000/05/02 18:48:41 danw Exp $
  # Any additions from configure.in:
  ac_help="$ac_help
    --enable-intl-patch     add -lintl to check for sane"
-@@ -4743,7 +4743,7 @@
+@@ -1364,7 +1364,6 @@
+ fi
+ 
+ 
+-INCLUDES="${INCLUDES} -I/usr/local/include"
+ CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+ if test "${ac_cv_prog_gcc}" = "yes"; then
+   CFLAGS="${CFLAGS} -Wall"
+@@ -4739,7 +4738,7 @@
  #  so we have to use x_includes and x_libraries to test for png
  #  and all following checks (=sane)
  # saved_CPPFLAGS is still up to date
@@ -20,7 +28,7 @@ $NetBSD: patch-aa,v 1.4 2000/05/02 18:48:41 danw Exp $
  if test "${USE_PNG}" = "yes"; then
    for ac_hdr in png.h
  do
-@@ -4844,6 +4844,7 @@
+@@ -4840,6 +4839,7 @@
  # check must stand at end of list because of the missing libintl in libsane.so
  # check needs x_libraries and x_includes because they may be needed by png
  if test "${ADD_LIBINTL}" = "no"; then
diff --git a/graphics/xsane/patches/patch-ab b/graphics/xsane/patches/patch-ab
deleted file mode 100644
index 0cbd9a37e0c..00000000000
--- a/graphics/xsane/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.4 1999/11/11 14:02:09 rh Exp $
-
---- frontend/Makefile.in.orig	Thu Nov 11 12:20:53 1999
-+++ frontend/Makefile.in	Thu Nov 11 12:22:58 1999
-@@ -29,13 +29,13 @@
- 
- CC = @CC@
- INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include \
--	   @GTK_CFLAGS@ @INCLUDES@ \
-+	   @GTK_CFLAGS@ @INCLUDES@ -I${LOCALBASE}/include \
- 	   -DLOCALEDIR=\""$(datadir)/locale"\"
- DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @INTLLIBS@ @LIBS@
-+LIBS = @INTLLIBS@ @LIBS@ -L${X11BASE}/lib -Wl,-R${X11BASE}/lib/sane -lsane
- GTK_LIBS = @GTK_LIBS@
- GIMP_LIBS = @GIMP_LIBS@
- 
diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST
index ad3b39351c3..080e8c04715 100644
--- a/graphics/xsane/pkg/PLIST
+++ b/graphics/xsane/pkg/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2000/01/26 22:03:19 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/08/28 16:00:20 rh Exp $
 bin/xsane
 man/man1/xsane.1
 share/locale/fr/LC_MESSAGES/xsane.mo
 share/locale/de/LC_MESSAGES/xsane.mo
 share/locale/cs/LC_MESSAGES/xsane.mo
+share/locale/sv/LC_MESSAGES/xsane.mo
 share/sane/xsane/xsane-style.rc
-share/sane/xsane-logo.xpm
+share/sane/xsane/xsane-calibration.pnm
+share/sane/xsane/xsane-logo.xpm
+share/sane/xsane/xsane-startimage.pnm
 share/sane/sane-backends-doc.html
 share/sane/sane-pnm-doc.html
 share/sane/sane-pnm16-doc.html
@@ -27,6 +30,10 @@ share/sane/sane-xsane-setup-save-doc.html
 share/sane/sane-xsane-standard-doc.html
 share/sane/sane-problems-doc.html
 share/sane/sane-xsane-setup-copy-doc.html
+share/sane/sane-xsane-output-formats-doc.html
+share/sane/sane-xsane-setup-device-doc.html
+share/sane/sane-xsane-setup-device.jpg
+share/sane/threshold.jpg
 share/sane/brightness.jpg
 share/sane/contrast.jpg
 share/sane/default.jpg