Add optional support for HP ScanJet 3900 series scanners.

4 files changed, 35 insertions, 4 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index d0ed37cb6f6..ca33000de7f 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.29 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2006/06/08 14:14:11 ben Exp $
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc.
 
 DISTNAME=       sane-backends-${SANE_VERSION}
-PKGREVISION=	1
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+PKGREVISION=	2
 
 USE_TOOLS+=		msgfmt
 USE_PKGLOCALEDIR=	YES
@@ -47,6 +48,7 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .endfor
 .endif
 
+.include "options.mk"
 .if (${OPSYS} != "SunOS")
 . include "../../devel/libusb/buildlink3.mk"
 .endif
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 8a14e182b73..15e6fe18c78 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/04/17 07:07:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/06/08 14:14:11 ben Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -28,6 +28,7 @@ lib/sane/libsane-fujitsu.la
 lib/sane/libsane-genesys.la
 lib/sane/libsane-gt68xx.la
 lib/sane/libsane-hp.la
+${SANE_HP3900}lib/sane/libsane-hp3900.la
 lib/sane/libsane-hp4200.la
 lib/sane/libsane-hp5400.la
 lib/sane/libsane-ibm.la
@@ -96,6 +97,7 @@ man/man5/sane-genesys.5
 man/man5/sane-gphoto2.5
 man/man5/sane-gt68xx.5
 man/man5/sane-hp.5
+${SANE_HP3900}man/man5/sane-hp3900.5
 man/man5/sane-hp5400.5
 man/man5/sane-hpsj5s.5
 man/man5/sane-ibm.5
@@ -244,6 +246,7 @@ share/examples/sane/fujitsu.conf
 share/examples/sane/genesys.conf
 share/examples/sane/gt68xx.conf
 share/examples/sane/hp.conf
+${SANE_HP3900}share/examples/sane/hp3900.conf
 share/examples/sane/hp4200.conf
 share/examples/sane/hp5400.conf
 share/examples/sane/ibm.conf
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 6c70664d0d8..b28f38dd231 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.19 2006/01/12 01:21:27 joerg Exp $
+$NetBSD: distinfo,v 1.20 2006/06/08 14:14:11 ben Exp $
 
 SHA1 (sane-backends-1.0.17.tar.gz) = a73e01575458a5fb7dc265cea50c6740555e1711
 RMD160 (sane-backends-1.0.17.tar.gz) = 43e440712e9da676e235dc6148c5dda347c30e22
 Size (sane-backends-1.0.17.tar.gz) = 3588993 bytes
+SHA1 (hp3900-sane1017_src_0.5.tar.gz) = 4a45100faae2572b2763253659f5cbfc8f5d31ea
+RMD160 (hp3900-sane1017_src_0.5.tar.gz) = d37163c66888de11fff41a0d0af09b9439dda34e
+Size (hp3900-sane1017_src_0.5.tar.gz) = 119430 bytes
 SHA1 (patch-aa) = fe4f9771d72512ac6a6c246971cb5940fba184cb
 SHA1 (patch-ab) = e9ed0b400458308a5c6a2631bda475c59e9a4abd
diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk
new file mode 100644
index 00000000000..f3b50b95905
--- /dev/null
+++ b/graphics/sane-backends/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2006/06/08 14:14:11 ben Exp $
+
+PKG_OPTIONS_VAR=                PKG_OPTIONS.sane-backends
+PKG_SUPPORTED_OPTIONS=          hp3900
+PKG_SUGGESTED_OPTIONS=		#defined
+
+.include "../../mk/bsd.options.mk"
+
+# Package-specific option-handling
+
+###
+### hp3900 support
+###
+.if !empty(PKG_OPTIONS:Mhp3900)
+PLIST_SUBST+=   SANE_HP3900=""
+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
+.else
+PLIST_SUBST+=   SANE_HP3900="@comment "
+.endif