r743 - in x86/trunk/packages: Xorg diffutils distcc docbook-xml docbook-xsl

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sat Sep 24 01:22:41 PDT 2005


Author: justin
Date: 2005-09-24 02:22:39 -0600 (Sat, 24 Sep 2005)
New Revision: 743

Modified:
   x86/trunk/packages/Xorg/Makefile
   x86/trunk/packages/diffutils/Makefile
   x86/trunk/packages/distcc/Makefile
   x86/trunk/packages/docbook-xml/Makefile
   x86/trunk/packages/docbook-xsl/Makefile
   x86/trunk/packages/docbook-xsl/install
Log:
Update Xorg patch, updated docbook-xsl, updated messages/logging up to packages docbook-xsl.

Modified: x86/trunk/packages/Xorg/Makefile
===================================================================
--- x86/trunk/packages/Xorg/Makefile	2005-09-24 07:19:21 UTC (rev 742)
+++ x86/trunk/packages/Xorg/Makefile	2005-09-24 08:22:39 UTC (rev 743)
@@ -8,9 +8,9 @@
 URL-$(FILE)= $(HTTPBLFS)/Xorg/$(FILE)
 SHA-$(FILE)= 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0
 
-PATCH1= xorg-6.8.1-luit_race-1.patch
+PATCH1= xorg-6.8.1-luit_race-2.patch
 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH1)
-SHA-$(PATCH1)= 2d211b65bcdcb7b926f392595d41fd177af8f818
+SHA-$(PATCH1)= 3a8434bc51cc21e1d72c24d157a05e679ad6ef6c
 
 PATCH2= X11R6.8.2-src-gcc4-1.patch
 URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH2)

Modified: x86/trunk/packages/diffutils/Makefile
===================================================================
--- x86/trunk/packages/diffutils/Makefile	2005-09-24 07:19:21 UTC (rev 742)
+++ x86/trunk/packages/diffutils/Makefile	2005-09-24 08:22:39 UTC (rev 743)
@@ -1,5 +1,4 @@
 # diffutils Makefile
-#==============================================================================
 
 NM= diffutils
 VRS= 2.8.1
@@ -10,80 +9,31 @@
 SHA-$(FILE)= b01fd84ae885fef426e6ccf157ae7184fb9a79a4
 
 # 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 \/
-#==============================================================================
-	@./configure --prefix=$(WD) >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
+	./configure --prefix=$(WD)
+	make $(PM)
+	make install
 
 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 \/
-#==============================================================================
-	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	./configure --prefix=/usr
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: compile-stage1 clean chroot compile-stage2

Modified: x86/trunk/packages/distcc/Makefile
===================================================================
--- x86/trunk/packages/distcc/Makefile	2005-09-24 07:19:21 UTC (rev 742)
+++ x86/trunk/packages/distcc/Makefile	2005-09-24 08:22:39 UTC (rev 743)
@@ -1,5 +1,4 @@
 # distcc Makefile
-#==============================================================================
 
 NM= distcc
 VRS= 2.18.3
@@ -10,47 +9,22 @@
 SHA-$(FILE)= 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) \
+	chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
 stage2: Makefile $(FILE)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=/usr >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages==========================================
-#
-	@$(OK)
-	@$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@make install >>../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	./configure --prefix=/usr
+	make $(PM)
+	make install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/docbook-xml/Makefile
===================================================================
--- x86/trunk/packages/docbook-xml/Makefile	2005-09-24 07:19:21 UTC (rev 742)
+++ x86/trunk/packages/docbook-xml/Makefile	2005-09-24 08:22:39 UTC (rev 743)
@@ -1,5 +1,4 @@
 # DocBook XML DTD Makefile
-#==============================================================================
 
 NM= docbook-xml
 VRS= 4.4
