Wed Aug 7 15:52:13 2019 UTC ()
sane-backends: PLIST fix for Darwin, which apparently enables another backend
(it's unclear why it only gets enabled on OS X)

From clement bouvier in PR pkg/54444.


(maya)
diff -r1.69 -r1.70 pkgsrc/graphics/sane-backends/Makefile
diff -r1.33 -r1.34 pkgsrc/graphics/sane-backends/PLIST
cvs diff -r1.69 -r1.70 pkgsrc/graphics/sane-backends/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/Makefile 2018/05/15 13:19:50 1.69
+++ pkgsrc/graphics/sane-backends/Makefile 2019/08/07 15:52:13 1.70
@@ -1,47 +1,48 @@ @@ -1,47 +1,48 @@
1# $NetBSD: Makefile,v 1.69 2018/05/15 13:19:50 jperkin Exp $ 1# $NetBSD: Makefile,v 1.70 2019/08/07 15:52:13 maya Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4COMMENT= API for access to scanners, digital cameras, frame grabbers, etc 4COMMENT= API for access to scanners, digital cameras, frame grabbers, etc
5 5
6DISTNAME= sane-backends-${SANE_VERSION} 6DISTNAME= sane-backends-${SANE_VERSION}
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 7DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
8 8
9# lib/Makefile.in builds .o files and then .a, but rules for shlibs, 9# lib/Makefile.in builds .o files and then .a, but rules for shlibs,
10# while apparently independent, cause libtool to create .o again, 10# while apparently independent, cause libtool to create .o again,
11# making it possible for the ar step of the .a build to fail to find 11# making it possible for the ar step of the .a build to fail to find
12# the .o 12# the .o
13MAKE_JOBS_SAFE= NO 13MAKE_JOBS_SAFE= NO
14 14
15USE_TOOLS+= msgfmt msgmerge pkg-config 15USE_TOOLS+= msgfmt msgmerge pkg-config
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17 17
18CONFIGURE_ARGS+= --with-gphoto2=no 18CONFIGURE_ARGS+= --with-gphoto2=no
19CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION} 19CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION}
20CONFIGURE_ARGS+= --without-snmp 20CONFIGURE_ARGS+= --without-snmp
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
22 22
23CONFIGURE_ENV.SunOS+= ac_cv_func_inet_ntop=yes 23CONFIGURE_ENV.SunOS+= ac_cv_func_inet_ntop=yes
24CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pton=yes 24CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pton=yes
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28PLIST_VARS+= mustek pint sm3600 28PLIST_VARS+= mustek pint sm3600 kvs40xx
29 29
30.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") || (${OPSYS} == "FreeBSD") 30.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") || (${OPSYS} == "FreeBSD")
31PLIST.sm3600= yes 31PLIST.sm3600= yes
32.elif (${OPSYS} == "Darwin") 32.elif (${OPSYS} == "Darwin")
33PLIST.mustek= yes 33PLIST.mustek= yes
34PLIST.sm3600= yes 34PLIST.sm3600= yes
 35PLIST.kvs40xx= yes
