summaryrefslogtreecommitdiff
path: root/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2002-04-21 23:47:50 +0000
committerWill Andrews <will@FreeBSD.org>2002-04-21 23:47:50 +0000
commitd1c2f0dddd4a74a79847b017915f3482671e055c (patch)
tree31ccd02a7c0d295ec66bf2eefa0f980fbb92cb91 /x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c
parentUpdate module: status. (diff)
Please welcome Qt3/KDE3 to our ports tree. This includes work since the
original versions of these ports, so some PORTREVISIONs were bumped. See http://freebsd.kde.org/ and mailing lists linked to from there for info on the packages generated to test these ports. bsd.kde.mk has already been updated a few days ago to work with these. Some patches applied to fix a few bugs were: deskutils/kdepim3: [1] Remove kpilot from build because it wasn't ready at release. editors/koffice-kde3: [2] Fix compile time bugs for FreeBSD. misc/kdeedu3: [3] Fix compile problem with kvoctrain. x11/kdebase3: [4] Fix KDM CPU usage and login bug. Some caveats: * All PLISTs are broken for deinstall due to script bug that I didn't notice until very recently. This will be fixed when I commit an update tomorrow. These ports should still install perfectly fine though. They should also deinstall without giving errors, but will leave directories behind. * You can't install this with any other version of QT or KDE already installed. I am not sure the checks are 100% working, but fixes for these will be forthcoming. This is mainly due to a policy decision made by kde@ to make QT/KDE ports install the way the rest of the world expects it to while also still conforming to FreeBSD's hier(7). For reference on this decision, please consult the KDE/FreeBSD mailing list archives. This decision fixes 2-year-old bug reports relating to how we handled this for KDE2 vs KDE1. Submitted by: [1] Adrian de Groot <adridg@cs.kun.nl>, [2] David Faure <faure@kde.org>, Andy Fawcett <andy@athame.co.uk> Lauri Watts <lauri@kde.org> [3] Lauri Watts <lauri@kde.org> [4] Alan Eldridge <alane@geeksrus.net> Oswald Buddenhagen <ossi@kde.org> Reviewed by: kde
Notes
Notes: svn path=/head/; revision=57964
Diffstat (limited to '')
-rw-r--r--x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c
deleted file mode 100644
index 2c852c344aac..000000000000
--- a/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- kdm/kfrontend/genkdmconf.c.orig Mon Nov 5 21:40:03 2001
-+++ kdm/kfrontend/genkdmconf.c Fri Feb 22 19:34:28 2002
-@@ -212,7 +212,7 @@
- */
-
- #ifndef HALT_CMD
--# ifdef BSD
-+# if defined(BSD) || defined(__FreeBSD__)
- # define HALT_CMD "/sbin/shutdown -h now"
- # define REBOOT_CMD "/sbin/shutdown -r now"
- # elif defined(__SVR4)
-@@ -1605,8 +1605,8 @@
- "chown $USER /dev/console\n"
- #endif
- "\n"
--"#exec sessreg -a -l $DISPLAY "
--#ifdef BSD
-+"exec sessreg -a -l $DISPLAY "
-+#if defined(BSD) || defined(__FreeBSD__)
- "-x " KDMCONF "/Xservers "
- #endif
- "$USER\n"
-@@ -1627,8 +1627,8 @@
- "chmod 622 /dev/console\n"
- #endif
- "\n"
--"#exec sessreg -d -l $DISPLAY "
--#ifdef BSD
-+"exec sessreg -d -l $DISPLAY "
-+#if defined(BSD) || defined(__FreeBSD__)
- "-x " KDMCONF "/Xservers "
- #endif
- "$USER\n"
-@@ -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);
-- ASPrintf (&newkdmrc, "%s/kdmrc", newdir);
-+ ASPrintf (&newkdmrc, "%s/kdmrc.dist", newdir);
- f = Create (newkdmrc, kdmrcmode);
- wrconf (f);
- fclose (f);