Sat Mar 30 05:18:11 2019 UTC ()
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.


(gutteridge)
diff -r1.22 -r1.23 pkgsrc/x11/mate-settings-daemon/Makefile
diff -r1.8 -r1.9 pkgsrc/x11/mate-settings-daemon/PLIST
cvs diff -r1.22 -r1.23 pkgsrc/x11/mate-settings-daemon/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/mate-settings-daemon/Makefile 2019/03/06 07:42:03 1.22
+++ pkgsrc/x11/mate-settings-daemon/Makefile 2019/03/30 05:18:11 1.23
@@ -1,28 +1,32 @@ @@ -1,28 +1,32 @@
1# $NetBSD: Makefile,v 1.22 2019/03/06 07:42:03 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.23 2019/03/30 05:18:11 gutteridge Exp $
2 2
3.include "../../meta-pkgs/mate/Makefile.common" 3.include "../../meta-pkgs/mate/Makefile.common"
4 4
5DISTNAME= mate-settings-daemon-${VERSION} 5DISTNAME= mate-settings-daemon-${VERSION}
6CATEGORIES= x11 6CATEGORIES= x11
7 7
8COMMENT= MATE settings daemon 8COMMENT= MATE settings daemon
9 9
10PKGCONFIG_OVERRIDE+= data/mate-settings-daemon.pc.in 10PKGCONFIG_OVERRIDE+= data/mate-settings-daemon.pc.in
11 11
12CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 12CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
13 13
 14PLIST_VARS+= rfkill
 15
14.if ${OPSYS} != "Linux" 16.if ${OPSYS} != "Linux"
15CONFIGURE_ARGS+= --disable-rfkill 17CONFIGURE_ARGS+= --disable-rfkill
 18.else
 19PLIST.rfkill= yes
16.endif 20.endif
17 21
18.include "options.mk" 22.include "options.mk"
19 23
20INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/mate-settings-daemon 24INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/mate-settings-daemon
21 25
22MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart 26MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
23OWN_DIRS+= ${PKG_SYSCONFDIR}/mate-settings-daemon/xrandr 27OWN_DIRS+= ${PKG_SYSCONFDIR}/mate-settings-daemon/xrandr
24CONF_FILES+= ${PREFIX}/share/examples/mate-settings-daemon/xdg/autostart/mate-settings-daemon.desktop \ 28CONF_FILES+= ${PREFIX}/share/examples/mate-settings-daemon/xdg/autostart/mate-settings-daemon.desktop \
25 ${PKG_SYSCONFDIR}/xdg/autostart/mate-settings-daemon.desktop 29 ${PKG_SYSCONFDIR}/xdg/autostart/mate-settings-daemon.desktop
26 30
27.include "../../devel/glib2/schemas.mk" 31.include "../../devel/glib2/schemas.mk"
28.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 32.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/x11/mate-settings-daemon/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/mate-settings-daemon/PLIST 2019/01/18 10:05:53 1.8
+++ pkgsrc/x11/mate-settings-daemon/PLIST 2019/03/30 05:18:11 1.9
@@ -1,49 +1,52 @@ @@ -1,49 +1,52 @@
1@comment $NetBSD: PLIST,v 1.8 2019/01/18 10:05:53 martin Exp $ 1@comment $NetBSD: PLIST,v 1.9 2019/03/30 05:18:11 gutteridge Exp $
2include/mate-settings-daemon/mate-settings-client.h 2include/mate-settings-daemon/mate-settings-client.h
3include/mate-settings-daemon/mate-settings-plugin.h 3include/mate-settings-daemon/mate-settings-plugin.h
4lib/mate-settings-daemon/a11y-keyboard.mate-settings-plugin 4lib/mate-settings-daemon/a11y-keyboard.mate-settings-plugin
5lib/mate-settings-daemon/a11y-settings.mate-settings-plugin 5lib/mate-settings-daemon/a11y-settings.mate-settings-plugin
6lib/mate-settings-daemon/background.mate-settings-plugin 6lib/mate-settings-daemon/background.mate-settings-plugin
7lib/mate-settings-daemon/clipboard.mate-settings-plugin 7lib/mate-settings-daemon/clipboard.mate-settings-plugin
8lib/mate-settings-daemon/housekeeping.mate-settings-plugin 8lib/mate-settings-daemon/housekeeping.mate-settings-plugin
9lib/mate-settings-daemon/keybindings.mate-settings-plugin 9lib/mate-settings-daemon/keybindings.mate-settings-plugin
10lib/mate-settings-daemon/keyboard.mate-settings-plugin 10lib/mate-settings-daemon/keyboard.mate-settings-plugin
11lib/mate-settings-daemon/liba11y-keyboard.la 11lib/mate-settings-daemon/liba11y-keyboard.la
12lib/mate-settings-daemon/liba11y-settings.la 12lib/mate-settings-daemon/liba11y-settings.la
13lib/mate-settings-daemon/libbackground.la 13lib/mate-settings-daemon/libbackground.la
14lib/mate-settings-daemon/libclipboard.la 14lib/mate-settings-daemon/libclipboard.la
15lib/mate-settings-daemon/libhousekeeping.la 15lib/mate-settings-daemon/libhousekeeping.la
16lib/mate-settings-daemon/libkeybindings.la 16lib/mate-settings-daemon/libkeybindings.la
17lib/mate-settings-daemon/libkeyboard.la 17lib/mate-settings-daemon/libkeyboard.la
18lib/mate-settings-daemon/libmedia-keys.la 18lib/mate-settings-daemon/libmedia-keys.la
19lib/mate-settings-daemon/libmouse.la 19lib/mate-settings-daemon/libmouse.la
20lib/mate-settings-daemon/libmpris.la 20lib/mate-settings-daemon/libmpris.la
 21${PLIST.rfkill}lib/mate-settings-daemon/librfkill.la
