diff options
| -rw-r--r-- | graphics/xsane/Makefile | 4 | ||||
| -rw-r--r-- | graphics/xsane/files/md5 | 4 | ||||
| -rw-r--r-- | graphics/xsane/files/patch-sum | 5 | ||||
| -rw-r--r-- | graphics/xsane/patches/patch-ac | 28 | ||||
| -rw-r--r-- | graphics/xsane/patches/patch-ad | 16 | ||||
| -rw-r--r-- | graphics/xsane/pkg/PLIST | 7 |
6 files changed, 43 insertions, 21 deletions
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index dc1bda34a2d..fee2e8a0d7a 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 1999/11/11 14:02:04 rh Exp $ +# $NetBSD: Makefile,v 1.10 1999/11/27 12:09:06 rh Exp $ # -DISTNAME= xsane-0.43 +DISTNAME= xsane-0.46 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 363bb455291..6822f9582b7 100644 --- a/graphics/xsane/files/md5 +++ b/graphics/xsane/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 1999/11/11 14:02:08 rh Exp $ +$NetBSD: md5,v 1.7 1999/11/27 12:09:07 rh Exp $ -MD5 (xsane-0.43.tar.gz) = 8378587301e271341af0a1e251e7bac7 +MD5 (xsane-0.46.tar.gz) = 45046760a4f5c6453774dda1e64146ac diff --git a/graphics/xsane/files/patch-sum b/graphics/xsane/files/patch-sum index aa877850d13..f7b30d9e8c3 100644 --- a/graphics/xsane/files/patch-sum +++ b/graphics/xsane/files/patch-sum @@ -1,5 +1,6 @@ -$NetBSD: patch-sum,v 1.3 1999/11/11 14:02:09 rh Exp $ +$NetBSD: patch-sum,v 1.4 1999/11/27 12:09:09 rh Exp $ MD5 (patch-aa) = d9ded3d2665d4cdb2976d211bff15a6a MD5 (patch-ab) = d180e1bee83c3ec706effb9901113fb0 -MD5 (patch-ac) = 0d04e0930db85eb06c9e0fa73cb4a159 +MD5 (patch-ac) = 491dd1663c97ceef7524796796cdaf79 +MD5 (patch-ad) = d4e761f04c059a5f50547b7a34d72c4d diff --git a/graphics/xsane/patches/patch-ac b/graphics/xsane/patches/patch-ac index 9c08cff5504..3a5e08080ee 100644 --- a/graphics/xsane/patches/patch-ac +++ b/graphics/xsane/patches/patch-ac @@ -1,13 +1,17 @@ -$NetBSD: patch-ac,v 1.3 1999/05/03 16:29:23 rh Exp $ +$NetBSD: patch-ac,v 1.4 1999/11/27 12:09:10 rh Exp $ ---- sanei/Makefile.in.orig Wed Apr 14 00:34:23 1999 -+++ sanei/Makefile.in Sun May 2 14:18:04 1999 -@@ -27,7 +27,7 @@ - INSTALL_DATA = @INSTALL_DATA@ - - CC = @CC@ --INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -+INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I${PREFIX}/include - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ +--- 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 new file mode 100644 index 00000000000..c41bed13ee3 --- /dev/null +++ b/graphics/xsane/patches/patch-ad @@ -0,0 +1,16 @@ +$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 dcd62defa47..47903f44b7d 100644 --- a/graphics/xsane/pkg/PLIST +++ b/graphics/xsane/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1999/11/11 14:02:09 rh Exp $ +@comment $NetBSD: PLIST,v 1.5 1999/11/27 12:09:11 rh Exp $ bin/xsane man/man1/xsane.1 share/locale/fr/LC_MESSAGES/xsane.mo @@ -22,9 +22,10 @@ share/sane/sane-xsane-preview-doc.html share/sane/sane-xsane-scan-doc.html share/sane/sane-xsane-setup-display-doc.html share/sane/sane-xsane-setup-fax-doc.html -share/sane/sane-xsane-setup-printer-doc.html 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/brightness.jpg share/sane/contrast.jpg share/sane/default.jpg @@ -46,9 +47,9 @@ share/sane/sane-xsane-pipette-white.jpg share/sane/sane-xsane-preview.jpg share/sane/sane-xsane-setup-display.jpg share/sane/sane-xsane-setup-fax.jpg -share/sane/sane-xsane-setup-printer.jpg share/sane/sane-xsane-setup-save.jpg share/sane/sane-xsane-standard.jpg +share/sane/sane-xsane-setup-copy.jpg share/sane/store.jpg share/sane/sane-xsane-visible-area.jpg share/sane/sane-xsane-zoom-in.jpg |