Author: justin
Date: 2005-09-24 02:39:02 -0600 (Sat, 24 Sep 2005)
New Revision: 744
Modified:
x86/trunk/packages/e2fsprogs/Makefile
x86/trunk/packages/eject/Makefile
x86/trunk/packages/expat/Makefile
x86/trunk/packages/expect/Makefile
x86/trunk/packages/file/Makefile
x86/trunk/packages/findutils/Makefile
x86/trunk/packages/firefox/Makefile
x86/trunk/packages/flex/Makefile
x86/trunk/packages/fontconfig/Makefile
Log:
Packages e2fsprogs to fontconfig - Messages/Logging update.
Modified: x86/trunk/packages/e2fsprogs/Makefile
===================================================================
--- x86/trunk/packages/e2fsprogs/Makefile 2005-09-24 08:22:39 UTC (rev
743)
+++ x86/trunk/packages/e2fsprogs/Makefile 2005-09-24 08:39:02 UTC (rev
744)
@@ -1,5 +1,4 @@
# E2fsprogs Makefile
-#==============================================================================
NM= e2fsprogs
VRS= 1.38
@@ -10,50 +9,25 @@
SHA-$(FILE)= 6252152e90c52a8cf158559cd16c0d0ec236c980
# Targets
-# =============================================================================
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 \/
-#==============================================================================
- @mkdir build
- @cd build ; ../configure --prefix=/usr --with-root-prefix="" \
- --enable-elf-shlibs --disable-evms >../../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @cd build ; make >>../../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @cd build ; make install >>../../$(DIR)[EMAIL PROTECTED] 2>&1
- @cd build ; make install-libs >>../../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ mkdir build
+ cd build ; ../configure --prefix=/usr --with-root-prefix="" \
+ --enable-elf-shlibs --disable-evms
+ cd build ; make
+ cd build ; make install
+ cd build ; make install-libs
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/eject/Makefile
===================================================================
--- x86/trunk/packages/eject/Makefile 2005-09-24 08:22:39 UTC (rev 743)
+++ x86/trunk/packages/eject/Makefile 2005-09-24 08:39:02 UTC (rev 744)
@@ -1,5 +1,4 @@
# eject Makefile
-#==============================================================================
NM= eject
VRS= 2.1.0
@@ -10,48 +9,23 @@
SHA-$(FILE)= 92059323f43093ab9f01690c97fb35f14eff4c53
# 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) $(PATCH1)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./bootstrap >../$(DIR)[EMAIL PROTECTED] 2>&1
- @./configure --prefix=/usr >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./bootstrap
+ ./configure --prefix=/usr
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/expat/Makefile
===================================================================
--- x86/trunk/packages/expat/Makefile 2005-09-24 08:22:39 UTC (rev 743)
+++ x86/trunk/packages/expat/Makefile 2005-09-24 08:39:02 UTC (rev 744)
@@ -1,5 +1,4 @@
# Expat Makefile
-#==============================================================================
NM= expat
VRS= 1.95.8
@@ -10,47 +9,22 @@
SHA-$(FILE)= 2bd162283c34093912882fec2081b82027026ad0
# 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, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 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/expect/Makefile
===================================================================
--- x86/trunk/packages/expect/Makefile 2005-09-24 08:22:39 UTC (rev 743)
+++ x86/trunk/packages/expect/Makefile 2005-09-24 08:39:02 UTC (rev 744)
@@ -1,5 +1,4 @@
# Expect Makefile
-#==============================================================================
NM= expect
VRS= 5.43.0
@@ -14,39 +13,22 @@
SHA-$(PATCH1)= ba903a7d04b4faa13c8b9db75e1537f55f28e82b
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
stage1: $(FILE) $(PATCH1)
- @$(std_build)
- @cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
- @make -C ../tcl clean
+ $(std_build)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+ make -C ../tcl clean
compile-stage1:
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @$(call echo_message, Configuring)
- @patch -Np1 -i ../$(PATCH1)
- @./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
- --with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --with-x=no \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @$(call echo_message, Making)
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @$(call echo_message, Installing)
- @make SCRIPTS="" install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @$(OK)
+ patch -Np1 -i ../$(PATCH1)
+ ./configure --prefix=$(WD) --with-tcl=$(WD)/lib \
+ --with-tclinclude=$(ROOT)/$(PKG)/tcl/tcl8.4.11 --with-x=no
+ make $(PM)
+ make SCRIPTS="" install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot
Modified: x86/trunk/packages/file/Makefile
===================================================================
--- x86/trunk/packages/file/Makefile 2005-09-24 08:22:39 UTC (rev 743)
+++ x86/trunk/packages/file/Makefile 2005-09-24 08:39:02 UTC (rev 744)
@@ -1,5 +1,4 @@
# File Makefile
-#==============================================================================
NM= file
VRS= 4.15
@@ -10,48 +9,23 @@
SHA-$(FILE)= 067947db9ad03ffd128214019d209927c93b0d16
# Targets
-# =============================================================================
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)
- @cp $(SRC)/$(FILE) $(LFSSRC)
+ $(std_build)
+ cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 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/findutils/Makefile
===================================================================
--- x86/trunk/packages/findutils/Makefile 2005-09-24 08:22:39 UTC (rev
743)
+++ x86/trunk/packages/findutils/Makefile 2005-09-24 08:39:02 UTC (rev
744)
@@ -1,5 +1,4 @@
# Findutils Makefile
-#==============================================================================
NM= findutils
VRS= 4.2.25
@@ -10,81 +9,32 @@
SHA-$(FILE)= 233a6615bdbbcebc396cc989abc3e06cb27d9f28
# 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)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
+ ./configure --prefix=$(WD)
+ make $(PM)
+ make install
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 --libexecdir=/usr/lib/locate \
- --localstatedir=/var/lib/locate >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr --libexecdir=/usr/lib/locate \
+ --localstatedir=/var/lib/locate
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/firefox/Makefile
===================================================================
--- x86/trunk/packages/firefox/Makefile 2005-09-24 08:22:39 UTC (rev 743)
+++ x86/trunk/packages/firefox/Makefile 2005-09-24 08:39:02 UTC (rev 744)
@@ -1,5 +1,4 @@
# Firefox Makefile
-#==============================================================================
NM= firefox
VRS= 1.0.6
@@ -14,53 +13,28 @@
SHA-$(PATCH1)= c918d248059e4f5f2f60c2f87ed3c2ebe6a91f7f
# 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) $(PATCH1)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @sed 's:@TOPSRCDIR@:$(ROOT)/$(PKG)/$(NM)/mozilla:' ../.mozconfig \
+ sed 's:@TOPSRCDIR@:$(ROOT)/$(PKG)/$(NM)/mozilla:' ../.mozconfig \
> .mozconfig
- @sed -i 's|openURL($${_optLast}|&, new-tab|' browser/app/mozilla.in
- @sed -i '[EMAIL PROTECTED]"$$moz_libdir"@&\n
run_moz="$$dist_bin/run-mozilla.sh"@' \
+ sed -i 's|openURL($${_optLast}|&, new-tab|' browser/app/mozilla.in
+ sed -i '[EMAIL PROTECTED]"$$moz_libdir"@&\n
run_moz="$$dist_bin/run-mozilla.sh"@' \
browser/app/mozilla.in
- @patch -Np1 -i ../$(PATCH1)
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make -f client.mk build >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make -f client.mk install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @cd $(ROOT)/$(PKG)/$(NM) ; cp -ra $(ROOT)/root/.mozilla /root
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ patch -Np1 -i ../$(PATCH1)
+ make -f client.mk build
+ make -f client.mk install
+ cd $(ROOT)/$(PKG)/$(NM) ; cp -ra $(ROOT)/root/.mozilla /root
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/flex/Makefile
===================================================================
--- x86/trunk/packages/flex/Makefile 2005-09-24 08:22:39 UTC (rev 743)
+++ x86/trunk/packages/flex/Makefile 2005-09-24 08:39:02 UTC (rev 744)
@@ -1,5 +1,4 @@
# Flex Makefile
-#==============================================================================
NM= flex
VRS= 2.5.31
@@ -14,60 +13,33 @@
SHA-$(PATCH1)= aafb7a09fa8ffe4d3db0737df6ac39d26f93e072
# 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) $(PATCH1)
- @$(std_build)
- @cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+ $(std_build)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @patch -Np1 -i ../$(PATCH1)
- @touch doc/flex.1
- @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @ln -s libfl.a /usr/lib/libl.a
-
- @echo "#!/bin/sh" > /usr/bin/lex
- @echo "# Begin /usr/bin/lex" >> /usr/bin/lex
- @echo "" >> /usr/bin/lex
- @echo "exec /usr/bin/flex -l \"[EMAIL PROTECTED]"" >> /usr/bin/lex
- @echo "" >> /usr/bin/lex
- @echo "# End /usr/bin/lex" >> /usr/bin/lex
- @chmod 755 /usr/bin/lex
+ patch -Np1 -i ../$(PATCH1)
+ touch doc/flex.1
+ ./configure --prefix=/usr
+ make $(PM)
+ make install
+ ln -s libfl.a /usr/lib/libl.a
+ echo "#!/bin/sh" > /usr/bin/lex
+ echo "# Begin /usr/bin/lex" >> /usr/bin/lex
+ echo "" >> /usr/bin/lex
+ echo "exec /usr/bin/flex -l \"[EMAIL PROTECTED]"" >> /usr/bin/lex
+ echo "" >> /usr/bin/lex
+ echo "# End /usr/bin/lex" >> /usr/bin/lex
+ chmod 755 /usr/bin/lex
-#
-#==Status Messages===========================================
-#
- @$(OK)
-
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/fontconfig/Makefile
===================================================================
--- x86/trunk/packages/fontconfig/Makefile 2005-09-24 08:22:39 UTC (rev
743)
+++ x86/trunk/packages/fontconfig/Makefile 2005-09-24 08:39:02 UTC (rev
744)
@@ -1,5 +1,4 @@
# Fontconfig Makefile
-#==============================================================================
NM= fontconfig
VRS= 2.3.2
@@ -10,49 +9,23 @@
SHA-$(FILE)= 4d9eb11ab369b58513b053417f6487b949b1b696
# 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, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @./configure --prefix=/usr --sysconfdir=/etc --disable-docs \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @sed -i -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-docs
+ make $(PM)
+ make install
+ sed -i -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
