diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index f3549304863..469f3e0e748 100755
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.52 2012/08/04 15:08:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2012/08/28 08:26:40 ajacoutot Exp $
 
 COMMENT=	API for accessing scanners, backends
 
-DISTNAME=	sane-backends-1.0.22
-
-REVISION=	9
+DISTNAME=	sane-backends-1.0.23
 
 SHARED_LIBS=	sane 2.0 # .1.0
 CATEGORIES=	graphics
@@ -19,14 +17,25 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c jpeg m tiff usb z pthread usb-1.0
+WANTLIB += asn1 c crypto cups gssapi jpeg krb5 m pthread ssl tiff
+WANTLIB += usb usb-1.0 z
 
-MASTER_SITES=	ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
-		ftp://ftp.sane-project.org/pub/sane/old-versions/${DISTNAME}/ \
-		ftp://ftp2.sane-project.org/pub/sane/${DISTNAME}/
+# XXX
+# README.txt: Due to limitations in alioth's file upload software, the
+# release has been divided into 3 parts. Download all three, and the
+# .md5sum. Join them using the following command:
+# cat sane-backends-1.0.23.tar.gz.[1-3] > sane-backends-1.0.23.tar.gz
+# Then check the md5sum as follows:
+# md5sum -c sane-backends-1.0.23.tar.gz.md5
+# MASTER_SITES=	https://alioth.debian.org/frs/download.php/3752/ \
+#		ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
+#		ftp://ftp.sane-project.org/pub/sane/old-versions/${DISTNAME}/ \
+#		ftp://ftp2.sane-project.org/pub/sane/${DISTNAME}/
+MASTER_SITES=	http://distfiles.bsdfrog.org/
 
 LIB_DEPENDS=	graphics/tiff \
-		devel/libusb-compat
+		devel/libusb-compat \
+		print/cups,-libs
 
 FLAVORS=	snmp
 FLAVOR?=
@@ -34,15 +43,13 @@ FLAVOR?=
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
 USE_GROFF=	Yes
-
 NO_REGRESS=	Yes
 
 LOCALSTATEDIR=	${BASELOCALSTATEDIR}/spool
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread" \
-		ac_cv_path_MAKEDEPEND="no"
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--sbindir=${PREFIX}/libexec \
 		--with-docdir=${PREFIX}/share/doc/sane-backends \
@@ -63,10 +70,14 @@ CONFIGURE_ARGS += --without-snmp
 
 FAKE_FLAGS=	configdir=${PREFIX}/share/examples/sane-backends/sane.d
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/configure
+
 post-install:
 	# removing the microtek2 backend which needs a Linux kernel module
 	find ${PREFIX} -name \*microtek2\* | xargs rm
 	cp -R ${WRKSRC}/tools/openbsd/ \
 		${PREFIX}/share/examples/sane-backends/hotplug
+	rm ${PREFIX}/share/examples/sane-backends/hotplug/{attach,detach}.orig
 
 .include <bsd.port.mk>
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 5f64144b803..c167039b6f0 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,5 +1,2 @@
-MD5 (sane-backends-1.0.22.tar.gz) = +t9Wpg9Hdr+yRJH2a2F89Q==
-RMD160 (sane-backends-1.0.22.tar.gz) = UkcTR0qBkzHQF5+mQv73ENBz8dE=
-SHA1 (sane-backends-1.0.22.tar.gz) = 3ATW5v0YeR2AAsP9sj6J/vMycTU=
-SHA256 (sane-backends-1.0.22.tar.gz) = n4ShaABJfwt5onhTG7Gg9DjebOjPUJ/vxlolLin5DFQ=
-SIZE (sane-backends-1.0.22.tar.gz) = 5150661
+SHA256 (sane-backends-1.0.23.tar.gz) = TU9bKIFhWvf8Dtdf3efcYjp0noDkDz95L+QBAWPLsCk=
+SIZE (sane-backends-1.0.23.tar.gz) = 5342350
diff --git a/graphics/sane-backends/patches/patch-Makefile_in b/graphics/sane-backends/patches/patch-Makefile_in
index a6deb7c34e0..36103c73ec9 100644
--- a/graphics/sane-backends/patches/patch-Makefile_in
+++ b/graphics/sane-backends/patches/patch-Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2011/03/03 13:43:50 ajacoutot Exp $
---- Makefile.in.orig	Sun Jan 30 19:50:56 2011
-+++ Makefile.in	Mon Feb 14 06:49:59 2011
+$OpenBSD: patch-Makefile_in,v 1.4 2012/08/28 08:26:40 ajacoutot Exp $
+--- Makefile.in.orig	Wed Aug 15 03:49:39 2012
++++ Makefile.in	Tue Aug 28 09:06:54 2012
 @@ -35,7 +35,7 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2011/03/03 13:43:50 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 \
