Update to sane-backends-1.0.22.

Add snmp support.
Fix username in README.

graphics/sane-backends/Makefile

@@ -1,12 +1,8 @@
-# $OpenBSD: Makefile,v 1.38 2011/01/17 23:26:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2011/03/03 13:43:50 ajacoutot Exp $
 
 COMMENT=	API for accessing scanners, backends
 
-DISTNAME=	sane-backends-1.0.21
+DISTNAME=	sane-backends-1.0.22
-REVISION=	12
-
-PATCHFILES=	sane-backends-1.0.21-i18n.patch
-PATCH_DIST_STRIP= -p1
 
 SHARED_LIBS=	sane 2.0 # .1.0
 CATEGORIES=	graphics
@@ -21,18 +17,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c dbus-1 exif jpeg ltdl m pthread usb z tiff
+WANTLIB += avahi-client avahi-common c crypto dbus-1 exif gphoto2
-WANTLIB += gphoto2 gphoto2_port avahi-client avahi-common
+WANTLIB += gphoto2_port jpeg ltdl m netsnmp pthread tiff usb z
 
 MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
-		ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/capture/ \
-		http://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
-		ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
 		ftp://ftp.sane-project.org/pub/sane/old-versions/${DISTNAME}/
 
 LIB_DEPENDS=	graphics/tiff \
 		graphics/libgphoto2 \
-		net/avahi
+		net/avahi \
+		net/net-snmp
 
 MODULES=	devel/gettext
 

graphics/sane-backends/distinfo

@@ -1,10 +1,5 @@
-MD5 (sane-backends-1.0.21-i18n.patch) = imRDtzHwTa2oFOJoxCsTmg==
+MD5 (sane-backends-1.0.22.tar.gz) = +t9Wpg9Hdr+yRJH2a2F89Q==
-MD5 (sane-backends-1.0.21.tar.gz) = vlhqI2M5Sc8uzwycbXaRMA==
+RMD160 (sane-backends-1.0.22.tar.gz) = UkcTR0qBkzHQF5+mQv73ENBz8dE=
-RMD160 (sane-backends-1.0.21-i18n.patch) = NaFjBfMOQUeLPegiZu/3KJLiSNY=
+SHA1 (sane-backends-1.0.22.tar.gz) = 3ATW5v0YeR2AAsP9sj6J/vMycTU=
-RMD160 (sane-backends-1.0.21.tar.gz) = AArkL/1khMVDialGi93h3Px1jd4=
+SHA256 (sane-backends-1.0.22.tar.gz) = n4ShaABJfwt5onhTG7Gg9DjebOjPUJ/vxlolLin5DFQ=
-SHA1 (sane-backends-1.0.21-i18n.patch) = 1Ez2QKDFbDJJ6dpcxks79FLhmJo=
+SIZE (sane-backends-1.0.22.tar.gz) = 5150661
-SHA1 (sane-backends-1.0.21.tar.gz) = SieJ6p2uHs4JDQFqvRSw8kUNm9s=
-SHA256 (sane-backends-1.0.21-i18n.patch) = nw0Woy/YuMya5eBjmxxRryE3xRBrmzGPDfgY1WifPvw=
-SHA256 (sane-backends-1.0.21.tar.gz) = 5E4vopJYl886nGN7gSJHcrRIODW/VGpIz5R3aJAilIs=
-SIZE (sane-backends-1.0.21-i18n.patch) = 2250
-SIZE (sane-backends-1.0.21.tar.gz) = 5050344

graphics/sane-backends/patches/patch-Makefile_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2010/04/26 10:41:28 ajacoutot Exp $
+$OpenBSD: patch-Makefile_in,v 1.3 2011/03/03 13:43:50 ajacoutot Exp $
---- Makefile.in.orig	Wed Apr 14 02:52:59 2010
+--- Makefile.in.orig	Sun Jan 30 19:50:56 2011
-+++ Makefile.in	Mon Apr 26 08:31:07 2010
++++ Makefile.in	Mon Feb 14 06:49:59 2011
 @@ -35,7 +35,7 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/04/26 10:41:28 ajacoutot Exp $
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  	$(top_srcdir)/configure $(top_srcdir)/include/sane/config.h.in \
  	AUTHORS COPYING ChangeLog INSTALL NEWS compile config.guess \
-@@ -292,11 +292,7 @@ top_builddir = @top_builddir@
+@@ -295,11 +295,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = include lib sanei backend frontend tools doc po
  DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite

graphics/sane-backends/patches/patch-backend_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-backend_Makefile_in,v 1.5 2010/04/26 10:41:28 ajacoutot Exp $
+$OpenBSD: patch-backend_Makefile_in,v 1.6 2011/03/03 13:43:50 ajacoutot Exp $
---- backend/Makefile.in.orig	Wed Apr 14 02:52:59 2010
+--- backend/Makefile.in.orig	Sun Jan 30 19:50:55 2011
-+++ backend/Makefile.in	Mon Apr 26 08:31:07 2010
++++ backend/Makefile.in	Mon Feb 14 06:49:59 2011
-@@ -1598,7 +1598,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
+@@ -1641,7 +1641,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
  # The -rpath option is added because we are creating _LTLIBRARIES based
  # on configure substitution.  This causes automake to not know the
  # correct $libdir and must be added here.

