Update to 1.0.23

* Update MASTER_SITES to MASTER_SITE_LOCAL

Changelog:
New with 1.0.23, released 2012-08-19:

* New backends: kvs40xx (Panasonic KV-S40xx),
  kodakaio (Kodak AiO ESP and Hero)
* Significant enhancements to several backends.
* 30 new scanner models supported.
* V4L support improvements.
* Improvements for builds on multiple platforms.
* Improved udev rules.
* Updated software deskew algorithm.
* Documentation updates.
* Bugfixes.

9 files changed, 122 insertions, 137 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 14be4df7de9..590732eee27 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2012/10/06 14:11:20 asau Exp $
-
-PKGREVISION=	3
+# $NetBSD: Makefile,v 1.59 2012/12/10 12:06:50 ryoon Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers etc.
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 2f5fae88a63..5d300e6ad23 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,14 +1,9 @@
-# $NetBSD: Makefile.common,v 1.29 2011/07/12 13:19:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2012/12/10 12:06:50 ryoon Exp $
 # used by graphics/sane-frontends/Makefile
 
 CATEGORIES?=	graphics
-MASTER_SITES?=	ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
-		ftp://ftp.informatik.uni-oldenburg.de/pub/sane/${DISTNAME}/ \
-		ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
-		ftp://ftp2.sane-project.org/pub/sane/${DISTNAME}/ \
-		ftp://ftp3.sane-project.org/pub/sane/${DISTNAME}/ \
-		ftp://ftp4.sane-project.org/hci/sane/${DISTNAME}/ \
-		ftp://ftp5.sane-project.org/pub/sane/${DISTNAME}/
+MASTER_SITES?=	${MASTER_SITE_LOCAL}
+# http://alioth.debian.org/frs/?group_id=30186
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
 HOMEPAGE?=	http://www.sane-project.org/
@@ -16,7 +11,7 @@ LICENSE=	gnu-gpl-v2
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	22
+SANE_MICRO?=	23
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR:Q}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR:Q}
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index e99d6a51881..729e031fa24 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2011/07/12 12:19:40 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2012/12/10 12:06:50 ryoon Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -6,6 +6,7 @@ bin/scanimage
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.la
+lib/pkgconfig/sane-backends.pc
 lib/sane/libsane-abaton.la
 lib/sane/libsane-agfafocus.la
 lib/sane/libsane-apple.la
@@ -43,6 +44,7 @@ lib/sane/libsane-hpljm1005.la
 lib/sane/libsane-hs2p.la
 lib/sane/libsane-ibm.la
 lib/sane/libsane-kodak.la
+lib/sane/libsane-kodakaio.la
 lib/sane/libsane-kvs1025.la
 lib/sane/libsane-kvs20xx.la
 lib/sane/libsane-leo.la
@@ -54,13 +56,12 @@ lib/sane/libsane-microtek.la
 lib/sane/libsane-microtek2.la
 lib/sane/libsane-mustek.la
 lib/sane/libsane-mustek_usb.la
-${PLIST.mustek}lib/sane/libsane-mustek_usb2.la
 lib/sane/libsane-nec.la
 lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
 lib/sane/libsane-p5.la
 lib/sane/libsane-pie.la
-${PLIST.pint}lib/sane/libsane-pint.la
+lib/sane/libsane-pint.la
 lib/sane/libsane-pixma.la
 lib/sane/libsane-plustek.la
 lib/sane/libsane-plustek_pp.la
@@ -69,7 +70,7 @@ lib/sane/libsane-rts8891.la
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
 lib/sane/libsane-sharp.la
-${PLIST.sm3600}lib/sane/libsane-sm3600.la
+lib/sane/libsane-sm3600.la
 lib/sane/libsane-sm3840.la
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-sp15c.la
@@ -125,6 +126,7 @@ man/man5/sane-hpljm1005.5
 man/man5/sane-hs2p.5
 man/man5/sane-ibm.5
 man/man5/sane-kodak.5
+man/man5/sane-kodakaio.5
 man/man5/sane-kvs1025.5
 man/man5/sane-kvs20xx.5
 man/man5/sane-leo.5
@@ -136,13 +138,12 @@ man/man5/sane-microtek.5
 man/man5/sane-microtek2.5
 man/man5/sane-mustek.5
 man/man5/sane-mustek_usb.5
-${PLIST.mustek}man/man5/sane-mustek_usb2.5
 man/man5/sane-nec.5
 man/man5/sane-net.5
 man/man5/sane-niash.5
 man/man5/sane-p5.5
 man/man5/sane-pie.5
