Author: justin
Date: 2005-09-25 00:19:08 -0600 (Sun, 25 Sep 2005)
New Revision: 767
Modified:
x86/trunk/packages/module-init-tools/Makefile
x86/trunk/packages/msmtp/Makefile
x86/trunk/packages/nALFS-profile/Makefile
x86/trunk/packages/nALFS/Makefile
x86/trunk/packages/nano/Makefile
x86/trunk/packages/ncftp/Makefile
x86/trunk/packages/ncurses/Makefile
x86/trunk/packages/openssh/Makefile
x86/trunk/packages/openssl/Makefile
x86/trunk/packages/pango/Makefile
x86/trunk/packages/patch/Makefile
x86/trunk/packages/pciutils/Makefile
x86/trunk/packages/perl/Makefile
x86/trunk/packages/pkgconfig/Makefile
x86/trunk/packages/popt/Makefile
x86/trunk/packages/portmap/Makefile
x86/trunk/packages/ppp/Makefile
x86/trunk/packages/procps/Makefile
x86/trunk/packages/psmisc/Makefile
x86/trunk/packages/readline/Makefile
Log:
Messages/Logging update for packages from module-init-tools to readline.
Modified: x86/trunk/packages/module-init-tools/Makefile
===================================================================
--- x86/trunk/packages/module-init-tools/Makefile 2005-09-25 05:14:42 UTC
(rev 766)
+++ x86/trunk/packages/module-init-tools/Makefile 2005-09-25 06:19:08 UTC
(rev 767)
@@ -1,5 +1,4 @@
# Module-Init-Tools Makefile
-#==============================================================================
NM= module-init-tools
VRS= 3.1
@@ -10,48 +9,23 @@
SHA-$(FILE)= f233cab26208aa7d21a8ca24e4a9712af23a5a1d
# 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 \/
-#==============================================================================
- @touch modprobe.conf.5
- @./configure --prefix="" --enable-zlib >../$(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)
+ touch modprobe.conf.5
+ ./configure --prefix="" --enable-zlib
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/msmtp/Makefile
===================================================================
--- x86/trunk/packages/msmtp/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/msmtp/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# msmtp Makefile
-#==============================================================================
NM= msmtp
VRS= 1.4.0
@@ -10,47 +9,22 @@
SHA-$(FILE)= b3b202883831d62d53d8cc7347fe5b654d6ed38f
# 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 \/
-#==============================================================================
- @./configure --prefix=/usr --sysconfdir=/etc >../$(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 --sysconfdir=/etc
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/nALFS/Makefile
===================================================================
--- x86/trunk/packages/nALFS/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/nALFS/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# nALFS Makefile
-#==============================================================================
NM= nALFS
VRS= 1.2.4
@@ -10,48 +9,23 @@
SHA-$(FILE)= e9847c5830f2b1c5a89fe3bb7fa397648b4099e7
# 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 --with-libxml2 \
- --with-curl --with-ssl >../$(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 --with-libxml2 \
+ --with-curl --with-ssl
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/nALFS-profile/Makefile
===================================================================
--- x86/trunk/packages/nALFS-profile/Makefile 2005-09-25 05:14:42 UTC (rev
766)
+++ x86/trunk/packages/nALFS-profile/Makefile 2005-09-25 06:19:08 UTC (rev
767)
@@ -1,5 +1,4 @@
# nALFS profile Makefile
-#==============================================================================
NM= profile
VRS= LFS-6.1
@@ -10,30 +9,21 @@
SHA-$(FILE)= e4be78e5de2e71ba7b48013483142aa62fc7283f
# 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 \/
-#==============================================================================
- @sed -i 's@/your/$(DIR)/packages@/[EMAIL PROTECTED]' config/general.ent
- @cp -rav . /root/nALFS-profile-$(DIR) >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ sed -i 's@/your/$(DIR)/packages@/[EMAIL PROTECTED]' config/general.ent
+ cp -rav . /root/nALFS-profile-$(DIR)
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/nano/Makefile
===================================================================
--- x86/trunk/packages/nano/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/nano/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Nano Makefile
-#==============================================================================
NM= nano
VRS= 1.2.5
@@ -10,51 +9,26 @@
SHA-$(FILE)= a3f332a43abedd5467da8808de90b53ae98fa5e0
# 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 --enable-color \
- --enable-multibuffer --enable-nanorc >../$(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
- @mkdir -p /usr/share/doc/nano/examples
- @cp nanorc.sample /usr/share/doc/nano/examples
- @cp $(ROOT)/etc/nanorc /etc
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr --sysconfdir=/etc --enable-color \
+ --enable-multibuffer --enable-nanorc
+ make $(PM)
+ make install
+ mkdir -p /usr/share/doc/nano/examples
+ cp nanorc.sample /usr/share/doc/nano/examples
+ cp $(ROOT)/etc/nanorc /etc
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/ncftp/Makefile
===================================================================
--- x86/trunk/packages/ncftp/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/ncftp/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# ncftp Makefile
-#==============================================================================
NM= ncftp
VRS= 3.1.9
@@ -10,49 +9,24 @@
SHA-$(FILE)= 052be99800b740a50b31619ccd65fd4f082a3386
# 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 -C libncftp shared >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @make -C libncftp soinstall >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @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 -C libncftp shared
+ make -C libncftp soinstall
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/ncurses/Makefile
===================================================================
--- x86/trunk/packages/ncurses/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/ncurses/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Ncurses Makefile
-#==============================================================================
NM= ncurses
VRS= 5.4
@@ -14,91 +13,41 @@
SHA-$(PATCH1)= 7da2e2ae84d49466ff777b4d815318391776e21b
# 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) --with-shared --without-debug \
- --without-ada --enable-overwrite >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make sources >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @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) --with-shared --without-debug \
+ --without-ada --enable-overwrite
+ make sources
+ 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) $(PATCH1)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @bzcat ../$(PATCH1) > update.sh
- @sh update.sh
- @./configure --prefix=/usr --with-shared --without-debug --with-gpm \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make sources >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @make $(PM) >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @chmod 755 /usr/lib/*.5.4
- @chmod 644 /usr/lib/libncurses++.a && mv /usr/lib/libncurses.so.5* /lib
- @ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
- @ln -sf libncurses.so /usr/lib/libcurses.so
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ bzcat ../$(PATCH1) > update.sh
+ sh update.sh
+ ./configure --prefix=/usr --with-shared --without-debug --with-gpm
+ make sources
+ make $(PM)
+ make install
+ chmod 755 /usr/lib/*.5.4
+ chmod 644 /usr/lib/libncurses++.a && mv /usr/lib/libncurses.so.5* /lib
+ ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
+ ln -sf libncurses.so /usr/lib/libcurses.so
clean:
- @-rm -rf $(DIR)
- @rm -f update.sh
+ -rm -rf $(DIR)
+ rm -f update.sh
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/openssh/Makefile
===================================================================
--- x86/trunk/packages/openssh/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/openssh/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,63 +1,36 @@
# OpenSSH Makefile
-#==============================================================================
NM= openssh
-VRS= 4.1p1
+VRS= 4.2p1
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.bz2
-URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
-SHA-$(FILE)= 7226920d228a2160a0ed1ccd9a607c6ca89f71e0
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/$(FILE)
+SHA-$(FILE)= 5e7231cfa8ec673ea856ce291b78fac8b380eb78
# 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 \/
-#==============================================================================
- @install -v -d -m700 /var/lib/sshd >../$(DIR)[EMAIL PROTECTED] 2>&1
- @chown root:sys /var/lib/sshd
- @groupadd sshd
- @useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
- @sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure
- @./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin
\
- --with-md5-passwords --with-privsep-path=/var/lib/sshd \
- >>../$(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-nokeys >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ install -v -d -m700 /var/lib/sshd
+ chown root:sys /var/lib/sshd
+ groupadd sshd
+ useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
+ sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure
+ ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin \
+ --with-md5-passwords --with-privsep-path=/var/lib/sshd
+ make $(PM)
+ make install-nokeys
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/openssl/Makefile
===================================================================
--- x86/trunk/packages/openssl/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/openssl/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# OpenSSL Makefile
-#==============================================================================
NM= openssl
VRS= 0.9.7g
@@ -14,51 +13,26 @@
SHA-$(PATCH1)= 723f730aff3c8d493f5e22bcb70734f48cfb41f4
# 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 \/
-#==============================================================================
- @patch -Np1 -i ../$(PATCH1) >../$(DIR)[EMAIL PROTECTED] 2>&1
- @./config --openssldir=/etc/ssl --prefix=/usr shared >>../$(DIR)[EMAIL
PROTECTED] 2>&1
- @sed -i 's/mcpu=pentium/mtune=i486/' Configure
- @sed -i 's/mcpu=pentium/mtune=i486/' Makefile
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) MANDIR=/usr/share/man >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make MANDIR=/usr/share/man install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @cp -r certs /etc/ssl
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ patch -Np1 -i ../$(PATCH1)
+ ./config --openssldir=/etc/ssl --prefix=/usr shared
+ sed -i 's/mcpu=pentium/mtune=i486/' Configure
+ sed -i 's/mcpu=pentium/mtune=i486/' Makefile
+ make $(PM) MANDIR=/usr/share/man
+ make MANDIR=/usr/share/man install
+ cp -r certs /etc/ssl
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/pango/Makefile
===================================================================
--- x86/trunk/packages/pango/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/pango/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Pango Makefile
-#==============================================================================
NM= pango
VRS= 1.8.1
@@ -10,47 +9,22 @@
SHA-$(FILE)= 46d6992cd5782a3ca7623f0d91f31b6bdffb0346
# 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/patch/Makefile
===================================================================
--- x86/trunk/packages/patch/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/patch/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Patch Makefile
-#==============================================================================
NM= patch
VRS= 2.5.4
@@ -10,82 +9,31 @@
SHA-$(FILE)= 0282d048ff6ebd06cb92adc06b49932ec71c382f
# 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 \/
-#==============================================================================
- @CPPFLAGS=-D_GNU_SOURCE ./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)
+ CPPFLAGS=-D_GNU_SOURCE ./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 \/
-#==============================================================================
- @CPPFLAGS=-D_GNU_SOURCE ./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)
+ CPPFLAGS=-D_GNU_SOURCE ./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/pciutils/Makefile
===================================================================
--- x86/trunk/packages/pciutils/Makefile 2005-09-25 05:14:42 UTC (rev
766)
+++ x86/trunk/packages/pciutils/Makefile 2005-09-25 06:19:08 UTC (rev
767)
@@ -1,5 +1,4 @@
# PCI Utilities Makefile
-#==============================================================================
NM= pciutils
VRS= 2.1.11
@@ -10,39 +9,22 @@
SHA-$(FILE)= fa561d97033d8992d2b20c5ca928e6a2ac9ebcfb
# 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, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make PREFIX=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make PREFIX=/usr install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @update-pciids
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ make PREFIX=/usr
+ make PREFIX=/usr install
+ update-pciids
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/perl/Makefile
===================================================================
--- x86/trunk/packages/perl/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/perl/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Perl Makefile
-#==============================================================================
NM= perl
VRS= 5.8.7
@@ -14,85 +13,34 @@
SHA-$(PATCH1)= e515154714acdbb1dbdbeb71727649895e26f50d
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
stage1: $(FILE) $(PATCH1)
- @$(std_build)
- @cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
+ $(std_build)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage1:
- @$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
- @patch -Np1 -i ../$(PATCH1)
- @./configure.gnu --prefix=$(WD) -Dstatic_ext='IO Fcntl POSIX' \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make perl utilities >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @cp perl pod/pod2man $(WD)/bin
- @mkdir -p $(WD)/lib/perl5/$(VRS)
- @cp -R lib/* $(WD)/lib/perl5/$(VRS)
-#
-#==Status Messages==========================================
-#
- @$(OK)
+ patch -Np1 -i ../$(PATCH1)
+ ./configure.gnu --prefix=$(WD) -Dstatic_ext='IO Fcntl POSIX'
+ make perl utilities
+ cp perl pod/pod2man $(WD)/bin
+ mkdir -p $(WD)/lib/perl5/$(VRS)
+ cp -R lib/* $(WD)/lib/perl5/$(VRS)
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.gnu --prefix=/usr -Dpager="/bin/less -isR" \
- >../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make >>../$(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.gnu --prefix=/usr -Dpager="/bin/less -isR"
+ make
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: compile-stage1 clean chroot compile-stage2
Modified: x86/trunk/packages/pkgconfig/Makefile
===================================================================
--- x86/trunk/packages/pkgconfig/Makefile 2005-09-25 05:14:42 UTC (rev
766)
+++ x86/trunk/packages/pkgconfig/Makefile 2005-09-25 06:19:08 UTC (rev
767)
@@ -1,5 +1,4 @@
# Pkgconfig Makefile
-#==============================================================================
NM= pkg-config
VRS= 0.19
@@ -10,47 +9,22 @@
SHA-$(FILE)= b09fa43dcc44fe0db8df1c4994a8ff9eab371666
# 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/popt/Makefile
===================================================================
--- x86/trunk/packages/popt/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/popt/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# popt Makefile
-#==============================================================================
NM= popt
VRS= 1.7
@@ -14,52 +13,27 @@
SHA-$(PATCH1)= 774d7b2ea41128ca8b46bc834f3de1052c4fb9dc
# 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 \/
-#==============================================================================
- @bzcat ../$(PATCH1) > ../$(DIR)-5.diff
- @patch -Np1 -i ../$(DIR)-5.diff
- @./configure --prefix=/usr >../$(DIR)[EMAIL PROTECTED] 2>&1
- @cp configure.in configure.ac
- @touch configure.in configure.ac
-#
-#==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)
+ bzcat ../$(PATCH1) > ../$(DIR)-5.diff
+ patch -Np1 -i ../$(DIR)-5.diff
+ ./configure --prefix=/usr
+ cp configure.in configure.ac
+ touch configure.in configure.ac
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
- @-rm -f $(DIR)-5.diff
+ -rm -rf $(DIR)
+ -rm -f $(DIR)-5.diff
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/portmap/Makefile
===================================================================
--- x86/trunk/packages/portmap/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/portmap/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# portmap Makefile
-#==============================================================================
NM= portmap
VRS= 5beta
@@ -18,40 +17,23 @@
SHA-$(PATCH2)= f9451c5a81006a6ae21358c9498ac9d26b93ff4e
# 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) $(PATCH2)
- @$(std_build)
+ $(std_build)
compile-stage2:
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @patch -Np1 -i ../$(PATCH1)
- @patch -Np1 -i ../$(PATCH2)
- @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)
+ patch -Np1 -i ../$(PATCH1)
+ patch -Np1 -i ../$(PATCH2)
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/ppp/Makefile
===================================================================
--- x86/trunk/packages/ppp/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/ppp/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# ppp Makefile
-#==============================================================================
NM= ppp
VRS= 2.4.3
@@ -10,49 +9,24 @@
SHA-$(FILE)= 7f3840464639f3575d08f9394cfbce65b1956aa8
# 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
- @cp -a $(ROOT)/etc/ppp /etc
- @chown -R 0:0 /etc/ppp
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr
+ make $(PM)
+ make install
+ cp -a $(ROOT)/etc/ppp /etc
+ chown -R 0:0 /etc/ppp
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/procps/Makefile
===================================================================
--- x86/trunk/packages/procps/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/procps/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Procps Makefile
-#==============================================================================
NM= procps
VRS= 3.2.5
@@ -10,38 +9,21 @@
SHA-$(FILE)= 188d0ccd6c7a655ae556fe1078c346cda1aca164
# 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, 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)
+ make $(PM)
+ make install
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/psmisc/Makefile
===================================================================
--- x86/trunk/packages/psmisc/Makefile 2005-09-25 05:14:42 UTC (rev 766)
+++ x86/trunk/packages/psmisc/Makefile 2005-09-25 06:19:08 UTC (rev 767)
@@ -1,5 +1,4 @@
# Psmisc Makefile
-#==============================================================================
NM= psmisc
VRS= 21.6
@@ -10,49 +9,24 @@
SHA-$(FILE)= c23b3cd41ed8e4d599dd4f2dfc22e397fc1351cf
# 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 \/
-#==============================================================================
- @./configure --prefix=/usr --exec-prefix="" >../$(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
- @mv /bin/pstree* /usr/bin
- @ln -sf pstree /usr/bin/pstree.x11
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ ./configure --prefix=/usr --exec-prefix=""
+ make $(PM)
+ make install
+ mv /bin/pstree* /usr/bin
+ ln -sf pstree /usr/bin/pstree.x11
clean:
- @-rm -rf $(DIR)
+ -rm -rf $(DIR)
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/packages/readline/Makefile
===================================================================
--- x86/trunk/packages/readline/Makefile 2005-09-25 05:14:42 UTC (rev
766)
+++ x86/trunk/packages/readline/Makefile 2005-09-25 06:19:08 UTC (rev
767)
@@ -1,5 +1,4 @@
# Readline Makefile
-#==============================================================================
NM= readline
VRS= 5.0
@@ -14,53 +13,28 @@
SHA-$(PATCH1)= 085d0d973d1a39707c26454db1d414957a85e2d0
# 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)
- @./configure --prefix=/usr --libdir=/lib >../$(DIR)[EMAIL PROTECTED]
2>&1
-#
-#==Status Messages==========================================
-#
- @$(OK)
- @$(call echo_message, Making)
-#==============================================================================
-# Make commands below \/
-#==============================================================================
- @make $(PM) SHLIB_XLDFLAGS=-lncurses >>../$(DIR)[EMAIL PROTECTED] 2>&1
-#
-#==Status Messages===========================================
-#
- @$(OK)
- @$(call echo_message, Installing)
-#==============================================================================
-# Install commands below \/
-#==============================================================================
- @make install >>../$(DIR)[EMAIL PROTECTED] 2>&1
- @chmod 755 /lib/lib{readline,history}.so*
- @rm /lib/lib{readline,history}.so
- @ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
- @ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
-#
-#==Status Messages===========================================
-#
- @$(OK)
+ patch -Np1 -i ../$(PATCH1)
+ ./configure --prefix=/usr --libdir=/lib
+ make $(PM) SHLIB_XLDFLAGS=-lncurses
+ make install
+ chmod 755 /lib/lib{readline,history}.so*
+ rm /lib/lib{readline,history}.so
+ ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
+ ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
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
