sane-backends: update to 1.0.27.

New with 1.0.27 (see Note 1), released 2017-05-22:

* Significant enhancements to canon_dr, epjitsu, epsonds, fujitsu,
  genesys, hp3500, pixma and xerox-mfp backends.
* Minor updates, bugfixes or scanners added in several backends.
* 30+ new scanner models supported.
* Made libusb-1.0 the default for USB support (see Note 2).
* Switched code from C90 to C99 (Thanks to Volker Diels-Grabsch).
* Updated Linux USB3 workaround (see Note 3).
* Documentation and translation updates.
* Bugfixes (Avahi, threading, USB, ICC/PNG/JPEG, etc).
* Reduced compiler warnings, improved code (see Note 4).

Note 1: There is no 1.0.26 release of sane-backends. That number was
skipped so that our development version numbers would more clearly be
an extension of the prior release. This should make packaging a little
easier for our downstream users.

Note 2: On all systems, the --enable-libusb* flags are now ignored.
Instead, the --with-usb and --without-usb flags now control support.
When neither is given, USB support will be enabled if possible and
disabled otherwise.  If --with-usb is requested but not possible,
./configure will fail.  There is no support to prefer libusb-0.1 over
libusb-1.0.  When libusb-1.0 is not found, libusb-0.1 will be tried.

Note 3: The Linux USB3 workaround which was added in version 1.0.25 is
now disabled by default. If you have difficulty using a scanner which
previously worked, or intermittent scanner availability, try setting
the new environment variable SANE_USB_WORKAROUND=1 before starting
your frontend.

Note 4: A special thanks goes to Olaf Meeuwissen for picking up the
janitorial duties in sane-backends. He has found and fixed a large
number of long-standing bugs, curated our bug tracker, improved our
build scripts and docs, and provided user support. Thank you Olaf!

11 files changed, 111 insertions, 281 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 8301cb8ac87..2b8fac21128 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.67 2016/04/09 14:19:25 richard Exp $
+# $NetBSD: Makefile,v 1.68 2018/02/25 21:22:07 wiz Exp $
 
-PKGREVISION=	4
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers, etc
 
@@ -43,7 +42,8 @@ canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
 dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \
 epjitsu.conf epson.conf epson2.conf epsonds.conf fujitsu.conf \
 genesys.conf gt68xx.conf hp.conf hp3900.conf \
-hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf leo.conf lexmark.conf \
+hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf \
+kvs1025.conf leo.conf lexmark.conf \
 ma1509.conf matsushita.conf \
 microtek.conf microtek2.conf mustek.conf mustek_usb.conf \
 nec.conf net.conf \
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 480212d03c5..b5f6792f105 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.32 2015/10/25 10:39:13 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2018/02/25 21:22:07 wiz Exp $
 # used by graphics/sane-frontends/Makefile
 
 CATEGORIES?=	graphics
-MASTER_SITES?=	https://alioth.debian.org/frs/download.php/file/4146/
+MASTER_SITES?=	https://alioth.debian.org/frs/download.php/file/4224/
 # http://alioth.debian.org/frs/?group_id=30186
 
 MAINTAINER?=	pkgsrc-users@NetBSD.org
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v2
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	25
+SANE_MICRO?=	27
 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 a55b642e0a6..5d5c19adc5a 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2015/10/25 10:39:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2018/02/25 21:22:07 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -180,89 +180,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-backends/AUTHORS
