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