r774 - in x86/trunk/packages: firefox mutt thunderbird

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Sep 25 11:39:17 PDT 2005


Author: justin
Date: 2005-09-25 12:39:15 -0600 (Sun, 25 Sep 2005)
New Revision: 774

Modified:
   x86/trunk/packages/firefox/Makefile
   x86/trunk/packages/mutt/Makefile
   x86/trunk/packages/thunderbird/Makefile
Log:
Merged cleanups from utf8-newmake branch for mutt, firefox and thunderbird. Updated firefox to 1.0.7.

Modified: x86/trunk/packages/firefox/Makefile
===================================================================
--- x86/trunk/packages/firefox/Makefile	2005-09-25 17:10:34 UTC (rev 773)
+++ x86/trunk/packages/firefox/Makefile	2005-09-25 18:39:15 UTC (rev 774)
@@ -1,14 +1,14 @@
 # Firefox Makefile
 
 NM= firefox
-VRS= 1.0.6
+VRS= 1.0.7
 DIR= mozilla
 
 FILE= $(NM)-$(VRS)-source.tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/F-H/$(FILE)
-SHA-$(FILE)= 56183aa14a0185a27a6ab4337d2ade7d1d45c2a6
++URL-$(FILE)= http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$(VRS)/source/$(FILE)
++SHA-$(FILE)= ac7549f609db8dbea6db33b2ffb3ae546eea64df
 
-PATCH1= $(NM)-$(VRS)-gcc4-1.patch
+PATCH1= $(NM)-1.0.6-gcc4-1.patch
 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH1)
 SHA-$(PATCH1)= c918d248059e4f5f2f60c2f87ed3c2ebe6a91f7f
 
@@ -32,7 +32,7 @@
 	patch -Np1 -i ../$(PATCH1)
 	make -f client.mk build
 	make -f client.mk install
-	cd $(ROOT)/$(PKG)/$(NM) ; cp -ra $(ROOT)/root/.mozilla /root
+	cp -ra $(ROOT)/root/.mozilla /root
 
 clean:
 	-rm -rf $(DIR)

Modified: x86/trunk/packages/mutt/Makefile
===================================================================
--- x86/trunk/packages/mutt/Makefile	2005-09-25 17:10:34 UTC (rev 773)
+++ x86/trunk/packages/mutt/Makefile	2005-09-25 18:39:15 UTC (rev 774)
@@ -27,8 +27,7 @@
 
 compile-stage2:
 	groupadd mail
-	gunzip -c ../$(PATCH1) > ../patch-$(VRS).vvv.nntp
-	patch -Np1 -i ../patch-$(VRS).vvv.nntp
+	zcat ../$(PATCH1) | patch -Np1
 	patch -Np1 -i ../$(PATCH2)
 	./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
 	 --enable-pop --enable-nntp --with-ssl

Modified: x86/trunk/packages/thunderbird/Makefile
===================================================================
--- x86/trunk/packages/thunderbird/Makefile	2005-09-25 17:10:34 UTC (rev 773)
+++ x86/trunk/packages/thunderbird/Makefile	2005-09-25 18:39:15 UTC (rev 774)
@@ -13,7 +13,7 @@
 SHA-$(PATCH1)= d26a28afe3ca418a2b005daf31a561175cb664eb
 
 PATCH2= $(NM)-$(VRS)-fixes-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
+URL-$(PATCH2)= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH2)
 SHA-$(PATCH2)= 85108557c83d0feafba5e080fdf6247a717237c8
 
 # Targets




More information about the livecd mailing list