Update to 1.0.16. Use pkgsrc's config file framework.

New with 1.0.16, released 2005-08-07:

* New backends: genesys, sm3840
* Updated backends: avision, canon, coolscan, epson, gphoto2, gt68xx, mustek,
  mustek_pp, niash, plustek, plustek_pp, qcam, sm3600, snapscan, teco2,
  umax_pp, v4l.
* More functionality/fixes for sanei_usb and sanei_pp.
* Added sanei_access to allow locking of SANE devices.
* Hotplug updates.
* scanimage updates.
* Portability fixes (especially for OS/2, 64bit platforms, BeOS+ZETA).
* Added Polish translation. Updated other translations. Fixed format strings.
* Documentation updates.
* Bugfixes.

7 files changed, 120 insertions, 75 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 428158e8c81..646ba350800 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/15 03:13:10 reed Exp $
+# $NetBSD: Makefile,v 1.23 2005/09/27 09:29:56 wiz Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
@@ -9,6 +9,7 @@ BUILD_USES_MSGFMT=	YES
 USE_PKGLOCALEDIR=	YES
 
 CONFIGURE_ARGS+=	--with-gphoto2=no
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION}
 
 .if (${OPSYS} == "SunOS")
 PLIST_SUBST+=	SANE_PINT="@comment "
@@ -21,6 +22,28 @@ PLIST_SUBST+=	SANE_PINT=""
 PLIST_SUBST+=	SANE_SM3600=""
 .endif
 
+USE_PKGINSTALL=	YES
+OWN_DIRS+=	${PKG_SYSCONFDIR}/sane.d
+EGDIR=		${PREFIX}/share/examples/sane
+.for f in abaton.conf agfafocus.conf apple.conf artec.conf \
+artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
+coolscan.conf coolscan2.conf dc210.conf dc240.conf dc25.conf dll.conf \
+dmc.conf epson.conf fujitsu.conf genesys.conf gt68xx.conf hp.conf \
+hp5400.conf ibm.conf leo.conf ma1509.conf matsushita.conf \
+microtek.conf microtek2.conf mustek.conf mustek_usb.conf nec.conf \
+net.conf pie.conf plustek.conf plustek_pp.conf ricoh.conf s9036.conf \
+saned.conf sceptre.conf sharp.conf sm3840.conf snapscan.conf \
+sp15c.conf st400.conf tamarack.conf teco1.conf teco2.conf teco3.conf \
+test.conf u12.conf umax.conf umax1220u.conf umax_pp.conf
+CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
+.endfor
+
+.if (${OPSYS} == "Linux")
+.for f in qcam.conf v4l.conf
+CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
+.endfor
+.endif
+
 .if (${OPSYS} != "SunOS")
 . include "../../devel/libusb/buildlink3.mk"
 .endif
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 1487fd1387f..9004844b8f3 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/05/22 20:08:07 jlam Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/09/27 09:29:56 wiz Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \
@@ -11,7 +11,7 @@ HOMEPAGE?=	http://www.sane-project.org/
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	15
+SANE_MICRO?=	16
 SANE_VERSION=	${SANE_MAJOR}.${SANE_MINOR}.${SANE_MICRO}
 PLIST_SUBST+=	SANE_MAJOR=${SANE_MAJOR}
 PLIST_SUBST+=	SANE_MINOR=${SANE_MINOR}
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 7acdc4bc25a..ddc8e955e48 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,59 +1,8 @@
-@comment $NetBSD: PLIST,v 1.13 2005/05/15 03:13:10 reed Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/09/27 09:29:56 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
 bin/scanimage
