mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
vim: Update to 7.2.
This commit is contained in:
File diff suppressed because it is too large
Load Diff
13
lfs/vim
13
lfs/vim
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# 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 #
|
||||
@@ -24,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)
|
||||
|
||||
###############################################################################
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 4ca69757678272f718b1041c810d82d8
|
||||
$(DL_FILE)_MD5 = f0901284b338e448bfd79ccca0041254
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -70,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)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,29 +0,0 @@
|
||||
Submitted By: Alexander E. Patrakov
|
||||
Date: 2006-07-25
|
||||
Initial Package Version: 7.0
|
||||
Origin: Alexander E. Patrakov
|
||||
Upstream Status: Sent
|
||||
Description: Allows downloading spellfiles via HTTP,
|
||||
thus reverting the negative effect of ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010
|
||||
|
||||
--- vim70/runtime/autoload/spellfile.vim.orig 2006-07-25 19:05:38.000000000 +0600
|
||||
+++ vim70/runtime/autoload/spellfile.vim 2006-07-25 19:39:32.000000000 +0600
|
||||
@@ -110,9 +110,14 @@
|
||||
endif
|
||||
endfunc
|
||||
|
||||
-" Read "fname" from the ftp server.
|
||||
+" Read "fname" from the server.
|
||||
function! spellfile#Nread(fname)
|
||||
- let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
|
||||
- let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
|
||||
- exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
|
||||
+ if strpart(g:spellfile_URL, 0, 6) == 'ftp://'
|
||||
+ " Avoid the password prompt by providing the default username and password
|
||||
+ let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
|
||||
+ let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
|
||||
+ exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
|
||||
+ else
|
||||
+ exe 'Nread "' . g:spellfile_URL . '/' . a:fname . '"'
|
||||
+ endif
|
||||
endfunc
|
||||
5414
src/patches/vim-7.2-fixes-4.patch
Normal file
5414
src/patches/vim-7.2-fixes-4.patch
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user