-${PLIST.pint}man/man5/sane-pint.5
+man/man5/sane-pint.5
 man/man5/sane-pixma.5
 man/man5/sane-plustek.5
 man/man5/sane-plustek_pp.5
@@ -172,89 +173,89 @@ man/man5/sane-xerox_mfp.5
 man/man7/sane.7
 man/man8/saned.8
 sbin/saned
-share/doc/sane-${SANE_VERSION}/AUTHORS
-share/doc/sane-${SANE_VERSION}/COPYING
-share/doc/sane-${SANE_VERSION}/ChangeLog
-share/doc/sane-${SANE_VERSION}/LICENSE
-share/doc/sane-${SANE_VERSION}/NEWS
-share/doc/sane-${SANE_VERSION}/PROBLEMS
-share/doc/sane-${SANE_VERSION}/PROJECTS
-share/doc/sane-${SANE_VERSION}/README
-share/doc/sane-${SANE_VERSION}/README.aix
-share/doc/sane-${SANE_VERSION}/README.beos
-share/doc/sane-${SANE_VERSION}/README.darwin
-share/doc/sane-${SANE_VERSION}/README.djpeg
-share/doc/sane-${SANE_VERSION}/README.freebsd
-share/doc/sane-${SANE_VERSION}/README.hp-ux
-share/doc/sane-${SANE_VERSION}/README.linux
-share/doc/sane-${SANE_VERSION}/README.netbsd
-share/doc/sane-${SANE_VERSION}/README.openbsd
-share/doc/sane-${SANE_VERSION}/README.os2
-share/doc/sane-${SANE_VERSION}/README.solaris
-share/doc/sane-${SANE_VERSION}/README.unixware2
-share/doc/sane-${SANE_VERSION}/README.unixware7
-share/doc/sane-${SANE_VERSION}/README.windows
-share/doc/sane-${SANE_VERSION}/README.zeta
-share/doc/sane-${SANE_VERSION}/backend-writing.txt
-share/doc/sane-${SANE_VERSION}/canon/canon.changes
-share/doc/sane-${SANE_VERSION}/canon/canon.install2700F.txt
-share/doc/sane-${SANE_VERSION}/gt68xx/gt68xx.CHANGES
-share/doc/sane-${SANE_VERSION}/gt68xx/gt68xx.TODO
-share/doc/sane-${SANE_VERSION}/leo/leo.txt
-share/doc/sane-${SANE_VERSION}/matsushita/matsushita.txt
-share/doc/sane-${SANE_VERSION}/mustek/mustek.CHANGES
-share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.CHANGES
-share/doc/sane-${SANE_VERSION}/mustek_usb/mustek_usb.TODO
-share/doc/sane-${SANE_VERSION}/mustek_usb2/mustek_usb2.CHANGES
-share/doc/sane-${SANE_VERSION}/mustek_usb2/mustek_usb2.TODO
-share/doc/sane-${SANE_VERSION}/niash/niash.TODO
-share/doc/sane-${SANE_VERSION}/plustek/FAQ
-share/doc/sane-${SANE_VERSION}/plustek/MakeModule.sh
-share/doc/sane-${SANE_VERSION}/plustek/Makefile.kernel24
-share/doc/sane-${SANE_VERSION}/plustek/Makefile.kernel26
-share/doc/sane-${SANE_VERSION}/plustek/Plustek-PARPORT-TODO.txt
-share/doc/sane-${SANE_VERSION}/plustek/Plustek-PARPORT.changes
-share/doc/sane-${SANE_VERSION}/plustek/Plustek-PARPORT.txt
-share/doc/sane-${SANE_VERSION}/plustek/Plustek-USB-TODO.txt
-share/doc/sane-${SANE_VERSION}/plustek/Plustek-USB.changes
-share/doc/sane-${SANE_VERSION}/plustek/Plustek-USB.txt
-share/doc/sane-${SANE_VERSION}/sane-backends-external.html
-share/doc/sane-${SANE_VERSION}/sane-backends.html
-share/doc/sane-${SANE_VERSION}/sane-mfgs-external.html
-share/doc/sane-${SANE_VERSION}/sane-mfgs.html
-share/doc/sane-${SANE_VERSION}/sceptre/s1200.txt
-share/doc/sane-${SANE_VERSION}/teco/teco1.txt
-share/doc/sane-${SANE_VERSION}/teco/teco2.txt
-share/doc/sane-${SANE_VERSION}/teco/teco3.txt
-share/doc/sane-${SANE_VERSION}/u12/U12.changes
-share/doc/sane-${SANE_VERSION}/u12/U12.todo
-share/doc/sane-${SANE_VERSION}/umax/negative-types.txt
-share/doc/sane-${SANE_VERSION}/umax/sane-logo.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced-options-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-advanced.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-astra-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-config-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-histogram.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-mirage-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-not-listed-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-others-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-parport-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-powerlook-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-scanner-clones-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-speed-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-standard-options-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-standard.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-text.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-text2.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-text4.jpg
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-uc-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax-vista-doc.html
-share/doc/sane-${SANE_VERSION}/umax/sane-umax.jpg
-share/doc/sane-${SANE_VERSION}/umax/umax.BUGS
-share/doc/sane-${SANE_VERSION}/umax/umax.CHANGES
-share/doc/sane-${SANE_VERSION}/umax/umax.FAQ
-share/doc/sane-${SANE_VERSION}/umax/umax.TODO
+share/doc/sane-${PKGVERSION}/AUTHORS
+share/doc/sane-${PKGVERSION}/COPYING
+share/doc/sane-${PKGVERSION}/ChangeLog
+share/doc/sane-${PKGVERSION}/LICENSE
+share/doc/sane-${PKGVERSION}/NEWS
+share/doc/sane-${PKGVERSION}/PROBLEMS
+share/doc/sane-${PKGVERSION}/PROJECTS
+share/doc/sane-${PKGVERSION}/README
+share/doc/sane-${PKGVERSION}/README.aix
+share/doc/sane-${PKGVERSION}/README.beos
+share/doc/sane-${PKGVERSION}/README.darwin
+share/doc/sane-${PKGVERSION}/README.djpeg
+share/doc/sane-${PKGVERSION}/README.freebsd
+share/doc/sane-${PKGVERSION}/README.hp-ux
+share/doc/sane-${PKGVERSION}/README.linux
+share/doc/sane-${PKGVERSION}/README.${LOWER_OPSYS}
+share/doc/sane-${PKGVERSION}/README.openbsd
+share/doc/sane-${PKGVERSION}/README.os2
+share/doc/sane-${PKGVERSION}/README.solaris
+share/doc/sane-${PKGVERSION}/README.unixware2
+share/doc/sane-${PKGVERSION}/README.unixware7
+share/doc/sane-${PKGVERSION}/README.windows
+share/doc/sane-${PKGVERSION}/README.zeta
+share/doc/sane-${PKGVERSION}/backend-writing.txt
+share/doc/sane-${PKGVERSION}/canon/canon.changes
+share/doc/sane-${PKGVERSION}/canon/canon.install2700F.txt
+share/doc/sane-${PKGVERSION}/gt68xx/gt68xx.CHANGES
+share/doc/sane-${PKGVERSION}/gt68xx/gt68xx.TODO
+share/doc/sane-${PKGVERSION}/leo/leo.txt
+share/doc/sane-${PKGVERSION}/matsushita/matsushita.txt
+share/doc/sane-${PKGVERSION}/mustek/mustek.CHANGES
+share/doc/sane-${PKGVERSION}/mustek_usb/mustek_usb.CHANGES
+share/doc/sane-${PKGVERSION}/mustek_usb/mustek_usb.TODO
+share/doc/sane-${PKGVERSION}/mustek_usb2/mustek_usb2.CHANGES
+share/doc/sane-${PKGVERSION}/mustek_usb2/mustek_usb2.TODO
+share/doc/sane-${PKGVERSION}/niash/niash.TODO
+share/doc/sane-${PKGVERSION}/plustek/FAQ
+share/doc/sane-${PKGVERSION}/plustek/MakeModule.sh
+share/doc/sane-${PKGVERSION}/plustek/Makefile.kernel24
+share/doc/sane-${PKGVERSION}/plustek/Makefile.kernel26
+share/doc/sane-${PKGVERSION}/plustek/Plustek-PARPORT-TODO.txt
+share/doc/sane-${PKGVERSION}/plustek/Plustek-PARPORT.changes
+share/doc/sane-${PKGVERSION}/plustek/Plustek-PARPORT.txt
+share/doc/sane-${PKGVERSION}/plustek/Plustek-USB-TODO.txt
+share/doc/sane-${PKGVERSION}/plustek/Plustek-USB.changes
+share/doc/sane-${PKGVERSION}/plustek/Plustek-USB.txt
+share/doc/sane-${PKGVERSION}/sane-backends-external.html
+share/doc/sane-${PKGVERSION}/sane-backends.html
+share/doc/sane-${PKGVERSION}/sane-mfgs-external.html
+share/doc/sane-${PKGVERSION}/sane-mfgs.html
+share/doc/sane-${PKGVERSION}/sceptre/s1200.txt
+share/doc/sane-${PKGVERSION}/teco/teco1.txt
+share/doc/sane-${PKGVERSION}/teco/teco2.txt
+share/doc/sane-${PKGVERSION}/teco/teco3.txt
+share/doc/sane-${PKGVERSION}/u12/U12.changes
+share/doc/sane-${PKGVERSION}/u12/U12.todo
+share/doc/sane-${PKGVERSION}/umax/negative-types.txt
+share/doc/sane-${PKGVERSION}/umax/sane-logo.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-advanced-options-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-advanced.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-astra-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-config-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-histogram.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-mirage-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-not-listed-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-others-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-parport-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-powerlook-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-scanner-clones-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-speed-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-standard-options-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-standard.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-text.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-text2.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-text4.jpg
+share/doc/sane-${PKGVERSION}/umax/sane-umax-uc-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax-vista-doc.html
+share/doc/sane-${PKGVERSION}/umax/sane-umax.jpg
+share/doc/sane-${PKGVERSION}/umax/umax.BUGS
+share/doc/sane-${PKGVERSION}/umax/umax.CHANGES
+share/doc/sane-${PKGVERSION}/umax/umax.FAQ
+share/doc/sane-${PKGVERSION}/umax/umax.TODO
 share/examples/sane/abaton.conf
 share/examples/sane/agfafocus.conf
 share/examples/sane/apple.conf
