diff options
| -rw-r--r-- | Attic/appendixd/vim.xml | 5 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 15 | ||||
| -rw-r--r-- | chapter04/vim.xml | 10 | ||||
| -rw-r--r-- | chapter06/vim-inst.xml | 39 | ||||
| -rw-r--r-- | index.xml | 37 |
5 files changed, 62 insertions, 44 deletions
diff --git a/Attic/appendixd/vim.xml b/Attic/appendixd/vim.xml index dcabb757a..e89efca3c 100644 --- a/Attic/appendixd/vim.xml +++ b/Attic/appendixd/vim.xml @@ -1,6 +1,3 @@ -Vim-rt (&vim-version;): -<ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink> - -Vim-src (&vim-version;): +Vim (&vim-version;): <ulink url="ftp://ftp.vim.org/pub/editors/vim/unix/">ftp://ftp.vim.org/pub/editors/vim/unix/</ulink> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 5dce65d60..72a9c146f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -11,13 +11,24 @@ <itemizedlist> <listitem><para>e2fsprogs-1.25</para></listitem> <listitem><para>gettext-0.10.40</para></listitem> +<listitem><para>libtool-1.4.2</para></listitem> +<listitem><para>lilo-22.0</para></listitem> <listitem><para>linux-2.4.10</para></listitem> -<listitem><para>modutils-2.4.9</para></listitem> -<listitem><para>util-linux-2.11i</para></listitem> +<listitem><para>man-pages-1.40</para></listitem> +<listitem><para>modutils-2.4.10</para></listitem> +<listitem><para>sysvinit-2.83</para></listitem> +<listitem><para>util-linux-2.11l</para></listitem> +<listitem><para>vim-6.0</para></listitem> </itemizedlist> </para></listitem> +<listitem><para>October 7th, 2001 [gerard]: Chapter 6 - Vim: Changed the +installation instructions to fix a bug in vim-6.0's +<filename>syntax/sh.vim</filename> file, and added the CPPFLAGS variable +to specify the global vimrc file as +<filename>/etc/vimrc</filename></para></listitem> + <listitem><para>October 2nd, 2001 [gerard]: Chapter 9 - The End: Added the reference to the LFS Counter at <ulink url="http://linuxfromscratch.org/cgi-bin/lfscounter.cgi"> diff --git a/chapter04/vim.xml b/chapter04/vim.xml index 6237cd2a3..b1c9fd561 100644 --- a/chapter04/vim.xml +++ b/chapter04/vim.xml @@ -1,8 +1,4 @@ -Vim-rt (&vim-version;) - &vim-rt-size;: -<ulink url="&ftp;/vim-&vim-version;-rt.tar.bz2">&ftp;/vim-&vim-version;-rt.tar.bz2</ulink> -<ulink url="&http;/vim-&vim-version;-rt.tar.bz2">&http;/vim-&vim-version;-rt.tar.bz2</ulink> - -Vim-src (&vim-version;) - &vim-src-size;: -<ulink url="&ftp;/vim-&vim-version;-src.tar.bz2">&ftp;/vim-&vim-version;-src.tar.bz2</ulink> -<ulink url="&http;/vim-&vim-version;-src.tar.bz2">&http;/vim-&vim-version;-src.tar.bz2</ulink> +Vim (&vim-version;) - &vim-size;: +<ulink url="&ftp;/vim-&vim-version;.tar.bz2">&ftp;/vim-&vim-version;.tar.bz2</ulink> +<ulink url="&http;/vim-&vim-version;.tar.bz2">&http;/vim-&vim-version;.tar.bz2</ulink> diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index 5ec6ae396..1e25a0f17 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -7,15 +7,20 @@ prefer. There are a few hints how to install different editors available at <ulink url="&hints-root;">&hints-root;</ulink>. The hints which are currently available are for Emacs, Joe and nano.</para> -<para>Both the vim-rt and vim-src packages need to be unpacked to install Vim. -Both packages will unpack their files into the vim-&vim-version; directory. This -won't overwrite any files from the other package. So it doesn't matter -in which order it is done. Install Vim by running the following commands:</para> +<para>Install Vim by running the following commands:</para> -<para><screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> \ - src/feature.h &&</userinput> +<para><screen><userinput>sed '/shUntil\|link shRepeat/{</userinput> +<userinput> /shUntil/N</userinput> +<userinput> /^/i\</userinput> +<userinput> if exists("b:is_kornshell") || exists("b:is_bash")</userinput> +<userinput> p</userinput> +<userinput> /$/i\</userinput> +<userinput> endif</userinput> +<userinput> d</userinput> +<userinput> }' runtime/syntax/sh.vim > sh.vim.fixed &&</userinput> +<userinput>mv sh.vim.fixed runtime/syntax/sh.vim &&</userinput> <userinput>./configure --prefix=/usr &&</userinput> -<userinput>make &&</userinput> +<userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> <userinput>ln -sf vim vi</userinput></screen></para> @@ -36,14 +41,24 @@ for their temporary state files, like temporary save files for example. If you wish vim to conform to the FHS, you should use this command set instead of the one presented above:</para> -<para><screen><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> \ - src/feature.h &&</userinput> +<para><screen><userinput>sed '/shUntil\|link shRepeat/{</userinput> +<userinput> /shUntil/N</userinput> +<userinput> /^/i\</userinput> +<userinput> if exists("b:is_kornshell") || +exists("b:is_bash")</userinput> +<userinput> p</userinput> +<userinput> /$/i\</userinput> +<userinput> endif</userinput> +<userinput> d</userinput> +<userinput> }' runtime/syntax/sh.vim > sh.vim.fixed +&&</userinput> +<userinput>mv sh.vim.fixed runtime/syntax/sh.vim &&</userinput> <userinput>./configure --prefix=/usr --localstatedir=/var/lib/vim &&</userinput> -<userinput>make &&</userinput> +<userinput>make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" +&&</userinput> <userinput>make install &&</userinput> <userinput>cd /usr/bin &&</userinput> -<userinput>ln -sf vim vi &&</userinput> -<userinput>mkdir /var/lib/vim</userinput></screen></para> +<userinput>ln -sf vim vi</userinput></screen></para> </sect2> @@ -4,8 +4,8 @@ <!ENTITY book SYSTEM "book/book.xml"> -<!ENTITY version "20011006"> -<!ENTITY releasedate "October 6th, 2001"> +<!ENTITY version "20011007"> +<!ENTITY releasedate "October 7th, 2001"> <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org"> <!ENTITY http-root "http://ftp.linuxfromscratch.org"> @@ -632,9 +632,9 @@ <!ENTITY ad-netkitbase SYSTEM "appendixd/netkitbase.xml"> <!ENTITY ad-nettools SYSTEM "appendixd/nettools.xml"> -<!ENTITY all-version "cvs-20010926-0930"> -<!ENTITY all-size-kb "78,500 KB"> -<!ENTITY all-size-mb "76.66 MB"> +<!ENTITY all-version "cvs-20011007-1758"> +<!ENTITY all-size-kb "78,460 KB"> +<!ENTITY all-size-mb "76.62 MB"> <!ENTITY bootscripts-version "cvs-20010907-2249"> @@ -800,9 +800,9 @@ <!ENTITY makedev-compsize "57 KB"> <!ENTITY makedev-time "1 minute"> -<!ENTITY man-pages-version "1.39"> +<!ENTITY man-pages-version "1.40"> <!ENTITY man-pages-depversion "1.39"> -<!ENTITY man-pages-size "489 KB"> +<!ENTITY man-pages-size "495 KB"> <!ENTITY man-pages-patch-size "2 KB"> <!ENTITY man-pages-compsize "5 MB"> <!ENTITY man-pages-time "1 minute"> @@ -826,10 +826,9 @@ <!ENTITY ncurses-compsize "29 MB"> <!ENTITY ncurses-time "6 minutes"> -<!ENTITY vim-version "5.8"> +<!ENTITY vim-version "6.0"> <!ENTITY vim-depversion "5.8"> -<!ENTITY vim-rt-size "1,045 KB"> -<!ENTITY vim-src-size "864 KB"> +<!ENTITY vim-size "2,711 KB"> <!ENTITY vim-compsize "15 MB"> <!ENTITY vim-time "2 minutes"> @@ -893,9 +892,9 @@ <!ENTITY file-compsize "2 MB"> <!ENTITY file-time "1 minute"> -<!ENTITY libtool-version "1.4"> +<!ENTITY libtool-version "1.4.2"> <!ENTITY libtool-depversion "1.4"> -<!ENTITY libtool-size "605 KB"> +<!ENTITY libtool-size "653 KB"> <!ENTITY libtool-compsize "5 MB"> <!ENTITY libtool-time "1 minute"> @@ -917,15 +916,15 @@ <!ENTITY e2fsprogs-compsize "21 MB"> <!ENTITY e2fsprogs-time "2 minutes"> -<!ENTITY lilo-version "21.7.5"> +<!ENTITY lilo-version "22.0"> <!ENTITY lilo-depversion "21.7.5"> -<!ENTITY lilo-size "175 KB"> +<!ENTITY lilo-size "251 KB"> <!ENTITY lilo-compsize "3 MB"> <!ENTITY lilo-time "1 minute"> -<!ENTITY modutils-version "2.4.9"> +<!ENTITY modutils-version "2.4.10"> <!ENTITY modutils-depversion "2.4.7"> -<!ENTITY modutils-size "213 KB"> +<!ENTITY modutils-size "214 KB"> <!ENTITY modutils-compsize "2 MB"> <!ENTITY modutils-time "1 minute"> @@ -959,15 +958,15 @@ <!ENTITY sysklogd-compsize "710 KB"> <!ENTITY sysklogd-time "1 minute"> -<!ENTITY sysvinit-version "2.82"> +<!ENTITY sysvinit-version "2.83"> <!ENTITY sysvinit-depversion "2.82"> <!ENTITY sysvinit-size "75 KB"> <!ENTITY sysvinit-compsize "630 KB"> <!ENTITY sysvinit-time "1 minute"> -<!ENTITY util-linux-version "2.11i"> +<!ENTITY util-linux-version "2.11l"> <!ENTITY util-linux-depversion "2.11h"> -<!ENTITY util-linux-size "970 KB"> +<!ENTITY util-linux-size "954 KB"> <!ENTITY util-linux-compsize "9 MB"> <!ENTITY util-linux-time "1 minute"> |