[pkgsrc/trunk]: pkgsrc/graphics/sane-backends Fix xsane build by adding back ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/55571153cd30
branches:  trunk
changeset: 398626:55571153cd30
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 04 23:09:06 2009 +0000

description:
Fix xsane build by adding back a symbol that was, according to Debian,
accidentally removed in 1.0.20.
Bump PKGREVISION.

diffstat:

 graphics/sane-backends/Makefile         |   4 ++--
 graphics/sane-backends/distinfo         |   3 ++-
 graphics/sane-backends/patches/patch-ag |  12 ++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r dcee0e730f93 -r 55571153cd30 graphics/sane-backends/Makefile
--- a/graphics/sane-backends/Makefile   Fri Sep 04 22:10:08 2009 +0000
+++ b/graphics/sane-backends/Makefile   Fri Sep 04 23:09:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2009/08/26 19:56:43 sno Exp $
+# $NetBSD: Makefile,v 1.44 2009/09/04 23:09:06 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -7,7 +7,7 @@
 
 DISTNAME=      sane-backends-${SANE_VERSION}
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
-PKGREVISION=   2
+PKGREVISION=   3
 
 # lib/Makefile.in builds .o files and then .a, but rules for shlibs,
 # while apparently independent, cause libtool to create .o again,
diff -r dcee0e730f93 -r 55571153cd30 graphics/sane-backends/distinfo
--- a/graphics/sane-backends/distinfo   Fri Sep 04 22:10:08 2009 +0000
+++ b/graphics/sane-backends/distinfo   Fri Sep 04 23:09:06 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2009/08/20 03:53:20 hasso Exp $
+$NetBSD: distinfo,v 1.26 2009/09/04 23:09:06 wiz Exp $
 
 SHA1 (sane-backends-1.0.20.tar.gz) = 3b4d2ecde8be404bb44269771cf5dc6e4c10b086
 RMD160 (sane-backends-1.0.20.tar.gz) = b80c0a15a75b3bce07060d65aecdcaf7860c323b
@@ -9,3 +9,4 @@
 SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
 SHA1 (patch-af) = f2b74ea5f61591c426158ff11f07ba36a90c5acc
+SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
diff -r dcee0e730f93 -r 55571153cd30 graphics/sane-backends/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/sane-backends/patches/patch-ag   Fri Sep 04 23:09:06 2009 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2009/09/04 23:09:06 wiz Exp $
+
+--- include/sane/sane.h.orig   2009-04-23 19:59:23.000000000 +0000
++++ include/sane/sane.h
+@@ -115,6 +115,7 @@ SANE_Device;
+ #define SANE_CAP_AUTOMATIC            (1 << 4)
+ #define SANE_CAP_INACTIVE             (1 << 5)
+ #define SANE_CAP_ADVANCED             (1 << 6)
++#define SANE_CAP_ALWAYS_SETTABLE      (1 << 7)
+ 
+ #define SANE_OPTION_IS_ACTIVE(cap)    (((cap) & SANE_CAP_INACTIVE) == 0)
+ #define SANE_OPTION_IS_SETTABLE(cap)  (((cap) & SANE_CAP_SOFT_SELECT) != 0)