-etc/sane.d/abaton.conf
-etc/sane.d/agfafocus.conf
-etc/sane.d/apple.conf
-etc/sane.d/artec.conf
-etc/sane.d/artec_eplus48u.conf
-etc/sane.d/avision.conf
-etc/sane.d/bh.conf
-etc/sane.d/canon.conf
-etc/sane.d/canon630u.conf
-etc/sane.d/coolscan.conf
-etc/sane.d/coolscan2.conf
-etc/sane.d/dc210.conf
-etc/sane.d/dc240.conf
-etc/sane.d/dc25.conf
-etc/sane.d/dll.conf
-etc/sane.d/dmc.conf
-etc/sane.d/epson.conf
-etc/sane.d/fujitsu.conf
-etc/sane.d/gt68xx.conf
-etc/sane.d/hp.conf
-etc/sane.d/hp5400.conf
-etc/sane.d/ibm.conf
-etc/sane.d/leo.conf
-etc/sane.d/ma1509.conf
-etc/sane.d/matsushita.conf
-etc/sane.d/microtek.conf
-etc/sane.d/microtek2.conf
-etc/sane.d/mustek.conf
-etc/sane.d/mustek_usb.conf
-etc/sane.d/nec.conf
-etc/sane.d/net.conf
-etc/sane.d/pie.conf
-etc/sane.d/plustek.conf
-etc/sane.d/plustek_pp.conf
-etc/sane.d/ricoh.conf
-etc/sane.d/s9036.conf
-etc/sane.d/saned.conf
-etc/sane.d/sceptre.conf
-etc/sane.d/sharp.conf
-etc/sane.d/snapscan.conf
-etc/sane.d/sp15c.conf
-etc/sane.d/st400.conf
-etc/sane.d/tamarack.conf
-etc/sane.d/teco1.conf
-etc/sane.d/teco2.conf
-etc/sane.d/teco3.conf
-etc/sane.d/test.conf
-etc/sane.d/u12.conf
-etc/sane.d/umax.conf
-etc/sane.d/umax1220u.conf
-etc/sane.d/umax_pp.conf
 include/sane/sane.h
 include/sane/saneopts.h
 lib/libsane.la
@@ -76,6 +25,7 @@ lib/sane/libsane-dll.la
 lib/sane/libsane-dmc.la
 lib/sane/libsane-epson.la
 lib/sane/libsane-fujitsu.la
+lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp5400.la
@@ -99,6 +49,7 @@ lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
 lib/sane/libsane-sharp.la
 ${SANE_SM3600}lib/sane/libsane-sm3600.la
+lib/sane/libsane-sm3840.la
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-sp15c.la
 lib/sane/libsane-st400.la
@@ -135,6 +86,7 @@ man/man5/sane-dll.5
 man/man5/sane-dmc.5
 man/man5/sane-epson.5
 man/man5/sane-fujitsu.5
+man/man5/sane-genesys.5
 man/man5/sane-gphoto2.5
 man/man5/sane-gt68xx.5
 man/man5/sane-hp.5
@@ -164,6 +116,7 @@ man/man5/sane-sceptre.5
 man/man5/sane-scsi.5
 man/man5/sane-sharp.5
 man/man5/sane-sm3600.5
+man/man5/sane-sm3840.5
 man/man5/sane-snapscan.5
 man/man5/sane-sp15c.5
 man/man5/sane-st400.5
@@ -203,6 +156,7 @@ 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
@@ -261,6 +215,59 @@ 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/examples/sane/abaton.conf
+share/examples/sane/agfafocus.conf
+share/examples/sane/apple.conf
+share/examples/sane/artec.conf
+share/examples/sane/artec_eplus48u.conf
+share/examples/sane/avision.conf
+share/examples/sane/bh.conf
+share/examples/sane/canon.conf
+share/examples/sane/canon630u.conf
+share/examples/sane/coolscan.conf
+share/examples/sane/coolscan2.conf
+share/examples/sane/dc210.conf
+share/examples/sane/dc240.conf
+share/examples/sane/dc25.conf
+share/examples/sane/dll.conf
+share/examples/sane/dmc.conf
+share/examples/sane/epson.conf
+share/examples/sane/fujitsu.conf
+share/examples/sane/genesys.conf
+share/examples/sane/gt68xx.conf
+share/examples/sane/hp.conf
+share/examples/sane/hp5400.conf
+share/examples/sane/ibm.conf
+share/examples/sane/leo.conf
+share/examples/sane/ma1509.conf
+share/examples/sane/matsushita.conf
+share/examples/sane/microtek.conf
+share/examples/sane/microtek2.conf
+share/examples/sane/mustek.conf
+share/examples/sane/mustek_usb.conf
+share/examples/sane/nec.conf
+share/examples/sane/net.conf
+share/examples/sane/pie.conf
+share/examples/sane/plustek.conf
+share/examples/sane/plustek_pp.conf
+share/examples/sane/ricoh.conf
+share/examples/sane/s9036.conf
+share/examples/sane/saned.conf
+share/examples/sane/sceptre.conf
+share/examples/sane/sharp.conf
+share/examples/sane/snapscan.conf
+share/examples/sane/sm3840.conf
+share/examples/sane/sp15c.conf
+share/examples/sane/st400.conf
+share/examples/sane/tamarack.conf
+share/examples/sane/teco1.conf
+share/examples/sane/teco2.conf
+share/examples/sane/teco3.conf
+share/examples/sane/test.conf
+share/examples/sane/u12.conf
+share/examples/sane/umax.conf
+share/examples/sane/umax1220u.conf
+share/examples/sane/umax_pp.conf
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/sane-backends.mo
@@ -271,12 +278,14 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/sane-backends.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/sane-backends.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sane-backends.mo
 @exec ${MKDIR} %D/share/sane/gt68xx
 @dirrm share/sane/gt68xx
 @dirrm share/sane
