From c1626d892a9e85742f99f39ae188e7e993ef796f Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Tue, 24 Dec 2013 18:52:24 +0000
Subject: [PATCH] Adapt blfs installation to recent changes in BLFS book

---
 common/libs/func_install_blfs | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 66a4174..5f30d32 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -63,11 +63,12 @@ if [ "$DEP_TIDY" = y ]; then
 else
   LINE_TIDY='#CONFIG_html-tidy is not set'
 fi
-if [ "$DEP_DBXML" = y ]; then
-  LINE_DBXML='CONFIG_DocBook=y'
-else
-  LINE_DBXML='#CONFIG_DocBook is not set'
-fi
+# DocBook is a rec dep of libxslt
+# if [ "$DEP_DBXML" = y ]; then
+#   LINE_DBXML='CONFIG_DocBook=y'
+# else
+#   LINE_DBXML='#CONFIG_DocBook is not set'
+# fi
 if [ "$DEP_LYNX" = y ]; then
   LINE_LYNX='CONFIG_lynx=y'
 else
@@ -109,7 +110,6 @@ $LINE_PYTHON
 $LINE_LIBXML
 $LINE_LIBXSLT
 $LINE_TIDY
-$LINE_DBXML
 $LINE_OPENSSL
 $LINE_WGET
 $LINE_SVN
@@ -146,6 +146,20 @@ popd
 rm -v $BUILDDIR$BLFS_ROOT/download_script
 
 # Suppresses unneeded parts of the scriptlets
+if [ "$DEP_LIBXSLT" = y ]; then
+  # libxslt pulls docbook-xsl in. Sorry for sed synthax.
+  # I do not know how to delete lines between 2 addresses excluding those
+  # two lines.
+  sed -i '\@^[[:space:]]*/etc/xml/catalog$@{
+n
+:a
+\@/etc/xml/catalog$@bb
+N
+ba
+:b
+d}' \
+      $BUILDDIR$BLFS_ROOT/scripts/*docbook-xsl
+fi
 if [ "$DEP_SUDO" = y ]; then
   sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
 fi