vim: Update to 7.4.

config/rootfiles/core/fifteen/filelists/vim

@@ -0,0 +1 @@
+../../../common/vim

config/vim/vimrc

@@ -0,0 +1,42 @@
+if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
+   set fileencodings=ucs-bom,utf-8,latin1
+endif
+
+set nocompatible
+set bs=indent,eol,start		" allow backspacing over everything in insert mode
+set viminfo='20,\"50		" read/write a .viminfo file, don't store more
+				" than 50 lines of registers
+set history=50			" keep 50 lines of command line history
+set ruler			" show the cursor position all the time
+
+" Only do this part when compiled with support for autocommands
+if has("autocmd")
+	augroup ipfire
+	autocmd!
+
+	" In text files, always limit the width of text to 78 characters
+	" autocmd BufRead *.txt set tw=78
+
+	" When editing a file, always jump to the last cursor position
+	autocmd BufReadPost *
+	\ if line("'\"") > 0 && line ("'\"") <= line("$") |
+	\   exe "normal! g'\"" |
+	\ endif
+
+	" don't write swapfile on most commonly used directories for NFS mounts or USB sticks
+	autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
+
+	" start with spec file template
+	autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
+
+	augroup END
+endif
+
+syntax on
+if (&term == "iterm") || (&term == "putty")
+  set background=dark
+endif
+
+" Don't wake up system with blinking cursor:
+" http://www.linuxpowertop.org/known.php
+let &guicursor = &guicursor . ",a:blinkon0"

lfs/vim

@@ -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
+	ln -svf vim /usr/bin/vi
-	echo "set backspace=2"	>> /etc/vimrc
+	install -m 644 $(DIR_SRC)/config/vim/vimrc /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)

src/patches/vim-7.2-mandir-1.patch

@@ -1,82 +0,0 @@
-Submitted By: Alexander E. Patrakov
-Date: 2006-05-27
-Initial Package Version: 7.0
-Upstream status: LFS specific
-Description: Adjusts installation of manual pages to meet Man-DB expectations.
-
-             Additional change to explicitly install the man pages into
-	     /usr/share/man instead of /usr/man by Ag Hatzim.
-
---- vim70/src/Makefile.orig	2006-05-27 12:49:31.767959808 +0300
-+++ vim70/src/Makefile	2006-05-27 12:49:55.778309680 +0300
-@@ -867,7 +867,7 @@
- # Uncomment the next line to install Vim in "/usr/bin"
- #BINDIR   = /usr/bin
- # Uncomment the next line to install Vim manuals in "/usr/share/man/man1"
--#MANDIR   = /usr/share/man
-+MANDIR   = /usr/share/man
- # Uncomment the next line to install Vim help files in "/usr/share/vim"
- #DATADIR  = /usr/share
- 
-@@ -1325,7 +1325,7 @@
- DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR)
- DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
- DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR)
--DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
-+DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
- DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
- 
- #	     BASIC_SRC: files that are always used
-@@ -1905,52 +1905,24 @@
- # install the language specific files for tools, if they were unpacked
- install-tool-languages:
- 	-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
- 
- # install the language specific files, if they were unpacked
- install-languages: languages $(DEST_LANG) $(DEST_KMAP)
- 	-$(SHELL) ./installman.sh install $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installman.sh install $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installman.sh install $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
--	-$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
- 	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- 		$(DEST_MAN_FR) $(INSTALLMLARGS)
- 	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_FR_I) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_FR_U) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- 		$(DEST_MAN_IT) $(INSTALLMLARGS)
- 	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_IT_I) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_IT_U) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- 		$(DEST_MAN_PL) $(INSTALLMLARGS)
- 	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_PL_I) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_PL_U) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
- 		$(DEST_MAN_RU) $(INSTALLMLARGS)
--	-$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
--		$(DEST_MAN_RU_U) $(INSTALLMLARGS)
- 	if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
- 	   cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
- 	   INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \