CVS commit: pkgsrc/x11/mate-settings-daemon

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Mar 30 05:18:11 UTC 2019

Modified Files:
        pkgsrc/x11/mate-settings-daemon: Makefile PLIST

Log Message:
mate-settings-daemon: build fix for Linux (rfkill)

Handle rfkill being enabled on Linux builds by conditionalizing this
in the PLIST. Build fix for Linux only, does not affect other OSes.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/mate-settings-daemon/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/mate-settings-daemon/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/mate-settings-daemon/Makefile
diff -u pkgsrc/x11/mate-settings-daemon/Makefile:1.22 pkgsrc/x11/mate-settings-daemon/Makefile:1.23
--- pkgsrc/x11/mate-settings-daemon/Makefile:1.22       Wed Mar  6 07:42:03 2019
+++ pkgsrc/x11/mate-settings-daemon/Makefile    Sat Mar 30 05:18:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/03/06 07:42:03 gutteridge Exp $
+# $NetBSD: Makefile,v 1.23 2019/03/30 05:18:11 gutteridge Exp $
 
 .include "../../meta-pkgs/mate/Makefile.common"
 
@@ -11,8 +11,12 @@ PKGCONFIG_OVERRIDE+= data/mate-settings-
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+PLIST_VARS+=           rfkill
+
 .if ${OPSYS} != "Linux"
 CONFIGURE_ARGS+=       --disable-rfkill
+.else
+PLIST.rfkill=          yes
 .endif
 
 .include "options.mk"

Index: pkgsrc/x11/mate-settings-daemon/PLIST
diff -u pkgsrc/x11/mate-settings-daemon/PLIST:1.8 pkgsrc/x11/mate-settings-daemon/PLIST:1.9
--- pkgsrc/x11/mate-settings-daemon/PLIST:1.8   Fri Jan 18 10:05:53 2019
+++ pkgsrc/x11/mate-settings-daemon/PLIST       Sat Mar 30 05:18:11 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/01/18 10:05:53 martin Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/03/30 05:18:11 gutteridge Exp $
 include/mate-settings-daemon/mate-settings-client.h
 include/mate-settings-daemon/mate-settings-plugin.h
 lib/mate-settings-daemon/a11y-keyboard.mate-settings-plugin
@@ -18,6 +18,7 @@ lib/mate-settings-daemon/libkeyboard.la
 lib/mate-settings-daemon/libmedia-keys.la
 lib/mate-settings-daemon/libmouse.la
 lib/mate-settings-daemon/libmpris.la
+${PLIST.rfkill}lib/mate-settings-daemon/librfkill.la
 ${PLIST.nss}lib/mate-settings-daemon/libsmartcard.la
 lib/mate-settings-daemon/libsound.la
 lib/mate-settings-daemon/libtyping-break.la
@@ -27,6 +28,7 @@ lib/mate-settings-daemon/libxsettings.la
 lib/mate-settings-daemon/media-keys.mate-settings-plugin
 lib/mate-settings-daemon/mouse.mate-settings-plugin
 lib/mate-settings-daemon/mpris.mate-settings-plugin
+${PLIST.rfkill}lib/mate-settings-daemon/rfkill.mate-settings-plugin
 ${PLIST.nss}lib/mate-settings-daemon/smartcard.mate-settings-plugin
 lib/mate-settings-daemon/sound.mate-settings-plugin
 lib/mate-settings-daemon/typing-break.mate-settings-plugin
@@ -34,6 +36,7 @@ lib/mate-settings-daemon/xrandr.mate-set
 lib/mate-settings-daemon/xrdb.mate-settings-plugin
 lib/mate-settings-daemon/xsettings.mate-settings-plugin
 lib/pkgconfig/mate-settings-daemon.pc
+${PLIST.rfkill}lib/udev/rules.d/61-mate-settings-daemon-rfkill.rules
 libexec/mate-settings-daemon
 ${PLIST.polkit}libexec/msd-datetime-mechanism
 libexec/msd-locate-pointer