r528 - in x86/trunk: . packages/nano

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 15:49:38 PDT 2005


Author: justin
Date: 2005-08-02 16:49:38 -0600 (Tue, 02 Aug 2005)
New Revision: 528

Modified:
   x86/trunk/packages/nano/Makefile
   x86/trunk/todo-list
Log:
Updated nano Makefile, version bump.

Modified: x86/trunk/packages/nano/Makefile
===================================================================
--- x86/trunk/packages/nano/Makefile	2005-08-02 22:45:27 UTC (rev 527)
+++ x86/trunk/packages/nano/Makefile	2005-08-02 22:49:38 UTC (rev 528)
@@ -1,32 +1,60 @@
 # Nano Makefile
+#==============================================================================
 
-# Package versions
 NM= nano
-VRS= 1.2.4
+VRS= 1.2.5
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://www.nano-editor.org/dist/v1.2/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= a3f332a43abedd5467da8808de90b53ae98fa5e0
 
-.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 /usr/bin/nano ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --enable-color --enable-multibuffer \
-	 --enable-nanorc && \
-	 make -j3 && make install && \
-	 mkdir -p /usr/share/doc/nano/examples && \
-	 cp nanorc.sample /usr/share/doc/nano/examples && \
-	 cp $(ROOT)/etc/nanorc /etc ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr --sysconfdir=/etc --enable-color \
+	 --enable-multibuffer --enable-nanorc >../$(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
+	@mkdir -p /usr/share/doc/nano/examples
+	@cp nanorc.sample /usr/share/doc/nano/examples
+	@cp $(ROOT)/etc/nanorc /etc
+#
+#==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:45:27 UTC (rev 527)
+++ x86/trunk/todo-list	2005-08-02 22:49:38 UTC (rev 528)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-nano
 ncftp
 nfs-utils
 openssh




More information about the livecd mailing list