35.else 36.else
36PLIST.pint= yes 37PLIST.pint= yes
37PLIST.sm3600= yes 38PLIST.sm3600= yes
38.endif 39.endif
39 40
40OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d 41OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d
41EGDIR= ${PREFIX}/share/examples/sane 42EGDIR= ${PREFIX}/share/examples/sane
42.for f in abaton.conf agfafocus.conf apple.conf artec.conf \ 43.for f in abaton.conf agfafocus.conf apple.conf artec.conf \
43artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \ 44artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
44canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \ 45canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
45dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \ 46dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \
46epjitsu.conf epson.conf epson2.conf epsonds.conf fujitsu.conf \ 47epjitsu.conf epson.conf epson2.conf epsonds.conf fujitsu.conf \
47genesys.conf gt68xx.conf hp.conf hp3900.conf \ 48genesys.conf gt68xx.conf hp.conf hp3900.conf \
cvs diff -r1.33 -r1.34 pkgsrc/graphics/sane-backends/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/PLIST 2018/05/15 14:58:08 1.33
+++ pkgsrc/graphics/sane-backends/PLIST 2019/08/07 15:52:13 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.33 2018/05/15 14:58:08 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.34 2019/08/07 15:52:13 maya Exp $
2bin/gamma4scanimage 2bin/gamma4scanimage
3bin/sane-config 3bin/sane-config
4bin/sane-find-scanner 4bin/sane-find-scanner
5bin/scanimage 5bin/scanimage
6bin/umax_pp 6bin/umax_pp
7include/sane/sane.h 7include/sane/sane.h
8include/sane/saneopts.h 8include/sane/saneopts.h
9lib/libsane.la 9lib/libsane.la
10${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo 10${PLIST.nls}share/locale/bg/LC_MESSAGES/sane-backends.mo
11${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo 11${PLIST.nls}share/locale/cs/LC_MESSAGES/sane-backends.mo
12${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo 12${PLIST.nls}share/locale/da/LC_MESSAGES/sane-backends.mo
13${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo 13${PLIST.nls}share/locale/de/LC_MESSAGES/sane-backends.mo
14${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo 14${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
@@ -61,26 +61,27 @@ lib/sane/libsane-gt68xx.la @@ -61,26 +61,27 @@ lib/sane/libsane-gt68xx.la
61lib/sane/libsane-hp.la 61lib/sane/libsane-hp.la
62lib/sane/libsane-hp3500.la 62lib/sane/libsane-hp3500.la
63lib/sane/libsane-hp3900.la 63lib/sane/libsane-hp3900.la
64lib/sane/libsane-hp4200.la 64lib/sane/libsane-hp4200.la
65lib/sane/libsane-hp5400.la 65lib/sane/libsane-hp5400.la
66lib/sane/libsane-hp5590.la 66lib/sane/libsane-hp5590.la
67lib/sane/libsane-hpljm1005.la 67lib/sane/libsane-hpljm1005.la
68lib/sane/libsane-hs2p.la 68lib/sane/libsane-hs2p.la
69lib/sane/libsane-ibm.la 69lib/sane/libsane-ibm.la
70lib/sane/libsane-kodak.la 70lib/sane/libsane-kodak.la
71lib/sane/libsane-kodakaio.la 71lib/sane/libsane-kodakaio.la
72lib/sane/libsane-kvs1025.la 72lib/sane/libsane-kvs1025.la
73lib/sane/libsane-kvs20xx.la 73lib/sane/libsane-kvs20xx.la
 74${PLIST.kvs40xx}lib/sane/libsane-kvs40xx.la
74lib/sane/libsane-leo.la 75lib/sane/libsane-leo.la
75lib/sane/libsane-lexmark.la 76lib/sane/libsane-lexmark.la
76lib/sane/libsane-ma1509.la 77lib/sane/libsane-ma1509.la
77lib/sane/libsane-magicolor.la 78lib/sane/libsane-magicolor.la
78lib/sane/libsane-matsushita.la 79lib/sane/libsane-matsushita.la
79lib/sane/libsane-microtek.la 80lib/sane/libsane-microtek.la
80lib/sane/libsane-microtek2.la 81lib/sane/libsane-microtek2.la
81lib/sane/libsane-mustek.la 82lib/sane/libsane-mustek.la
82lib/sane/libsane-mustek_usb.la 83lib/sane/libsane-mustek_usb.la
83${PLIST.mustek}lib/sane/libsane-mustek_usb2.la 84${PLIST.mustek}lib/sane/libsane-mustek_usb2.la
84lib/sane/libsane-nec.la 85lib/sane/libsane-nec.la
85lib/sane/libsane-net.la 86lib/sane/libsane-net.la
86lib/sane/libsane-niash.la 87lib/sane/libsane-niash.la
@@ -146,26 +147,27 @@ man/man5/sane-gt68xx.5 @@ -146,26 +147,27 @@ man/man5/sane-gt68xx.5
146man/man5/sane-hp.5 147man/man5/sane-hp.5
147man/man5/sane-hp3500.5 148man/man5/sane-hp3500.5
148man/man5/sane-hp3900.5 149man/man5/sane-hp3900.5
149man/man5/sane-hp4200.5 150man/man5/sane-hp4200.5
150man/man5/sane-hp5400.5 151man/man5/sane-hp5400.5
151man/man5/sane-hp5590.5 152man/man5/sane-hp5590.5
152man/man5/sane-hpljm1005.5 153man/man5/sane-hpljm1005.5
153man/man5/sane-hs2p.5 154man/man5/sane-hs2p.5
154man/man5/sane-ibm.5 155man/man5/sane-ibm.5
155man/man5/sane-kodak.5 156man/man5/sane-kodak.5
156man/man5/sane-kodakaio.5 157man/man5/sane-kodakaio.5
157man/man5/sane-kvs1025.5 158man/man5/sane-kvs1025.5
158man/man5/sane-kvs20xx.5 159man/man5/sane-kvs20xx.5
 160${PLIST.kvs40xx}man/man5/sane-kvs40xx.5
159man/man5/sane-leo.5 161man/man5/sane-leo.5
160man/man5/sane-lexmark.5 162man/man5/sane-lexmark.5
161man/man5/sane-ma1509.5 163man/man5/sane-ma1509.5
162man/man5/sane-magicolor.5 164man/man5/sane-magicolor.5
163man/man5/sane-matsushita.5 165man/man5/sane-matsushita.5
164man/man5/sane-microtek.5 166man/man5/sane-microtek.5
165man/man5/sane-microtek2.5 167man/man5/sane-microtek2.5
166man/man5/sane-mustek.5 168man/man5/sane-mustek.5
167man/man5/sane-mustek_usb.5 169man/man5/sane-mustek_usb.5
168${PLIST.mustek}man/man5/sane-mustek_usb2.5 170${PLIST.mustek}man/man5/sane-mustek_usb2.5
169man/man5/sane-nec.5 171man/man5/sane-nec.5
170man/man5/sane-net.5 172man/man5/sane-net.5
171man/man5/sane-niash.5 173man/man5/sane-niash.5