Tue May 15 14:58:08 2018 UTC ()
sane-backends: Handle nls correctly.


(jperkin)
diff -r1.32 -r1.33 pkgsrc/graphics/sane-backends/PLIST
diff -r1.9 -r1.10 pkgsrc/graphics/sane-backends/options.mk
cvs diff -r1.32 -r1.33 pkgsrc/graphics/sane-backends/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/PLIST 2018/02/25 21:22:07 1.32
+++ pkgsrc/graphics/sane-backends/PLIST 2018/05/15 14:58:08 1.33
@@ -1,22 +1,44 @@ @@ -1,22 +1,44 @@
1@comment $NetBSD: PLIST,v 1.32 2018/02/25 21:22:07 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.33 2018/05/15 14:58:08 jperkin 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
 11${PLIST.nls}share/locale/cs/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
 14${PLIST.nls}share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
 15${PLIST.nls}share/locale/en@quot/LC_MESSAGES/sane-backends.mo
 16${PLIST.nls}share/locale/en_GB/LC_MESSAGES/sane-backends.mo
 17${PLIST.nls}share/locale/eo/LC_MESSAGES/sane-backends.mo
 18${PLIST.nls}share/locale/es/LC_MESSAGES/sane-backends.mo
 19${PLIST.nls}share/locale/fi/LC_MESSAGES/sane-backends.mo
 20${PLIST.nls}share/locale/fr/LC_MESSAGES/sane-backends.mo
 21${PLIST.nls}share/locale/gl/LC_MESSAGES/sane-backends.mo
 22${PLIST.nls}share/locale/hu/LC_MESSAGES/sane-backends.mo
 23${PLIST.nls}share/locale/it/LC_MESSAGES/sane-backends.mo
 24${PLIST.nls}share/locale/ja/LC_MESSAGES/sane-backends.mo
 25${PLIST.nls}share/locale/nb/LC_MESSAGES/sane-backends.mo
 26${PLIST.nls}share/locale/nl/LC_MESSAGES/sane-backends.mo
 27${PLIST.nls}share/locale/pl/LC_MESSAGES/sane-backends.mo
 28${PLIST.nls}share/locale/pt/LC_MESSAGES/sane-backends.mo
 29${PLIST.nls}share/locale/ru/LC_MESSAGES/sane-backends.mo
 30${PLIST.nls}share/locale/sv/LC_MESSAGES/sane-backends.mo
 31${PLIST.nls}share/locale/uk/LC_MESSAGES/sane-backends.mo
10lib/pkgconfig/sane-backends.pc 32lib/pkgconfig/sane-backends.pc
11lib/sane/libsane-abaton.la 33lib/sane/libsane-abaton.la
12lib/sane/libsane-agfafocus.la 34lib/sane/libsane-agfafocus.la
13lib/sane/libsane-apple.la 35lib/sane/libsane-apple.la
14lib/sane/libsane-artec.la 36lib/sane/libsane-artec.la
15lib/sane/libsane-artec_eplus48u.la 37lib/sane/libsane-artec_eplus48u.la
16lib/sane/libsane-as6e.la 38lib/sane/libsane-as6e.la
17lib/sane/libsane-avision.la 39lib/sane/libsane-avision.la
18lib/sane/libsane-bh.la 40lib/sane/libsane-bh.la
19lib/sane/libsane-canon.la 41lib/sane/libsane-canon.la
20lib/sane/libsane-canon630u.la 42lib/sane/libsane-canon630u.la
21lib/sane/libsane-canon_dr.la 43lib/sane/libsane-canon_dr.la
22lib/sane/libsane-cardscan.la 44lib/sane/libsane-cardscan.la
cvs diff -r1.9 -r1.10 pkgsrc/graphics/sane-backends/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/sane-backends/options.mk 2012/06/12 15:45:56 1.9
+++ pkgsrc/graphics/sane-backends/options.mk 2018/05/15 14:58:08 1.10
@@ -1,22 +1,29 @@ @@ -1,22 +1,29 @@
1# $NetBSD: options.mk,v 1.9 2012/06/12 15:45:56 wiz Exp $ 1# $NetBSD: options.mk,v 1.10 2018/05/15 14:58:08 jperkin Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.sane-backends 3PKG_OPTIONS_VAR= PKG_OPTIONS.sane-backends
4PKG_SUPPORTED_OPTIONS= inet6 snmp 4PKG_SUPPORTED_OPTIONS= inet6 nls snmp
5PKG_SUGGESTED_OPTIONS= inet6 5PKG_SUGGESTED_OPTIONS= inet6
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# Package-specific option-handling 9PLIST_VARS+= nls
10 10
11.if !empty(PKG_OPTIONS:Minet6) 11.if !empty(PKG_OPTIONS:Minet6)
12CONFIGURE_ARGS+= --enable-ipv6 12CONFIGURE_ARGS+= --enable-ipv6
13.else 13.else
14CONFIGURE_ARGS+= --disable-ipv6 14CONFIGURE_ARGS+= --disable-ipv6
15.endif 15.endif
16 16
 17.if !empty(PKG_OPTIONS:Mnls)
 18CONFIGURE_ARGS+= --enable-nls
 19PLIST.nls= yes
 20.else
 21CONFIGURE_ARGS+= --disable-nls
 22.endif
 23
17.if !empty(PKG_OPTIONS:Msnmp) 24.if !empty(PKG_OPTIONS:Msnmp)
18CONFIGURE_ARGS+= --with-snmp=yes 25CONFIGURE_ARGS+= --with-snmp=yes
19.include "../../net/net-snmp/buildlink3.mk" 26.include "../../net/net-snmp/buildlink3.mk"
20.else 27.else
21CONFIGURE_ARGS+= --with-snmp=no 28CONFIGURE_ARGS+= --with-snmp=no
22.endif 29.endif