@@ -288,6 +289,7 @@ share/examples/sane/hp5400.conf
 share/examples/sane/hs2p.conf
 share/examples/sane/ibm.conf
 share/examples/sane/kodak.conf
+share/examples/sane/kodakaio.conf
 share/examples/sane/leo.conf
 share/examples/sane/lexmark.conf
 share/examples/sane/ma1509.conf
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index 6bea2104c50..c5967e020b7 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2012/02/06 12:40:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2012/12/10 12:06:50 ryoon Exp $
 
 BUILDLINK_TREE+=	sane-backends
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	sane-backends
 SANE_BACKENDS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sane-backends+=	sane-backends>=1.0.3
-BUILDLINK_ABI_DEPENDS.sane-backends+=	sane-backends>=1.0.22nb2
+BUILDLINK_ABI_DEPENDS.sane-backends+=	sane-backends>=1.0.23
 BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index ef1f56091a5..8f33c3449de 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.33 2011/07/31 20:05:58 gls Exp $
+$NetBSD: distinfo,v 1.34 2012/12/10 12:06:50 ryoon Exp $
 
-SHA1 (sane-backends-1.0.22.tar.gz) = dc04d6e6fd18791d8002c3fdb23e89fef3327135
-RMD160 (sane-backends-1.0.22.tar.gz) = 524713474a819331d0179fa642fef710d073f1d1
-Size (sane-backends-1.0.22.tar.gz) = 5150661 bytes
+SHA1 (sane-backends-1.0.23.tar.gz) = 62fc65736879f0bdb2fda20a31ee10d1ed335ae7
+RMD160 (sane-backends-1.0.23.tar.gz) = af41f4b2d34aa6dae9dfc88d1dedd630f6584737
+Size (sane-backends-1.0.23.tar.gz) = 5342350 bytes
 SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
