r1764 - in trunk: . packages/file packages/grep packages/groff packages/gzip packages/inetutils packages/iproute2 packages/less packages/module-init-tools packages/psmisc packages/shadow packages/sysklogd packages/sysvinit packages/tar packages/texinfo packages/udev packages/util-linux packages/vim

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Dec 6 03:36:34 PST 2006


Author: alexander
Date: 2006-12-06 04:36:26 -0700 (Wed, 06 Dec 2006)
New Revision: 1764

Modified:
   trunk/Makefile
   trunk/packages/file/Makefile
   trunk/packages/grep/Makefile
   trunk/packages/groff/Makefile
   trunk/packages/gzip/Makefile
   trunk/packages/inetutils/Makefile
   trunk/packages/iproute2/Makefile
   trunk/packages/less/Makefile
   trunk/packages/module-init-tools/Makefile
   trunk/packages/psmisc/Makefile
   trunk/packages/shadow/Makefile
   trunk/packages/sysklogd/Makefile
   trunk/packages/sysvinit/Makefile
   trunk/packages/tar/Makefile
   trunk/packages/texinfo/Makefile
   trunk/packages/udev/Makefile
   trunk/packages/util-linux/Makefile
   trunk/packages/vim/Makefile
Log:
Updated the rest of LFS packages. Now the build breaks on reiserfsprogs
because of asm/unaligned.h


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -238,7 +238,7 @@
 	ch-glibc re-adjust-toolchain ch-binutils ch-gcc ch-db ch-sed \
 	ch-e2fsprogs ch-coreutils ch-iana-etc ch-m4 ch-bison ch-gpm \
 	ch-ncurses ch-procps ch-libtool ch-perl ch-readline ch-zlib \
-	ch-autoconf ch-automake ch-bash ch-stop-here
+	ch-autoconf ch-automake ch-bash
 
 post-bash: ch-bzip2 ch-diffutils ch-file ch-findutils ch-flex \
 	ch-gawk ch-gettext ch-grep ch-groff ch-gzip ch-inetutils \
@@ -250,7 +250,7 @@
 blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-nano ch-joe \
 	ch-screen ch-pkgconfig ch-libidn ch-libgpg-error ch-libgcrypt \
 	ch-gnutls ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
-	ch-subversion ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
+	ch-subversion stop-here ch-lfs-bootscripts ch-livecd-bootscripts ch-docbook-xml ch-libxslt \
 	ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng \
 	ch-freetype ch-fontconfig \
 	ch-Xorg-base ch-Xorg-util ch-Xorg-proto ch-Xorg-lib ch-libdrm ch-Mesa \

Modified: trunk/packages/file/Makefile
===================================================================
--- trunk/packages/file/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/file/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,12 +1,12 @@
 # File Makefile
 
 NM= file
-VRS= 4.17
+VRS= 4.18
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= e03710a3fcb95db6d0ee9cfcdf88c19a5e525ee4
+SHA-$(FILE)= b733d3dd7e4ab4e16f52ef000163e92c99686c61
 
 # Targets
 

Modified: trunk/packages/grep/Makefile
===================================================================
--- trunk/packages/grep/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/grep/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -38,6 +38,7 @@
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH50)
+	chmod +x tests/fmbtest.sh
 	./configure --prefix=/usr --bindir=/bin
 	make $(PM)
 	make install

Modified: trunk/packages/groff/Makefile
===================================================================
--- trunk/packages/groff/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/groff/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,21 +1,21 @@
 # Groff Makefile
 
-# ascii8 and nippon devices exist only for groff-1.18.1.1 as a patch
+# ascii8 and nippon devices exist only for groff-1.18.1.x as a patch
 # rejected upstream.
 # Do not upgrade this package before Debian does it!
 # http://bugs.debian.org/196762
 
 NM= groff
