From 7bbcce3ce7fde7357d6ece9389fd83c4a6b627d0 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Thu, 25 Aug 2016 10:04:30 +0000
Subject: [PATCH] Fix "blfs_root" location in envars.conf, to match initial
 location when installing BLFS tools. Convert package names to lowercase in
 wrap and pack functions for porg, since porg does that anyway

---
 BLFS/envars.conf            | 2 +-
 pkgmngt/packInstall.sh.porg | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/BLFS/envars.conf b/BLFS/envars.conf
index c9a4979..b433ed3 100644
--- a/BLFS/envars.conf
+++ b/BLFS/envars.conf
@@ -162,4 +162,4 @@ if [ -r /etc/profile ]; then source /etc/profile; fi
 # where the functions are dfined, and we'll source it just before
 # installing.
 
-export PACK_INSTALL=${HOME}/blfs_root/packInstall.sh # change as needed
+export PACK_INSTALL=/blfs_root/packInstall.sh # change as needed
diff --git a/pkgmngt/packInstall.sh.porg b/pkgmngt/packInstall.sh.porg
index edd5b01..3149f71 100644
--- a/pkgmngt/packInstall.sh.porg
+++ b/pkgmngt/packInstall.sh.porg
@@ -13,6 +13,9 @@ local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
            sed 's/^[0-9]\{1\}-//')
+# Porg converts package names to lowercase anyway, so do the conversion
+# ourselves
+PACKAGE=${PACKAGE,,}
 # version is only accessible from PKGDIR name. Since the format of the
 # name is not normalized, several hacks are necessary...
 case $PCKGVRS in
@@ -39,6 +42,9 @@ local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
            sed 's/^[0-9]\{1\}-//')
 local PCKGVRS=$(basename $PKGDIR)
+# Porg converts package names to lowercase anyway, so do the conversion
+# ourselves
+PACKAGE=${PACKAGE,,}
 case $PCKGVRS in
   expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;
   vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;