Here is what I had to do to get the current 6.1.1-1 branch to build.
With the exception of outright removing an ncurses patch (couldn't be
arsed to figure out why it whas added), every change was just to
overcome download problems and tarball/patch location problems.

-- 
Archaic

Want control, education, and security from your operating system?
Hardened Linux From Scratch
http://www.linuxfromscratch.org/hlfs

Index: linux/config
===================================================================
--- linux/config        (revision 1078)
+++ linux/config        (working copy)
@@ -581,7 +581,7 @@
 #
 # CONFIG_IEEE1394_VIDEO1394 is not set
 # CONFIG_IEEE1394_SBP2 is not set
-CONFIG_IEEE1394_ETH1394=m
+# CONFIG_IEEE1394_ETH1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 CONFIG_IEEE1394_RAWIO=m
 # CONFIG_IEEE1394_CMP is not set
Index: packages/ncurses/Makefile
===================================================================
--- packages/ncurses/Makefile   (revision 1082)
+++ packages/ncurses/Makefile   (working copy)
@@ -5,9 +5,7 @@
 VRS= 5.4
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-20050319-patch.sh
 URL= $(HTTP)/$(NM)/$(FILE)
-URL1= ftp://invisible-island.net/ncurses/5.4/$(PATCH).bz2
 
 # RULES
 
@@ -33,9 +31,7 @@
        @echo ""
        @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
         mv $(FILE) $(SRC) ; fi
-       @if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) && bunzip2 $(PATCH).bz2 ; 
fi
        @if [ ! -f /usr/bin/clear ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) 
