Mon Dec 27 15:07:52 2010 UTC ()
Fixed building on Mac OS X; fixed PLIST; added tiff dependency for dell1600n


(adam)
diff -r1.47 -r1.48 pkgsrc/graphics/sane-backends/Makefile
diff -r1.25 -r1.26 pkgsrc/graphics/sane-backends/PLIST
diff -r1.29 -r1.30 pkgsrc/graphics/sane-backends/distinfo
diff -r0 -r1.1 pkgsrc/graphics/sane-backends/patches/patch-ah
diff -r0 -r1.1 pkgsrc/graphics/sane-backends/patches/patch-ai
diff -r0 -r1.1 pkgsrc/graphics/sane-backends/patches/patch-aj
diff -r0 -r1.1 pkgsrc/graphics/sane-backends/patches/patch-ak
cvs diff -r1.47 -r1.48 pkgsrc/graphics/sane-backends/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/Makefile 2010/12/23 11:44:45 1.47
+++ pkgsrc/graphics/sane-backends/Makefile 2010/12/27 15:07:52 1.48
@@ -1,69 +1,74 @@ @@ -1,69 +1,74 @@
1# $NetBSD: Makefile,v 1.47 2010/12/23 11:44:45 dsainty Exp $ 1# $NetBSD: Makefile,v 1.48 2010/12/27 15:07:52 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
 4PKGREVISION= 1
4 5
5.include "Makefile.common" 6.include "Makefile.common"
6COMMENT= API for access to scanners, digital cameras, frame grabbers etc. 7COMMENT= API for access to scanners, digital cameras, frame grabbers etc.
7 8
8DISTNAME= sane-backends-${SANE_VERSION} 9DISTNAME= sane-backends-${SANE_VERSION}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 10DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10 11
11# lib/Makefile.in builds .o files and then .a, but rules for shlibs, 12# lib/Makefile.in builds .o files and then .a, but rules for shlibs,
12# while apparently independent, cause libtool to create .o again, 13# while apparently independent, cause libtool to create .o again,
13# making it possible for the ar step of the .a build to fail to find 14# making it possible for the ar step of the .a build to fail to find
14# the .o 15# the .o
15MAKE_JOBS_SAFE= NO 16MAKE_JOBS_SAFE= NO
16 17
17USE_TOOLS+= msgfmt msgmerge 18USE_TOOLS+= msgfmt msgmerge
18USE_PKGLOCALEDIR= YES 19USE_PKGLOCALEDIR= YES
19 20
20CONFIGURE_ARGS+= --with-gphoto2=no 21CONFIGURE_ARGS+= --with-gphoto2=no
21CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION} 22CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION}
22 23
23.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
24 25
25PLIST_VARS+= pint sm3600 26PLIST_VARS+= mustek pint sm3600
26 27
27.if (${OPSYS} == "SunOS") 28.if (${OPSYS} == "SunOS")
28# nothing 29# nothing
29.elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") 30.elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly")
30PLIST.sm3600= yes 31PLIST.sm3600= yes
 32.elif (${OPSYS} == "Darwin")
 33PLIST.mustek= yes
 34PLIST.sm3600= yes
