summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2022-06-07 18:03:55 +0000
committerwiz <wiz@pkgsrc.org>2022-06-07 18:03:55 +0000
commitea560ff66eb0d27a6e0ef2dca2cdd69da2e492db (patch)
tree7a2516cd3a27389c4be6923f9dbd0b898d5a103a /security
parentfa2e675747b0a7ad17d6252f9e669f21db3fa9f6 (diff)
downloadpkgsrc-ea560ff66eb0d27a6e0ef2dca2cdd69da2e492db.tar.gz
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.
Diffstat (limited to 'security')
-rw-r--r--security/polkit/Makefile5
-rw-r--r--security/polkit/PLIST10
-rw-r--r--security/polkit/options.mk17
3 files changed, 13 insertions, 19 deletions
diff --git a/security/polkit/Makefile b/security/polkit/Makefile
index 27a7067363b..966f6cd98bb 100644
--- a/security/polkit/Makefile
+++ b/security/polkit/Makefile
@@ -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=${POLKITD_USER}
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"
diff --git a/security/polkit/PLIST b/security/polkit/PLIST
index 6c90dcea15c..d6607cfe191 100644
--- a/security/polkit/PLIST
+++ b/security/polkit/PLIST
@@ -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/polkitagentlistener.h
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-1
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
diff --git a/security/polkit/options.mk b/security/polkit/options.mk
index b530745f2da..132b1cf635f 100644
--- a/security/polkit/options.mk
+++ b/security/polkit/options.mk
@@ -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"