+share/doc/sane-backends/COPYING
+share/doc/sane-backends/ChangeLog
+share/doc/sane-backends/LICENSE
+share/doc/sane-backends/NEWS
+share/doc/sane-backends/PROBLEMS
+share/doc/sane-backends/PROJECTS
+share/doc/sane-backends/README
+share/doc/sane-backends/README.aix
+share/doc/sane-backends/README.beos
+share/doc/sane-backends/README.darwin
+share/doc/sane-backends/README.djpeg
+share/doc/sane-backends/README.freebsd
+share/doc/sane-backends/README.hp-ux
+share/doc/sane-backends/README.linux
+share/doc/sane-backends/README.netbsd
+share/doc/sane-backends/README.openbsd
+share/doc/sane-backends/README.os2
+share/doc/sane-backends/README.solaris
+share/doc/sane-backends/README.unixware2
+share/doc/sane-backends/README.unixware7
+share/doc/sane-backends/README.windows
+share/doc/sane-backends/README.zeta
+share/doc/sane-backends/backend-writing.txt
+share/doc/sane-backends/canon/canon.changes
+share/doc/sane-backends/canon/canon.install2700F.txt
+share/doc/sane-backends/gt68xx/gt68xx.CHANGES
+share/doc/sane-backends/gt68xx/gt68xx.TODO
+share/doc/sane-backends/leo/leo.txt
+share/doc/sane-backends/matsushita/matsushita.txt
+share/doc/sane-backends/mustek/mustek.CHANGES
+share/doc/sane-backends/mustek_usb/mustek_usb.CHANGES
+share/doc/sane-backends/mustek_usb/mustek_usb.TODO
+share/doc/sane-backends/mustek_usb2/mustek_usb2.CHANGES
+share/doc/sane-backends/mustek_usb2/mustek_usb2.TODO
+share/doc/sane-backends/niash/niash.TODO
+share/doc/sane-backends/plustek/FAQ
+share/doc/sane-backends/plustek/MakeModule.sh
+share/doc/sane-backends/plustek/Makefile.kernel24
+share/doc/sane-backends/plustek/Makefile.kernel26
+share/doc/sane-backends/plustek/Plustek-PARPORT-TODO.txt
+share/doc/sane-backends/plustek/Plustek-PARPORT.changes
+share/doc/sane-backends/plustek/Plustek-PARPORT.txt
+share/doc/sane-backends/plustek/Plustek-USB-TODO.txt
+share/doc/sane-backends/plustek/Plustek-USB.changes
+share/doc/sane-backends/plustek/Plustek-USB.txt
+share/doc/sane-backends/sane-backends-external.html
+share/doc/sane-backends/sane-backends.html
+share/doc/sane-backends/sane-mfgs-external.html
+share/doc/sane-backends/sane-mfgs.html
+share/doc/sane-backends/sceptre/s1200.txt
+share/doc/sane-backends/teco/teco1.txt
+share/doc/sane-backends/teco/teco2.txt
+share/doc/sane-backends/teco/teco3.txt
+share/doc/sane-backends/u12/U12.changes
+share/doc/sane-backends/u12/U12.todo
+share/doc/sane-backends/umax/negative-types.txt
+share/doc/sane-backends/umax/sane-logo.jpg
+share/doc/sane-backends/umax/sane-umax-advanced-options-doc.html
+share/doc/sane-backends/umax/sane-umax-advanced.jpg
+share/doc/sane-backends/umax/sane-umax-astra-doc.html
+share/doc/sane-backends/umax/sane-umax-config-doc.html
+share/doc/sane-backends/umax/sane-umax-doc.html
+share/doc/sane-backends/umax/sane-umax-histogram.jpg
+share/doc/sane-backends/umax/sane-umax-mirage-doc.html
+share/doc/sane-backends/umax/sane-umax-not-listed-doc.html
+share/doc/sane-backends/umax/sane-umax-others-doc.html
+share/doc/sane-backends/umax/sane-umax-parport-doc.html
+share/doc/sane-backends/umax/sane-umax-powerlook-doc.html
+share/doc/sane-backends/umax/sane-umax-scanner-clones-doc.html
+share/doc/sane-backends/umax/sane-umax-speed-doc.html
+share/doc/sane-backends/umax/sane-umax-standard-options-doc.html
+share/doc/sane-backends/umax/sane-umax-standard.jpg
+share/doc/sane-backends/umax/sane-umax-text.jpg
+share/doc/sane-backends/umax/sane-umax-text2.jpg
+share/doc/sane-backends/umax/sane-umax-text4.jpg
+share/doc/sane-backends/umax/sane-umax-uc-doc.html
+share/doc/sane-backends/umax/sane-umax-vista-doc.html
+share/doc/sane-backends/umax/sane-umax.jpg
+share/doc/sane-backends/umax/umax.BUGS
+share/doc/sane-backends/umax/umax.CHANGES
+share/doc/sane-backends/umax/umax.FAQ
+share/doc/sane-backends/umax/umax.TODO
 share/examples/sane/abaton.conf
 share/examples/sane/agfafocus.conf
 share/examples/sane/apple.conf
@@ -298,6 +298,7 @@ share/examples/sane/hs2p.conf
 share/examples/sane/ibm.conf
 share/examples/sane/kodak.conf
 share/examples/sane/kodakaio.conf
