ovpnmain.cgi: Don't fail if files are not existant.

[people/teissler/ipfire-2.x.git] / lfs / vim

diff --git a/lfs/vim b/lfs/vim
index 260d5246d38dfac1d1cecbf0bf01da202ee36555..3935d335162037091395007e7a338fc48d7247af 100644 (file)
--- 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.2
 
 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/vim70
+DIR_APP    = $(DIR_SRC)/vim72
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4ca69757678272f718b1041c810d82d8
+$(DL_FILE)_MD5 = f0901284b338e448bfd79ccca0041254
 
 install : $(TARGET)
 
@@ -72,9 +70,8 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.2-fixes-4.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vim-7.2-mandir-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) && make $(MAKETUNING)
@@ -82,9 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -sv vim /usr/bin/vi
        echo "set nocompatible" >  /etc/vimrc
        echo "set backspace=2"  >> /etc/vimrc
+       echo "set ruler"                >> /etc/vimrc
        echo "syntax on"                >> /etc/vimrc
        echo -e "if (&term == \"iterm\") || (&term == \"putty\")" >> /etc/vimrc
-       echo "set background=dark"      >> /etc/vimrc
+       echo "  set background=dark"    >> /etc/vimrc
        echo "endif"                    >> /etc/vimrc
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)