@@ -10,33 +9,24 @@
 SHA-$(FILE)= 7c4d91c82ad3747e1b5600c91782758e5d91c22b
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE)
-	@mkdir $(DIR)
-	@cd $(DIR) ; unzip ../$(FILE)
-	@make -C $(DIR) -f ../Makefile compile-$@
-	@make clean
-	@touch $@
+	mkdir $(DIR)
+	cd $(DIR) ; unzip ../$(FILE)
+	make -C $(DIR) -f ../Makefile compile-$@
+	make clean
+	touch $@
 
 compile-stage2:
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@../install >../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	../install
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/docbook-xsl/Makefile
===================================================================
--- x86/trunk/packages/docbook-xsl/Makefile	2005-09-24 07:19:21 UTC (rev 742)
+++ x86/trunk/packages/docbook-xsl/Makefile	2005-09-24 08:22:39 UTC (rev 743)
@@ -1,39 +1,29 @@
 # DocBook XSL Stylesheets Makefile
-#==============================================================================
 
 NM= docbook-xsl
-VRS= 1.68.1
+VRS= 1.69.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTPBLFS)/D-E/$(FILE)
-SHA-$(FILE)= b39a164cbfa6ec1373266bf1593610a366d72fa8
+SHA-$(FILE)= aaabf0e274609134e187a6c36d2be23f3471f507
 
 # Targets
-# =============================================================================
 
 include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) \
+	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
 stage2: Makefile $(FILE)
-	@$(std_build)
+	$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
-	@../install >../$(DIR)-$@.log 2>&1
-	@ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current
-#
-#==Status Messages===========================================
-#
-	@$(OK)
+	../install
+	ln -s xsl-stylesheets-$(VRS) /usr/share/xml/docbook/xsl-stylesheets-current
 
 clean:
-	@-rm -rf $(DIR)
+	-rm -rf $(DIR)
 
 .PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/docbook-xsl/install
===================================================================
--- x86/trunk/packages/docbook-xsl/install	2005-09-24 07:19:21 UTC (rev 742)
+++ x86/trunk/packages/docbook-xsl/install	2005-09-24 08:22:39 UTC (rev 743)
@@ -1,44 +1,31 @@
 #!/bin/bash
-install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
-install -v -d -m755 /etc/xml &&
-chown -R root:root . &&
-cp -v -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
-    images javahelp lib manpages params profiling template xhtml \
-    /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
-install -v -d -m755 /usr/share/doc/xml &&
-cp -v -af doc/* /usr/share/doc/xml &&
-cd /usr/share/xml/docbook/xsl-stylesheets-1.68.1 &&
-sh INSTALL &&
+install -v -d -m755 /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
+cp -v -R VERSION common eclipse extensions fo html \
+         htmlhelp images javahelp lib manpages params \
+         profiling slides template website xhtml \
+    /usr/share/xml/docbook/xsl-stylesheets-1.69.1 &&
+install -v -m755 -d /usr/share/doc/docbook-xsl-1.69.1 &&
+cp -v -R doc/* /usr/share/doc/docbook-xsl-1.69.1 &&
+if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&
 if [ ! -f /etc/xml/catalog ]; then
     xmlcatalog --noout --create /etc/xml/catalog
 fi &&
-if [ ! -f /etc/xml/docbook ]; then
-    xmlcatalog --noout --create /etc/xml/docbook
-fi &&
 xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/1.68.1" \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+           "http://docbook.sourceforge.net/release/xsl/1.69.1" \
+           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/1.68.1" \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+           "http://docbook.sourceforge.net/release/xsl/1.69.1" \
+           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteSystem" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+           "http://docbook.sourceforge.net/release/xsl/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteURI" \
-    "http://docbook.sourceforge.net/release/xsl/current" \
-    "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \
+           "http://docbook.sourceforge.net/release/xsl/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-1.69.1" \
     /etc/xml/catalog &&
-xmlcatalog --noout --add "delegateSystem" \
-    "http://docbook.sourceforge.net/release/xsl/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
-xmlcatalog --noout --add "delegateURI" \
-    "http://docbook.sourceforge.net/release/xsl/" \
-    "file:///etc/xml/docbook" \
-    /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteSystem" \
     "http://docbook.sourceforge.net/release/xsl/1.67.2" \
     "/usr/share/xml/docbook/xsl-stylesheets-1.68.1" \




More information about the livecd mailing list