Attachment 136210 Details for Bug 181353 – file.diff

[patch] file.diff

file.diff (text/plain), 3.61 KB, created by Hendrik Lugtenburg on 2013-08-17 14:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hendrik Lugtenburg

Created: 2013-08-17 14:10:00 UTC

Size: 3.61 KB

patch

obsolete

>Index: books/handbook/x11/chapter.xml
>===================================================================
>--- books/handbook/x11/chapter.xml	(revision 42558)
>+++ books/handbook/x11/chapter.xml	(working copy)
>@@ -1581,15 +1581,6 @@
> 	  <application>KDE</application>, consult the <ulink
> 	  url="http://freebsd.kde.org/">KDE/FreeBSD
> 	  initiative</ulink>'s website.</para>
>-
>-	<para>There are two versions of
>-	  <application>KDE</application> available on FreeBSD.
>-	  Version 3 has been around for a long time, and is still
>-	  available in the Ports Collection though it's now
>-	  unmaintained and partially broken.  Version 4 is
>-	  punctually updated and is the default choice for
>-	  <application>KDE</application> users.  They can even be
>-	  installed side by side.</para>
>       </sect3>
> 
>       <sect3 id="x11-wm-kde-install">
>@@ -1599,30 +1590,23 @@
> 	  other desktop environment, the software can be easily
> 	  installed from a package or the Ports Collection:</para>
> 
>-	<para>To install the <application>KDE 3</application> package
>-	  from the network, type:</para>
>-
>-	<screen>&prompt.root; <userinput>pkg_add -r kde</userinput></screen>
>-
>-	<para>To install the <application>KDE 4</application> package
>-	  from the network, type:</para>
>-
> 	<screen>&prompt.root; <userinput>pkg_add -r kde4</userinput></screen>
> 
> 	<para>&man.pkg.add.1; will automatically fetch the latest
> 	  version of the application.</para>
>+  	<para>Or if you use <application>pkgng</application>:
>+	</para>
>+	<screen>&prompt.root; <userinput>pkg install kde4</userinput></screen>
> 
>-	<para>To build <application>KDE 3</application> from source,
>+	<para>To build <application>KDE</application> from source,
> 	  use the ports tree:</para>
> 
>-	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde3</userinput>
>-&prompt.root; <userinput>make install clean</userinput></screen>
>-
>-	<para>To build <application>KDE 4</application> from source,
>-	  use the ports tree:</para>
>-
> 	<screen>&prompt.root; <userinput>cd /usr/ports/x11/kde4</userinput>
> &prompt.root; <userinput>make install clean</userinput></screen>
>+	<para>This will pop up a curses based menu that let you choose
>+		which modules to install. Note that it is a very large port 
>+		and will take quite some time to compile.
>+	</para>
> 
> 	<para>After <application>KDE</application> has been installed,
> 	  the X server must be told to launch this application
>@@ -1629,12 +1613,6 @@
> 	  instead of the default window manager.  This is accomplished
> 	  by editing the <filename>.xinitrc</filename> file:</para>
> 
>-	<para>For <application>KDE 3</application>:</para>
>-
>-	<screen>&prompt.user; <userinput>echo "exec startkde" &gt; ~/.xinitrc</userinput></screen>
>-
>-	<para>For <application>KDE 4</application>:</para>
>-
> 	<screen>&prompt.user; <userinput>echo "exec /usr/local/kde4/bin/startkde" &gt; ~/.xinitrc</userinput></screen>
> 
> 	<para>Now, whenever the X Window System is invoked with
>@@ -1684,18 +1662,7 @@
> 	  <application>GNOME</application>, or something else) to
> 	  run after logging on.</para>
> 
>-	<para>To enable <application>KDM</application>, different
>-	  files need to be edited depending on the version of
>-	  <application>KDE</application>.</para>
>-
>-	<para>For <application>KDE 3</application>, the
>-	  <literal>ttyv8</literal> entry in
>-	  <filename>/etc/ttys</filename> has to be adapted as
>-	  follows:</para>
>-
>-	 <programlisting>ttyv8 "/usr/local/bin/kdm -nodaemon" xterm on secure</programlisting>
>-
>-	<para>For <application>KDE 4</application>, you have to mount
>+  <para>For <application>KDE 4</application>, you have to mount
> 	  &man.procfs.5; and add the following line to
> 	  <filename>/etc/rc.conf</filename>:</para>

Actions: View | Diff

Attachments on bug 181353: 136210 | 136211