Wed Jan 26 17:17:39 2022 UTC ()
sane-backends: Reorganize PLIST_VARS

pkgsrc changes:
---------------
  * Remove sm3600 variable since it is enabled for any OPSYS.
  * Remove mustek and kvs40xx variables since these backends are built if
    pthread is available. Actually it build on Linux and on other Unix-like
    systems. For Unix-like other than Linux, pthread is not enabled by default
    but we explicitly enable it in Makefile.
  * Bump revision

/!\ pint is built if sys/scanio.h exists. Feel free to add systems that implement it.
/!\ Feel free to reintroduce mustek and kvs40xx for systems that do not implement
    pthread.


(triaxx)
diff -r1.78 -r1.79 pkgsrc/graphics/sane-backends/Makefile
diff -r1.37 -r1.38 pkgsrc/graphics/sane-backends/PLIST
cvs diff -r1.78 -r1.79 pkgsrc/graphics/sane-backends/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/Makefile 2022/01/08 11:47:49 1.78
+++ pkgsrc/graphics/sane-backends/Makefile 2022/01/26 17:17:39 1.79
@@ -1,53 +1,48 @@ @@ -1,53 +1,48 @@
1# $NetBSD: Makefile,v 1.78 2022/01/08 11:47:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.79 2022/01/26 17:17:39 triaxx Exp $
2 2
 3PKGREVISION= 1
3.include "Makefile.common" 4.include "Makefile.common"
4MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/ 5MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/
5COMMENT= API for access to scanners, digital cameras, frame grabbers, etc 6COMMENT= API for access to scanners, digital cameras, frame grabbers, etc
6 7
7DISTNAME= sane-backends-${SANE_VERSION} 8DISTNAME= sane-backends-${SANE_VERSION}
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 10
10USE_TOOLS+= msgfmt msgmerge pkg-config 11USE_TOOLS+= msgfmt msgmerge pkg-config
11USE_PKGLOCALEDIR= YES 12USE_PKGLOCALEDIR= YES
12 13
13PYTHON_VERSIONS_ACCEPTED= 27 14PYTHON_VERSIONS_ACCEPTED= 27
14 15
15# c++11 is needed for genesys backend 16# c++11 is needed for genesys backend
16USE_LANGUAGES= c c++11 17USE_LANGUAGES= c c++11
17 18
18# C++11 19# C++11
19GCC_REQD+= 4.8 20GCC_REQD+= 4.8
20 21
 22CONFIGURE_ARGS+= --enable-pthread
