r500 - in x86/trunk: . packages/subversion

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 12:28:32 PDT 2005


Author: jhuntwork
Date: 2005-08-02 13:28:32 -0600 (Tue, 02 Aug 2005)
New Revision: 500

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

Modified: x86/trunk/packages/subversion/Makefile
===================================================================
--- x86/trunk/packages/subversion/Makefile	2005-08-02 19:20:20 UTC (rev 499)
+++ x86/trunk/packages/subversion/Makefile	2005-08-02 19:28:32 UTC (rev 500)
@@ -1,30 +1,58 @@
 # Subversion Makefile
+#==============================================================================
 
-# Package versions
 NM= subversion
-VRS= 1.1.3
+VRS= 1.1.4
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= http://subversion.tigris.org/tarballs/$(FILE)
+URL-$(FILE)= $(HTTPBLFS)/Q-S/$(FILE)
+SHA-$(FILE)= e686712a75557387446141aeff3c8f060eb4ebcf
 
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
 
-#RULES
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-.PHONY: clean chroot stage2
+stage2: Makefile $(FILE)
+	@$(std_build)
 
-chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+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
+	@install -v -d -m755 /usr/share/doc/$(DIR) >>../$(DIR)-$@.log 2>&1
+	@cp -v -R doc/* /usr/share/doc/$(DIR) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/svn ] ; then unpack $(FILE) && cd $(DIR) && \
-	 ./configure --prefix=/usr && \
-	 make -j3 && make install && chown -R 0:0 /usr/include/apr-0 ; fi
-	@make clean
-
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: compile-stage1 clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 19:20:20 UTC (rev 499)
+++ x86/trunk/todo-list	2005-08-02 19:28:32 UTC (rev 500)
@@ -44,4 +44,3 @@
 packages/slrn
 packages/squashfs
 packages/startup-notification
-packages/subversion




More information about the livecd mailing list