-@@ -295,11 +295,7 @@ top_builddir = @top_builddir@
+@@ -298,11 +298,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
diff --git a/graphics/sane-backends/patches/patch-backend_Makefile_in b/graphics/sane-backends/patches/patch-backend_Makefile_in
index 204725f9634..e3698e63bc2 100644
--- a/graphics/sane-backends/patches/patch-backend_Makefile_in
+++ b/graphics/sane-backends/patches/patch-backend_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-backend_Makefile_in,v 1.6 2011/03/03 13:43:50 ajacoutot Exp $
---- backend/Makefile.in.orig	Sun Jan 30 19:50:55 2011
-+++ backend/Makefile.in	Mon Feb 14 06:49:59 2011
-@@ -1641,7 +1641,7 @@ AM_LDFLAGS = @STRICT_LDFLAGS@
+$OpenBSD: patch-backend_Makefile_in,v 1.7 2012/08/28 08:26:40 ajacoutot Exp $
+--- backend/Makefile.in.orig	Wed Aug 15 03:49:37 2012
++++ backend/Makefile.in	Tue Aug 28 09:06:54 2012
+@@ -1685,7 +1685,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.
diff --git a/graphics/sane-backends/patches/patch-backend_dll_c b/graphics/sane-backends/patches/patch-backend_dll_c
index 185cf5337ea..9430fcac242 100644
--- a/graphics/sane-backends/patches/patch-backend_dll_c
+++ b/graphics/sane-backends/patches/patch-backend_dll_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-backend_dll_c,v 1.4 2009/05/06 10:23:21 ajacoutot Exp $
---- backend/dll.c.orig	Tue May  5 10:01:03 2009
-+++ backend/dll.c	Tue May  5 10:02:12 2009
-@@ -398,7 +398,7 @@ load (struct backend *be)
+$OpenBSD: patch-backend_dll_c,v 1.5 2012/08/28 08:26:40 ajacoutot Exp $
+--- backend/dll.c.orig	Fri Aug 10 02:33:29 2012
++++ backend/dll.c	Tue Aug 28 09:06:54 2012
+@@ -400,7 +400,7 @@ load (struct backend *be)
  # elif defined (__APPLE__) && defined (__MACH__)
  #   define POSTFIX ".%u.so"
  # else
@@ -10,7 +10,7 @@ $OpenBSD: patch-backend_dll_c,v 1.4 2009/05/06 10:23:21 ajacoutot Exp $
  # endif
    mode = getenv ("LD_BIND_NOW") ? RTLD_NOW : RTLD_LAZY;
  #elif defined(HAVE_SHL_LOAD)