-SHA1 (patch-ab) = 9ce48e03a70ae0c1c31a27e09f3745773fa9b898
+SHA1 (patch-ab) = 0462997912869fe3083e1b385a478a31bc3deec0
 SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474
-SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
+SHA1 (patch-ad) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
 SHA1 (patch-af) = db4ba80826d76363ad28c22eea325e19868fd1e4
 SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
@@ -14,5 +14,5 @@ SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 SHA1 (patch-ai) = 74f27b5a66e3dfd96337cb00a4ff3bc48804256b
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
-SHA1 (patch-backend_magicolor.c) = d717160eef83b7f412f55ca2716ebf76f3fb1900
-SHA1 (patch-backend_xerox__mfp-tcp.c) = 45cf630762ec9757aa8e1306190641dd99dcc673
+SHA1 (patch-backend_magicolor.c) = e6cbb54a0ea0e688b0189b3d07d1dff34070a179
+SHA1 (patch-backend_xerox__mfp-tcp.c) = 3818b623217f15ed7f30724d1d70b1614befb88f
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
index a7cd0fd161d..ca9cb1bad58 100644
--- a/graphics/sane-backends/patches/patch-ab
+++ b/graphics/sane-backends/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2011/07/12 12:19:41 wiz Exp $
+$NetBSD: patch-ab,v 1.13 2012/12/10 12:06:51 ryoon Exp $
 
