pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/mate-settings-daemon mate-settings-daemon: build f...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1cf71778fb6
branches:  trunk
changeset: 393961:e1cf71778fb6
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Sat Mar 30 05:18:11 2019 +0000

description:
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.

diffstat:

 x11/mate-settings-daemon/Makefile |  6 +++++-
 x11/mate-settings-daemon/PLIST    |  5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 21be2576839b -r e1cf71778fb6 x11/mate-settings-daemon/Makefile
--- a/x11/mate-settings-daemon/Makefile Fri Mar 29 21:31:18 2019 +0000
+++ b/x11/mate-settings-daemon/Makefile Sat Mar 30 05:18:11 2019 +0000
@@ -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 @@
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+PLIST_VARS+=           rfkill
+
 .if ${OPSYS} != "Linux"
 CONFIGURE_ARGS+=       --disable-rfkill
+.else
+PLIST.rfkill=          yes
 .endif
 
 .include "options.mk"
diff -r 21be2576839b -r e1cf71778fb6 x11/mate-settings-daemon/PLIST
--- a/x11/mate-settings-daemon/PLIST    Fri Mar 29 21:31:18 2019 +0000
+++ b/x11/mate-settings-daemon/PLIST    Sat Mar 30 05:18:11 2019 +0000
@@ -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/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/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/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



Home | Main Index | Thread Index | Old Index