+share/examples/sane/kvs1025.conf
 share/examples/sane/leo.conf
 share/examples/sane/lexmark.conf
 share/examples/sane/ma1509.conf
@@ -336,26 +337,6 @@ share/examples/sane/umax.conf
 share/examples/sane/umax1220u.conf
 share/examples/sane/umax_pp.conf
 share/examples/sane/xerox_mfp.conf
-share/locale/bg/LC_MESSAGES/sane-backends.mo
-share/locale/cs/LC_MESSAGES/sane-backends.mo
-share/locale/da/LC_MESSAGES/sane-backends.mo
-share/locale/de/LC_MESSAGES/sane-backends.mo
-share/locale/en_GB/LC_MESSAGES/sane-backends.mo
-share/locale/eo/LC_MESSAGES/sane-backends.mo
-share/locale/es/LC_MESSAGES/sane-backends.mo
-share/locale/fi/LC_MESSAGES/sane-backends.mo
-share/locale/fr/LC_MESSAGES/sane-backends.mo
-share/locale/gl/LC_MESSAGES/sane-backends.mo
-share/locale/hu/LC_MESSAGES/sane-backends.mo
-share/locale/it/LC_MESSAGES/sane-backends.mo
-share/locale/ja/LC_MESSAGES/sane-backends.mo
-share/locale/nb/LC_MESSAGES/sane-backends.mo
-share/locale/nl/LC_MESSAGES/sane-backends.mo
-share/locale/pl/LC_MESSAGES/sane-backends.mo
-share/locale/pt/LC_MESSAGES/sane-backends.mo
-share/locale/ru/LC_MESSAGES/sane-backends.mo
-share/locale/sv/LC_MESSAGES/sane-backends.mo
-share/locale/uk/LC_MESSAGES/sane-backends.mo
 @pkgdir share/sane/snapscan
 @pkgdir share/sane/gt68xx
 @pkgdir share/sane/epjitsu
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index facfee617bd..8d97952390e 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.45 2018/01/31 10:43:03 jperkin Exp $
+$NetBSD: distinfo,v 1.46 2018/02/25 21:22:07 wiz Exp $
 
-SHA1 (sane-backends-1.0.25.tar.gz) = 05824922d91571e1fc2f5cdd270745783d593754
-RMD160 (sane-backends-1.0.25.tar.gz) = 1cfd81eeddf3ef3c2cea98f6ca7640522b249fab
-SHA512 (sane-backends-1.0.25.tar.gz) = b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df
-Size (sane-backends-1.0.25.tar.gz) = 5955016 bytes
+SHA1 (sane-backends-1.0.27.tar.gz) = 579ec4d6279c7f0f02014358a7e74056672a1e43
+RMD160 (sane-backends-1.0.27.tar.gz) = 09afbf4efee05759aef49de8d41c7d089a41ed05
+SHA512 (sane-backends-1.0.27.tar.gz) = c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
+Size (sane-backends-1.0.27.tar.gz) = 6430188 bytes
 SHA1 (patch-aa) = 91f5838b7c455dc160ba22d15659c1b19a222668
 SHA1 (patch-ab) = f6ec74b90f5499d07117559c7079ba2efccccf17
-SHA1 (patch-ac) = 49e0cc0b6e0dfb96e5ee3cfc3f554b7e40492757
-SHA1 (patch-ae) = d374c33cad835d56fb9f2fbb2594a85e0a0d7158
 SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 SHA1 (patch-ai) = 14f5467eb865406cbec00b8d47b5c23c4c89f113
 SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
-SHA1 (patch-backend_kodakaio.c) = f96af8b2fb0369f51d2320285253c5e67218e629
-SHA1 (patch-backend_pieusb__buffer.c) = 7e7c6dbb0798876532a04a0831be2ab2bd2931ca
+SHA1 (patch-backend_epsonds.c) = 2ecbb36431254b7059c3e35b5ac094c4b3f41374
 SHA1 (patch-m4_byteorder.m4) = 23f4b0256fc9980d3472e77ab558b0e24a9495b4
-SHA1 (patch-sanei_sanei__ir.c) = 66e913d7db9d03a42850778aca39da8f0dde02fa
-SHA1 (patch-sanei_sanei_usb.c) = b053c94d240580d919c418081fca5c75cf4fb1a7
 SHA1 (patch-tools_umax__pp.c) = debe660184a1380a894e8a5414983f5fdb19cded
