Author: justin
Date: 2005-11-17 13:01:36 -0700 (Thu, 17 Nov 2005)
New Revision: 1087
Modified:
branches/6.1.1-1/packages/LFS-BOOK/Makefile
branches/6.1.1-1/packages/blfs-bootscripts/Makefile
branches/6.1.1-1/packages/bzip2/Makefile
branches/6.1.1-1/packages/cvs/Makefile
branches/6.1.1-1/packages/dialog/Makefile
branches/6.1.1-1/packages/freefont/Makefile
branches/6.1.1-1/packages/openssl/Makefile
branches/6.1.1-1/packages/rp-pppoe/Makefile
branches/6.1.1-1/packages/subversion/Makefile
branches/6.1.1-1/packages/util-linux/Makefile
branches/6.1.1-1/packages/xfsprogs/Makefile
Log:
Fixed various small bugs in 6.1.1-1 branch. Thanks Archaic.
Modified: branches/6.1.1-1/packages/LFS-BOOK/Makefile
===================================================================
--- branches/6.1.1-1/packages/LFS-BOOK/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/LFS-BOOK/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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
Modified: branches/6.1.1-1/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/6.1.1-1/packages/blfs-bootscripts/Makefile 2005-11-17 19:45:15 UTC
(rev 1086)
+++ branches/6.1.1-1/packages/blfs-bootscripts/Makefile 2005-11-17 20:01:36 UTC
(rev 1087)
@@ -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
Modified: branches/6.1.1-1/packages/bzip2/Makefile
===================================================================
--- branches/6.1.1-1/packages/bzip2/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/bzip2/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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 && \
Modified: branches/6.1.1-1/packages/cvs/Makefile
===================================================================
--- branches/6.1.1-1/packages/cvs/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/cvs/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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
Modified: branches/6.1.1-1/packages/dialog/Makefile
===================================================================
--- branches/6.1.1-1/packages/dialog/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/dialog/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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)
Modified: branches/6.1.1-1/packages/freefont/Makefile
===================================================================
--- branches/6.1.1-1/packages/freefont/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/freefont/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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
Modified: branches/6.1.1-1/packages/openssl/Makefile
===================================================================
--- branches/6.1.1-1/packages/openssl/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/openssl/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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
Modified: branches/6.1.1-1/packages/rp-pppoe/Makefile
===================================================================
--- branches/6.1.1-1/packages/rp-pppoe/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/rp-pppoe/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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
Modified: branches/6.1.1-1/packages/subversion/Makefile
===================================================================
--- branches/6.1.1-1/packages/subversion/Makefile 2005-11-17 19:45:15 UTC
(rev 1086)
+++ branches/6.1.1-1/packages/subversion/Makefile 2005-11-17 20:01:36 UTC
(rev 1087)
@@ -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:
Modified: branches/6.1.1-1/packages/util-linux/Makefile
===================================================================
--- branches/6.1.1-1/packages/util-linux/Makefile 2005-11-17 19:45:15 UTC
(rev 1086)
+++ branches/6.1.1-1/packages/util-linux/Makefile 2005-11-17 20:01:36 UTC
(rev 1087)
@@ -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
Modified: branches/6.1.1-1/packages/xfsprogs/Makefile
===================================================================
--- branches/6.1.1-1/packages/xfsprogs/Makefile 2005-11-17 19:45:15 UTC (rev
1086)
+++ branches/6.1.1-1/packages/xfsprogs/Makefile 2005-11-17 20:01:36 UTC (rev
1087)
@@ -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
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
