r503 - in x86/trunk: . packages/ion packages/irssi

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 13:00:58 PDT 2005


Author: justin
Date: 2005-08-02 14:00:57 -0600 (Tue, 02 Aug 2005)
New Revision: 503

Modified:
   x86/trunk/packages/ion/Makefile
   x86/trunk/packages/irssi/Makefile
   x86/trunk/todo-list
Log:
Updated ion,irssi Makefiles.

Modified: x86/trunk/packages/ion/Makefile
===================================================================
--- x86/trunk/packages/ion/Makefile	2005-08-02 19:58:22 UTC (rev 502)
+++ x86/trunk/packages/ion/Makefile	2005-08-02 20:00:57 UTC (rev 503)
@@ -1,28 +1,56 @@
 # ion Makefile
+#==============================================================================
 
-# Package versions
 NM= ion
 VRS= 2-20040729
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.gz
-URL= http://modeemi.cs.tut.fi/~tuomov/ion/dl/$(FILE)
+URL-$(FILE)= http://modeemi.cs.tut.fi/~tuomov/ion/dl/$(FILE)
+SHA-$(FILE)= 92329a392de13dfb79ecd236eeb121a7045327e5
 
-#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/ion ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(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)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/packages/irssi/Makefile
===================================================================
--- x86/trunk/packages/irssi/Makefile	2005-08-02 19:58:22 UTC (rev 502)
+++ x86/trunk/packages/irssi/Makefile	2005-08-02 20:00:57 UTC (rev 503)
@@ -1,29 +1,57 @@
-# Eterm Makefile
+# irssi Makefile
+#==============================================================================
 
-# Package versions
 NM= irssi
 VRS= 0.8.9
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://irssi.org/files/$(FILE)
+URL-$(FILE)= http://irssi.org/files/$(FILE)
+SHA-$(FILE)= 57799a1e99ac5f6694eb6fd049d39a4e2e51f576
 
-#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/irssi ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install ; fi
+stage2: Makefile $(FILE)
+	@$(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
 	@cp -ra $(ROOT)/root/.irssi /root
-	@make clean
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 19:58:22 UTC (rev 502)
+++ x86/trunk/todo-list	2005-08-02 20:00:57 UTC (rev 503)
@@ -2,8 +2,6 @@
 packages/grub
 packages/hotplug
 packages/inputattach
-packages/ion
-packages/irssi
 packages/isoinfo
 packages/joe
 packages/lfs-bootscripts




More information about the livecd mailing list