X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fvim;h=260d5246d38dfac1d1cecbf0bf01da202ee36555;hp=87e6ead959974131e8ca9d8d5eb0252ac4224424;hb=bf7c473f7b0b0231854ed00e633322b25c5a247b;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/vim b/lfs/vim
index 87e6ead959..260d5246d3 100644
--- a/lfs/vim
+++ b/lfs/vim
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: vim,v 1.3.2.3 2005/04/13 23:52:04 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,26 +26,23 @@
 
 include Config
 
-VER        = 6.3
+VER        = 7.0
 
 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.vim.org/pub/vim/unix
-DIR_APP    = $(DIR_SRC)/vim63
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/vim70
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-	vim-6.3-security_fix-1.patch
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-vim-6.3-security_fix-1.patch = $(URL_LFS)/vim/vim-6.3-security_fix-1.patch
 
-$(DL_FILE)_MD5 = 821fda8f14d674346b87e3ef9cb96389
-vim-6.3-security_fix-1.patch_MD5 = ef9a421f1d29993ce5bbd709cece4624
+$(DL_FILE)_MD5 = 4ca69757678272f718b1041c810d82d8
 
 install : $(TARGET)
 
@@ -81,14 +72,19 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/vim-6.3-security_fix-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.0-fixes-7.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.0-mandir-1.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.0-spellfile-1.patch
 	cd $(DIR_APP) && echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-	cd $(DIR_APP) && echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --with-features=tiny --disable-gpm 
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr --enable-multibyte --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	ln -sf vim /usr/bin/vi
-	echo "set nocompatible"	>  /root/.vimrc
-	echo "set bs=2"		>> /root/.vimrc
+	ln -sv vim /usr/bin/vi
+	echo "set nocompatible"	>  /etc/vimrc
+	echo "set backspace=2"	>> /etc/vimrc
+	echo "syntax on"		>> /etc/vimrc
+	echo -e "if (&term == \"iterm\") || (&term == \"putty\")" >> /etc/vimrc
+	echo "set background=dark"	>> /etc/vimrc
+	echo "endif"			>> /etc/vimrc
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)