+@dirrm share/examples/sane
 @dirrm share/doc/sane-${SANE_VERSION}/umax
 @dirrm share/doc/sane-${SANE_VERSION}/u12
 @dirrm share/doc/sane-${SANE_VERSION}/teco
@@ -292,4 +301,3 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sane-backends.mo
 @dirrm share/doc/sane-${SANE_VERSION}
 @dirrm lib/sane
 @dirrm include/sane
-@dirrm etc/sane.d
diff --git a/graphics/sane-backends/PLIST.Linux b/graphics/sane-backends/PLIST.Linux
index 7b18357f2c2..e8394401475 100644
--- a/graphics/sane-backends/PLIST.Linux
+++ b/graphics/sane-backends/PLIST.Linux
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2005/05/15 03:13:10 reed Exp $
-etc/sane.d/qcam.conf
-etc/sane.d/v4l.conf
+@comment $NetBSD: PLIST.Linux,v 1.2 2005/09/27 09:29:56 wiz Exp $
 lib/sane/libsane-qcam.la
 lib/sane/libsane-v4l.la
+share/examples/sane/qcam.conf
+share/examples/sane/v4l.conf
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 0e515635b70..8dac90490aa 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2005/02/24 08:45:13 agc Exp $
+$NetBSD: distinfo,v 1.17 2005/09/27 09:29:56 wiz Exp $
 
-SHA1 (sane-backends-1.0.15.tar.gz) = 521bdeacbab389a6fd67f16123e09b9f86752169
-RMD160 (sane-backends-1.0.15.tar.gz) = 0e42007ff24d0a5f94c7c901982619cf4d1a7068
-Size (sane-backends-1.0.15.tar.gz) = 3231759 bytes
-SHA1 (patch-aa) = b782bc8ee2e6d68e667706659998a6c82ce1d5e6
+SHA1 (sane-backends-1.0.16.tar.gz) = 38e2bf7aef648f3ea19bd6c89af2c2fdd8b6eeb1
+RMD160 (sane-backends-1.0.16.tar.gz) = 694030faddf3b14035b6d4cee0151aa48f71049d
+Size (sane-backends-1.0.16.tar.gz) = 3409799 bytes
+SHA1 (patch-aa) = 211eb2cef3f623de612dd5d94291e151f66e1255
+SHA1 (patch-ab) = 0bc5e7899683c3962a186a7155a5d4c9011b6a3d
diff --git a/graphics/sane-backends/patches/patch-aa b/graphics/sane-backends/patches/patch-aa
index 53abef1e40e..eca28b8da10 100644
--- a/graphics/sane-backends/patches/patch-aa
+++ b/graphics/sane-backends/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2003/06/29 10:16:45 rh Exp $
+$NetBSD: patch-aa,v 1.9 2005/09/27 09:29:56 wiz Exp $
 
---- doc/Makefile.in.orig	Thu May  1 09:12:55 2003
-+++ doc/Makefile.in
-@@ -25,7 +25,7 @@ mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
- configdir = ${sysconfdir}/sane.d
--docdir=$(prefix)/doc/sane-@VERSION@
-+docdir=$(prefix)/share/doc/sane-@VERSION@
+--- include/sane/sanei_backend.h.orig	2004-11-13 21:50:48.000000000 +0100
++++ include/sane/sanei_backend.h
+@@ -16,7 +16,7 @@
+  * Compiler related options
+  */
  
- MKDIR = $(top_srcdir)/mkinstalldirs
- INSTALL = @INSTALL@
+-#ifdef __GNUC__
++#if defined(__GNUC__) && !defined(__NetBSD__)
+ 
+ /* __unused tells the compiler a variable is unused, so the
+  * compiler doesn't spit a warning. */
diff --git a/graphics/sane-backends/patches/patch-ab b/graphics/sane-backends/patches/patch-ab
new file mode 100644
index 00000000000..d4958bd1a10
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.6 2005/09/27 09:29:56 wiz Exp $
+
+--- backend/Makefile.in.orig	2005-07-30 14:28:10.000000000 +0200
++++ backend/Makefile.in
+@@ -25,7 +25,7 @@ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-configdir = ${sysconfdir}/sane.d
++configdir = ${prefix}/share/examples/sane
+ BEOS_ADDONDIR = @BEOS_ADDONDIR@
+ 
+ V_MAJOR = @V_MAJOR@