graphics/sane-backends/patches/patch-backend_dll_conf_in

@@ -1,6 +1,6 @@
-$OpenBSD: patch-backend_dll_conf_in,v 1.5 2010/04/26 10:41:28 ajacoutot Exp $
+$OpenBSD: patch-backend_dll_conf_in,v 1.6 2011/03/03 13:43:50 ajacoutot Exp $
---- backend/dll.conf.in.orig	Mon Apr  5 15:18:03 2010
+--- backend/dll.conf.in.orig	Sun Jan 16 02:01:28 2011
-+++ backend/dll.conf.in	Mon Apr 26 08:31:07 2010
++++ backend/dll.conf.in	Mon Feb 14 06:49:59 2011
 @@ -30,7 +30,7 @@ genesys
  gt68xx
  hp
@@ -10,7 +10,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.5 2010/04/26 10:41:28 ajacoutot Exp $
  hp3500
  hp4200
  hp5400
-@@ -59,7 +59,7 @@ pixma
+@@ -61,7 +61,7 @@ pixma
  plustek
  #plustek_pp
  #pnm
@@ -19,7 +19,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.5 2010/04/26 10:41:28 ajacoutot Exp $
  ricoh
  rts8891
  s9036
-@@ -80,5 +80,5 @@ u12
+@@ -82,5 +82,5 @@ u12
  umax
  #umax_pp
  umax1220u

graphics/sane-backends/patches/patch-backend_xerox_mfp-tcp_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-backend_xerox_mfp-tcp_c,v 1.1 2011/03/03 13:43:50 ajacoutot Exp $
+--- backend/xerox_mfp-tcp.c.orig	Mon Feb 14 07:09:29 2011
++++ backend/xerox_mfp-tcp.c	Mon Feb 14 07:09:49 2011
+@@ -27,6 +27,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <sys/time.h>
++#include <sys/socket.h>
+ 
+ #include "sane/saneopts.h"
+ #include "sane/sanei_scsi.h"

graphics/sane-backends/patches/patch-configure

@@ -1,33 +1,33 @@
-$OpenBSD: patch-configure,v 1.11 2010/11/27 11:36:00 ajacoutot Exp $
+$OpenBSD: patch-configure,v 1.12 2011/03/03 13:43:50 ajacoutot Exp $
---- configure.orig	Mon Apr 26 02:57:49 2010
+--- configure.orig	Mon Feb 14 02:27:52 2011
-+++ configure	Sat Nov 27 11:25:18 2010
++++ configure	Mon Feb 14 06:50:54 2011
-@@ -11687,13 +11687,13 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
+@@ -7202,13 +7202,13 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then :
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ #define HAVE_PTHREAD_H 1
  _ACEOF
  
