r569 - in x86/trunk/packages: Xorg html_tidy libpng

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Aug 11 16:59:21 PDT 2005


Author: thomasp
Date: 2005-08-11 17:59:20 -0600 (Thu, 11 Aug 2005)
New Revision: 569

Modified:
   x86/trunk/packages/Xorg/Makefile
   x86/trunk/packages/html_tidy/Makefile
   x86/trunk/packages/libpng/Makefile
Log:
Use versioned html_tidy source tarball or sha1sum will always fail
Chained some commands in Xorg together so they are executed in the proper directory
Fixed a typo in libpng


Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-08-11 23:19:30 UTC (rev 568)
+++ x86/trunk/packages/Xorg/Makefile	2005-08-11 23:59:20 UTC (rev 569)
@@ -11,12 +11,14 @@
 SHA-$(FILE)= 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0
 
 PATCH1= xorg-6.8.1-luit_race-1.patch
-URL-$(FILE)= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH1)
-SHA-$(FILE)= 2d211b65bcdcb7b926f392595d41fd177af8f818
+URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH1)
+SHA-$(PATCH1)= 2d211b65bcdcb7b926f392595d41fd177af8f818
 
 # Targets
 # =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
 	@chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
@@ -31,15 +33,15 @@
 #==============================================================================
 	@patch -Np1 -i ../$(PATCH1)
 	@sed -i '/^SUBDIRS =/s/s etc$$//' programs/Xserver/Xprint/Imakefile
-	@pushd config/util
-	@make -f Makefile.ini lndir >../$(DIR)-$@.log 2>&1
-	@cp lndir /usr/bin/
-	@popd
+	@pushd config/util ; \
+	make -f Makefile.ini lndir >../$(DIR)-$@.log 2>&1 ; \
+	cp lndir /usr/bin/ ; \
+	popd
 	@mkdir ../$(DIR)build
-	@cd ../$(DIR)build
-	@lndir -silent ../$(DIR)
-	@cp ../host.def config/cf/host.def
-	@sed -i -e "s@#include <linux/config.h>@/* & */@" `grep -lr linux/config.h *`
+	@cd ../$(DIR)build ; \
+	lndir -silent ../$(DIR) ; \
+	cp ../host.def config/cf/host.def ; \
+	sed -i -e "s@#include <linux/config.h>@/* & */@" `grep -lr linux/config.h *`
 #
 #==Status Messages==========================================
 #
@@ -48,7 +50,7 @@
 #==============================================================================
 # Make commands below \/
 #==============================================================================
-	@make $(PM) World >>../$(DIR)-$@.log 2>&1
+	@cd ../$(DIR)build ; make $(PM) World >>../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #
@@ -57,8 +59,8 @@
 #==============================================================================
 # Install commands below \/
 #==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-	@make install.man >>../$(DIR)-$@.log 2>&1
+	@cd ../$(DIR)build ; make install >>../$(DIR)-$@.log 2>&1 ; \
+	 make install.man >>../$(DIR)-$@.log 2>&1
 	@ln -sf ../X11R6/bin /usr/bin/X11
 	@ln -sf ../X11R6/lib/X11 /usr/lib/X11
 	@ln -sf ../X11R6/include/X11 /usr/include/X11

Modified: x86/trunk/packages/html_tidy/Makefile
===================================================================
--- x86/trunk/packages/html_tidy/Makefile	2005-08-11 23:19:30 UTC (rev 568)
+++ x86/trunk/packages/html_tidy/Makefile	2005-08-11 23:59:20 UTC (rev 569)
@@ -2,12 +2,12 @@
 #==============================================================================
 
 NM= tidy
-VRS=
+VRS= 050803
 DIR= $(NM)
 
-FILE= $(NM)_src.tgz
+FILE= $(NM)_src_$(VRS).tgz
 URL-$(FILE)= http://tidy.sourceforge.net/src/$(FILE)
-SHA-$(FILE)= 4b39260051743223e0e899f72284bb4f2cb695f0
+SHA-$(FILE)= 2f21799a738e8fc41e383cad115f9fd9eb11f425
 
 FILE1= $(NM)_docs.tgz
 URL-$(FILE1)= http://tidy.sourceforge.net/docs/$(FILE1)

Modified: x86/trunk/packages/libpng/Makefile
===================================================================
--- x86/trunk/packages/libpng/Makefile	2005-08-11 23:19:30 UTC (rev 568)
+++ x86/trunk/packages/libpng/Makefile	2005-08-11 23:59:20 UTC (rev 569)
@@ -30,7 +30,7 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
-	@patch -Np1 -i ../$(PATCH) >../$(DIR)-$@.log 2>&1
+	@patch -Np1 -i ../$(PATCH1) >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages==========================================
 #




More information about the livecd mailing list