-@@ -460,7 +460,7 @@ load (struct backend *be)
+@@ -462,7 +462,7 @@ load (struct backend *be)
                                              (be->name)+2, V_MAJOR);
  #else
        snprintf (libname, sizeof (libname), "%s/" PREFIX "%s" POSTFIX,
diff --git a/graphics/sane-backends/patches/patch-backend_dll_conf_in b/graphics/sane-backends/patches/patch-backend_dll_conf_in
index 939d806a137..882d126896c 100644
--- a/graphics/sane-backends/patches/patch-backend_dll_conf_in
+++ b/graphics/sane-backends/patches/patch-backend_dll_conf_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-backend_dll_conf_in,v 1.6 2011/03/03 13:43:50 ajacoutot Exp $
---- backend/dll.conf.in.orig	Sun Jan 16 02:01:28 2011
-+++ backend/dll.conf.in	Mon Feb 14 06:49:59 2011
+$OpenBSD: patch-backend_dll_conf_in,v 1.7 2012/08/28 08:26:40 ajacoutot Exp $
+--- backend/dll.conf.in.orig	Sun Jul  1 04:00:44 2012
++++ backend/dll.conf.in	Tue Aug 28 09:06:54 2012
 @@ -30,7 +30,7 @@ genesys
  gt68xx
  hp
@@ -10,7 +10,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.6 2011/03/03 13:43:50 ajacoutot Exp $
  hp3500
  hp4200
  hp5400
-@@ -61,7 +61,7 @@ pixma
+@@ -62,7 +62,7 @@ pixma
  plustek
  #plustek_pp
  #pnm
@@ -19,7 +19,7 @@ $OpenBSD: patch-backend_dll_conf_in,v 1.6 2011/03/03 13:43:50 ajacoutot Exp $
  ricoh
  rts8891
  s9036
-@@ -82,5 +82,5 @@ u12
+@@ -83,5 +83,5 @@ u12
  umax
  #umax_pp
  umax1220u
diff --git a/graphics/sane-backends/patches/patch-backend_epson2-commands_c b/graphics/sane-backends/patches/patch-backend_epson2-commands_c
deleted file mode 100644
index c5106cf1089..00000000000
--- a/graphics/sane-backends/patches/patch-backend_epson2-commands_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-backend_epson2-commands_c,v 1.1 2010/11/27 11:36:00 ajacoutot Exp $
---- backend/epson2-commands.c.orig	Sat Nov 27 10:41:36 2010
-+++ backend/epson2-commands.c	Sat Nov 27 10:41:43 2010
-@@ -21,6 +21,7 @@
- 
- #include <byteorder.h>
- #include <math.h>
-+#include <sys/types.h>
- 
- #include "epson2.h"
- #include "epson2-io.h"
diff --git a/graphics/sane-backends/patches/patch-backend_epson2_c b/graphics/sane-backends/patches/patch-backend_epson2_c
deleted file mode 100644
index 6cb4573a421..00000000000
--- a/graphics/sane-backends/patches/patch-backend_epson2_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-backend_epson2_c,v 1.2 2010/11/27 11:36:00 ajacoutot Exp $
---- backend/epson2.c.orig	Mon Apr  5 15:18:04 2010
-+++ backend/epson2.c	Sat Nov 27 10:40:27 2010
-@@ -57,6 +57,8 @@
- #include <unistd.h>
- #include <errno.h>
- #include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
- 
- #include "sane/saneopts.h"
- #include "sane/sanei_scsi.h"
diff --git a/graphics/sane-backends/patches/patch-backend_kodak_c b/graphics/sane-backends/patches/patch-backend_kodak_c
deleted file mode 100644
index 88d0133b78e..00000000000
--- a/graphics/sane-backends/patches/patch-backend_kodak_c
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-backend_kodak_c,v 1.1 2010/04/26 10:41:28 ajacoutot Exp $
---- backend/kodak.c.orig	Mon Apr 26 08:45:06 2010
-+++ backend/kodak.c	Mon Apr 26 09:03:45 2010
-@@ -110,10 +110,10 @@
- # include <libc.h>              /* NeXTStep/OpenStep */
- #endif
- 
--#include "sane/sanei_backend.h"
--#include "sane/sanei_scsi.h"
--#include "sane/saneopts.h"
--#include "sane/sanei_config.h"
-+#include "../include/sane/sanei_backend.h"
-+#include "../include/sane/sanei_scsi.h"
-+#include "../include/sane/saneopts.h"
-+#include "../include/sane/sanei_config.h"
- 
- #include "kodak-cmd.h"
- #include "kodak.h"
diff --git a/graphics/sane-backends/patches/patch-backend_kvs20xx_opt_c b/graphics/sane-backends/patches/patch-backend_kvs20xx_opt_c
new file mode 100644
index 00000000000..4b5aa9732c5
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-backend_kvs20xx_opt_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-backend_kvs20xx_opt_c,v 1.1 2012/08/28 08:26:40 ajacoutot Exp $
+
+kvs20xx_opt.c:186: warning: implicit declaration of function 'malloc'
+
+--- backend/kvs20xx_opt.c.orig	Tue Aug 28 09:32:29 2012
++++ backend/kvs20xx_opt.c	Tue Aug 28 09:32:53 2012
+@@ -9,6 +9,7 @@
+ #include "../include/sane/config.h"
+ 
+ #include <string.h>
++#include <stdlib.h> /* malloc(3) */
+ 
+ #define DEBUG_DECLARE_ONLY
+ #define BACKEND_NAME kvs20xx
diff --git a/graphics/sane-backends/patches/patch-backend_magicolor_c b/graphics/sane-backends/patches/patch-backend_magicolor_c
index 38136dd63b0..1a92e0bf999 100644
--- a/graphics/sane-backends/patches/patch-backend_magicolor_c
+++ b/graphics/sane-backends/patches/patch-backend_magicolor_c
@@ -1,9 +1,9 @@
-$OpenBSD: patch-backend_magicolor_c,v 1.1 2011/04/25 09:34:39 ajacoutot Exp $
---- backend/magicolor.c.orig	Mon Apr 25 11:07:51 2011
-+++ backend/magicolor.c	Mon Apr 25 11:08:15 2011
-@@ -53,6 +53,8 @@
- #include <math.h>
- #include <poll.h>
+$OpenBSD: patch-backend_magicolor_c,v 1.2 2012/08/28 08:26:40 ajacoutot Exp $
+--- backend/magicolor.c.orig	Mon Nov 21 21:17:48 2011
++++ backend/magicolor.c	Tue Aug 28 09:06:54 2012
+@@ -57,6 +57,8 @@
+ #include <sys/socket.h>
+ #endif
  
 +#include <sys/socket.h>
 +
diff --git a/graphics/sane-backends/patches/patch-backend_xerox_mfp-tcp_c b/graphics/sane-backends/patches/patch-backend_xerox_mfp-tcp_c
deleted file mode 100644
index ecd4ef2d864..00000000000
--- a/graphics/sane-backends/patches/patch-backend_xerox_mfp-tcp_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$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"
diff --git a/graphics/sane-backends/patches/patch-backend_xerox_mfp_h b/graphics/sane-backends/patches/patch-backend_xerox_mfp_h
new file mode 100644
index 00000000000..92c5e25bf40
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-backend_xerox_mfp_h
@@ -0,0 +1,16 @@
+$OpenBSD: patch-backend_xerox_mfp_h,v 1.1 2012/08/28 08:26:40 ajacoutot Exp $
+
+/usr/include/sys/param.h:190:1: warning: this is the location of the previous definition
+
+--- backend/xerox_mfp.h.orig	Tue Aug 28 09:29:54 2012
++++ backend/xerox_mfp.h	Tue Aug 28 09:31:42 2012
+@@ -18,7 +18,9 @@
+ #define UNUSED(x) x
+ #endif
+ 
++#ifndef MIN
+ #define MIN(a,b) (((a) < (b)) ? (a) : (b))
++#endif
+ 
+ #define UNCONST(ptr) ((void *)(long)(ptr))
+ 
diff --git a/graphics/sane-backends/patches/patch-configure b/graphics/sane-backends/patches/patch-configure
index d28c257a7d4..a4d917dac9f 100644
--- a/graphics/sane-backends/patches/patch-configure
+++ b/graphics/sane-backends/patches/patch-configure
@@ -1,33 +1,7 @@
-$OpenBSD: patch-configure,v 1.12 2011/03/03 13:43:50 ajacoutot Exp $
---- configure.orig	Mon Feb 14 02:27:52 2011
-+++ configure	Mon Feb 14 06:50:54 2011
-@@ -7202,13 +7202,13 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then :
- #define HAVE_PTHREAD_H 1
- _ACEOF
- 
--       { $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:${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 :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -7239,7 +7239,7 @@ fi
- { $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 :
--  PTHREAD_LIBS="-lpthread"
-+  PTHREAD_LIBS="-pthread"
- fi
- 
-        have_pthread=yes
-@@ -7319,18 +7319,6 @@ if test "${with_group+set}" = set; then :
+$OpenBSD: patch-configure,v 1.13 2012/08/28 08:26:40 ajacoutot Exp $
+--- configure.orig	Sun Aug 19 22:45:11 2012
++++ configure	Tue Aug 28 09:11:02 2012
+@@ -7353,18 +7353,6 @@ if test "${with_group+set}" = set; then :
  
  fi
  
@@ -46,7 +20,7 @@ $OpenBSD: patch-configure,v 1.12 2011/03/03 13:43:50 ajacoutot Exp $
    fi
    if test $use_locking = yes ; then
      INSTALL_LOCKPATH=install-lockpath
-@@ -7971,7 +7959,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
+@@ -8009,7 +7997,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
  
  fi
  
@@ -55,7 +29,7 @@ $OpenBSD: patch-configure,v 1.12 2011/03/03 13:43:50 ajacoutot Exp $
      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 \
-@@ -8216,6 +8204,7 @@ $as_echo_n "checking for socklen_t in <sys/socket.h>..
+@@ -8267,6 +8255,7 @@ $as_echo_n "checking for socklen_t in <sys/socket.h>..
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
@@ -63,3 +37,12 @@ $OpenBSD: patch-configure,v 1.12 2011/03/03 13:43:50 ajacoutot Exp $
  #include <sys/socket.h>
  
  int
+@@ -9548,7 +9537,7 @@ fi
+ 
+ nl added by PN 3/2/12 to detect cups
+ $as_echo "checking for cups"
+-if test -e /usr/include/cups/cups.h ; then
++if test -e ${LOCALBASE}/include/cups/cups.h ; then
+ 
+ $as_echo "#define HAVE_CUPS 1" >>confdefs.h
+ 
diff --git a/graphics/sane-backends/patches/patch-include_sane_sanei_tcp_h b/graphics/sane-backends/patches/patch-include_sane_sanei_tcp_h
deleted file mode 100644
index 1af3c2301e4..00000000000
--- a/graphics/sane-backends/patches/patch-include_sane_sanei_tcp_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-include_sane_sanei_tcp_h,v 1.1 2010/05/21 11:47:54 ajacoutot Exp $
---- include/sane/sanei_tcp.h.orig	Fri May 21 13:36:09 2010
-+++ include/sane/sanei_tcp.h	Fri May 21 13:36:22 2010
-@@ -20,6 +20,7 @@
- 
- #include <sane/sane.h>
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <netdb.h>
- 
diff --git a/graphics/sane-backends/patches/patch-tools_umax_pp_c b/graphics/sane-backends/patches/patch-tools_umax_pp_c
new file mode 100644
index 00000000000..e27f16af03a
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-tools_umax_pp_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-tools_umax_pp_c,v 1.1 2012/08/28 08:26:40 ajacoutot Exp $
+
+umax_pp.c:330: warning: implicit declaration of function 'putenv'
+
+--- tools/umax_pp.c.orig	Tue Aug 28 09:29:19 2012
++++ tools/umax_pp.c	Tue Aug 28 09:29:29 2012
+@@ -7,6 +7,7 @@
+ 
+ /* For putenv */
+ #define _XOPEN_SOURCE
++#define _XOPEN_SOURCE_EXTENDED 1
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <string.h>
diff --git a/graphics/sane-backends/pkg/DESCR b/graphics/sane-backends/pkg/DESCR
index d0760ffd3bb..f7ec5a6572f 100755
--- a/graphics/sane-backends/pkg/DESCR
+++ b/graphics/sane-backends/pkg/DESCR
@@ -1,27 +1,6 @@
-SANE stands for "Scanner Access Now Easy" and is an application
-programming interface (API) that provides standardized access to any
-raster image scanner hardware (flatbed scanner, hand-held scanner,
-video- and still-cameras, frame-grabbers, etc.). The SANE API is public
-domain and its discussion and development is open to everybody. The
-current source code is written for UNIX (including GNU/Linux) and is
-available under the GNU General Public License (the SANE API is
-available to proprietary applications and backends as well, however).
-More details about the license can be found on our license page. Ports
-to MacOS X, OS/2 and Microsoft Windows are either already done or in
-progress.
-
-SANE is a universal scanner interface. The value of such a universal
-interface is that it allows writing just one driver per image
-acquisition device rather than one driver for each device and
-application. So, if you have three applications and four devices,
-traditionally you'd have had to write 12 different programs. With SANE,
-this number is reduced to seven: the three applications plus the four
-drivers. Of course, the savings get even bigger as more and more drivers
-and/or applications are added.
-
-SANE-BACKENDS comes complete with documentation, several backends,
-scanimage command line frontend, and networking support. For
-other/graphical frontends take a look at sane-frontends and XSane.
+SANE stands for Scanner Access Now Easy.
+This package contains the SANE libraries (this means backends and
+network scanning parts) and the command line frontend scanimage.
 
 Available FLAVOR:
-	snmp - build with net-snmp support (i.e. SNMP scanners support)
+	snmp - build with net-snmp support (SNMP scanner autodiscovery)
diff --git a/graphics/sane-backends/pkg/PFRAG.shared b/graphics/sane-backends/pkg/PFRAG.shared
index 57de6b17942..b0ec2e27a99 100644
--- a/graphics/sane-backends/pkg/PFRAG.shared
+++ b/graphics/sane-backends/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.12 2011/06/16 10:14:58 ajacoutot Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.13 2012/08/28 08:26:40 ajacoutot Exp $
 @lib lib/libsane.so.${LIBsane_VERSION}
 lib/sane/libsane-abaton.so
 lib/sane/libsane-agfafocus.so
@@ -37,6 +37,7 @@ lib/sane/libsane-hpljm1005.so
 lib/sane/libsane-hs2p.so
 lib/sane/libsane-ibm.so
 lib/sane/libsane-kodak.so
+lib/sane/libsane-kodakaio.so
 lib/sane/libsane-kvs1025.so
 lib/sane/libsane-kvs20xx.so
 lib/sane/libsane-leo.so
diff --git a/graphics/sane-backends/pkg/PLIST b/graphics/sane-backends/pkg/PLIST
index 5fd155063c0..20a3eb0c8fe 100644
--- a/graphics/sane-backends/pkg/PLIST
+++ b/graphics/sane-backends/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2011/06/16 10:14:58 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2012/08/28 08:26:40 ajacoutot Exp $
 @newgroup _saned:553
 @newuser _saned:553:_saned:daemon:SANE Scanner Daemon:/var/empty:/sbin/nologin
 @extraunexec rm -rf /var/spool/lock/sane/*
@@ -12,6 +12,8 @@ include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.a
 lib/libsane.la
+lib/pkgconfig/
+lib/pkgconfig/sane-backends.pc
 lib/sane/
 @comment lib/sane/libsane-abaton.a
 @comment lib/sane/libsane-abaton.la
@@ -87,6 +89,8 @@ lib/sane/
 @comment lib/sane/libsane-ibm.la
 @comment lib/sane/libsane-kodak.a
 @comment lib/sane/libsane-kodak.la
+@comment lib/sane/libsane-kodakaio.a
+@comment lib/sane/libsane-kodakaio.la
 @comment lib/sane/libsane-kvs1025.a
 @comment lib/sane/libsane-kvs1025.la
 @comment lib/sane/libsane-kvs20xx.a
@@ -208,6 +212,7 @@ lib/sane/
 @man man/man5/sane-hs2p.5
 @man man/man5/sane-ibm.5
 @man man/man5/sane-kodak.5
+@man man/man5/sane-kodakaio.5
 @man man/man5/sane-kvs1025.5
 @man man/man5/sane-kvs20xx.5
 @man man/man5/sane-leo.5
@@ -408,6 +413,8 @@ share/examples/sane-backends/sane.d/ibm.conf
 @sample ${SYSCONFDIR}/sane.d/ibm.conf
 share/examples/sane-backends/sane.d/kodak.conf
 @sample ${SYSCONFDIR}/sane.d/kodak.conf
+share/examples/sane-backends/sane.d/kodakaio.conf
+@sample ${SYSCONFDIR}/sane.d/kodakaio.conf
 share/examples/sane-backends/sane.d/leo.conf
 @sample ${SYSCONFDIR}/sane.d/leo.conf
 share/examples/sane-backends/sane.d/lexmark.conf
@@ -480,26 +487,63 @@ share/examples/sane-backends/sane.d/umax_pp.conf
 @sample ${SYSCONFDIR}/sane.d/umax_pp.conf
 share/examples/sane-backends/sane.d/xerox_mfp.conf
 @sample ${SYSCONFDIR}/sane.d/xerox_mfp.conf
+share/locale/
+share/locale/bg/
+share/locale/bg/LC_MESSAGES/
 share/locale/bg/LC_MESSAGES/sane-backends.mo
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/sane-backends.mo
+share/locale/da/
+share/locale/da/LC_MESSAGES/
 share/locale/da/LC_MESSAGES/sane-backends.mo
+share/locale/de/
+share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/sane-backends.mo
 share/locale/en_GB/
 share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/sane-backends.mo
+share/locale/eo/
+share/locale/eo/LC_MESSAGES/
 share/locale/eo/LC_MESSAGES/sane-backends.mo
+share/locale/es/
+share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/sane-backends.mo
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/sane-backends.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/sane-backends.mo
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
 share/locale/gl/LC_MESSAGES/sane-backends.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/sane-backends.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/sane-backends.mo
+share/locale/nb/
+share/locale/nb/LC_MESSAGES/
 share/locale/nb/LC_MESSAGES/sane-backends.mo
+share/locale/nl/
+share/locale/nl/LC_MESSAGES/
 share/locale/nl/LC_MESSAGES/sane-backends.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/sane-backends.mo
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
 share/locale/pt/LC_MESSAGES/sane-backends.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/sane-backends.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/sane-backends.mo
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
 share/locale/uk/LC_MESSAGES/sane-backends.mo
 share/sane/
 share/sane/artec_eplus48u/