---- configure.orig	2011-02-14 01:27:52.000000000 +0000
+--- configure.orig	2012-08-19 20:45:11.000000000 +0000
 +++ configure
-@@ -7202,13 +7202,13 @@ if test "x$ac_cv_header_pthread_h" = x""
+@@ -7236,13 +7236,13 @@ if test "x$ac_cv_header_pthread_h" = xye
  #define HAVE_PTHREAD_H 1
  _ACEOF
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.12 2011/07/12 12:19:41 wiz Exp $
 -$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 +       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
 +$as_echo_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+ if ${ac_cv_lib_pthread_pthread_create+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,16 +19,16 @@ $NetBSD: patch-ab,v 1.12 2011/07/12 12:19:41 wiz Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -7239,7 +7239,7 @@ fi
+@@ -7273,7 +7273,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 :
+ if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
 -  PTHREAD_LIBS="-lpthread"
 +  PTHREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  fi
  
         have_pthread=yes
-@@ -17092,14 +17092,14 @@ for be in ${BACKENDS}; do
+@@ -17741,14 +17741,14 @@ for be in ${BACKENDS}; do
      ;;
  
      mustek_pp)
diff --git a/graphics/sane-backends/patches/patch-ad b/graphics/sane-backends/patches/patch-ad
index ca11a96d4df..60603682bcc 100644
--- a/graphics/sane-backends/patches/patch-ad
+++ b/graphics/sane-backends/patches/patch-ad
@@ -1,12 +1,2 @@
-$NetBSD: patch-ad,v 1.6 2008/04/13 21:43:39 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2012/12/10 12:06:51 ryoon Exp $
 
---- include/sane/sanei_tcp.h.orig	2006-11-30 23:23:19.000000000 +0000
-+++ include/sane/sanei_tcp.h
-@@ -22,6 +22,7 @@
- 
- #include <netinet/in.h>
- #include <netdb.h>
-+#include <sys/types.h>
- 
- extern SANE_Status sanei_tcp_open(const char *host, int port, int *fdp);
- extern void sanei_tcp_close(int fd);
diff --git a/graphics/sane-backends/patches/patch-backend_magicolor.c b/graphics/sane-backends/patches/patch-backend_magicolor.c
index b845eb08bff..04f3962faff 100644
--- a/graphics/sane-backends/patches/patch-backend_magicolor.c
+++ b/graphics/sane-backends/patches/patch-backend_magicolor.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-backend_magicolor.c,v 1.1 2011/07/31 20:05:58 gls Exp $
+$NetBSD: patch-backend_magicolor.c,v 1.2 2012/12/10 12:06:51 ryoon Exp $
 
 Fix for pkg/45196. Add sys/socket.h header.
 
---- backend/magicolor.c.orig	2011-01-30 18:49:46.000000000 +0000
+--- backend/magicolor.c.orig	2011-11-21 20:17:48.000000000 +0000
 +++ backend/magicolor.c
 @@ -50,6 +50,11 @@
  #include <unistd.h>
@@ -15,4 +15,4 @@ Fix for pkg/45196. Add sys/socket.h header.
 +
  #include <math.h>
  #include <poll.h>
- 
+ #include <sys/types.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
index 4b8835ad1ce..f449ee4d399 100644
--- a/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c
+++ b/graphics/sane-backends/patches/patch-backend_xerox__mfp-tcp.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-backend_xerox__mfp-tcp.c,v 1.1 2011/07/31 20:05:58 gls Exp $
+$NetBSD: patch-backend_xerox__mfp-tcp.c,v 1.2 2012/12/10 12:06:51 ryoon Exp $
 
 Fix for pkg/45196. Add sys/socket.h header.
 
---- backend/xerox_mfp-tcp.c.orig	2010-12-01 23:49:58.000000000 +0000
+--- backend/xerox_mfp-tcp.c.orig	2011-11-21 20:17:48.000000000 +0000
 +++ backend/xerox_mfp-tcp.c
-@@ -28,6 +28,10 @@
- #include <errno.h>
- #include <sys/time.h>
+@@ -32,6 +32,10 @@
+ #include <sys/socket.h>
+ #endif
  
 +#ifdef HAVE_SYS_SOCKET_H
 +#include <sys/socket.h>