r505 - in x86/trunk: . packages/slrn

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 13:11:12 PDT 2005


Author: jhuntwork
Date: 2005-08-02 14:11:12 -0600 (Tue, 02 Aug 2005)
New Revision: 505

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

Modified: x86/trunk/packages/slrn/Makefile
===================================================================
--- x86/trunk/packages/slrn/Makefile	2005-08-02 20:04:58 UTC (rev 504)
+++ x86/trunk/packages/slrn/Makefile	2005-08-02 20:11:12 UTC (rev 505)
@@ -1,30 +1,59 @@
 # slrn Makefile
+#==============================================================================
 
-# Package versions
 NM= slrn
 VRS= 0.9.8.1
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://easynews.dl.sourceforge.net/sourceforge/$(NM)/$(FILE)
+URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/$(NM)/$(FILE)
+SHA-$(FILE)= 1502debf524b90eceb2b15202a6d3cd0f5dc6887
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+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 /usr/bin/slrn ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --with-slrnpull \
-	 --with-mta="/usr/bin/msmtp -t" --enable-spool --with-ssl && \
-	 make -j3 && make install && \
-	 cp $(ROOT)/root/.slrnrc /root/ ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --sysconfdir=/etc --with-slrnpull \
+	 --with-mta="/usr/bin/msmtp -t" --enable-spool --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
+	@cp $(ROOT)/root/.slrnrc /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 20:04:58 UTC (rev 504)
+++ x86/trunk/todo-list	2005-08-02 20:11:12 UTC (rev 505)
@@ -38,4 +38,3 @@
 packages/screen
 packages/shadow
 packages/slang
-packages/slrn




More information about the livecd mailing list