--       { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-+       { $as_echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
++       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -pthread" >&5
 +$as_echo_n "checking for pthread_create in -pthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
+ if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
 +LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* confdefs.h.  */
+ /* end confdefs.h.  */
- _ACEOF
+ 
-@@ -11753,7 +11753,7 @@ fi
+@@ -7239,7 +7239,7 @@ fi
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
  $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
+ if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
 -  PTHREAD_LIBS="-lpthread"
 +  PTHREAD_LIBS="-pthread"
  fi
  
         have_pthread=yes
-@@ -11927,18 +11927,6 @@ if test "${with_group+set}" = set; then
+@@ -7319,18 +7319,6 @@ if test "${with_group+set}" = set; then :
  
  fi
  
@@ -37,26 +37,26 @@ $OpenBSD: patch-configure,v 1.11 2010/11/27 11:36:00 ajacoutot Exp $
 -    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
 -    rm -f sanetest.file
 -    if test ! -z "$lasterror"; then
--      { $as_echo "$as_me:$LINENO: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
 -$as_echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;}
--      { $as_echo "$as_me:$LINENO: WARNING: Locking feature will be disabled." >&5
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Locking feature will be disabled." >&5
 -$as_echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
 -      use_locking=no
 -    fi
    fi
    if test $use_locking = yes ; then
      INSTALL_LOCKPATH=install-lockpath
-@@ -12752,7 +12740,7 @@ fi
+@@ -7971,7 +7959,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
- 
  
+ fi
  
 -for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
 +for ac_header in fcntl.h unistd.h sys/dsreq.h sys/select.h \
      sys/time.h sys/shm.h sys/ipc.h sys/signal.h sys/scanio.h os2.h \
      sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
      dev/ppbus/ppi.h machine/cpufunc.h sys/bitypes.h sys/sem.h sys/poll.h \
-@@ -14056,6 +14044,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -8216,6 +8204,7 @@ $as_echo_n "checking for socklen_t in <sys/socket.h>..
- cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 +#include <sys/types.h>

graphics/sane-backends/pkg/PFRAG.shared

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2010/11/25 13:55:57 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.11 2011/03/03 13:43:50 ajacoutot Exp $
 @lib lib/libsane.so.${LIBsane_VERSION}
 lib/sane/libsane-abaton.so
 lib/sane/libsane-agfafocus.so
@@ -39,9 +39,11 @@ lib/sane/libsane-hs2p.so
 lib/sane/libsane-ibm.so
 lib/sane/libsane-kodak.so
 lib/sane/libsane-kvs1025.so
+lib/sane/libsane-kvs20xx.so
 lib/sane/libsane-leo.so
 lib/sane/libsane-lexmark.so
 lib/sane/libsane-ma1509.so
+lib/sane/libsane-magicolor.so
 lib/sane/libsane-matsushita.so
 lib/sane/libsane-microtek.so
 lib/sane/libsane-mustek.so

graphics/sane-backends/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2010/11/25 13:55:57 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.13 2011/03/03 13:43:50 ajacoutot Exp $
 @newgroup _saned:553
 @newuser _saned:553:_saned:daemon:SANE Scanner Daemon:/var/empty:/sbin/nologin
 %%SHARED%%
@@ -90,12 +90,16 @@ lib/sane/
 @comment lib/sane/libsane-kodak.la
 @comment lib/sane/libsane-kvs1025.a
 @comment lib/sane/libsane-kvs1025.la
+@comment lib/sane/libsane-kvs20xx.a
+@comment lib/sane/libsane-kvs20xx.la
 @comment lib/sane/libsane-leo.a
 @comment lib/sane/libsane-leo.la
 @comment lib/sane/libsane-lexmark.a
 @comment lib/sane/libsane-lexmark.la
 @comment lib/sane/libsane-ma1509.a
 @comment lib/sane/libsane-ma1509.la
+@comment lib/sane/libsane-magicolor.a
+@comment lib/sane/libsane-magicolor.la
 @comment lib/sane/libsane-matsushita.a
 @comment lib/sane/libsane-matsushita.la
 @comment lib/sane/libsane-microtek.a
@@ -207,9 +211,11 @@ lib/sane/
 @man man/man5/sane-ibm.5
 @man man/man5/sane-kodak.5
 @man man/man5/sane-kvs1025.5
+@man man/man5/sane-kvs20xx.5
 @man man/man5/sane-leo.5
 @man man/man5/sane-lexmark.5
 @man man/man5/sane-ma1509.5
+@man man/man5/sane-magicolor.5
 @man man/man5/sane-matsushita.5
 @man man/man5/sane-microtek.5
 @man man/man5/sane-mustek.5
@@ -412,6 +418,8 @@ share/examples/sane-backends/sane.d/lexmark.conf
 @sample ${SYSCONFDIR}/sane.d/lexmark.conf
 share/examples/sane-backends/sane.d/ma1509.conf
 @sample ${SYSCONFDIR}/sane.d/ma1509.conf
+share/examples/sane-backends/sane.d/magicolor.conf
+@sample ${SYSCONFDIR}/sane.d/magicolor.conf
 share/examples/sane-backends/sane.d/matsushita.conf
 @sample ${SYSCONFDIR}/sane.d/matsushita.conf
 share/examples/sane-backends/sane.d/microtek.conf

graphics/sane-backends/pkg/README

@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.4 2011/01/17 23:24:40 ajacoutot Exp $
+$OpenBSD: README,v 1.5 2011/03/03 13:43:50 ajacoutot Exp $
 
 Using sane(7) under OpenBSD
 ===========================
@@ -8,7 +8,7 @@ First read ${TRUEPREFIX}/share/doc/sane-backends/PROBLEMS.
 USB
 ---
 Since USB scanning will be handled by libusb, you need to allow the
-_cups user access to the corresponding USB endpoint. To do so, find
+_saned user access to the corresponding USB endpoint. To do so, find
 where your scanner is attached to using dmesg(8) then change the
 ownerships accordingly.
 ugenX = /dev/ugenX
@@ -33,8 +33,8 @@ the _saned group.
 SCSI
 ----
 SANE only supports the generic SCSI uk(4) devices.
-Make sure your user has read/write access to the scanner device or you
+Make sure your user account has access to the scanner device or you will
-will not be able to scan.
+not be able to scan.
 
 LOCKING
 -------
@@ -44,9 +44,9 @@ add yourself to the _saned group or you will not be able to scan.
 
 NETWORK
 -------
-The saned(8) daemon needs rw access to your device, make sure the _saned
+By default, the saned(8) daemon runs as _saned, so you need to allow the
-group as rw permissions.
+_saned user access to the scanner device.
 If you're planning on using the SANE network daemon (saned) with
-inetd(8) as opposed to starting it standalone from the provided rc
+inetd(8) as opposed to starting it standalone from the provided rc.d(8)
 script, add the following line in /etc/services:
 sane-port	6566/tcp	saned	# SANE network scanner daemon