[02095ae] | 1 | <?xml version="1.0" encoding="ISO-8859-1"?>
|
---|
[c439b8a] | 2 | <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
---|
| 3 | "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
---|
[02095ae] | 4 | <!ENTITY % general-entities SYSTEM "../../general.ent">
|
---|
| 5 | %general-entities;
|
---|
| 6 | ]>
|
---|
| 7 |
|
---|
| 8 | <sect1 id="ch-system-diffutils" role="wrap">
|
---|
| 9 | <?dbhtml filename="diffutils.html"?>
|
---|
| 10 |
|
---|
| 11 | <title>Diffutils-&diffutils-version;</title>
|
---|
| 12 |
|
---|
| 13 | <indexterm zone="ch-system-diffutils">
|
---|
| 14 | <primary sortas="a-Diffutils">Diffutils</primary>
|
---|
| 15 | </indexterm>
|
---|
| 16 |
|
---|
| 17 | <sect2 role="package">
|
---|
| 18 | <title/>
|
---|
| 19 |
|
---|
| 20 | <para>The Diffutils package contains programs that show the differences
|
---|
| 21 | between files or directories.</para>
|
---|
| 22 |
|
---|
| 23 | </sect2>
|
---|
| 24 |
|
---|
| 25 | <sect2 role="installation">
|
---|
| 26 | <title>Installation of Diffutils</title>
|
---|
| 27 |
|
---|
[e84c831] | 28 | <para os="p1">This patch adds support for Internationalization:</para>
|
---|
| 29 |
|
---|
| 30 | <screen os="p2"><userinput>patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
|
---|
| 31 |
|
---|
[02095ae] | 32 | <para os="a">Prepare Diffutils for compilation:</para>
|
---|
| 33 |
|
---|
[cee2ca2] | 34 | <screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
|
---|
| 35 | --prefix=/usr</userinput></screen>
|
---|
[02095ae] | 36 |
|
---|
[93a6da3] | 37 | <para os="s1">Diffutils wants ed as the default editor, the following sed will allow us
|
---|
| 38 | to use vim:</para>
|
---|
| 39 |
|
---|
| 40 | <screen os="s2"><userinput>sed -i 's@\(^#define DEFAULT_EDITOR_PROGRAM \).*@\1"vi"@' config.h</userinput></screen>
|
---|
| 41 |
|
---|
[7ec27e2] | 42 | <para os="s3">Diffutils man-pages want to be recreated, but it requires
|
---|
| 43 | help2man. So we update the time on the files to prevent them from being
|
---|
| 44 | recreated:</para>
|
---|
| 45 |
|
---|
| 46 | <screen os="s4"><userinput>touch man/*.1</userinput></screen>
|
---|
| 47 |
|
---|
| 48 |
|
---|
[02095ae] | 49 | <para os="c">Compile the package:</para>
|
---|
| 50 |
|
---|
| 51 | <screen os="d"><userinput>make</userinput></screen>
|
---|
| 52 |
|
---|
| 53 | <para os="e">Install the package:</para>
|
---|
| 54 |
|
---|
[586feb7] | 55 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
|
---|
[02095ae] | 56 |
|
---|
| 57 | </sect2>
|
---|
| 58 |
|
---|
| 59 | <sect2 id="contents-diffutils" role="content">
|
---|
| 60 | <title>Contents of Diffutils</title>
|
---|
| 61 |
|
---|
| 62 | <segmentedlist>
|
---|
| 63 | <segtitle>Installed programs</segtitle>
|
---|
| 64 |
|
---|
| 65 | <seglistitem>
|
---|
| 66 | <seg>cmp, diff, diff3, and sdiff</seg>
|
---|
| 67 | </seglistitem>
|
---|
| 68 | </segmentedlist>
|
---|
| 69 |
|
---|
| 70 | <variablelist>
|
---|
| 71 | <bridgehead renderas="sect3">Short Descriptions</bridgehead>
|
---|
| 72 | <?dbfo list-presentation="list"?>
|
---|
| 73 | <?dbhtml list-presentation="table"?>
|
---|
| 74 |
|
---|
| 75 | <varlistentry id="cmp">
|
---|
| 76 | <term><command>cmp</command></term>
|
---|
| 77 | <listitem>
|
---|
| 78 | <para>Compares two files and reports whether or in which bytes
|
---|
| 79 | they differ</para>
|
---|
| 80 | <indexterm zone="ch-system-diffutils cmp">
|
---|
| 81 | <primary sortas="b-cmp">cmp</primary>
|
---|
| 82 | </indexterm>
|
---|
| 83 | </listitem>
|
---|
| 84 | </varlistentry>
|
---|
| 85 |
|
---|
| 86 | <varlistentry id="diff">
|
---|
| 87 | <term><command>diff</command></term>
|
---|
| 88 | <listitem>
|
---|
| 89 | <para>Compares two files or directories and reports which lines in
|
---|
| 90 | the files differ</para>
|
---|
| 91 | <indexterm zone="ch-system-diffutils diff">
|
---|
| 92 | <primary sortas="b-diff">diff</primary>
|
---|
| 93 | </indexterm>
|
---|
| 94 | </listitem>
|
---|
| 95 | </varlistentry>
|
---|
| 96 |
|
---|
| 97 | <varlistentry id="diff3">
|
---|
| 98 | <term><command>diff3</command></term>
|
---|
| 99 | <listitem>
|
---|
| 100 | <para>Compares three files line by line</para>
|
---|
| 101 | <indexterm zone="ch-system-diffutils diff3">
|
---|
| 102 | <primary sortas="b-diff3">diff3</primary>
|
---|
| 103 | </indexterm>
|
---|
| 104 | </listitem>
|
---|
| 105 | </varlistentry>
|
---|
| 106 |
|
---|
| 107 | <varlistentry id="sdiff">
|
---|
| 108 | <term><command>sdiff</command></term>
|
---|
| 109 | <listitem>
|
---|
| 110 | <para>Merges two files and interactively outputs the results</para>
|
---|
| 111 | <indexterm zone="ch-system-diffutils sdiff">
|
---|
| 112 | <primary sortas="b-sdiff">sdiff</primary>
|
---|
| 113 | </indexterm>
|
---|
| 114 | </listitem>
|
---|
| 115 | </varlistentry>
|
---|
| 116 |
|
---|
| 117 | </variablelist>
|
---|
| 118 |
|
---|
| 119 | </sect2>
|
---|
| 120 |
|
---|
| 121 | </sect1>
|
---|