CVS commit: pkgsrc/security/pcsc-lite

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Sun Jul 21 01:02:26 UTC 2024

Modified Files:
        pkgsrc/security/pcsc-lite: Makefile PLIST
Added Files:
        pkgsrc/security/pcsc-lite: options.mk

Log Message:
Add a polkit pkgsrc option

Polkit pulls glib, hence it is nice to disable it when trying to lower
disk footprint


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/security/pcsc-lite/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/pcsc-lite/PLIST
cvs rdiff -u -r0 -r1.3 pkgsrc/security/pcsc-lite/options.mk

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

Modified files:

Index: pkgsrc/security/pcsc-lite/Makefile
diff -u pkgsrc/security/pcsc-lite/Makefile:1.47 pkgsrc/security/pcsc-lite/Makefile:1.48
--- pkgsrc/security/pcsc-lite/Makefile:1.47     Mon Jun 10 09:33:58 2024
+++ pkgsrc/security/pcsc-lite/Makefile  Sun Jul 21 01:02:26 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2024/06/10 09:33:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.48 2024/07/21 01:02:26 manu Exp $
 
 DISTNAME=      pcsc-lite-2.2.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    security
 MASTER_SITES=  https://pcsclite.apdu.fr/files/
 EXTRACT_SUFX=  .tar.xz
@@ -16,6 +16,7 @@ USE_LANGUAGES=        c c++
 USE_TOOLS+=    flex perl pkg-config
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 MESON_ARGS+=   -Dipcdir=${VARBASE}/pcsc-lite
 MESON_ARGS+=   -Dlibsystemd=false
@@ -44,7 +45,6 @@ RCD_SCRIPTS=          pcscd
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../lang/python/application.mk"
-.include "../../security/polkit/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/pcsc-lite/PLIST
diff -u pkgsrc/security/pcsc-lite/PLIST:1.13 pkgsrc/security/pcsc-lite/PLIST:1.14
--- pkgsrc/security/pcsc-lite/PLIST:1.13        Mon May 20 19:52:42 2024
+++ pkgsrc/security/pcsc-lite/PLIST     Sun Jul 21 01:02:26 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2024/05/20 19:52:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2024/07/21 01:02:26 manu Exp $
 bin/pcsc-spy
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
@@ -18,4 +18,4 @@ man/man5/reader.conf.5
 man/man8/pcscd.8
 sbin/pcscd
 share/doc/pcsc-lite/setup_spy.sh
-share/polkit-1/actions/org.debian.pcsc-lite.policy
+${POLKIT}share/polkit-1/actions/org.debian.pcsc-lite.policy

Added files:

Index: pkgsrc/security/pcsc-lite/options.mk
diff -u /dev/null pkgsrc/security/pcsc-lite/options.mk:1.3
--- /dev/null   Sun Jul 21 01:02:26 2024
+++ pkgsrc/security/pcsc-lite/options.mk        Sun Jul 21 01:02:26 2024
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.3 2024/07/21 01:02:26 manu Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.pcsc-lite
+
+PKG_SUPPORTED_OPTIONS=         polkit
+PKG_SUGGESTED_OPTIONS=         polkit
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpolkit)
+.include "../../security/polkit/buildlink3.mk"
+MESON_ARGS+=           -Dpolkit=true
+PLIST_SUBST+=          POLKIT=""
+.else
+MESON_ARGS+=           -Dpolkit=false
+PLIST_SUBST+=          POLKIT="@comment "
+.endif
+