Update xsane to 0.48. Changes are as follows:

 - No longer requires patches ac and ad thanks to author's quick
   reaction to feedback.

xsane-0.46 -> 0.47:
-------------------

 - if helpfile viewer is netscape-remote and netscape is not running
   it is started

 - replaced ENODATA (used for EOF detection in xsane-rc-io and
   xsane-device-preferences) by XSANE_EOF (=-1)
   (ENODATA is not defined on all systems)

 - If faxproject does not exist, project data entries are made insensitive
   and buttons "send project" and "delete project" are replaced by "create
   project"

 - Added missing "&" in xsane_device_preferences_save_values:
   xsane_rc_io_w_array(w, &len, (void **) &word_array, (WireCodecFunc)
   xsane_rc_io_w_word, sizeof(SANE_Word)); that cause segmentation fault
   when writing bool, int or fixpoint arrays.


xsane-0.47 -> 0.48:
-------------------

 - "START" button is made insensitive in fax mode if project does not exist.

 - Preview window is created at the same time as the main dialog and it is
   destroyed at program end. Disabling "show preview" hides the preview
   window. This way the preview window placement does work correct.

 - set default values in xsane_device_preferences_load_file(char *filename)
   before reading the saved values, show_preview default = true

 - Mouse pointers display relevant mode icons in preview window now.

 - In copy mode the maximum selectable size that fits to the selected
   printer is drawn by a rect now. Selection is limited to the printer
   size.

 - if no local xsane.rc, xsane-style.rc or DEVICE.drc file exists it is
   loaded from SANE_DATA_DIR/xsane

 - all xsane rc files are placed in a subdirectory xsane now
   (~/.sane/xsane, SANE_DATA/DIR/xsane)

 - temporary files (previews, conversions) are saved in /tmp (defined in
   SANE_PATH_TMP in xsane.h) now

 - added window decoration icon (top left) to each xsane window (does work
   with kwm, does not work with fvwm2)

 - added warning icon and error icon

 - removed xsane_files_exit_callback, now xsane_scan_win_delete is used for
   all exit program calls

 - conversion-* and preview-* files are created with permission
   "-rw-------", images- and project-files are created with
   "preferences.image_umask" xsane.rc and *.drc are created with
   XSANE_DEFAULT_UMASK defined in xsane.h

6 files changed, 8 insertions, 43 deletions

diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index fee2e8a0d7a..01c2d0a2294 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 1999/11/27 12:09:06 rh Exp $
+# $NetBSD: Makefile,v 1.11 2000/01/06 13:48:10 rh Exp $
 #
 
-DISTNAME=	xsane-0.46
+DISTNAME=	xsane-0.48
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.wolfsburg.de/~rauch/sane/ \
 		http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/graphics/xsane/files/md5 b/graphics/xsane/files/md5
index 6822f9582b7..edabc55d779 100644
--- a/graphics/xsane/files/md5
+++ b/graphics/xsane/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 1999/11/27 12:09:07 rh Exp $
+$NetBSD: md5,v 1.8 2000/01/06 13:48:10 rh Exp $
 
-MD5 (xsane-0.46.tar.gz) = 45046760a4f5c6453774dda1e64146ac
+MD5 (xsane-0.48.tar.gz) = 28180746f89c9cad9dd87dfd1b222a2f
diff --git a/graphics/xsane/files/patch-sum b/graphics/xsane/files/patch-sum
index f7b30d9e8c3..7ff38165602 100644
--- a/graphics/xsane/files/patch-sum
+++ b/graphics/xsane/files/patch-sum
@@ -1,6 +1,4 @@
-$NetBSD: patch-sum,v 1.4 1999/11/27 12:09:09 rh Exp $
+$NetBSD: patch-sum,v 1.5 2000/01/06 13:48:11 rh Exp $
 
 MD5 (patch-aa) = d9ded3d2665d4cdb2976d211bff15a6a
 MD5 (patch-ab) = d180e1bee83c3ec706effb9901113fb0
-MD5 (patch-ac) = 491dd1663c97ceef7524796796cdaf79
-MD5 (patch-ad) = d4e761f04c059a5f50547b7a34d72c4d
diff --git a/graphics/xsane/patches/patch-ac b/graphics/xsane/patches/patch-ac
deleted file mode 100644
index 3a5e08080ee..00000000000
--- a/graphics/xsane/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1999/11/27 12:09:10 rh Exp $
-
---- frontend/xsane-rc-io.c.orig	Wed Nov 17 20:52:45 1999
-+++ frontend/xsane-rc-io.c	Sat Nov 27 11:33:19 1999
-@@ -89,8 +89,11 @@
-           {
-             if (nread == 0)
-             {
--/*              errno = EINVAL; */
-+#ifdef ENODATA
-               errno = ENODATA; /* EOF */
-+#else
-+              errno = EINVAL;
-+#endif
-             }
-             w->status = errno;
-             return;
diff --git a/graphics/xsane/patches/patch-ad b/graphics/xsane/patches/patch-ad
deleted file mode 100644
index c41bed13ee3..00000000000
--- a/graphics/xsane/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1999/11/27 12:09:10 rh Exp $
-
---- frontend/xsane-device-preferences.c.orig	Fri Nov 19 21:44:10 1999
-+++ frontend/xsane-device-preferences.c	Sat Nov 27 12:29:58 1999
-@@ -116,7 +116,11 @@
-       xsane_rc_io_w_string(w, &name);
-     }
- 
-+#ifdef ENODATA
-     if (w->status == ENODATA) /* eof */
-+#else
-+    if (w->status == EAGAIN) /* eof */
-+#endif
-     {
-       if (keep_going) /* we had a reload otpions? */
-       {
diff --git a/graphics/xsane/pkg/PLIST b/graphics/xsane/pkg/PLIST
index 47903f44b7d..43441236c08 100644
--- a/graphics/xsane/pkg/PLIST
+++ b/graphics/xsane/pkg/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 1999/11/27 12:09:11 rh Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/01/06 13:48:11 rh Exp $
 bin/xsane
 man/man1/xsane.1
 share/locale/fr/LC_MESSAGES/xsane.mo
 share/locale/de/LC_MESSAGES/xsane.mo
-share/sane/xsane-style.rc
+share/sane/xsane/xsane-style.rc
 share/sane/xsane-logo.xpm
 share/sane/sane-backends-doc.html
 share/sane/sane-pnm-doc.html
@@ -59,5 +59,5 @@ share/sane/sane-xsane-zoom-undo.jpg
 share/sane/sane-xsane.jpg
 share/sane/xsane-logo.jpg
 share/sane/xsane-logo2.jpg
-share/sane/xxx.jpg
+@dirrm share/sane/xsane
 @dirrm share/sane