-VRS= 1.18.1.1
+VRS= 1.18.1.4
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 19c8c83e6ee29dd6041dae0daf1c1d0debd3d32a
+SHA-$(FILE)= 70580701fd90cf6fe7fb70fe951cb2d66bd14e7c
 
 PATCH= $(DIR)-debian_fixes-1.patch
 URL-$(PATCH)= $(HTTP)/$(NM)/$(PATCH)
-SHA-$(PATCH)= 39fb82b9673523cb2451a0491929693226ea97dd
+SHA-$(PATCH)= 4a171a1c7b6c493b5c4349aa18ff1905bddffcb0
 
 # Targets
 

Modified: trunk/packages/gzip/Makefile
===================================================================
--- trunk/packages/gzip/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/gzip/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -35,6 +35,7 @@
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
+	sed -i 's/tail +/tail -n +/' gzexe.in
 	./configure --prefix=/usr
 	sed -i 's@"BINDIR"@/bin at g' gzexe.in
 	make $(PM)

Modified: trunk/packages/inetutils/Makefile
===================================================================
--- trunk/packages/inetutils/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/inetutils/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,21 +1,17 @@
 # Inetutils Makefile
 
 NM= inetutils
-VRS= 1.4.2
+VRS= 1.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 6b60d2c78702512e95afae36415f6fe3523dba77
+SHA-$(FILE)= f2dc4d7fa5f5590ea71260c464f60eb3b1fc7505
 
-PATCH1= $(DIR)-no_server_man_pages-1.patch
+PATCH1= $(DIR)-no_server_man_pages-2.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= ccd3c59f9ed4eca6f7a8dffb494ed8916087bc50
+SHA-$(PATCH1)= 55510e7f21a09cb688d9a069b6564df3dfe5abbf
 
-PATCH2= $(DIR)-gcc4_fixes-3.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 77b063b0fcc15a55e28c18e1b30e1cdf5b1b7d3a
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -24,15 +20,14 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH2)} $(LFSSRC)/
+	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH2)
 	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --libexecdir=/usr/sbin \
-	--sysconfdir=/etc --localstatedir=/var \
+	--sysconfdir=/etc --localstatedir=/var --disable-ifconfig \
 	--disable-logger --disable-syslogd \
 	--disable-whois --disable-servers
 	make $(PM)

Modified: trunk/packages/iproute2/Makefile
===================================================================
--- trunk/packages/iproute2/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/iproute2/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,13 +1,13 @@
 # Iproute2 Makefile
 
 NM= iproute2
-VRS= 2.6.16
-DATE= 060323
+VRS= 2.6.18
+DATE= 061002
 DIR= $(NM)-$(VRS)-$(DATE)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 76d866bb3b46a7b2e73d79a4faf6fa8971527633
+SHA-$(FILE)= 94f9b91d59e0e63b441130e158422a62a7a31b98
 
 # Targets
 

Modified: trunk/packages/less/Makefile
===================================================================
--- trunk/packages/less/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/less/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -8,6 +8,9 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= fa0d9aa30ec461866786c4080bb594fc3337bb02
 
+PATCH1= $(DIR)-signal_fix-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 6951f821ad33dae0ed4cee99ab89023216db848c
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,11 +19,12 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
-	cp $(SRC)/$(FILE) $(LFSSRC)
+	cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --sysconfdir=/etc
 	make $(PM)
 	make install

Modified: trunk/packages/module-init-tools/Makefile
===================================================================
--- trunk/packages/module-init-tools/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/module-init-tools/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -9,7 +9,7 @@
 SHA-$(FILE)= b51e8ac170be23a1f2e301a1dddd47a47ec2186a
 
 PATCH1= $(DIR)-modprobe-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1)
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 0caecb2078cc47c97e496e2e4717b8b82a52eb01
 
 # Targets

Modified: trunk/packages/psmisc/Makefile
===================================================================
--- trunk/packages/psmisc/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/psmisc/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,12 +1,12 @@
 # Psmisc Makefile
 
 NM= psmisc
