CVS commit: pkgsrc/x11/xfce4-session

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Sun Dec  4 13:50:08 UTC 2016

Modified Files:
        pkgsrc/x11/xfce4-session: Makefile PLIST
Added Files:
        pkgsrc/x11/xfce4-session: options.mk

Log Message:
Make the "polkit" dependency optional


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/x11/xfce4-session/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xfce4-session/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xfce4-session/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/x11/xfce4-session/Makefile
diff -u pkgsrc/x11/xfce4-session/Makefile:1.55 pkgsrc/x11/xfce4-session/Makefile:1.56
--- pkgsrc/x11/xfce4-session/Makefile:1.55      Wed Aug  3 10:23:39 2016
+++ pkgsrc/x11/xfce4-session/Makefile   Sun Dec  4 13:50:08 2016
@@ -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"

Index: pkgsrc/x11/xfce4-session/PLIST
diff -u pkgsrc/x11/xfce4-session/PLIST:1.18 pkgsrc/x11/xfce4-session/PLIST:1.19
--- pkgsrc/x11/xfce4-session/PLIST:1.18 Sat Jun  4 15:13:27 2016
+++ pkgsrc/x11/xfce4-session/PLIST      Sun Dec  4 13:50:08 2016
@@ -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-sessio
 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

Added files:

Index: pkgsrc/x11/xfce4-session/options.mk
diff -u /dev/null pkgsrc/x11/xfce4-session/options.mk:1.1
--- /dev/null   Sun Dec  4 13:50:08 2016
+++ pkgsrc/x11/xfce4-session/options.mk Sun Dec  4 13:50:08 2016
@@ -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
+
+