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 <alane@geeksrus.net>
This commit is contained in:
Pete Fritchman 2002-03-03 04:18:22 +00:00
parent 79d8385b49
commit af63e016fd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=55444
16 changed files with 104 additions and 24 deletions

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);

View file

@ -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

View file

@ -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);