31.else 35.else
32PLIST.pint= yes 36PLIST.pint= yes
33PLIST.sm3600= yes 37PLIST.sm3600= yes
34.endif 38.endif
35 39
36OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d 40OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d
37EGDIR= ${PREFIX}/share/examples/sane 41EGDIR= ${PREFIX}/share/examples/sane
38.for f in abaton.conf agfafocus.conf apple.conf artec.conf \ 42.for f in abaton.conf agfafocus.conf apple.conf artec.conf \
39artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \ 43artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
40canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \ 44canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
41dc210.conf dc240.conf dc25.conf dll.conf dmc.conf \ 45dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \
42epson.conf epjitsu.conf epson2.conf fujitsu.conf \ 46epson.conf epjitsu.conf epson2.conf fujitsu.conf \
43genesys.conf gt68xx.conf hp.conf hp3900.conf \ 47genesys.conf gt68xx.conf hp.conf hp3900.conf \
44hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf leo.conf lexmark.conf \ 48hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf leo.conf lexmark.conf \
45ma1509.conf matsushita.conf \ 49ma1509.conf matsushita.conf \
46microtek.conf microtek2.conf mustek.conf mustek_usb.conf \ 50microtek.conf microtek2.conf mustek.conf mustek_usb.conf \
47nec.conf net.conf \ 51nec.conf net.conf \
48p5.conf pie.conf pixma.conf plustek.conf plustek_pp.conf \ 52p5.conf pie.conf pixma.conf plustek.conf plustek_pp.conf \
49ricoh.conf rts8891.conf \ 53ricoh.conf rts8891.conf \
50s9036.conf saned.conf sceptre.conf sharp.conf sm3840.conf snapscan.conf \ 54s9036.conf saned.conf sceptre.conf sharp.conf sm3840.conf snapscan.conf \
51sp15c.conf st400.conf stv680.conf \ 55sp15c.conf st400.conf stv680.conf \
52tamarack.conf teco1.conf teco2.conf teco3.conf \ 56tamarack.conf teco1.conf teco2.conf teco3.conf \
53test.conf u12.conf umax.conf umax1220u.conf umax_pp.conf xerox_mfp.conf 57test.conf u12.conf umax.conf umax1220u.conf umax_pp.conf xerox_mfp.conf
54CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f} 58CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
55.endfor 59.endfor
56 60
57.if (${OPSYS} == "Linux") 61.if (${OPSYS} == "Linux")
58.for f in qcam.conf v4l.conf 62.for f in qcam.conf v4l.conf
59CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f} 63CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
60.endfor 64.endfor
61.endif 65.endif
62 66
63.include "options.mk" 67.include "options.mk"
64.if (${OPSYS} != "SunOS") 68.if (${OPSYS} != "SunOS")
65. include "../../devel/libusb/buildlink3.mk" 69. include "../../devel/libusb/buildlink3.mk"
66.endif 70.endif
 71.include "../../graphics/tiff/buildlink3.mk"
67.include "../../mk/jpeg.buildlink3.mk" 72.include "../../mk/jpeg.buildlink3.mk"
68.include "../../mk/pthread.buildlink3.mk" 73.include "../../mk/pthread.buildlink3.mk"
69.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/graphics/sane-backends/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/PLIST 2010/09/19 15:06:18 1.25
+++ pkgsrc/graphics/sane-backends/PLIST 2010/12/27 15:07:52 1.26
@@ -1,39 +1,40 @@ @@ -1,39 +1,40 @@
1@comment $NetBSD: PLIST,v 1.25 2010/09/19 15:06:18 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.26 2010/12/27 15:07:52 adam Exp $
2bin/gamma4scanimage 2bin/gamma4scanimage
3bin/sane-config 3bin/sane-config
4bin/sane-find-scanner 4bin/sane-find-scanner
5bin/scanimage 5bin/scanimage
6include/sane/sane.h 6include/sane/sane.h
7include/sane/saneopts.h 7include/sane/saneopts.h
8lib/libsane.la 8lib/libsane.la
9lib/sane/libsane-abaton.la 9lib/sane/libsane-abaton.la
10lib/sane/libsane-agfafocus.la 10lib/sane/libsane-agfafocus.la
11lib/sane/libsane-apple.la 11lib/sane/libsane-apple.la
12lib/sane/libsane-artec.la 12lib/sane/libsane-artec.la
13lib/sane/libsane-artec_eplus48u.la 13lib/sane/libsane-artec_eplus48u.la
14lib/sane/libsane-as6e.la 14lib/sane/libsane-as6e.la
15lib/sane/libsane-avision.la 15lib/sane/libsane-avision.la
16lib/sane/libsane-bh.la 16lib/sane/libsane-bh.la
17lib/sane/libsane-canon.la 17lib/sane/libsane-canon.la
18lib/sane/libsane-canon630u.la 18lib/sane/libsane-canon630u.la
19lib/sane/libsane-canon_dr.la 19lib/sane/libsane-canon_dr.la
20lib/sane/libsane-cardscan.la 20lib/sane/libsane-cardscan.la
21lib/sane/libsane-coolscan.la 21lib/sane/libsane-coolscan.la
22lib/sane/libsane-coolscan2.la 22lib/sane/libsane-coolscan2.la
23lib/sane/libsane-coolscan3.la 23lib/sane/libsane-coolscan3.la
24lib/sane/libsane-dc210.la 24lib/sane/libsane-dc210.la
25lib/sane/libsane-dc240.la 25lib/sane/libsane-dc240.la
26lib/sane/libsane-dc25.la 26lib/sane/libsane-dc25.la
 27lib/sane/libsane-dell1600n_net.la
