Date: Tue, 9 Dec 2014 18:58:52 +0000 (UTC) From: Johannes Jost Meixner <xmj@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46078 - in head/en_US.ISO8859-1/books/handbook: desktop linuxemu Message-ID: <201412091858.sB9Iwq1j031593@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: xmj (ports committer) Date: Tue Dec 9 18:58:52 2014 New Revision: 46078 URL: https://svnweb.freebsd.org/changeset/doc/46078 Log: Rework desktop and linuxemu bits for c6. Now that ports defaults to CentOS 6.6, redo the relevant handbook bits, replacing Fedora 10 with CentOS 6.6. While there, improve the wording a little. Differential Revision: https://reviews.freebsd.org/D1117 Approved by: wblock, bcr Approved by: swills (mentor) Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Tue Dec 9 14:02:20 2014 (r46077) +++ head/en_US.ISO8859-1/books/handbook/desktop/chapter.xml Tue Dec 9 18:58:52 2014 (r46078) @@ -220,27 +220,16 @@ <procedure> <step> - <para>Install the <package>www/nspluginwrapper</package> + <para>Install <package role="port">www/nspluginwrapper</package> from the port. Due to licensing restrictions, a package is not available. This port requires - <package>emulators/linux_base-f10</package> which is a - large port.</para> + <package>emulators/linux_base-c6</package>.</para> </step> <step> - <para>Install the - <package>www/linux-f10-flashplugin11</package> port. Due - to licensing restrictions, a package is not - available.</para> - </step> - - <step> - <screen>&prompt.root; <userinput>ln -s /usr/local/lib/browser_plugins/linux-f10-flashplugin/libflashplayer.so \ - /usr/local/lib/browser_plugins/</userinput></screen> - - <para>Create the - <filename>/usr/local/lib/browser_plugins</filename> - directory if it is not already present.</para> + <para>Install <package role="port">www/linux-c6-flashplugin11</package> + from the port. Due to licensing restrictions, a package + is not available.</para> </step> <step> @@ -318,13 +307,12 @@ <literal>opera</literal>.</para> <para>To install &adobe; &flash; plugin support, first compile - the <package>www/linux-f10-flashplugin11</package> port, - as a package is not available due to licensing restrictions. - Then install either the - <package>www/opera-linuxplugins</package> port or package. + the <package role="port">www/linux-c6-flashplugin11</package> port. + Licensing restrictions prevent making a package available. + Then install <package role="port">www/opera-linuxplugins</package>. This example compiles both applications from ports:</para> - <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-f10-flashplugin11</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/www/linux-c6-flashplugin11</userinput> &prompt.root; <userinput>make install clean</userinput> &prompt.root; <userinput>cd /usr/ports/www/opera-linuxplugins</userinput> &prompt.root; <userinput>make install clean</userinput></screen> Modified: head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Tue Dec 9 14:02:20 2014 (r46077) +++ head/en_US.ISO8859-1/books/handbook/linuxemu/chapter.xml Tue Dec 9 18:58:52 2014 (r46078) @@ -120,17 +120,16 @@ 1 2 0xc0100000 16bdb8 kernel 7 1 0xc24db000 d000 linux.ko</screen> - <para>The <package>emulators/linux-base-f10</package> package or + <para>The <package>emulators/linux_base-c6</package> package or port is the easiest way to install a base set of &linux; libraries and binaries on a &os; system. To install the port:</para> - <screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base-f10</userinput> + <screen>&prompt.root; <userinput>cd /usr/ports/emulators/linux_base-c6</userinput> &prompt.root; <userinput>make install distclean</userinput></screen> - <para>In order for &linux; compatibility to be enabled at boot - time, add the following line to - <filename>/etc/rc.conf</filename>:</para> + <para>For &linux; compatibility to be enabled at boot time, + add this line to <filename>/etc/rc.conf</filename>:</para> <programlisting>linux_enable="YES"</programlisting> @@ -337,7 +336,7 @@ multi on</programlisting> <title>Running the &mathematica; Installer</title> <para>Before installing &mathematica;, make sure that the - <filename role="package">textproc/linux-f10-aspell</filename> + <filename role="package">textproc/linux-c6-aspell</filename> package or port is installed and that the &man.linprocfs.5; file system is mounted.</para>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412091858.sB9Iwq1j031593>