X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fvim;h=8928dbd92ba6a6fc373240371c0592c4409b370c;hb=f63cb53f4aa6b049e01aad78a724c9b5dca1a42a;hp=1859221ea18bdb04c17c95b1fd43d600b5f06cfc;hpb=90d372c4b422f71fec009b3ae0cda948f881dc7d;p=ipfire-2.x.git

diff --git a/lfs/vim b/lfs/vim
index 1859221ea1..8928dbd92b 100644
--- a/lfs/vim
+++ b/lfs/vim
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,12 +24,12 @@
 
 include Config
 
-VER        = 7.0
+VER        = 7.4
 
 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/vim70
+DIR_APP    = $(DIR_SRC)/vim74
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 821fda8f14d674346b87e3ef9cb96389
+$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65
 
 install : $(TARGET)
 
@@ -72,19 +70,18 @@ $(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 < $(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) && ./configure --prefix=/usr --enable-multibyte --disable-nls
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--with-features=huge \
+		--enable-multibyte \
+		--enable-gui=no \
+		--disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	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
+
+	ln -svf vim /usr/bin/vi
+	install -m 644 $(DIR_SRC)/config/vim/vimrc /etc/vimrc
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)