r748 - in x86/trunk/packages: gawk man thunderbird util-linux

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sat Sep 24 09:52:26 PDT 2005


Author: justin
Date: 2005-09-24 10:52:25 -0600 (Sat, 24 Sep 2005)
New Revision: 748

Modified:
   x86/trunk/packages/gawk/Makefile
   x86/trunk/packages/man/Makefile
   x86/trunk/packages/thunderbird/Makefile
   x86/trunk/packages/util-linux/Makefile
Log:
Fixed 2 wrong patch SHA1SUMS for Thunderbird, updated util-linux to 2.12r, updated gawk to 3.1.5, updated man to 1.6b.

Modified: x86/trunk/packages/gawk/Makefile
===================================================================
--- x86/trunk/packages/gawk/Makefile	2005-09-24 13:18:12 UTC (rev 747)
+++ x86/trunk/packages/gawk/Makefile	2005-09-24 16:52:25 UTC (rev 748)
@@ -1,12 +1,12 @@
 # Gawk Makefile
 
 NM= gawk
-VRS= 3.1.4
+VRS= 3.1.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= d05aad7163b8f49744bff658d1df0d237d9e5125
+SHA-$(FILE)= 0d5694461f1c32f1eae41a1c0d7ba0939b47e369
 
 # Targets
 

Modified: x86/trunk/packages/man/Makefile
===================================================================
--- x86/trunk/packages/man/Makefile	2005-09-24 13:18:12 UTC (rev 747)
+++ x86/trunk/packages/man/Makefile	2005-09-24 16:52:25 UTC (rev 748)
@@ -2,12 +2,12 @@
 #==============================================================================
 
 NM= man
-VRS= 1.6a
+VRS= 1.6b
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 579e29dc96fa3dbc88b192b69fe2902c8c21e105
+SHA-$(FILE)= e4b84ca61565314ef1a29a4c1221b6321dbdc278
 
 # Targets
 # =============================================================================
@@ -15,44 +15,20 @@
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) \
+	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@sed -i 's at -is@&R at g' configure
-	@sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in
-	@./configure -confdir=/etc >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	sed -i 's at -is@&R at g' configure
+	sed -i 's at MANPATH./usr/man@#&@g' src/man.conf.in
+	./configure -confdir=/etc
+	make
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/thunderbird/Makefile
===================================================================
--- x86/trunk/packages/thunderbird/Makefile	2005-09-24 13:18:12 UTC (rev 747)
+++ x86/trunk/packages/thunderbird/Makefile	2005-09-24 16:52:25 UTC (rev 748)
@@ -11,7 +11,7 @@
 
 PATCH1= $(NM)-$(VRS)-gcc4-1.patch
 URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH1)
-SHA-$(PATCH1)= c918d248059e4f5f2f60c2f87ed3c2ebe6a91f7f
+SHA-$(PATCH1)= d26a28afe3ca418a2b005daf31a561175cb664eb
 
 PATCH2= $(NM)-$(VRS)-fixes-1.patch
 URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)

Modified: x86/trunk/packages/util-linux/Makefile
===================================================================
--- x86/trunk/packages/util-linux/Makefile	2005-09-24 13:18:12 UTC (rev 747)
+++ x86/trunk/packages/util-linux/Makefile	2005-09-24 16:52:25 UTC (rev 748)
@@ -1,110 +1,50 @@
 # Util-Linux Makefile
-#==============================================================================
 
 NM= util-linux
-VRS= 2.12q
+VRS= 2.12r
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8a7d0a4a9f3637e17c618bc1641f91606ef2efaf
+SHA-$(FILE)= 740b7eb5ae1148b2200b2cd34a0a6c4b0db577e4
 
 PATCH1= $(DIR)-cramfs-1.patch
 URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
 
-PATCH2= $(DIR)-reiser_crash-2.patch
-URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
-SHA-$(PATCH2)= 91a03ae31e1a842f0da3aefdbaa74d76c927c465
-
-PATCH3= $(DIR)-umount_fix-1.patch
-URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
-SHA-$(PATCH3)= 28671233f1fb3e8d094ada6536cac26bf98ba103
-
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 stage1: $(FILE)
-	@$(std_build)
-	@cp $(SRC)/$(FILE) $(LFSSRC)
+	$(std_build)
+	cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage1:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@sed -i 's@/usr/include@$(WD)/include at g' configure
-	@./configure >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make -C lib >>../$(DIR)-$@.log 2>&1
-	@make -C mount mount umount >>../$(DIR)-$@.log 2>&1
-	@make -C text-utils more >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@cp mount/{,u}mount text-utils/more $(WD)/bin
-#
-#==Status Messages==========================================
-#
-	@$(OK)
+	sed -i 's@/usr/include@$(WD)/include at g' configure
+	./configure
+	make -C lib
+	make -C mount mount umount
+	make -C text-utils more
+	cp mount/{,u}mount text-utils/more $(WD)/bin
 
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) \
+	chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
-	@$(std_build)
-	@cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)/
+stage2: Makefile $(FILE) $(PATCH1)
+	$(std_build)
+	cp $(SRC)/$(PATCH1) $(LFSSRC)/
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@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)
-	@patch -Np1 -i ../$(PATCH3)
-	@./configure >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) HAVE_KILL=yes HAVE_SLN=yes >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make HAVE_KILL=yes HAVE_SLN=yes install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	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)
+	./configure
+	make $(PM) HAVE_KILL=yes HAVE_SLN=yes
+	make HAVE_KILL=yes HAVE_SLN=yes install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: compile-stage1 clean chroot compile-stage2




More information about the livecd mailing list