Author: justin
Date: 2005-11-17 01:49:01 -0700 (Thu, 17 Nov 2005)
New Revision: 1083
Modified:
branches/6.1.1-1/packages/bash/Makefile
branches/6.1.1-1/packages/gpm/Makefile
branches/6.1.1-1/packages/ncurses/Makefile
branches/6.1.1-1/packages/sharutils/Makefile
branches/6.1.1-1/packages/texinfo/Makefile
Log:
Fixed various bugs in 6.1.1-1 branch. Ncurses patch has disappeared from
server. Removed for now so build continues.
Modified: branches/6.1.1-1/packages/bash/Makefile
===================================================================
--- branches/6.1.1-1/packages/bash/Makefile 2005-11-17 07:41:41 UTC (rev
1082)
+++ branches/6.1.1-1/packages/bash/Makefile 2005-11-17 08:49:01 UTC (rev
1083)
@@ -46,6 +46,8 @@
mv $(PATCH1) $(SRC) ; fi
@if [ ! -f $(SRC)/$(PATCH2) ] ; then $(WGET) $(URL2) && \
mv $(PATCH2) $(SRC) ; fi
+ @if [ ! -f $(SRC)/$(FILE2) ] ; then $(WGET) $(URL3) && \
+ mv $(FILE2) $(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|" && \
Modified: branches/6.1.1-1/packages/gpm/Makefile
===================================================================
--- branches/6.1.1-1/packages/gpm/Makefile 2005-11-17 07:41:41 UTC (rev
1082)
+++ branches/6.1.1-1/packages/gpm/Makefile 2005-11-17 08:49:01 UTC (rev
1083)
@@ -7,9 +7,9 @@
FILE= $(DIR).tar.bz2
PATCH1= $(DIR)-segfault-1.patch
PATCH2= $(DIR)-silent-1.patch
-URL= ftp://arcana.linux.it/pub/gpm/$(FILE)
-URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
-URL2= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
+URL= $(HTTPBLFS)/$(NM)/$(FILE)
+URL1= $(HTTPBLFS)/$(NM)/$(PATCH1)
+URL2= $(HTTPBLFS)/$(NM)/$(PATCH2)
#RULES
Modified: branches/6.1.1-1/packages/ncurses/Makefile
===================================================================
--- branches/6.1.1-1/packages/ncurses/Makefile 2005-11-17 07:41:41 UTC (rev
1082)
+++ branches/6.1.1-1/packages/ncurses/Makefile 2005-11-17 08:49:01 UTC (rev
1083)
@@ -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
&& \
Modified: branches/6.1.1-1/packages/sharutils/Makefile
===================================================================
--- branches/6.1.1-1/packages/sharutils/Makefile 2005-11-17 07:41:41 UTC
(rev 1082)
+++ branches/6.1.1-1/packages/sharutils/Makefile 2005-11-17 08:49:01 UTC
(rev 1083)
@@ -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
Modified: branches/6.1.1-1/packages/texinfo/Makefile
===================================================================
--- branches/6.1.1-1/packages/texinfo/Makefile 2005-11-17 07:41:41 UTC (rev
1082)
+++ branches/6.1.1-1/packages/texinfo/Makefile 2005-11-17 08:49:01 UTC (rev
1083)
@@ -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
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
