From 0fd8a9d4eb476215ec4bcd5308ad381b11e21d6b Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Sat, 15 Oct 2005 11:59:59 +0000
Subject: [PATCH] Added support for UTF-8 branch packages and patches.

---
 jhalfs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/jhalfs b/jhalfs
index 96708b8..e3ebaf3 100755
--- a/jhalfs
+++ b/jhalfs
@@ -313,6 +313,10 @@ extract_commands() {
   grep "\-version" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@' \
   -e '/generic/d' >> packages
   echo `grep "glibc" packages | sed 's@glibc@glibc-linuxthreads@'` >> packages
+  # If we are buildind the UTF-8 branch, the glibc-libidn package is required
+  if grep -q "man-db-version" $BOOK/general.ent ; then
+    echo `grep "glibc" packages | sed 's@glibc@glibc-libidn@'` >> packages
+  fi
   grep "ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
 
   # Done. Moving on...
@@ -323,9 +327,9 @@ extract_commands() {
 download() {
   cd $BUILDDIR/sources
 
-  # Hackish fix for the bash-doc and glibc-linuxthreads packages that
+  # Hackish fix for the bash-doc and glibc-{linuxthreads,libidn} packages that
   # doesn't conform to norms in the URL scheme.
-  DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@'`
+  DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@' -e 's@-libidn@@'`
 
   # Find the md5 sum for this package.
   if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2" MD5SUMS` ; fi
@@ -380,9 +384,11 @@ get_sources() {
     # Iterate through each package and grab it, along with any patches it needs.
     for i in `cat $JHALFSDIR/packages` ; do
       PKG=`echo $i | sed 's/-version.*//'`
+      # Needed for Groff patchlevel patch on UTF-8 branch
+      GROFFLEVEL=`echo $i | sed -e 's/groff-patchlevel //' -e 's/"//g'`
 
       # Someone used some silly entities right next to the valid package entities.
-      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" ] ; then continue ; fi
+      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
       if [ "$PKG" = "tcl" ] ; then
@@ -395,6 +401,11 @@ get_sources() {
         PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
         download $PKG $PATCH
       done
+      # Needed for Groff patchlevel patch on UTF-8 branch
+      for patch in `grep "$PKG_&$PKG" $JHALFSDIR/patches` ; do
+        PATCH=`echo $patch | sed 's@&'$PKG'-version;-&'$PKG'-patchlevel;@'$VRS'-'$GROFFLEVEL'@'`
+        download $PKG $PATCH
+      done
     done
     # Hardcoded Udev configuration file until find a better way
     download udev udev-config-3.rules