From 16b8febb8cdff5adab7efd8d8fa0da73b4b9ada1 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Tue, 21 May 2013 20:22:41 +0000
Subject: [PATCH] merge trunk r3705

---
 LFS/lfs.xsl                   | 5 +++--
 common/libs/func_wrt_Makefile | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 3a93918..1968adf 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -145,14 +145,15 @@
   <xsl:template match="sect2">
     <!--XML::Parser is on the same page as Perl. The present code is OK
         except for PKG_DEST and PKGDIR, which would be the same as for Perl.
-        so set them to valid values.-->
+        so set them to valid values.
+        Since rev 10281, that is no more true. So comment out.
     <xsl:if test="contains(string(./title),'XML::Parser')">
       <xsl:text>PKGDIR=$(dirname $PKGDIR)/</xsl:text>
       <xsl:copy-of select="substring-after(.//userinput[@remap='pre'], 'cd ')"/>
       <xsl:text>
 PKG_DEST=$(dirname $PKGDIR)/000-xml-parser
 </xsl:text>
-    </xsl:if>
+    </xsl:if>-->
     <xsl:apply-templates
       select=".//screen[not(@role) or
                         @role != 'nodump']/userinput[
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 3624e12..9bd0e8e 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -106,6 +106,10 @@ get_package_tarball_name() {       #
          ;;
      udev) echo $(grep "^systemd" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
+     xml-parser) echo $(grep "^XML" $JHALFSDIR/pkg_tarball_list | head -n1 )
+         ;;
+     libdbus) echo $(grep "^dbus" $JHALFSDIR/pkg_tarball_list | head -n1 )
+         ;;
      *)  echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
          ;;
    esac