summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authormartin <martin@pkgsrc.org>2016-12-04 13:50:08 +0000
committermartin <martin@pkgsrc.org>2016-12-04 13:50:08 +0000
commitc2caec9fd1882a25821a73eba14a9d1553689250 (patch)
tree26aa73ee707d67b6f1477f796b0326fb2335a1d8 /x11
parentdd37414fea6cf278800ccc493f6334ca0aa04cb6 (diff)
downloadpkgsrc-c2caec9fd1882a25821a73eba14a9d1553689250.tar.gz
Make the "polkit" dependency optional
Diffstat (limited to 'x11')
-rw-r--r--x11/xfce4-session/Makefile4
-rw-r--r--x11/xfce4-session/PLIST4
-rw-r--r--x11/xfce4-session/options.mk16
3 files changed, 20 insertions, 4 deletions
diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 7a0435a750c..dd44adca0ab 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2016/08/03 10:23:39 adam Exp $
+# $NetBSD: Makefile,v 1.56 2016/12/04 13:50:08 martin Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -47,8 +47,8 @@ CONF_FILES+= ${EGDIR}/xinitrc \
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../security/polkit/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/libxfce4ui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index 1151021309e..81ee9f3155c 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2016/06/04 15:13:27 youri Exp $
+@comment $NetBSD: PLIST,v 1.19 2016/12/04 13:50:08 martin Exp $
bin/startxfce4
bin/xfce4-session
bin/xfce4-session-logout
@@ -97,6 +97,6 @@ share/locale/vi/LC_MESSAGES/xfce4-session.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
-share/polkit-1/actions/org.xfce.session.policy
+${PLIST.polkit}share/polkit-1/actions/org.xfce.session.policy
share/themes/Default/balou/logo.png
share/themes/Default/balou/themerc
diff --git a/x11/xfce4-session/options.mk b/x11/xfce4-session/options.mk
new file mode 100644
index 00000000000..2cf23f83a51
--- /dev/null
+++ b/x11/xfce4-session/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2016/12/04 13:50:08 martin Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-session
+PKG_SUPPORTED_OPTIONS= polkit
+PKG_SUGGESTED_OPTIONS= polkit
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS = polkit
+
+.if !empty(PKG_OPTIONS:Mpolkit)
+.include "../../security/polkit/buildlink3.mk"
+PLIST.polkit = yes
+.endif
+
+