27lib/sane/libsane-dll.la 28lib/sane/libsane-dll.la
28lib/sane/libsane-dmc.la 29lib/sane/libsane-dmc.la
29lib/sane/libsane-epjitsu.la 30lib/sane/libsane-epjitsu.la
30lib/sane/libsane-epson.la 31lib/sane/libsane-epson.la
31lib/sane/libsane-epson2.la 32lib/sane/libsane-epson2.la
32lib/sane/libsane-fujitsu.la 33lib/sane/libsane-fujitsu.la
33lib/sane/libsane-genesys.la 34lib/sane/libsane-genesys.la
34lib/sane/libsane-gt68xx.la 35lib/sane/libsane-gt68xx.la
35lib/sane/libsane-hp.la 36lib/sane/libsane-hp.la
36lib/sane/libsane-hp3500.la 37lib/sane/libsane-hp3500.la
37lib/sane/libsane-hp3900.la 38lib/sane/libsane-hp3900.la
38lib/sane/libsane-hp4200.la 39lib/sane/libsane-hp4200.la
39lib/sane/libsane-hp5400.la 40lib/sane/libsane-hp5400.la
@@ -41,26 +42,27 @@ lib/sane/libsane-hp5590.la @@ -41,26 +42,27 @@ lib/sane/libsane-hp5590.la
41lib/sane/libsane-hpljm1005.la 42lib/sane/libsane-hpljm1005.la
42lib/sane/libsane-hs2p.la 43lib/sane/libsane-hs2p.la
43lib/sane/libsane-ibm.la 44lib/sane/libsane-ibm.la
44lib/sane/libsane-kodak.la 45lib/sane/libsane-kodak.la
45lib/sane/libsane-kvs1025.la 46lib/sane/libsane-kvs1025.la
46lib/sane/libsane-leo.la 47lib/sane/libsane-leo.la
47lib/sane/libsane-lexmark.la 48lib/sane/libsane-lexmark.la
48lib/sane/libsane-ma1509.la 49lib/sane/libsane-ma1509.la
49lib/sane/libsane-matsushita.la 50lib/sane/libsane-matsushita.la
50lib/sane/libsane-microtek.la 51lib/sane/libsane-microtek.la
51lib/sane/libsane-microtek2.la 52lib/sane/libsane-microtek2.la
52lib/sane/libsane-mustek.la 53lib/sane/libsane-mustek.la
53lib/sane/libsane-mustek_usb.la 54lib/sane/libsane-mustek_usb.la
 55${PLIST.mustek}lib/sane/libsane-mustek_usb2.la
