Update to 1.0.19.

Remove sane-backends-hp3900 option, support is now enabled by default.

New with 1.0.19, released 2008-02-10:

* New backends: cardscan (Corex Cardscan 800c), epjitsu (Epson-based Fujitsu),
  epson2 (various Epson scanners), hp3900 (HP ScanJet 3970 and more),
  hp5590 (HP ScanJet 5590 and more), hpljm1005 (HP LaserJet M1005 and more),
  hs2p (Ricoh IS400 series)
* Updated backends: abaton, agfafocus, apple, artec, artec_eplus48u, as6e,
  avision, canon, coolscan, coolscan2, dc25, dell1600n_net, dll, epson,
  fujitsu, genesys, gt68xx, hp3500, ibm, lexmark, microtek, microtek2, mustek,
  nec, net, pie, pint, pixma, plustek, plustek_pp, ricoh, s9036, sm3600,
  sm3840, snapscan, sp15c, st400, tamarack, teco2, test, u12, umax, umax1220u,
  umax_pp
* Scanimage detects more chipsets.
* Internal scsi, usb, tcp and udp code updates.
* Basic HAL .fdi creation support
* Build system updates.
* Updated translations.
* Documentation updates.
* Bugfixes.

6 files changed, 50 insertions, 32 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 3c6b7366fcb..d065b6cea96 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:02 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2008/04/13 21:43:39 wiz Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
@@ -35,9 +35,11 @@ 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 \
-hp4200.conf hp5400.conf ibm.conf leo.conf lexmark.conf \
+cardscan.conf coolscan.conf coolscan2.conf \
+dc210.conf dc240.conf dc25.conf dll.conf dmc.conf \
+epson.conf epjitsu.conf epson2.conf fujitsu.conf \
+genesys.conf gt68xx.conf hp.conf hp3900.conf \
+hp4200.conf hp5400.conf hs2p.conf ibm.conf leo.conf lexmark.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 \
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index 42e5f8e737f..19d7060b663 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2006/08/23 18:29:22 wiz Exp $
+# $NetBSD: Makefile.common,v 1.25 2008/04/13 21:43:39 wiz Exp $
 
 CATEGORIES?=	graphics
 MASTER_SITES?=	ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
@@ -14,7 +14,7 @@ HOMEPAGE?=	http://www.sane-project.org/
 
 SANE_MAJOR?=	1
 SANE_MINOR?=	0
-SANE_MICRO?=	18
+SANE_MICRO?=	19
 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 69cde491ace..2c1202edee4 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:02 jlam Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/04/13 21:43:39 wiz Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -16,6 +16,7 @@ lib/sane/libsane-avision.la
 lib/sane/libsane-bh.la
 lib/sane/libsane-canon.la
 lib/sane/libsane-canon630u.la
+lib/sane/libsane-cardscan.la
 lib/sane/libsane-coolscan.la
 lib/sane/libsane-coolscan2.la
 lib/sane/libsane-dc210.la
@@ -23,15 +24,20 @@ lib/sane/libsane-dc240.la
 lib/sane/libsane-dc25.la
 lib/sane/libsane-dll.la
 lib/sane/libsane-dmc.la
+lib/sane/libsane-epjitsu.la
 lib/sane/libsane-epson.la
+lib/sane/libsane-epson2.la
 lib/sane/libsane-fujitsu.la
 lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.la
 lib/sane/libsane-hp3500.la
-${PLIST.hp3900}lib/sane/libsane-hp3900.la
+lib/sane/libsane-hp3900.la
 lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp5400.la
+lib/sane/libsane-hp5590.la
+lib/sane/libsane-hpljm1005.la
+lib/sane/libsane-hs2p.la
 lib/sane/libsane-ibm.la
 lib/sane/libsane-leo.la
 lib/sane/libsane-lexmark.la
@@ -84,6 +90,7 @@ man/man5/sane-bh.5
 man/man5/sane-canon.5
 man/man5/sane-canon630u.5
 man/man5/sane-canon_pp.5
+man/man5/sane-cardscan.5
 man/man5/sane-coolscan.5
 man/man5/sane-coolscan2.5
 man/man5/sane-dc210.5
@@ -91,6 +98,7 @@ man/man5/sane-dc240.5
 man/man5/sane-dc25.5
 man/man5/sane-dll.5
 man/man5/sane-dmc.5
+man/man5/sane-epjitsu.5
 man/man5/sane-epson.5
 man/man5/sane-fujitsu.5
 man/man5/sane-genesys.5
@@ -98,10 +106,13 @@ man/man5/sane-gphoto2.5
 man/man5/sane-gt68xx.5
 man/man5/sane-hp.5
 man/man5/sane-hp3500.5
-${PLIST.hp3900}man/man5/sane-hp3900.5
+man/man5/sane-hp3900.5
 man/man5/sane-hp4200.5
 man/man5/sane-hp5400.5
