CVS commit: pkgsrc/security/polkit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  7 18:03:55 UTC 2022

Modified Files:
        pkgsrc/security/polkit: Makefile PLIST options.mk

Log Message:
polkit: remove introspection option, enabling it by default

It was default-on, but bump PKGREVISION to be on the safe side
for those who disabled it.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/security/polkit/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/polkit/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/polkit/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/polkit/Makefile
diff -u pkgsrc/security/polkit/Makefile:1.41 pkgsrc/security/polkit/Makefile:1.42
--- pkgsrc/security/polkit/Makefile:1.41        Sat Mar 12 08:01:51 2022
+++ pkgsrc/security/polkit/Makefile     Tue Jun  7 18:03:55 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2022/03/12 08:01:51 nia Exp $
+# $NetBSD: Makefile,v 1.42 2022/06/07 18:03:55 wiz Exp $
 
 DISTNAME=      polkit-0.120
 PKGREVISION=   2
@@ -39,6 +39,7 @@ CONFIGURE_ARGS+=      --with-polkitd-user=${P
 CONFIGURE_ARGS+=       --disable-libsystemd-login
 CONFIGURE_ARGS+=       --disable-libelogind
 CONFIGURE_ARGS+=       --with-duktape
+CONFIGURE_ARGS+=       --enable-introspection
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -84,5 +85,7 @@ pre-configure:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/polkit/PLIST
diff -u pkgsrc/security/polkit/PLIST:1.6 pkgsrc/security/polkit/PLIST:1.7
--- pkgsrc/security/polkit/PLIST:1.6    Mon Nov  1 10:20:48 2021
+++ pkgsrc/security/polkit/PLIST        Tue Jun  7 18:03:55 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/11/01 10:20:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/06/07 18:03:55 wiz Exp $
 bin/pk-example-frobnicate
 bin/pkaction
 bin/pkcheck
@@ -32,8 +32,8 @@ include/polkit-1/polkitagent/polkitagent
 include/polkit-1/polkitagent/polkitagentsession.h
 include/polkit-1/polkitagent/polkitagenttextlistener.h
 include/polkit-1/polkitagent/polkitagenttypes.h
-${PLIST.introspection}lib/girepository-1.0/Polkit-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/PolkitAgent-1.0.typelib
+lib/girepository-1.0/Polkit-1.0.typelib
+lib/girepository-1.0/PolkitAgent-1.0.typelib
 lib/libpolkit-agent-1.la
 lib/libpolkit-gobject-1.la
 lib/pkgconfig/polkit-agent-1.pc
@@ -52,8 +52,8 @@ ${PLIST.pam}share/examples/pam.d/polkit-
 share/examples/polkit/polkit-1/rules.d/50-default.rules
 share/gettext/its/polkit.its
 share/gettext/its/polkit.loc
-${PLIST.introspection}share/gir-1.0/Polkit-1.0.gir
-${PLIST.introspection}share/gir-1.0/PolkitAgent-1.0.gir
+share/gir-1.0/Polkit-1.0.gir
+share/gir-1.0/PolkitAgent-1.0.gir
 share/locale/cs/LC_MESSAGES/polkit-1.mo
 share/locale/da/LC_MESSAGES/polkit-1.mo
 share/locale/de/LC_MESSAGES/polkit-1.mo

Index: pkgsrc/security/polkit/options.mk
diff -u pkgsrc/security/polkit/options.mk:1.4 pkgsrc/security/polkit/options.mk:1.5
--- pkgsrc/security/polkit/options.mk:1.4       Thu Nov  5 17:06:57 2020
+++ pkgsrc/security/polkit/options.mk   Tue Jun  7 18:03:55 2022
@@ -1,21 +1,12 @@
-# $NetBSD: options.mk,v 1.4 2020/11/05 17:06:57 nia Exp $
+# $NetBSD: options.mk,v 1.5 2022/06/07 18:03:55 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.polkit
-PKG_SUPPORTED_OPTIONS= introspection pam
-PKG_SUGGESTED_OPTIONS= introspection pam
+PKG_SUPPORTED_OPTIONS= pam
+PKG_SUGGESTED_OPTIONS= pam
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   introspection pam
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-introspection
-PLIST.introspection=   yes
-.else
-CONFIGURE_ARGS+=       --disable-introspection
-.endif
+PLIST_VARS+=   pam
 
 .if !empty(PKG_OPTIONS:Mpam)
 .include "../../mk/pam.buildlink3.mk"