CVS commit: pkgsrc/graphics/sane-backends

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Jan 26 17:17:39 UTC 2022

Modified Files:
        pkgsrc/graphics/sane-backends: Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/graphics/sane-backends/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/sane-backends/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/sane-backends/Makefile
diff -u pkgsrc/graphics/sane-backends/Makefile:1.78 pkgsrc/graphics/sane-backends/Makefile:1.79
--- pkgsrc/graphics/sane-backends/Makefile:1.78 Sat Jan  8 11:47:49 2022
+++ pkgsrc/graphics/sane-backends/Makefile      Wed Jan 26 17:17:39 2022
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2022/01/08 11:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2022/01/26 17:17:39 triaxx Exp $
 
+PKGREVISION=   1
 .include "Makefile.common"
 MASTER_SITES=  https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/
 COMMENT=       API for access to scanners, digital cameras, frame grabbers, etc
@@ -18,6 +19,7 @@ USE_LANGUAGES=                c c++11
 # C++11
 GCC_REQD+=             4.8
 
+CONFIGURE_ARGS+=       --enable-pthread
 CONFIGURE_ARGS+=       --with-gphoto2=no
 CONFIGURE_ARGS+=       --without-snmp
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
@@ -27,17 +29,10 @@ CONFIGURE_ENV.SunOS+=       ac_cv_func_inet_pt
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=           mustek pint sm3600 kvs40xx
+PLIST_VARS+=           pint
 
-.if (${OPSYS} == "SunOS") || (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") || (${OPSYS} == "FreeBSD")
-PLIST.sm3600=          yes
-.elif (${OPSYS} == "Darwin")
-PLIST.mustek=          yes
-PLIST.sm3600=          yes
-PLIST.kvs40xx=         yes
-.else
+.if (${OPSYS} == "NetBSD")
 PLIST.pint=            yes
-PLIST.sm3600=          yes
 .endif
 
 LIBS.SunOS+=   -lresolv -lnsl -lsocket

Index: pkgsrc/graphics/sane-backends/PLIST
diff -u pkgsrc/graphics/sane-backends/PLIST:1.37 pkgsrc/graphics/sane-backends/PLIST:1.38
--- pkgsrc/graphics/sane-backends/PLIST:1.37    Tue Jan  4 16:04:39 2022
+++ pkgsrc/graphics/sane-backends/PLIST Wed Jan 26 17:17:39 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2022/01/04 16:04:39 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.38 2022/01/26 17:17:39 triaxx Exp $
 bin/gamma4scanimage
 bin/sane-config
 bin/sane-find-scanner
@@ -50,7 +50,7 @@ lib/sane/libsane-kodak.la
 lib/sane/libsane-kodakaio.la
 lib/sane/libsane-kvs1025.la
 lib/sane/libsane-kvs20xx.la
-${PLIST.kvs40xx}lib/sane/libsane-kvs40xx.la
+lib/sane/libsane-kvs40xx.la
 lib/sane/libsane-leo.la
 lib/sane/libsane-lexmark.la
 lib/sane/libsane-ma1509.la
@@ -60,7 +60,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-mustek_usb2.la
 lib/sane/libsane-nec.la
 lib/sane/libsane-net.la
 lib/sane/libsane-niash.la
@@ -77,7 +77,7 @@ lib/sane/libsane-rts8891.la
 lib/sane/libsane-s9036.la
 lib/sane/libsane-sceptre.la
 lib/sane/libsane-sharp.la
-${PLIST.sm3600}lib/sane/libsane-sm3600.la
+lib/sane/libsane-sm3600.la
 lib/sane/libsane-sm3840.la
 lib/sane/libsane-snapscan.la
 lib/sane/libsane-sp15c.la
@@ -138,7 +138,7 @@ man/man5/sane-kodak.5
 man/man5/sane-kodakaio.5
 man/man5/sane-kvs1025.5
 man/man5/sane-kvs20xx.5
-${PLIST.kvs40xx}man/man5/sane-kvs40xx.5
+man/man5/sane-kvs40xx.5
 man/man5/sane-leo.5
 man/man5/sane-lexmark.5
 man/man5/sane-ma1509.5
@@ -148,7 +148,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-mustek_usb2.5
 man/man5/sane-nec.5
 man/man5/sane-net.5
 man/man5/sane-niash.5
@@ -166,7 +166,7 @@ man/man5/sane-s9036.5
 man/man5/sane-sceptre.5
 man/man5/sane-scsi.5
 man/man5/sane-sharp.5
-${PLIST.sm3600}man/man5/sane-sm3600.5
+man/man5/sane-sm3600.5
 man/man5/sane-sm3840.5
 man/man5/sane-snapscan.5
 man/man5/sane-sp15c.5