+man/man5/sane-hp5590.5
+man/man5/sane-hpljm1005.5
 man/man5/sane-hpsj5s.5
+man/man5/sane-hs2p.5
 man/man5/sane-ibm.5
 man/man5/sane-leo.5
 man/man5/sane-lexmark.5
@@ -240,6 +251,7 @@ share/examples/sane/avision.conf
 share/examples/sane/bh.conf
 share/examples/sane/canon.conf
 share/examples/sane/canon630u.conf
+share/examples/sane/cardscan.conf
 share/examples/sane/coolscan.conf
 share/examples/sane/coolscan2.conf
 share/examples/sane/dc210.conf
@@ -247,14 +259,17 @@ share/examples/sane/dc240.conf
 share/examples/sane/dc25.conf
 share/examples/sane/dll.conf
 share/examples/sane/dmc.conf
+share/examples/sane/epjitsu.conf
 share/examples/sane/epson.conf
+share/examples/sane/epson2.conf
 share/examples/sane/fujitsu.conf
 share/examples/sane/genesys.conf
 share/examples/sane/gt68xx.conf
 share/examples/sane/hp.conf
-${PLIST.hp3900}share/examples/sane/hp3900.conf
+share/examples/sane/hp3900.conf
 share/examples/sane/hp4200.conf
 share/examples/sane/hp5400.conf
+share/examples/sane/hs2p.conf
 share/examples/sane/ibm.conf
 share/examples/sane/leo.conf
 share/examples/sane/lexmark.conf
@@ -292,12 +307,13 @@ 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/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/it/LC_MESSAGES/sane-backends.mo
+share/locale/nb/LC_MESSAGES/sane-backends.mo
 share/locale/nl/LC_MESSAGES/sane-backends.mo
-share/locale/no/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
@@ -306,6 +322,8 @@ share/locale/sv/LC_MESSAGES/sane-backends.mo
 @dirrm share/sane/snapscan
 @exec ${MKDIR} %D/share/sane/gt68xx
 @dirrm share/sane/gt68xx
+@exec ${MKDIR} %D/share/sane/epjitsu
+@dirrm share/sane/epjitsu
 @exec ${MKDIR} %D/share/sane/artec_eplus48u
 @dirrm share/sane/artec_eplus48u
 @dirrm share/sane
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 5d4034102ba..b19fc407f74 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.22 2006/08/05 22:41:49 wiz Exp $
+$NetBSD: distinfo,v 1.23 2008/04/13 21:43:39 wiz Exp $
 
-SHA1 (sane-backends-1.0.18.tar.gz) = f4c360b87ced287e4015a0dafd766ad885c539e1
-RMD160 (sane-backends-1.0.18.tar.gz) = aa863adff417d7c33cbb85c193878aa54a056100
-Size (sane-backends-1.0.18.tar.gz) = 3789493 bytes
+SHA1 (sane-backends-1.0.19.tar.gz) = 3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5
+RMD160 (sane-backends-1.0.19.tar.gz) = 1aaf304cbfeb3d6c95f6081d04225441a87b6644
+Size (sane-backends-1.0.19.tar.gz) = 4293184 bytes
 SHA1 (patch-aa) = ab6c283a929763dc9292371349bcebc4aed537ea
 SHA1 (patch-ab) = afb6766afbbfc165bab25fe74c7210d9177b46ef
 SHA1 (patch-ac) = 7e4e710b0a570e677bdca6054ace3df07bbb909a
+SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
index 9bc7beaab55..469822921f6 100644
--- a/graphics/sane-backends/options.mk
+++ b/graphics/sane-backends/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:02 jlam Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/13 21:43:39 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.sane-backends
-PKG_SUPPORTED_OPTIONS=		inet6 sane-backends-hp3900
+PKG_SUPPORTED_OPTIONS=		inet6
 PKG_SUGGESTED_OPTIONS=		#defined
 
 .include "../../mk/bsd.options.mk"
@@ -13,18 +13,3 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
-
-
-###
-### hp3900 support
-###
-PLIST_VARS+=	hp3900
-
-.if !empty(PKG_OPTIONS:Mhp3900)
-PLIST.hp3900=	yes
-DISTFILES+=	hp3900-sane1017_src_0.5.tar.gz
-SITES.hp3900-sane1017_src_0.5.tar.gz=${MASTER_SITE_SOURCEFORGE:=hp3900-series/}
-post-patch:
-	cd ${WRKSRC} && \
-	${PATCH} -p1 <${WRKDIR}/hp3900-sane1017_src_0.5/hp3900-sane1017_0.5.diff
-.endif
diff --git a/graphics/sane-backends/patches/patch-ad b/graphics/sane-backends/patches/patch-ad
new file mode 100644
index 00000000000..ca11a96d4df
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.6 2008/04/13 21:43:39 wiz 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);