diff --git a/graphics/sane-backends/patches/patch-ac b/graphics/sane-backends/patches/patch-ac
deleted file mode 100644
index 56a9d5263e5..00000000000
--- a/graphics/sane-backends/patches/patch-ac
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2015/10/27 11:29:35 wiz Exp $
-
-DragonFly support.
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315205&group_id=30186&atid=410366
-
---- sanei/sanei_ab306.c.orig	2010-04-05 13:18:05.000000000 +0000
-+++ sanei/sanei_ab306.c
-@@ -78,7 +78,7 @@ inb (u_long port)
- #include "../include/sane/sanei.h"
- #include "../include/sane/sanei_ab306.h"
- 
--#if (defined(HAVE_IOPERM) || defined(__FreeBSD__)) && !defined(IO_SUPPORT_MISSING)
-+#if (defined(HAVE_IOPERM) || defined(__FreeBSD__) || defined(__DragonFly__)) && !defined(IO_SUPPORT_MISSING)
- 
- #include <errno.h>
- #include <fcntl.h>
-@@ -99,7 +99,7 @@ inb (u_long port)
- #define PORT_DEV	"/dev/port"
- #define AB306_CIO	0x379		/* control i/o port */
- 
--#if defined(__FreeBSD__)	
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- static int dev_io_fd = 0;
- #endif
- 
-@@ -287,7 +287,7 @@ sanei_ab306_open (const char *dev, int *
- 
-   status = sanei_ab306_get_io_privilege (i);
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-   status = sanei_ab306_get_io_privilege (i);
-   if (status != SANE_STATUS_GOOD)
-     return status;
-@@ -366,7 +366,7 @@ sanei_ab306_get_io_privilege (int fd)
- {
-   if (port[fd].port_fd < 0)
-     {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-       if (dev_io_fd == 0)
- 	dev_io_fd = open ("/dev/io", O_RDONLY);
-       if (dev_io_fd < 0)
-@@ -517,7 +517,7 @@ sanei_ab306_exit (void)
- 	/* power off the scanner: */
- 	ab306_outb (port + i, port[i].base + 1, 0x00);
-       }
--#if defined(__FreeBSD)
-+#if defined(__FreeBSD) || defined(__DragonFly__)
-   if (dev_io_fd >0)
-     close (dev_io_fd);
- #endif /* defined(__FreeBSD__) */
diff --git a/graphics/sane-backends/patches/patch-ae b/graphics/sane-backends/patches/patch-ae
deleted file mode 100644
index d4c7ec3d65c..00000000000
--- a/graphics/sane-backends/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2015/10/27 11:29:35 wiz Exp $
-
-DragonFly support.
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315206&group_id=30186&atid=410366
-
---- tools/sane-find-scanner.c.orig	2006-03-11 12:45:29.000000000 +0000
-+++ tools/sane-find-scanner.c
-@@ -1359,7 +1359,7 @@ main (int argc, char **argv)
- 	"/dev/scanner", "/dev/scanner0", "/dev/scanner1",
- 	"/dev/pass0", "/dev/pass1", "/dev/pass2", "/dev/pass3",
- 	"/dev/pass4", "/dev/pass5", "/dev/pass6", "/dev/pass7",
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- 	"/dev/uk0", "/dev/uk1", "/dev/uk2", "/dev/uk3", "/dev/uk4",
- 	"/dev/uk5", "/dev/uk6",
- #elif defined(__NetBSD__)
diff --git a/graphics/sane-backends/patches/patch-backend_epsonds.c b/graphics/sane-backends/patches/patch-backend_epsonds.c
new file mode 100644
index 00000000000..8a1c2e96f91
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-backend_epsonds.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-backend_epsonds.c,v 1.1 2018/02/25 21:22:07 wiz Exp $
+
+Add header for struct timeval.
+
+--- backend/epsonds.c.orig	2017-05-15 01:19:11.000000000 +0000
++++ backend/epsonds.c
+@@ -41,6 +41,7 @@
+ #include "sane/config.h"
+ 
+ #include <ctype.h>
++#include <sys/time.h>
+ #include <unistd.h>
+ 
+ #include "sane/saneopts.h"
diff --git a/graphics/sane-backends/patches/patch-backend_kodakaio.c b/graphics/sane-backends/patches/patch-backend_kodakaio.c
deleted file mode 100644
index c69938fa153..00000000000
--- a/graphics/sane-backends/patches/patch-backend_kodakaio.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-backend_kodakaio.c,v 1.3 2015/10/27 11:29:35 wiz Exp $
-
-DragonFly build fix.
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315207&group_id=30186&atid=410366
-
---- backend/kodakaio.c.orig	2013-08-25 21:22:58.000000000 +0000
-+++ backend/kodakaio.c
-@@ -181,6 +181,7 @@ normal levels. This system is a plan rat
- #include <math.h>
- #include <poll.h>
- #include <time.h>
-+#include <sys/socket.h>
- 
- #if WITH_AVAHI
- /* used for auto detecting network printers  */
diff --git a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c b/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c
deleted file mode 100644
index 0e24343721e..00000000000
--- a/graphics/sane-backends/patches/patch-backend_pieusb__buffer.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-backend_pieusb__buffer.c,v 1.3 2015/11/11 12:40:03 wiz Exp $
-
-Remove unportable header inclusion.
-XXX: should be fixed better, hope upstream does that.
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315209&group_id=30186&atid=410366
-
---- backend/pieusb_buffer.c.orig	2015-09-01 00:31:33.000000000 +0000
-+++ backend/pieusb_buffer.c
-@@ -100,15 +100,8 @@
- #include <stdio.h>
- #include <fcntl.h>
- #include <sys/mman.h>
--#include <endian.h>
- 
--/* When creating the release backend, make complains about unresolved external
-- * le16toh, although it finds the include <endian.h> */
--#if __BYTE_ORDER == __LITTLE_ENDIAN
-- #define le16toh(x) (x)
--#else
-- #define le16toh(x) __bswap_16 (x)
--#endif
-+#include "byteorder.h"
- 
- static void buffer_update_read_index(struct Pieusb_Read_Buffer* buffer, int increment);
- 
diff --git a/graphics/sane-backends/patches/patch-sanei_sanei__ir.c b/graphics/sane-backends/patches/patch-sanei_sanei__ir.c
deleted file mode 100644
index 34b44f847a8..00000000000
--- a/graphics/sane-backends/patches/patch-sanei_sanei__ir.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-sanei_sanei__ir.c,v 1.3 2015/11/02 18:42:50 leot Exp $
-
-Remove unportable header inclusion.
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315208&group_id=30186&atid=410366
-
---- sanei/sanei_ir.c.orig	2015-09-29 01:10:43.000000000 +0000
-+++ sanei/sanei_ir.c
-@@ -29,7 +29,8 @@
- 
- #include <stdlib.h>
- #include <string.h>
--#include <values.h>
-+#include <limits.h>
-+#include <float.h>
- #include <math.h>
- 
- #define BACKEND_NAME sanei_ir	/* name of this module for debugging */
diff --git a/graphics/sane-backends/patches/patch-sanei_sanei_usb.c b/graphics/sane-backends/patches/patch-sanei_sanei_usb.c
deleted file mode 100644
index 1099d63a4bb..00000000000
--- a/graphics/sane-backends/patches/patch-sanei_sanei_usb.c
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-sanei_sanei_usb.c,v 1.1 2016/03/15 09:14:03 martin Exp $
-
-Avoid storing an int (the number of bytes transfered) in the wrong
-half of a ssize_t on big endian 64bit platforms.
-
-Reported upstream as:
-https://alioth.debian.org/tracker/index.php?func=detail&aid=315337
-
-
---- sanei/sanei_usb.c.orig	2014-12-16 14:37:26.000000000 +0100
-+++ sanei/sanei_usb.c	2016-03-15 09:12:34.335049822 +0100
-@@ -2310,10 +2310,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_B
-     {
-       if (devices[dn].bulk_in_ep)
- 	{
--	  int ret;
-+	  int ret, rsize;
- 	  ret = libusb_bulk_transfer (devices[dn].lu_handle,
- 				      devices[dn].bulk_in_ep, buffer,
--				      (int) *size, (int *) &read_size,
-+				      (int) *size, &rsize,
- 				      libusb_timeout);
- 
- 	  if (ret < 0)
-@@ -2323,6 +2323,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_B
- 
- 	      read_size = -1;
- 	    }
-+	  else
-+	    {
-+	      read_size = rsize;
-+	    }
- 	}
-       else
- 	{