Ticket #2376: 00_emacs

File 00_emacs, 3.6 KB (added by Jeremy Henty, 19 years ago)

Patch: updates BLFS to emacs-22.1

Line 
1diff -Naur -- 02-patched/BOOK/general.ent 03-working/BOOK/general.ent
2--- 02-patched/BOOK/general.ent 2007-08-13 01:29:41.000000000 +0100
3+++ 03-working/BOOK/general.ent 2007-08-15 21:59:27.000000000 +0100
4@@ -82,7 +82,7 @@
5
6 <!-- Chapter 6 -->
7 <!ENTITY vim-version "7.1">
8-<!ENTITY emacs-version "21.4a">
9+<!ENTITY emacs-version "22.1">
10 <!ENTITY nano-version "2.0.1">
11 <!ENTITY joe-version "3.5">
12 <!ENTITY ed-version "0.2">
13diff -Naur -- 02-patched/BOOK/postlfs/editors/emacs.xml 03-working/BOOK/postlfs/editors/emacs.xml
14--- 02-patched/BOOK/postlfs/editors/emacs.xml 2007-08-12 15:34:20.000000000 +0100
15+++ 03-working/BOOK/postlfs/editors/emacs.xml 2007-08-16 19:57:51.000000000 +0100
16@@ -6,10 +6,10 @@
17
18 <!ENTITY emacs-download-http "http://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
19 <!ENTITY emacs-download-ftp "ftp://ftp.gnu.org/pub/gnu/emacs/emacs-&emacs-version;.tar.gz">
20- <!ENTITY emacs-md5sum "8f9d97cbd126121bd5d97e5e31168a87">
21- <!ENTITY emacs-size "20.4 MB">
22- <!ENTITY emacs-buildsize "96.8 MB">
23- <!ENTITY emacs-time "4.2 SBU">
24+ <!ENTITY emacs-md5sum "6949df37caec2d7a2e0eee3f1b422726">
25+ <!ENTITY emacs-size "36.4 MB">
26+ <!ENTITY emacs-buildsize "260 MB">
27+ <!ENTITY emacs-time "3.3 SBU">
28 ]>
29
30 <sect1 id="emacs" xreflabel="Emacs-&emacs-version;">
31@@ -54,14 +54,6 @@
32 </listitem>
33 </itemizedlist>
34
35- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
36- <itemizedlist spacing="compact">
37- <listitem>
38- <para>Required patch: <ulink
39- url="&patch-root;/emacs-&emacs-version;-altgr-1.patch"/></para>
40- </listitem>
41- </itemizedlist>
42-
43 <bridgehead renderas="sect3">Emacs Dependencies</bridgehead>
44
45 <bridgehead renderas="sect4">Optional</bridgehead>
46@@ -82,23 +74,18 @@
47 <sect2 role="installation">
48 <title>Installation of Emacs</title>
49
50- <para>In some circumstances, the AltGr modifier key present on some
51- keyboards is not recognized. Ensure that it is by applying the
52- following patch:</para>
53-
54-<screen><userinput>patch -Np1 -i ../emacs-&emacs-version;-altgr-1.patch</userinput></screen>
55-
56 <para>Install <application>Emacs</application> by running the following
57 commands:</para>
58
59-<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
60+<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib --localstatedir=/var &amp;&amp;
61 make bootstrap</userinput></screen>
62
63 <para>This package does not come with a test suite.</para>
64
65 <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
66
67-<screen role="root"><userinput>make install</userinput></screen>
68+<screen role="root"><userinput>make install &amp;&amp;
69+chown -v -R root:root /usr/share/emacs/&emacs-version;</userinput></screen>
70
71 </sect2>
72
73@@ -108,6 +95,11 @@
74 <para><option>--libexecdir=/usr/lib</option>: Place library
75 executables in a Filesystem Hierarchy Standard (FHS) location.</para>
76
77+ <para><option>--localstatedir=/var</option>: Create game
78+ score files
79+ in <filename class='directory'>/var/games/emacs</filename> instead
80+ of <filename class='directory'>/usr/var/games/emacs</filename>.</para>
81+
82 </sect2>
83
84 <sect2 role="content">
85@@ -122,7 +114,7 @@
86 <seg>b2m, ctags, ebrowse, emacs, emacsclient, etags, grep-changelog,
87 and rcs-checkin</seg>
88 <seg>None</seg>
89- <seg>/usr/lib/emacs and /usr/share/emacs</seg>
90+ <seg>/usr/lib/emacs, /usr/share/emacs and /var/games/emacs</seg>
91 </seglistitem>
92 </segmentedlist>
93