54lib/sane/libsane-nec.la 56lib/sane/libsane-nec.la
55lib/sane/libsane-net.la 57lib/sane/libsane-net.la
56lib/sane/libsane-niash.la 58lib/sane/libsane-niash.la
57lib/sane/libsane-p5.la 59lib/sane/libsane-p5.la
58lib/sane/libsane-pie.la 60lib/sane/libsane-pie.la
59${PLIST.pint}lib/sane/libsane-pint.la 61${PLIST.pint}lib/sane/libsane-pint.la
60lib/sane/libsane-pixma.la 62lib/sane/libsane-pixma.la
61lib/sane/libsane-plustek.la 63lib/sane/libsane-plustek.la
62lib/sane/libsane-plustek_pp.la 64lib/sane/libsane-plustek_pp.la
63lib/sane/libsane-ricoh.la 65lib/sane/libsane-ricoh.la
64lib/sane/libsane-rts8891.la 66lib/sane/libsane-rts8891.la
65lib/sane/libsane-s9036.la 67lib/sane/libsane-s9036.la
66lib/sane/libsane-sceptre.la 68lib/sane/libsane-sceptre.la
@@ -120,26 +122,27 @@ man/man5/sane-hp5590.5 @@ -120,26 +122,27 @@ man/man5/sane-hp5590.5
120man/man5/sane-hpljm1005.5 122man/man5/sane-hpljm1005.5
121man/man5/sane-hs2p.5 123man/man5/sane-hs2p.5
122man/man5/sane-ibm.5 124man/man5/sane-ibm.5
123man/man5/sane-kodak.5 125man/man5/sane-kodak.5
124man/man5/sane-kvs1025.5 126man/man5/sane-kvs1025.5
125man/man5/sane-leo.5 127man/man5/sane-leo.5
126man/man5/sane-lexmark.5 128man/man5/sane-lexmark.5
127man/man5/sane-ma1509.5 129man/man5/sane-ma1509.5
128man/man5/sane-matsushita.5 130man/man5/sane-matsushita.5
129man/man5/sane-microtek.5 131man/man5/sane-microtek.5
130man/man5/sane-microtek2.5 132man/man5/sane-microtek2.5
131man/man5/sane-mustek.5 133man/man5/sane-mustek.5
132man/man5/sane-mustek_usb.5 134man/man5/sane-mustek_usb.5
 135${PLIST.mustek}man/man5/sane-mustek_usb2.5
133man/man5/sane-nec.5 136man/man5/sane-nec.5
134man/man5/sane-net.5 137man/man5/sane-net.5
135man/man5/sane-niash.5 138man/man5/sane-niash.5
136man/man5/sane-p5.5 139man/man5/sane-p5.5
137man/man5/sane-pie.5 140man/man5/sane-pie.5
138${PLIST.pint}man/man5/sane-pint.5 141${PLIST.pint}man/man5/sane-pint.5
139man/man5/sane-pixma.5 142man/man5/sane-pixma.5
140man/man5/sane-plustek.5 143man/man5/sane-plustek.5
141man/man5/sane-plustek_pp.5 144man/man5/sane-plustek_pp.5
142man/man5/sane-ricoh.5 145man/man5/sane-ricoh.5
143man/man5/sane-rts8891.5 146man/man5/sane-rts8891.5
144man/man5/sane-s9036.5 147man/man5/sane-s9036.5
145man/man5/sane-sceptre.5 148man/man5/sane-sceptre.5
@@ -255,26 +258,27 @@ share/examples/sane/artec.conf @@ -255,26 +258,27 @@ share/examples/sane/artec.conf
255share/examples/sane/artec_eplus48u.conf 258share/examples/sane/artec_eplus48u.conf
256share/examples/sane/avision.conf 259share/examples/sane/avision.conf
257share/examples/sane/bh.conf 260share/examples/sane/bh.conf
258share/examples/sane/canon.conf 261share/examples/sane/canon.conf
259share/examples/sane/canon630u.conf 262share/examples/sane/canon630u.conf
260share/examples/sane/canon_dr.conf 263share/examples/sane/canon_dr.conf
261share/examples/sane/cardscan.conf 264share/examples/sane/cardscan.conf
262share/examples/sane/coolscan.conf 265share/examples/sane/coolscan.conf
263share/examples/sane/coolscan2.conf 266share/examples/sane/coolscan2.conf
264share/examples/sane/coolscan3.conf 267share/examples/sane/coolscan3.conf
265share/examples/sane/dc210.conf 268share/examples/sane/dc210.conf
266share/examples/sane/dc240.conf 269share/examples/sane/dc240.conf
267share/examples/sane/dc25.conf 270share/examples/sane/dc25.conf
 271share/examples/sane/dell1600n_net.conf
