###############################################################################
-# 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> #
-# #
-# 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 $
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
include Config
-VER = 6.3
+VER = 7.2
THISAPP = vim-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/vim63
+DIR_APP = $(DIR_SRC)/vim72
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_IPFIRE)/vim-6.3-security_fix-1.patch
-$(DL_FILE)_MD5 = 821fda8f14d674346b87e3ef9cb96389
-vim-6.3-security_fix-1.patch_MD5 = ef9a421f1d29993ce5bbd709cece4624
+$(DL_FILE)_MD5 = f0901284b338e448bfd79ccca0041254
install : $(TARGET)
$(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.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) && 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 "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
@rm -rf $(DIR_APP)
@$(POSTBUILD)