21${PLIST.nss}lib/mate-settings-daemon/libsmartcard.la 22${PLIST.nss}lib/mate-settings-daemon/libsmartcard.la
22lib/mate-settings-daemon/libsound.la 23lib/mate-settings-daemon/libsound.la
23lib/mate-settings-daemon/libtyping-break.la 24lib/mate-settings-daemon/libtyping-break.la
24lib/mate-settings-daemon/libxrandr.la 25lib/mate-settings-daemon/libxrandr.la
25lib/mate-settings-daemon/libxrdb.la 26lib/mate-settings-daemon/libxrdb.la
26lib/mate-settings-daemon/libxsettings.la 27lib/mate-settings-daemon/libxsettings.la
27lib/mate-settings-daemon/media-keys.mate-settings-plugin 28lib/mate-settings-daemon/media-keys.mate-settings-plugin
28lib/mate-settings-daemon/mouse.mate-settings-plugin 29lib/mate-settings-daemon/mouse.mate-settings-plugin
29lib/mate-settings-daemon/mpris.mate-settings-plugin 30lib/mate-settings-daemon/mpris.mate-settings-plugin
 31${PLIST.rfkill}lib/mate-settings-daemon/rfkill.mate-settings-plugin
30${PLIST.nss}lib/mate-settings-daemon/smartcard.mate-settings-plugin 32${PLIST.nss}lib/mate-settings-daemon/smartcard.mate-settings-plugin
31lib/mate-settings-daemon/sound.mate-settings-plugin 33lib/mate-settings-daemon/sound.mate-settings-plugin
32lib/mate-settings-daemon/typing-break.mate-settings-plugin 34lib/mate-settings-daemon/typing-break.mate-settings-plugin
33lib/mate-settings-daemon/xrandr.mate-settings-plugin 35lib/mate-settings-daemon/xrandr.mate-settings-plugin
34lib/mate-settings-daemon/xrdb.mate-settings-plugin 36lib/mate-settings-daemon/xrdb.mate-settings-plugin
35lib/mate-settings-daemon/xsettings.mate-settings-plugin 37lib/mate-settings-daemon/xsettings.mate-settings-plugin
36lib/pkgconfig/mate-settings-daemon.pc 38lib/pkgconfig/mate-settings-daemon.pc
 39${PLIST.rfkill}lib/udev/rules.d/61-mate-settings-daemon-rfkill.rules
37libexec/mate-settings-daemon 40libexec/mate-settings-daemon
38${PLIST.polkit}libexec/msd-datetime-mechanism 41${PLIST.polkit}libexec/msd-datetime-mechanism
39libexec/msd-locate-pointer 42libexec/msd-locate-pointer
40man/man1/mate-settings-daemon.1 43man/man1/mate-settings-daemon.1
41man/man1/msd-datetime-mechanism.1 44man/man1/msd-datetime-mechanism.1
42man/man1/msd-locate-pointer.1 45man/man1/msd-locate-pointer.1
43share/dbus-1/services/org.mate.SettingsDaemon.service 46share/dbus-1/services/org.mate.SettingsDaemon.service
44${PLIST.polkit}share/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service 47${PLIST.polkit}share/dbus-1/system-services/org.mate.SettingsDaemon.DateTimeMechanism.service
45${PLIST.polkit}share/examples/mate-settings-daemon/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf 48${PLIST.polkit}share/examples/mate-settings-daemon/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
46share/examples/mate-settings-daemon/xdg/autostart/mate-settings-daemon.desktop 49share/examples/mate-settings-daemon/xdg/autostart/mate-settings-daemon.desktop
47share/examples/mate-settings-daemon/xrdb/Editres.ad 50share/examples/mate-settings-daemon/xrdb/Editres.ad
48share/examples/mate-settings-daemon/xrdb/Emacs.ad 51share/examples/mate-settings-daemon/xrdb/Emacs.ad
49share/examples/mate-settings-daemon/xrdb/General.ad 52share/examples/mate-settings-daemon/xrdb/General.ad