[pkgsrc/trunk]: pkgsrc/sysutils/mate-power-manager mate-power-manager: Disabl...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/532c7a150e64
branches:  trunk
changeset: 442293:532c7a150e64
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Nov 22 12:58:37 2020 +0000

description:
mate-power-manager: Disable gnome-keyring integration

diffstat:

 sysutils/mate-power-manager/Makefile   |   8 ++++----
 sysutils/mate-power-manager/options.mk |  14 --------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diffs (47 lines):

diff -r 62f9cd957711 -r 532c7a150e64 sysutils/mate-power-manager/Makefile
--- a/sysutils/mate-power-manager/Makefile      Sun Nov 22 12:05:09 2020 +0000
+++ b/sysutils/mate-power-manager/Makefile      Sun Nov 22 12:58:37 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2020/08/24 04:41:41 gutteridge Exp $
+# $NetBSD: Makefile,v 1.27 2020/11/22 12:58:37 nia Exp $
 
-PKGREVISION= 2
+PKGREVISION= 3
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      mate-power-manager-${VERSION:R}.1
@@ -15,14 +15,14 @@
 TOOL_DEPENDS+=         polkit-[0-9]*:../../security/polkit
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --without-keyring
+
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples/${PKGBASE}
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/autostart
 CONF_FILES+=   ${PREFIX}/share/examples/mate-power-manager/xdg/autostart/mate-power-manager.desktop \
                ${PKG_SYSCONFDIR}/xdg/autostart/mate-power-manager.desktop
 
-.include "options.mk"
-
 .include "../../devel/glib2/schemas.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/upower/buildlink3.mk"
diff -r 62f9cd957711 -r 532c7a150e64 sysutils/mate-power-manager/options.mk
--- a/sysutils/mate-power-manager/options.mk    Sun Nov 22 12:05:09 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2020/05/31 23:44:49 gutteridge Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.mate-power-manager
-PKG_SUPPORTED_OPTIONS= keyring
-PKG_SUGGESTED_OPTIONS= keyring
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mkeyring)
-.include "../../security/libgnome-keyring/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-keyring
-.else
-CONFIGURE_ARGS+=       --without-keyring
-.endif