strongswan: Do not create any NAT rules when using VTI/GRE

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

diff --git a/lfs/vim b/lfs/vim
index 3935d335162037091395007e7a338fc48d7247af..81d1516d7320d9b1a4f5bb3fd057ade22c830328 100644 (file)
--- a/lfs/vim
+++ b/lfs/vim
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
+# Copyright (C) 2007-2018  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        #
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = 7.2
+VER        = 7.4
 
 THISAPP    = vim-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/vim72
+DIR_APP    = $(DIR_SRC)/vim74
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f0901284b338e448bfd79ccca0041254
+$(DL_FILE)_MD5 = 607e135c559be642f210094ad023dc65
 
 install : $(TARGET)
 
@@ -70,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.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) && ./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 "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 "endif"                    >> /etc/vimrc
+
+       ln -svf vim /usr/bin/vi
+       install -m 644 $(DIR_SRC)/config/vim/vimrc /etc/vimrc
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)