-VRS= 22.2
+VRS= 22.3
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 1ae222803c5b5967a1b93e69f08330e0cdc1a554
+SHA-$(FILE)= 262e5a738c323f5b1f0a112c6fcc906f9860e948
 
 # Targets
 

Modified: trunk/packages/shadow/Makefile
===================================================================
--- trunk/packages/shadow/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/shadow/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,12 +1,12 @@
 # Shadow Makefile
 
 NM= shadow
-VRS= 4.0.15
+VRS= 4.0.17
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 0f7cd3366a032091fdffd2f8edf65056bd576cae
+SHA-$(FILE)= 326b3de0a81c1e1f9bfc75e67d45678c14fe282d
 
 # Targets
 
@@ -25,18 +25,12 @@
 	sed -i 's/groups$$(EXEEXT) //' src/Makefile
 	find man -name Makefile -exec sed -i '/groups/d' {} \;
 	sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
-	../convert-mans UTF-8 ISO-8859-2 man/cs/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/de/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/es/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/fi/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/fr/*.?
-	../convert-mans UTF-8 ISO-8859-2 man/hu/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/id/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/it/*.?
+	for i in de es fi fr id it pt_BR ; do \
+		../convert-mans UTF-8 ISO-8859-1 man/$$i/*.? ; done
+	for i in cs hu pl ; do \
+		../convert-mans UTF-8 ISO-8859-2 man/$$i/*.? ; done
 	../convert-mans UTF-8 EUC-JP man/ja/*.?
 	# ../convert-mans UTF-8 EUC-KR man/ko/*.?
-	../convert-mans UTF-8 ISO-8859-2 man/pl/*.?
-	../convert-mans UTF-8 ISO-8859-1 man/pt_BR/*.?
 	../convert-mans UTF-8 KOI8-R man/ru/*.?
 	../convert-mans UTF-8 ISO-8859-9 man/tr/*.?
 	# ../convert-mans UTF-8 GB2312 man/zh_CN/*.?

Modified: trunk/packages/sysklogd/Makefile
===================================================================
--- trunk/packages/sysklogd/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/sysklogd/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -8,13 +8,13 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 093775da0e429d0768cf195ceb20fdd6d96aeeea
 
-PATCH1= $(DIR)-fixes-1.patch
+PATCH1= $(DIR)-fixes-2.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 4fbd5e56c212c8e37f363eb48ba86a5ecea21f4a
+SHA-$(PATCH1)= 905d17574d6972f494b8ec4cb62bfad1c9f3ff62
 
-PATCH50= $(DIR)-8bit-1.patch
-URL-$(PATCH50)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= edc01eceb4ae7af3d6a02e23a4dace8fee50f3eb
+PATCH2= $(DIR)-8bit-1.patch
+URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= edc01eceb4ae7af3d6a02e23a4dace8fee50f3eb
 
 # Targets
 
@@ -24,13 +24,13 @@
 	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH50)} $(LFSSRC)
+	cp $(SRC)/{$(FILE),$(PATCH1),$(PATCH2)} $(LFSSRC)
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH50)
+	patch -Np1 -i ../$(PATCH2)
 	make $(PM)
 	make install
 	install -m644 $(ROOT)/etc/syslog.conf /etc

Modified: trunk/packages/sysvinit/Makefile
===================================================================
--- trunk/packages/sysvinit/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/sysvinit/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -9,8 +9,6 @@
 SHA-$(FILE)= 3e78df609a2ff0fea6304cb662a7f10298d03667
 
 PATCH1= $(DIR)-reexec06-1.patch
-URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= d06fd7274e767c1c98be27d1dc4adb135260e479
 
 # Targets
 

Modified: trunk/packages/tar/Makefile
===================================================================
--- trunk/packages/tar/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/tar/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -27,12 +27,8 @@
 
 stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
 	$(std_build)
-	cp $(SRC)/{$(PATCH2),$(PATCH3)} $(LFSSRC)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH2)
-	patch -Np1 -i ../$(PATCH3)
 	./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin
 	make $(PM)
 	make install

Modified: trunk/packages/texinfo/Makefile
===================================================================
--- trunk/packages/texinfo/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/texinfo/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -3,19 +3,18 @@
 NM= texinfo
 VRS= 4.8
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
 
-FILE= $(DIR).tar.bz2
+FILE= $(DIR)a.tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= b19e906f7220294c1e8b087d583c50f5c4d7c420
+SHA-$(FILE)= cde723b115faebb81019154c320e108c5042c906
 
-PATCH1= $(DIR)-tempfile_fix-2.patch
+PATCH1= $(DIR)a-tempfile_fix-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 2ead28cb8e2679cdb53e1e4908209f0a31397dfe
 
-PATCH50= $(DIR)-multibyte-1.patch
-URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= b97ae3468c03f8389dbf5c9b6eed64f996f9ed5c
+PATCH2= $(DIR)a-multibyte-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= b97ae3468c03f8389dbf5c9b6eed64f996f9ed5c
 
 # Targets
 
@@ -34,13 +33,13 @@
 	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
 	$(std_build)
-	cp $(SRC)/{$(PATCH1),$(PATCH50)} $(LFSSRC)
+	cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
-	patch -Np1 -i ../$(PATCH50)
+	patch -Np1 -i ../$(PATCH2)
 	./configure --prefix=/usr
 	make $(PM)
 	make install

Modified: trunk/packages/udev/Makefile
===================================================================
--- trunk/packages/udev/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/udev/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -1,18 +1,18 @@
 # Udev Makefile
 
 NM= udev
-VRS= 096
-CONFVRS= 6.2
+VRS= 103
+CONFVRS= 20061021
 DIR= $(NM)-$(VRS)
 CONFDIR=$(NM)-config-$(CONFVRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8d15b89fdf93ba84e2d33ff6061e140aed0a4dce
+SHA-$(FILE)= 015372f585beeba05217ad6568178820b2713571
 
 FILE1= $(CONFDIR).tar.bz2
-URL-$(FILE1)= http://www.linuxfromscratch.org/lfs/downloads/6.2/$(FILE1)
-SHA-$(FILE1)= 5cd22b8e9cf1e996871e2bc540d75e57a4f706a3
+URL-$(FILE1)= $(HTTP)/$(NM)-config/$(FILE1)
+SHA-$(FILE1)= 11b85243e0eec64be63be9e743f1ba7441a47e62
 
 # Targets
 
@@ -38,7 +38,8 @@
 	rm -rf extras/dasd_id
 	make EXTRAS="`echo extras/*/`"
 	make DESTDIR=/ EXTRAS="`echo extras/*/`" install
-	cp $(CONFDIR)/[0-9]* /etc/udev/rules.d/
+	cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/
+	cd $(CONFDIR) ; make install install-doc install-extra-doc
 	echo 'ACTION=="add", BUS=="pci", SYSFS{class}=="0x030000", RUN+="detect-video"' >/etc/udev/rules.d/30-video.rules
 	install -m755 ../detect-video ../dhcp-helper /lib/udev
 	install -m644 ../50-network.rules /etc/udev/rules.d/

Modified: trunk/packages/util-linux/Makefile
===================================================================
--- trunk/packages/util-linux/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/util-linux/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -16,12 +16,12 @@
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
 
-PATCH31= $(DIR)-gcc4_fixes-1.patch
-URL-$(PATCH31)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH31)
-SHA-$(PATCH31)= 638972c2f2b09cf20aac60ede91e803a96cea4d9
+PATCH2= $(DIR)-lseek-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 5cebb93628a644b9e2b72944bdcb244f0b67374b
 
 STAGE1_DEPS = $(FILE)
-STAGE2_DEPS = $(FILE) $(FILE1) $(PATCH1)
+STAGE2_DEPS = $(FILE) $(FILE1) $(PATCH1) $(PATCH2)
 
 # Targets
 
@@ -45,7 +45,7 @@
 
 stage2: Makefile $(STAGE2_DEPS)
 	$(std_build)
-	cp $(SRC)/$(PATCH1) $(LFSSRC)/
+	cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
 
 compile-stage2:
 	tar jxf ../$(FILE1)
@@ -53,6 +53,8 @@
 	sed -i 's at etc/adjtime at var/lib/hwclock/adjtime at g' hwclock/hwclock.c
 	mkdir -p /var/lib/hwclock
 	patch -Np1 -i ../$(PATCH1)
+	patch -Np1 -i ../$(PATCH2)
+	./configure
 	make $(PM) HAVE_KILL=yes HAVE_SLN=yes
 	make HAVE_KILL=yes HAVE_SLN=yes install
 

Modified: trunk/packages/vim/Makefile
===================================================================
--- trunk/packages/vim/Makefile	2006-12-05 16:39:45 UTC (rev 1763)
+++ trunk/packages/vim/Makefile	2006-12-06 11:36:26 UTC (rev 1764)
@@ -5,25 +5,21 @@
 DIR= $(NM)70
 
 FILE= $(NM)-$(VRS).tar.bz2
-URL-$(FILE)= http://ftp.vim.org/pub/vim/unix/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 38ef48cabf942d0dc804a794dcc6f002b9457fc8
 
 FILE2= $(NM)-$(VRS)-lang.tar.gz
-URL-$(FILE2)= http://ftp.vim.org/pub/vim/extra/$(FILE2)
+URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
 SHA-$(FILE2)= 3db6b0004d213490cc00d361835e7a7c685adb52
 
-PATCH1= $(NM)-$(VRS)-fixes-7.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH1)
-SHA-$(PATCH1)= caf8b4b5635cf72edd033b048a993f80c5a5aa7b
+PATCH1= $(NM)-$(VRS)-fixes-14.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 53682430a0673e15d20b435702f2e9132249fb77
 
 PATCH2= $(NM)-$(VRS)-mandir-1.patch
-URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH2)
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
 SHA-$(PATCH2)= 182f46dfacefdd3bf6f821dea71f90547d414230
 
-PATCH3= $(NM)-$(VRS)-spellfile-1.patch
-URL-$(PATCH3)= http://www.linuxfromscratch.org/patches/lfs/6.2/$(PATCH3)
-SHA-$(PATCH3)= 4e0cb489a9b8f989f154d14cadb50deba619dd2b
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -36,20 +32,19 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2) $(PATCH3)
+stage2: Makefile $(FILE) $(FILE2) $(PATCH1) $(PATCH2)
 	$(std_build)
-	cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)
+	cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1),$(PATCH2)} $(LFSSRC)
 
 compile-stage2:
 	unpack ../$(FILE2) --strip-components=1
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
-	patch -Np1 -i ../$(PATCH3)
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	./configure --prefix=/usr --enable-multibyte
 	make $(PM)
 	make install
-	rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
+	rm -f /usr/share/vim/$(DIR)/tutor/tutor.{pl,ru}
 	rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
 	ln -sfv vim /usr/bin/vi
 	for L in "" fr it pl ru ; do \
@@ -64,13 +59,12 @@
 	unpack ../$(FILE2) --strip-components=1
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
-	patch -Np1 -i ../$(PATCH3)
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 	echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
 	./configure --prefix=/usr --with-features=huge
 	make $(PM)
 	make install
-	rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
+	rm -f /usr/share/vim/$(DIR)/tutor/tutor.{pl,sk}
 	rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
 	ln -sfv vim /usr/bin/vi
 	for L in "" fr it pl ru ; do \




More information about the livecd mailing list