Fixed building on Mac OS X; fixed PLIST; added tiff dependency for dell1600n

7 files changed, 87 insertions, 5 deletions

diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 546184cc052..e5185ef7e7a 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2010/12/23 11:44:45 dsainty Exp $
+# $NetBSD: Makefile,v 1.48 2010/12/27 15:07:52 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+PKGREVISION=	1
 
 .include "Makefile.common"
 COMMENT=	API for access to scanners, digital cameras, frame grabbers etc.
@@ -22,12 +23,15 @@ CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION}
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=		pint sm3600
+PLIST_VARS+=		mustek pint sm3600
 
 .if (${OPSYS} == "SunOS")
 # nothing
 .elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly")
 PLIST.sm3600=		yes
+.elif (${OPSYS} == "Darwin")
+PLIST.mustek=		yes
+PLIST.sm3600=		yes
 .else
 PLIST.pint=		yes
 PLIST.sm3600=		yes
@@ -38,7 +42,7 @@ 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 \
 canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
-dc210.conf dc240.conf dc25.conf dll.conf dmc.conf \
+dc210.conf dc240.conf dc25.conf dell1600n_net.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 kodak.conf leo.conf lexmark.conf \
@@ -64,6 +68,7 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .if (${OPSYS} != "SunOS")
 . include "../../devel/libusb/buildlink3.mk"
 .endif
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST
index 4b14c76e5e1..ef809150e20 100644
--- a/graphics/sane-backends/PLIST
+++ b/graphics/sane-backends/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2010/09/19 15:06:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2010/12/27 15:07:52 adam Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -24,6 +24,7 @@ lib/sane/libsane-coolscan3.la
 lib/sane/libsane-dc210.la
 lib/sane/libsane-dc240.la
 lib/sane/libsane-dc25.la
+lib/sane/libsane-dell1600n_net.la
 lib/sane/libsane-dll.la
 lib/sane/libsane-dmc.la
 lib/sane/libsane-epjitsu.la
@@ -51,6 +52,7 @@ 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
@@ -130,6 +132,7 @@ 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
@@ -265,6 +268,7 @@ share/examples/sane/coolscan3.conf
 share/examples/sane/dc210.conf
 share/examples/sane/dc240.conf
 share/examples/sane/dc25.conf
+share/examples/sane/dell1600n_net.conf
 share/examples/sane/dll.conf
 share/examples/sane/dmc.conf
 share/examples/sane/epjitsu.conf
diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo
index 4d55ce12e80..82638d5230e 100644
--- a/graphics/sane-backends/distinfo
+++ b/graphics/sane-backends/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2010/12/08 09:35:29 wiz Exp $
+$NetBSD: distinfo,v 1.30 2010/12/27 15:07:52 adam Exp $
 
 SHA1 (sane-backends-1.0.21.tar.gz) = 4a2789ea9dae1ece090d016abd14b0f2450d9bdb
 RMD160 (sane-backends-1.0.21.tar.gz) = 000ae42ffd6484c54389a9468bdde1dcfc758dde
@@ -10,3 +10,7 @@ SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
 SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
 SHA1 (patch-af) = 7c7eeec5599062fba7bd0ad93dec8e976d5cce0d
 SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
+SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
+SHA1 (patch-ai) = d04bc976f02e755b107fca1a29b00596e6c1ef54
+SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
+SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
diff --git a/graphics/sane-backends/patches/patch-ah b/graphics/sane-backends/patches/patch-ah
new file mode 100644
index 00000000000..fe10b91062d
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2010/12/27 15:07:52 adam Exp $
+
+Avoid duplicate symbols in libepson and libepson2.
+
+--- backend/epson_usb.h.orig	2010-12-27 14:39:24.000000000 +0000
++++ backend/epson_usb.h
+@@ -3,8 +3,6 @@
+ 
+ #define SANE_EPSON_VENDOR_ID	(0x4b8)
+ 
+-extern SANE_Word sanei_epson_usb_product_ids[];
+ 
+-extern int sanei_epson_getNumberOfUSBProductIds (void);
+ 
+ #endif
diff --git a/graphics/sane-backends/patches/patch-ai b/graphics/sane-backends/patches/patch-ai
new file mode 100644
index 00000000000..8efcc36ade4
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.1 2010/12/27 15:07:52 adam Exp $
+
+Avoid duplicate symbols in libepson and libepson2.
+
+--- backend/epson_usb.c.orig	2010-12-27 14:37:39.000000000 +0000
++++ backend/epson_usb.c
+@@ -3,7 +3,7 @@
+ #include "epson_usb.h"
+ 
+ 
+-SANE_Word sanei_epson_usb_product_ids[] = {
++static SANE_Word sanei_epson_usb_product_ids[] = {
+   0x101, /* GT-7000U, Perfection 636U */
+   0x103, /* GT-6600U, Perfection 610 */
+   0x104, /* GT-7600U, GT-7600UF, Perfection 1200U, Perfection 1200U PHOTO */
+@@ -79,7 +79,7 @@ SANE_Word sanei_epson_usb_product_ids[] 
+ 				   in the config file as "usb <vendor> <product>" */
+ };
+ 
+-int
++static int
+ sanei_epson_getNumberOfUSBProductIds (void)
+ {
+   return sizeof (sanei_epson_usb_product_ids) / sizeof (SANE_Word);
diff --git a/graphics/sane-backends/patches/patch-aj b/graphics/sane-backends/patches/patch-aj
new file mode 100644
index 00000000000..eca6d4ae4e8
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2010/12/27 15:07:52 adam Exp $
+
+Avoid duplicate symbols in libepson and libepson2.
+
+--- backend/epson.c.orig	2010-12-27 14:36:16.000000000 +0000
++++ backend/epson.c
+@@ -333,7 +333,7 @@
+ 
+ #include  "epson.h"
+ #include  "epson_scsi.h"
+-#include  "epson_usb.h"
++#include  "epson_usb.c"
+ 
+ #define  EPSON_CONFIG_FILE      "epson.conf"
+ 
diff --git a/graphics/sane-backends/patches/patch-ak b/graphics/sane-backends/patches/patch-ak
new file mode 100644
index 00000000000..3f746913a6e
--- /dev/null
+++ b/graphics/sane-backends/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2010/12/27 15:07:52 adam Exp $
+
+Avoid duplicate symbols in libepson and libepson2.
+
+--- backend/epson2.c.orig	2010-12-27 14:36:45.000000000 +0000
++++ backend/epson2.c
+@@ -72,7 +72,7 @@
+ #include "epson2-ops.h"
+ 
+ #include "epson2_scsi.h"
+-#include "epson_usb.h"
++#include "epson_usb.c"
+ #include "epson2_net.h"
+ 
+ /*