svn commit: r433837 - in head/x11/lightdm: . files

[Ben Woods]

Author: woodsb02
Date: Sat Feb 11 07:09:56 2017
New Revision: 433837
URL: https://svnweb.freebsd.org/changeset/ports/433837

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

Modified:
  head/x11/lightdm/Makefile
  head/x11/lightdm/files/Xsession.in

Modified: head/x11/lightdm/Makefile
==============================================================================
--- head/x11/lightdm/Makefile	Sat Feb 11 05:23:19 2017	(r433836)
+++ head/x11/lightdm/Makefile	Sat Feb 11 07:09:56 2017	(r433837)
@@ -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/
 

Modified: head/x11/lightdm/files/Xsession.in
==============================================================================
--- head/x11/lightdm/files/Xsession.in	Sat Feb 11 05:23:19 2017	(r433836)
+++ head/x11/lightdm/files/Xsession.in	Sat Feb 11 07:09:56 2017	(r433837)
@@ -15,7 +15,7 @@ for file in "%%LOCALBASE%%/etc/profile" 
 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/Xreso
 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"