aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2011-10-08 16:01:35 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2011-10-08 16:01:35 +0000
commitbb0f266fc3650ce6b6bd07338530cd2374d3f6fb (patch)
tree7a62a61af71008c2fb9541059d1d96423acedfcf
parentdaed5a3e75d60b08ebf67e8d4287c152908aa764 (diff)
Update to man-pages-3.35.
Add additional environment variable to man-db. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9619 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml21
-rw-r--r--chapter06/man-db.xml13
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
4 files changed, 34 insertions, 10 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c3831c38b..cd38ed88f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,12 +37,25 @@
-->
<listitem>
+ <para>2011-10-08</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to man-pages-3.35. Fixes
+ <ulink url="&lfs-ticket-root;2936">#2936</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Add additional environment variable
+ to man-db.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2011-10-07</para>
<itemizedlist>
- <listitem>
- <para>[bdubbs] - Miror update to bootscripts Makefile. Fixes
- <ulink url="&lfs-ticket-root;2939">#2939</ulink>.
- </para>
+ <listitem>
+ <para>[bdubbs] - Minor update to bootscripts Makefile. Fixes
+ <ulink url="&lfs-ticket-root;2939">#2939</ulink>.</para>
</listitem>
<listitem>
<para>[matthew] - Remove Pkg-Config, and its dependencies PCRE and
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index dd28d7519..833099bef 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -43,7 +43,9 @@
<para>Prepare Man-DB for compilation:</para>
-<screen><userinput remap="configure">libpipeline_CFLAGS='' libpipeline_LIBS='-lpipeline' \
+<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true \
+ libpipeline_CFLAGS='' \
+ libpipeline_LIBS='-lpipeline' \
./configure --prefix=/usr --libexecdir=/usr/lib \
--docdir=/usr/share/doc/man-db-&man-db-version; --sysconfdir=/etc \
--disable-setuid --with-browser=/usr/bin/lynx \
@@ -53,6 +55,15 @@
<title>The meaning of the configure options:</title>
<varlistentry>
+ <term><parameter>PKG_CONFIG=, libpipeline_ ...</parameter></term>
+ <listitem>
+ <para>These environment variables allow the configuration
+ process to complete without the external <command>pkg-config</command>
+ program.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>--disable-setuid</parameter></term>
<listitem>
<para>This disables making the <command>man</command> program setuid
diff --git a/general.ent b/general.ent
index e98463e82..4e913da33 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111007">
-<!ENTITY releasedate "Oct 7, 2011">
+<!ENTITY version "SVN-20111008">
+<!ENTITY releasedate "Oct 8, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 93dc58dcc..6d82a66d5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -359,10 +359,10 @@
<!ENTITY man-db-ch6-du "22 MB">
<!ENTITY man-db-ch6-sbu "0.4 SBU">
-<!ENTITY man-pages-version "3.32">
-<!ENTITY man-pages-size "1,108 KB">
+<!ENTITY man-pages-version "3.35">
+<!ENTITY man-pages-size "1,650 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "1278c5289660e42a597fefd30d9bdcf0">
+<!ENTITY man-pages-md5 "e41432ee35a49036bbaf8d4598506e9c">
<!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-ch6-du "21 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">