21CONFIGURE_ARGS+= --with-gphoto2=no 23CONFIGURE_ARGS+= --with-gphoto2=no
22CONFIGURE_ARGS+= --without-snmp 24CONFIGURE_ARGS+= --without-snmp
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 25CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
24 26
25CONFIGURE_ENV.SunOS+= ac_cv_func_inet_ntop=yes 27CONFIGURE_ENV.SunOS+= ac_cv_func_inet_ntop=yes
26CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pton=yes 28CONFIGURE_ENV.SunOS+= ac_cv_func_inet_pton=yes
27 29
28.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
29 31
30PLIST_VARS+= mustek pint sm3600 kvs40xx 32PLIST_VARS+= pint
31 33
32.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") || (${OPSYS} == "FreeBSD") 34.if (${OPSYS} == "NetBSD")
33PLIST.sm3600= yes 
34.elif (${OPSYS} == "Darwin") 
35PLIST.mustek= yes 
36PLIST.sm3600= yes 
37PLIST.kvs40xx= yes 
38.else 
39PLIST.pint= yes 35PLIST.pint= yes
40PLIST.sm3600= yes 
41.endif 36.endif
42 37
43LIBS.SunOS+= -lresolv -lnsl -lsocket 38LIBS.SunOS+= -lresolv -lnsl -lsocket
44 39
45OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d 40OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d
46EGDIR= ${PREFIX}/share/examples/sane 41EGDIR= ${PREFIX}/share/examples/sane
47.for f in abaton.conf agfafocus.conf apple.conf artec.conf \ 42.for f in abaton.conf agfafocus.conf apple.conf artec.conf \
48artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \ 43artec_eplus48u.conf avision.conf bh.conf canon.conf canon630u.conf \
49canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \ 44canon_dr.conf cardscan.conf coolscan.conf coolscan2.conf coolscan3.conf \
50dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \ 45dc210.conf dc240.conf dc25.conf dell1600n_net.conf dll.conf dmc.conf \
51epjitsu.conf epson.conf epson2.conf epsonds.conf fujitsu.conf \ 46epjitsu.conf epson.conf epson2.conf epsonds.conf fujitsu.conf \
52genesys.conf gt68xx.conf hp.conf hp3900.conf \ 47genesys.conf gt68xx.conf hp.conf hp3900.conf \
53hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf \ 48hp4200.conf hp5400.conf hs2p.conf ibm.conf kodak.conf \
cvs diff -r1.37 -r1.38 pkgsrc/graphics/sane-backends/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/PLIST 2022/01/04 16:04:39 1.37
+++ pkgsrc/graphics/sane-backends/PLIST 2022/01/26 17:17:39 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.37 2022/01/04 16:04:39 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.38 2022/01/26 17:17:39 triaxx 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
10lib/pkgconfig/sane-backends.pc 10lib/pkgconfig/sane-backends.pc
11lib/sane/libsane-abaton.la 11lib/sane/libsane-abaton.la
12lib/sane/libsane-agfafocus.la 12lib/sane/libsane-agfafocus.la
13lib/sane/libsane-apple.la 13lib/sane/libsane-apple.la
14lib/sane/libsane-artec.la 14lib/sane/libsane-artec.la
@@ -40,54 +40,54 @@ lib/sane/libsane-gt68xx.la @@ -40,54 +40,54 @@ lib/sane/libsane-gt68xx.la
40lib/sane/libsane-hp.la 40lib/sane/libsane-hp.la
41lib/sane/libsane-hp3500.la 41lib/sane/libsane-hp3500.la
42lib/sane/libsane-hp3900.la 42lib/sane/libsane-hp3900.la
43lib/sane/libsane-hp4200.la 43lib/sane/libsane-hp4200.la
44lib/sane/libsane-hp5400.la 44lib/sane/libsane-hp5400.la
45lib/sane/libsane-hp5590.la 45lib/sane/libsane-hp5590.la
46lib/sane/libsane-hpljm1005.la 46lib/sane/libsane-hpljm1005.la
47lib/sane/libsane-hs2p.la 47lib/sane/libsane-hs2p.la
48lib/sane/libsane-ibm.la 48lib/sane/libsane-ibm.la
49lib/sane/libsane-kodak.la 49lib/sane/libsane-kodak.la
50lib/sane/libsane-kodakaio.la 50lib/sane/libsane-kodakaio.la
51lib/sane/libsane-kvs1025.la 51lib/sane/libsane-kvs1025.la
52lib/sane/libsane-kvs20xx.la 52lib/sane/libsane-kvs20xx.la
53${PLIST.kvs40xx}lib/sane/libsane-kvs40xx.la 53lib/sane/libsane-kvs40xx.la
54lib/sane/libsane-leo.la 54lib/sane/libsane-leo.la
55lib/sane/libsane-lexmark.la 55lib/sane/libsane-lexmark.la
56lib/sane/libsane-ma1509.la 56lib/sane/libsane-ma1509.la
57lib/sane/libsane-magicolor.la 57lib/sane/libsane-magicolor.la
58lib/sane/libsane-matsushita.la 58lib/sane/libsane-matsushita.la
59lib/sane/libsane-microtek.la 59lib/sane/libsane-microtek.la
60lib/sane/libsane-microtek2.la 60lib/sane/libsane-microtek2.la
61lib/sane/libsane-mustek.la 61lib/sane/libsane-mustek.la
62lib/sane/libsane-mustek_usb.la 62lib/sane/libsane-mustek_usb.la
63${PLIST.mustek}lib/sane/libsane-mustek_usb2.la 63lib/sane/libsane-mustek_usb2.la
64lib/sane/libsane-nec.la 64lib/sane/libsane-nec.la
65lib/sane/libsane-net.la 65lib/sane/libsane-net.la
66lib/sane/libsane-niash.la 66lib/sane/libsane-niash.la
67lib/sane/libsane-p5.la 67lib/sane/libsane-p5.la
68lib/sane/libsane-pie.la 68lib/sane/libsane-pie.la
69lib/sane/libsane-pieusb.la 69lib/sane/libsane-pieusb.la
70${PLIST.pint}lib/sane/libsane-pint.la 70${PLIST.pint}lib/sane/libsane-pint.la
71lib/sane/libsane-pixma.la 71lib/sane/libsane-pixma.la
72lib/sane/libsane-plustek.la 72lib/sane/libsane-plustek.la
73lib/sane/libsane-plustek_pp.la 73lib/sane/libsane-plustek_pp.la
74lib/sane/libsane-ricoh.la 74lib/sane/libsane-ricoh.la
75lib/sane/libsane-ricoh2.la 75lib/sane/libsane-ricoh2.la
76lib/sane/libsane-rts8891.la 76lib/sane/libsane-rts8891.la
77lib/sane/libsane-s9036.la 77lib/sane/libsane-s9036.la
78lib/sane/libsane-sceptre.la 78lib/sane/libsane-sceptre.la
79lib/sane/libsane-sharp.la 79lib/sane/libsane-sharp.la
80${PLIST.sm3600}lib/sane/libsane-sm3600.la 80lib/sane/libsane-sm3600.la
81lib/sane/libsane-sm3840.la 81lib/sane/libsane-sm3840.la
82lib/sane/libsane-snapscan.la 82lib/sane/libsane-snapscan.la
83lib/sane/libsane-sp15c.la 83lib/sane/libsane-sp15c.la
84lib/sane/libsane-st400.la 84lib/sane/libsane-st400.la
85lib/sane/libsane-stv680.la 85lib/sane/libsane-stv680.la
86lib/sane/libsane-tamarack.la 86lib/sane/libsane-tamarack.la
87lib/sane/libsane-teco1.la 87lib/sane/libsane-teco1.la
88lib/sane/libsane-teco2.la 88lib/sane/libsane-teco2.la
89lib/sane/libsane-teco3.la 89lib/sane/libsane-teco3.la
90lib/sane/libsane-test.la 90lib/sane/libsane-test.la
91lib/sane/libsane-u12.la 91lib/sane/libsane-u12.la
92lib/sane/libsane-umax.la 92lib/sane/libsane-umax.la
93lib/sane/libsane-umax1220u.la 93lib/sane/libsane-umax1220u.la
@@ -128,55 +128,55 @@ man/man5/sane-gt68xx.5 @@ -128,55 +128,55 @@ man/man5/sane-gt68xx.5
128man/man5/sane-hp.5 128man/man5/sane-hp.5
129man/man5/sane-hp3500.5 129man/man5/sane-hp3500.5
130man/man5/sane-hp3900.5 130man/man5/sane-hp3900.5
131man/man5/sane-hp4200.5 131man/man5/sane-hp4200.5
132man/man5/sane-hp5400.5 132man/man5/sane-hp5400.5
133man/man5/sane-hp5590.5 133man/man5/sane-hp5590.5
134man/man5/sane-hpljm1005.5 134man/man5/sane-hpljm1005.5
135man/man5/sane-hs2p.5 135man/man5/sane-hs2p.5
136man/man5/sane-ibm.5 136man/man5/sane-ibm.5
137man/man5/sane-kodak.5 137man/man5/sane-kodak.5
138man/man5/sane-kodakaio.5 138man/man5/sane-kodakaio.5
139man/man5/sane-kvs1025.5 139man/man5/sane-kvs1025.5
140man/man5/sane-kvs20xx.5 140man/man5/sane-kvs20xx.5
141${PLIST.kvs40xx}man/man5/sane-kvs40xx.5 141man/man5/sane-kvs40xx.5
142man/man5/sane-leo.5 142man/man5/sane-leo.5
143man/man5/sane-lexmark.5 143man/man5/sane-lexmark.5
144man/man5/sane-ma1509.5 144man/man5/sane-ma1509.5
145man/man5/sane-magicolor.5 145man/man5/sane-magicolor.5
146man/man5/sane-matsushita.5 146man/man5/sane-matsushita.5
147man/man5/sane-microtek.5 147man/man5/sane-microtek.5
148man/man5/sane-microtek2.5 148man/man5/sane-microtek2.5
149man/man5/sane-mustek.5 149man/man5/sane-mustek.5
150man/man5/sane-mustek_usb.5 150man/man5/sane-mustek_usb.5
151${PLIST.mustek}man/man5/sane-mustek_usb2.5 151man/man5/sane-mustek_usb2.5
152man/man5/sane-nec.5 152man/man5/sane-nec.5
153man/man5/sane-net.5 153man/man5/sane-net.5
154man/man5/sane-niash.5 154man/man5/sane-niash.5
155man/man5/sane-p5.5 155man/man5/sane-p5.5
156man/man5/sane-pie.5 156man/man5/sane-pie.5
157man/man5/sane-pieusb.5 157man/man5/sane-pieusb.5
158${PLIST.pint}man/man5/sane-pint.5 158${PLIST.pint}man/man5/sane-pint.5
159man/man5/sane-pixma.5 159man/man5/sane-pixma.5
160man/man5/sane-plustek.5 160man/man5/sane-plustek.5
161man/man5/sane-plustek_pp.5 161man/man5/sane-plustek_pp.5
162man/man5/sane-ricoh.5 162man/man5/sane-ricoh.5
163man/man5/sane-ricoh2.5 163man/man5/sane-ricoh2.5
164man/man5/sane-rts8891.5 164man/man5/sane-rts8891.5
165man/man5/sane-s9036.5 165man/man5/sane-s9036.5
166man/man5/sane-sceptre.5 166man/man5/sane-sceptre.5
167man/man5/sane-scsi.5 167man/man5/sane-scsi.5
168man/man5/sane-sharp.5 168man/man5/sane-sharp.5
169${PLIST.sm3600}man/man5/sane-sm3600.5 169man/man5/sane-sm3600.5
170man/man5/sane-sm3840.5 170man/man5/sane-sm3840.5
171man/man5/sane-snapscan.5 171man/man5/sane-snapscan.5
172man/man5/sane-sp15c.5 172man/man5/sane-sp15c.5
173man/man5/sane-st400.5 173man/man5/sane-st400.5
174man/man5/sane-stv680.5 174man/man5/sane-stv680.5
175man/man5/sane-tamarack.5 175man/man5/sane-tamarack.5
176man/man5/sane-teco1.5 176man/man5/sane-teco1.5
177man/man5/sane-teco2.5 177man/man5/sane-teco2.5
178man/man5/sane-teco3.5 178man/man5/sane-teco3.5
179man/man5/sane-test.5 179man/man5/sane-test.5
180man/man5/sane-u12.5 180man/man5/sane-u12.5
181man/man5/sane-umax.5 181man/man5/sane-umax.5
182man/man5/sane-umax1220u.5 182man/man5/sane-umax1220u.5