From af63e016fda581a59ab79f971dbafbaf209f8b8f Mon Sep 17 00:00:00 2001 From: Pete Fritchman Date: Sun, 3 Mar 2002 04:18:22 +0000 Subject: Make the "default" target failback on KDE if the user doesn't have a .xsession file. Before this fix, kdm wouldn't log the user in with "default" if no .xsession existed.. but it seems to make sense that KDE's display manager should fall back to KDE by default. Bump PORTREVISION. PR: 35223 Submitted by: Alan E --- x11/kdebase4-workspace/Makefile | 2 +- .../files/patch-kdm::kfrontend::genkdmconf.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'x11/kdebase4-workspace') diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index f5be27d77504..8c4aa2a9dfb5 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= kdebase PORTVERSION= 2.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c index d520f23414ba..2c852c344aac 100644 --- a/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c +++ b/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c @@ -1,5 +1,5 @@ --- kdm/kfrontend/genkdmconf.c.orig Mon Nov 5 21:40:03 2001 -+++ kdm/kfrontend/genkdmconf.c Sat Jan 5 23:49:40 2002 ++++ kdm/kfrontend/genkdmconf.c Fri Feb 22 19:34:28 2002 @@ -212,7 +212,7 @@ */ @@ -31,7 +31,17 @@ "-x " KDMCONF "/Xservers " #endif "$USER\n" -@@ -1781,7 +1781,7 @@ +@@ -1658,7 +1658,8 @@ + " exec xterm -geometry 80x24-0-0 $*\n" + " ;;\n" + " \"\"|default)\n" +-" exec $HOME/.xsession $*\n" ++" test -x $HOME/.xsession && exec $HOME/.xsession $*\n" ++" sess=kde\n" + " ;;\n" + "esac\n" + "\n" +@@ -1781,7 +1782,7 @@ } addKdePath ("UserPath", DEF_USER_PATH); addKdePath ("SystemPath", DEF_SYSTEM_PATH); -- cgit v1.2.3