268share/examples/sane/dll.conf 272share/examples/sane/dll.conf
269share/examples/sane/dmc.conf 273share/examples/sane/dmc.conf
270share/examples/sane/epjitsu.conf 274share/examples/sane/epjitsu.conf
271share/examples/sane/epson.conf 275share/examples/sane/epson.conf
272share/examples/sane/epson2.conf 276share/examples/sane/epson2.conf
273share/examples/sane/fujitsu.conf 277share/examples/sane/fujitsu.conf
274share/examples/sane/genesys.conf 278share/examples/sane/genesys.conf
275share/examples/sane/gt68xx.conf 279share/examples/sane/gt68xx.conf
276share/examples/sane/hp.conf 280share/examples/sane/hp.conf
277share/examples/sane/hp3900.conf 281share/examples/sane/hp3900.conf
278share/examples/sane/hp4200.conf 282share/examples/sane/hp4200.conf
279share/examples/sane/hp5400.conf 283share/examples/sane/hp5400.conf
280share/examples/sane/hs2p.conf 284share/examples/sane/hs2p.conf
cvs diff -r1.29 -r1.30 pkgsrc/graphics/sane-backends/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/distinfo 2010/12/08 09:35:29 1.29
+++ pkgsrc/graphics/sane-backends/distinfo 2010/12/27 15:07:52 1.30
@@ -1,12 +1,16 @@ @@ -1,12 +1,16 @@
1$NetBSD: distinfo,v 1.29 2010/12/08 09:35:29 wiz Exp $ 1$NetBSD: distinfo,v 1.30 2010/12/27 15:07:52 adam Exp $
2 2
3SHA1 (sane-backends-1.0.21.tar.gz) = 4a2789ea9dae1ece090d016abd14b0f2450d9bdb 3SHA1 (sane-backends-1.0.21.tar.gz) = 4a2789ea9dae1ece090d016abd14b0f2450d9bdb
4RMD160 (sane-backends-1.0.21.tar.gz) = 000ae42ffd6484c54389a9468bdde1dcfc758dde 4RMD160 (sane-backends-1.0.21.tar.gz) = 000ae42ffd6484c54389a9468bdde1dcfc758dde
5Size (sane-backends-1.0.21.tar.gz) = 5050344 bytes 5Size (sane-backends-1.0.21.tar.gz) = 5050344 bytes
6SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224 6SHA1 (patch-aa) = ff3439b060d6aa78f63d6acd09d87499a4d7f224
7SHA1 (patch-ab) = ab1f77b2f6e7cb691fe4e97aa6d0c8d8e4f46bc9 7SHA1 (patch-ab) = ab1f77b2f6e7cb691fe4e97aa6d0c8d8e4f46bc9
8SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474 8SHA1 (patch-ac) = 900911de5cde4a6cdc35cbc2d13371b13c596474
9SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892 9SHA1 (patch-ad) = ffd50b49305c05bda28de0536ca54171baff6892
10SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9 10SHA1 (patch-ae) = bf9b53fd5c9b74915769afe9e17bed292a8a9ed9
11SHA1 (patch-af) = 7c7eeec5599062fba7bd0ad93dec8e976d5cce0d 11SHA1 (patch-af) = 7c7eeec5599062fba7bd0ad93dec8e976d5cce0d
12SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834 12SHA1 (patch-ag) = 8155659bce4e1ce569a8a4a74131f21670c0a834
 13SHA1 (patch-ah) = 6e747c3b541c9ebb57db6477ac6b6e48b1df0248
 14SHA1 (patch-ai) = d04bc976f02e755b107fca1a29b00596e6c1ef54
 15SHA1 (patch-aj) = c2e0733796872f1b074d0491dea4cffa1891bccc
 16SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76
File Added: pkgsrc/graphics/sane-backends/patches/patch-ah
$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
File Added: pkgsrc/graphics/sane-backends/patches/patch-ai
$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);
File Added: pkgsrc/graphics/sane-backends/patches/patch-aj
$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"
File Added: pkgsrc/graphics/sane-backends/patches/patch-ak
$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"
 
 /*