&& \
-        sh ../$(PATCH) && \
         ./configure --prefix=/usr --with-shared --without-debug --with-gpm && \
         make sources && make -j3 && make install && chmod 755 /usr/lib/*.5.4 
&& \
         chmod 644 /usr/lib/libncurses++.a && mv /usr/lib/libncurses.so.5* /lib 
&& \
Index: packages/gpm/Makefile
===================================================================
--- packages/gpm/Makefile       (revision 1082)
+++ packages/gpm/Makefile       (working copy)
@@ -7,7 +7,7 @@
 FILE= $(DIR).tar.bz2
 PATCH1= $(DIR)-segfault-1.patch
 PATCH2= $(DIR)-silent-1.patch
-URL= ftp://arcana.linux.it/pub/gpm/$(FILE)
+URL= $(HTTPBLFS)/$(NM)/$(FILE)
 URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
 URL2= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
 
Index: packages/openssl/Makefile
===================================================================
--- packages/openssl/Makefile   (revision 1082)
+++ packages/openssl/Makefile   (working copy)
@@ -6,8 +6,8 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.gz
 PATCH1=  $(DIR)-fix_manpages-1.patch
-URL= http://www.openssl.org/source/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
+URL= $(HTTPBLFS)/$(NM)/$(FILE)
+URL1= $(HTTPBLFS)/$(NM)/$(PATCH1)
 
 #RULES
 
Index: packages/util-linux/Makefile
===================================================================
--- packages/util-linux/Makefile        (revision 1082)
+++ packages/util-linux/Makefile        (working copy)
@@ -42,7 +42,7 @@
         mv $(PATCH2) $(SRC) ; fi
        @if [ ! -f /bin/mount ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
         sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/lib/hwclock/[EMAIL 
PROTECTED]' hwclock/hwclock.c && \
-        patch -Np1 -i $(SRC)/$(PATCH) && patch -Np1 -i ../$(PATCH2) && \
+        patch -Np1 -i $(SRC)/$(PATCH) && patch -Np1 -i $(SRC)/$(PATCH2) && \
         ./configure && \
         make -j3 HAVE_KILL=yes HAVE_SLN=yes && \
         make HAVE_KILL=yes HAVE_SLN=yes install ; fi
Index: packages/xfsprogs/Makefile
===================================================================
--- packages/xfsprogs/Makefile  (revision 1082)
+++ packages/xfsprogs/Makefile  (working copy)
@@ -4,8 +4,8 @@
 NM= xfsprogs
 VRS= 2.6.25
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).src.tar.gz
-URL= ftp://oss.sgi.com/projects/xfs/download/cmd_tars/$(FILE)
+FILE= $(DIR).src.tar.bz2
+URL= $(HTTPBLFS)/$(NM)/$(FILE)
 
 #RULES
 
Index: packages/subversion/Makefile
===================================================================
--- packages/subversion/Makefile        (revision 1082)
+++ packages/subversion/Makefile        (working copy)
@@ -23,7 +23,7 @@
        @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
        @if [ ! -f /usr/bin/svn ] ; then unpack $(FILE) && cd $(DIR) && \
         ./configure --prefix=/usr && \
-        make -j3 && make install && chown -R 0:0 /usr/include/apr-0 ; fi
+        make && make install && chown -R 0:0 /usr/include/apr-0 ; fi
        @make clean
 
 clean:
Index: packages/blfs-bootscripts/Makefile
===================================================================
--- packages/blfs-bootscripts/Makefile  (revision 1082)
+++ packages/blfs-bootscripts/Makefile  (working copy)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= blfs-bootscripts
-VRS= 20050709
+VRS= 20051018
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 PATCH=$(NM)-add-autosshd-1.patch
Index: packages/docbook-xsl/install
===================================================================
--- packages/docbook-xsl/install        (revision 1082)
+++ packages/docbook-xsl/install        (working copy)
@@ -1,14 +1,11 @@
 #!/bin/bash
-install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
+install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
 install -v -d -m755 /etc/xml &&
 chown -R root:root . &&
 cp -v -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
     images javahelp lib manpages params profiling template xhtml \
-    /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
+    /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
 install -v -d -m755 /usr/share/doc/xml &&
-cp -v -af doc/* /usr/share/doc/xml &&
-cd /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
-sh INSTALL &&
 if [ ! -f /etc/xml/catalog ]; then
     xmlcatalog --noout --create /etc/xml/catalog
 fi &&
@@ -16,20 +13,20 @@
     xmlcatalog --noout --create /etc/xml/docbook
 fi &&
 xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/1.68.1"; \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+    "http://docbook.sourceforge.net/release/xsl/1.69.1"; \
+    "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/1.68.1"; \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+    "http://docbook.sourceforge.net/release/xsl/1.69.1"; \
+    "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/current"; \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+    "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/current"; \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+    "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "delegateSystem" \
     "http://docbook.sourceforge.net/release/xsl/"; \
@@ -41,9 +38,9 @@
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/1.67.2"; \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+    "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteURI" \
     "http://docbook.sourceforge.net/release/xsl/1.67.2"; \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+    "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog
Index: packages/docbook-xsl/Makefile
===================================================================
--- packages/docbook-xsl/Makefile       (revision 1082)
+++ packages/docbook-xsl/Makefile       (working copy)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= docbook-xsl
-VRS= 1.68.1
+VRS= 1.69.1
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 URL= http://easynews.dl.sourceforge.net/sourceforge/docbook/$(FILE)
Index: packages/freefont/Makefile
===================================================================
--- packages/freefont/Makefile  (revision 1082)
+++ packages/freefont/Makefile  (working copy)
@@ -1,11 +1,11 @@
 # FreeFont Makefile
 
 # Package versions
-NM= freefont
-VRS= ttf
+NM= freefont-ttf
+VRS= 20050407
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://ftp.gnu.org/savannah/files/freefont/$(FILE)
+FILE= $(DIR).tar.bz2
+URL= $(HTTPBLFS)/$(NM)/$(FILE)
 LOCATION= /usr/X11R6/lib/X11/fonts/TTF
 
 #RULES
Index: packages/sharutils/Makefile
===================================================================
--- packages/sharutils/Makefile (revision 1082)
+++ packages/sharutils/Makefile (working copy)
@@ -19,7 +19,7 @@
        @echo "======> Building $(NM) in chroot"
        @echo ""
        @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-       @if [ ! -f /usr/bin/clear ] ; then unpack $(FILE) && cd $(DIR) && \
+       @if [ ! -f /usr/bin/shar ] ; then unpack $(FILE) && cd $(DIR) && \
         ./configure --prefix=/usr && \
         make -j3 && \
         make install ; fi
Index: packages/dialog/Makefile
===================================================================
--- packages/dialog/Makefile    (revision 1082)
+++ packages/dialog/Makefile    (working copy)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= dialog
-VRS= 1.0-20050306
+VRS= 1.0-20051107
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tgz
 URL= ftp://invisible-island.net/dialog/$(FILE)
Index: packages/texinfo/Makefile
===================================================================
--- packages/texinfo/Makefile   (revision 1082)
+++ packages/texinfo/Makefile   (working copy)
@@ -35,7 +35,7 @@
        @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
         mv $(PATCH1) $(SRC) ; fi
        @if [ ! -f /usr/bin/info ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && 
\
-        patch -Np1 -i ../$(PATCH1) && \
+        patch -Np1 -i $(SRC)/$(PATCH1) && \
         ./configure --prefix=/usr && make -j3 && make install && \
         make -j3 TEXMF=/usr/share/texmf install-tex ; fi
        @make clean     
Index: packages/cvs/Makefile
===================================================================
--- packages/cvs/Makefile       (revision 1082)
+++ packages/cvs/Makefile       (working copy)
@@ -6,8 +6,8 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 PATCH= $(DIR)-zlib-1.patch
-URL= https://ccvs.cvshome.org/files/documents/19/861/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH)
+URL= $(HTTPBLFS)/$(NM)/$(FILE)
+URL1= $(HTTPBLFS)/$(NM)/$(PATCH)
 
 #RULES
 
Index: packages/bzip2/Makefile
===================================================================
--- packages/bzip2/Makefile     (revision 1082)
+++ packages/bzip2/Makefile     (working copy)
@@ -39,7 +39,7 @@
        @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
         mv $(FILE) $(SRC) ; fi
        @if [ ! -f /bin/bzip2 ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-        patch -Np1 -i ../$(PATCH1) && patch -Np1 -i ../$(PATCH2) && \
+        patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \
         make -j3 -f Makefile-libbz2_so && make clean && \
         make -j3 && make install && \
         cp bzip2-shared /bin/bzip2 && cp -a libbz2.so* /lib && \
Index: packages/rp-pppoe/Makefile
===================================================================
--- packages/rp-pppoe/Makefile  (revision 1082)
+++ packages/rp-pppoe/Makefile  (working copy)
@@ -7,7 +7,7 @@
 FILE= $(DIR).tar.gz
 PATCH= $(DIR)-iproute2-1.patch
 URL= http://www.roaringpenguin.com/penguin/pppoe/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH)
+URL1= $(HTTPBLFS)/$(NM)/$(PATCH)
 
 # RULES
 
Index: packages/LFS-BOOK/Makefile
===================================================================
--- packages/LFS-BOOK/Makefile  (revision 1082)
+++ packages/LFS-BOOK/Makefile  (working copy)
@@ -2,7 +2,7 @@
 
 # Package versions
 NM= LFS-BOOK
-VRS= 6.1.1
+VRS= 6.1.1-pre1
 DIR= $(NM)-$(VRS)-HTML
 URL= svn://svn.linuxfromscratch.org/LFS/tags/$(VRS)/BOOK
 
Index: packages/bash/Makefile
===================================================================
--- packages/bash/Makefile      (revision 1082)
+++ packages/bash/Makefile      (working copy)
@@ -42,13 +42,15 @@
        @echo ""
        @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
         mv $(FILE) $(SRC) ; fi
+       @if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL3) && \
+        mv $(FILE2) $(SRC) ; fi
        @if [ ! -f $(SRC)/$(PATCH1) ] ; then $(WGET) $(URL1) && \
         mv $(PATCH1) $(SRC) ; fi
        @if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
         mv $(PATCH2) $(SRC) ; fi
        @if [ ! -f /bin/bashbug ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-        tar -xfv $(SRC)/$(FILE2) && \
-        sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|" && \
+        tar -xf $(SRC)/$(FILE2) && \
+        sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-3.0|" 
Makefile.in && \
         patch -Np1 -i $(SRC)/$(PATCH2) && patch -Np1 -i $(SRC)/$(PATCH1) && \
         ./configure --prefix=/usr --bindir=/bin --without-bash-malloc 
--with-installed-readline && \
         make && rm /bin/bash && make install ; fi
-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to