diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2017-02-11 07:09:56 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2017-02-11 07:09:56 +0000 |
| commit | eae391e7b39f4136d6b86b4bdc694fea922170d8 (patch) | |
| tree | 3442a1a8abf205944af27a91f374c976c4cb885b | |
| parent | shells/fish: fix completions for python (diff) | |
x11/lightdm: Make Xsession check for more system-wide config files
Xresources, Xkbmap and Xmodmap will now be read if they are found in
%%LOCALBASE%%/etc/X11/ or %%LOCALBASE%%/etc/X11/xinit/
with or without a "." prefix.
User-specific versions are still also found in $HOME/ with a "." prefix.
Notes
Notes:
svn path=/head/; revision=433837
| -rw-r--r-- | x11/lightdm/Makefile | 2 | ||||
| -rw-r--r-- | x11/lightdm/files/Xsession.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile index 0a8d1cf9de31..be3ffb1d2fba 100644 --- a/x11/lightdm/Makefile +++ b/x11/lightdm/Makefile @@ -3,7 +3,7 @@ PORTNAME= lightdm PORTVERSION= 1.20.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ diff --git a/x11/lightdm/files/Xsession.in b/x11/lightdm/files/Xsession.in index 76de7d9060a9..feec550a1ef3 100644 --- a/x11/lightdm/files/Xsession.in +++ b/x11/lightdm/files/Xsession.in @@ -15,7 +15,7 @@ for file in "%%LOCALBASE%%/etc/profile" "$HOME/.profile" "%%LOCALBASE%%/etc/xpro done # Load resources -for file in "%%LOCALBASE%%/etc/X11/Xresources" "$HOME/.Xresources"; do +for file in "%%LOCALBASE%%/etc/X11/Xresources" "%%LOCALBASE%%/etc/X11/.Xresources" "%%LOCALBASE%%/etc/X11/xinit/Xresources" "%%LOCALBASE%%/etc/X11/xinit/.Xresources" "$HOME/.Xresources"; do if [ -f "$file" ]; then echo "Loading resource: $file" xrdb -merge "$file" @@ -23,7 +23,7 @@ for file in "%%LOCALBASE%%/etc/X11/Xresources" "$HOME/.Xresources"; do done # Load keymaps -for file in "%%LOCALBASE%%/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do +for file in "%%LOCALBASE%%/etc/X11/Xkbmap" "%%LOCALBASE%%/etc/X11/.Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/.Xkbmap" "$HOME/.Xkbmap"; do if [ -f "$file" ]; then echo "Loading keymap: $file" setxkbmap `cat "$file"` @@ -33,7 +33,7 @@ done # Load xmodmap if not using XKB if [ -z "$XKB_IN_USE" ]; then - for file in "%%LOCALBASE%%/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do + for file in "%%LOCALBASE%%/etc/X11/Xmodmap" "%%LOCALBASE%%/etc/X11/.Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/Xkbmap" "%%LOCALBASE%%/etc/X11/xinit/.Xkbmap" "$HOME/.Xmodmap"; do if [ -f "$file" ]; then echo "Loading modmap: $file" xmodmap "$file" |