mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 03:07:43 +02:00
Naechster Schritt im LFS.
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@300 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
1473
src/patches/vim-7.0-fixes-7.patch
Normal file
1473
src/patches/vim-7.0-fixes-7.patch
Normal file
File diff suppressed because it is too large
Load Diff
82
src/patches/vim-7.0-mandir-1.patch
Normal file
82
src/patches/vim-7.0-mandir-1.patch
Normal file
@@ -0,0 +1,82 @@
|
||||
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; \
|
||||
29
src/patches/vim-7.0-spellfile-1.patch
Normal file
29
src/patches/vim-7.0-spellfile-1.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
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
|
||||
Reference in New Issue
Block a user