r527 - in x86/trunk: . packages/mutt

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 15:45:28 PDT 2005


Author: justin
Date: 2005-08-02 16:45:27 -0600 (Tue, 02 Aug 2005)
New Revision: 527

Modified:
   x86/trunk/packages/mutt/Makefile
   x86/trunk/todo-list
Log:
Updated mutt Makefile.

Modified: x86/trunk/packages/mutt/Makefile
===================================================================
--- x86/trunk/packages/mutt/Makefile	2005-08-02 22:37:26 UTC (rev 526)
+++ x86/trunk/packages/mutt/Makefile	2005-08-02 22:45:27 UTC (rev 527)
@@ -1,34 +1,64 @@
 # mutt Makefile
+#==============================================================================
 
-# Package versions
 NM= mutt
 VRS= 1.4.2.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR)i.tar.gz
-NNTP_PATCH= patch-$(VRS).vvv.nntp
-URL= ftp://ftp.mutt.org/mutt/$(FILE)
-URL1= http://mutt.org.ua/download/mutt-$(VRS)/$(NNTP_PATCH).gz
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= f56b36f8836ee624633858d903d153e9b6e3afad
 
-#RULES
+PATCH1= patch-$(VRS).vvv.nntp
+URL-$(PATCH1)= http://mutt.org.ua/download/mutt-$(VRS)/$(PATCH1).gz
+SHA-$(PATCH1)= ac0ddf0831808b01c67ab27b3e3823ecf1ca131b
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f $(NNTP_PATCH) ] ; then $(WGET) $(URL1) && gunzip $(NNTP_PATCH).gz ; fi
-	-groupadd mail
-	@if [ ! -f /usr/bin/mutt ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(NNTP_PATCH) && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --enable-imap --enable-pop --enable-nntp --with-ssl && \
-	 make -j3 && make install && \
-	 install -m600  $(ROOT)/root/.muttrc /root ; fi
-	@make clean
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@groupadd mail
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
+	 --enable-pop --enable-nntp --with-ssl >../$(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
+	@install -m600  $(ROOT)/root/.muttrc /root
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 22:37:26 UTC (rev 526)
+++ x86/trunk/todo-list	2005-08-02 22:45:27 UTC (rev 527)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-mutt
 nano
 ncftp
 nfs-utils




More information about the livecd mailing list