vim: updated to 7.4.890 and updated mandir

diff --git a/vim/.footprint b/vim/.footprint
index 420d93876c4362e1ff9245e64584d71c766ff578..cf56d79921bca5378d4323c6c2be5e79ba06e522 100644 (file)
--- a/vim/.footprint
+++ b/vim/.footprint
@@ -10,18 +10,21 @@ lrwxrwxrwx  root/root       usr/bin/vi -> /bin/vi
 lrwxrwxrwx     root/root       usr/bin/view -> vim
 -rwxr-xr-x     root/root       usr/bin/vim
 lrwxrwxrwx     root/root       usr/bin/vimdiff -> vim
-drwxr-xr-x     root/root       usr/man/
-drwxr-xr-x     root/root       usr/man/man1/
--rw-r--r--     root/root       usr/man/man1/evim.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/ex.1.gz -> vim.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/gvim.1.gz -> vim.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/rview.1.gz -> vim.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/rvim.1.gz -> vim.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/vi.1.gz -> vim.1.gz
-lrwxrwxrwx     root/root       usr/man/man1/view.1.gz -> vim.1.gz
--rw-r--r--     root/root       usr/man/man1/vim.1.gz
--rw-r--r--     root/root       usr/man/man1/vimdiff.1.gz
+-rwxr-xr-x     root/root       usr/bin/vimtutor
+-rwxr-xr-x     root/root       usr/bin/xxd
 drwxr-xr-x     root/root       usr/share/
+drwxr-xr-x     root/root       usr/share/man/
+drwxr-xr-x     root/root       usr/share/man/man1/
+-rw-r--r--     root/root       usr/share/man/man1/evim.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/ex.1.gz -> vim.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/gvim.1.gz -> vim.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/rview.1.gz -> vim.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/rvim.1.gz -> vim.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/vi.1.gz -> vim.1.gz
+lrwxrwxrwx     root/root       usr/share/man/man1/view.1.gz -> vim.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/vim.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/vimdiff.1.gz
+-rw-r--r--     root/root       usr/share/man/man1/xxd.1.gz
 drwxr-xr-x     root/root       usr/share/vim/
 drwxr-xr-x     root/root       usr/share/vim/autoload/
 -rw-r--r--     root/root       usr/share/vim/autoload/ada.vim
@@ -107,6 +110,7 @@ drwxr-xr-x  root/root       usr/share/vim/compiler/
 -rw-r--r--     root/root       usr/share/vim/compiler/gcc.vim
 -rw-r--r--     root/root       usr/share/vim/compiler/gfortran.vim
 -rw-r--r--     root/root       usr/share/vim/compiler/gnat.vim
+-rw-r--r--     root/root       usr/share/vim/compiler/go.vim
 -rw-r--r--     root/root       usr/share/vim/compiler/haml.vim
 -rw-r--r--     root/root       usr/share/vim/compiler/hp_acc.vim
 -rw-r--r--     root/root       usr/share/vim/compiler/icc.vim
@@ -207,6 +211,7 @@ drwxr-xr-x  root/root       usr/share/vim/doc/
 -rw-r--r--     root/root       usr/share/vim/doc/pattern.txt
 -rw-r--r--     root/root       usr/share/vim/doc/pi_getscript.txt
 -rw-r--r--     root/root       usr/share/vim/doc/pi_gzip.txt
+-rw-r--r--     root/root       usr/share/vim/doc/pi_logipat.txt
 -rw-r--r--     root/root       usr/share/vim/doc/pi_netrw.txt
 -rw-r--r--     root/root       usr/share/vim/doc/pi_paren.txt
 -rw-r--r--     root/root       usr/share/vim/doc/pi_spec.txt
@@ -324,6 +329,7 @@ drwxr-xr-x  root/root       usr/share/vim/ftplugin/
 -rw-r--r--     root/root       usr/share/vim/ftplugin/diff.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/dircolors.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/docbk.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/dockerfile.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/dosbatch.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/dosini.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/dtd.vim
@@ -343,6 +349,7 @@ drwxr-xr-x  root/root       usr/share/vim/ftplugin/
 -rw-r--r--     root/root       usr/share/vim/ftplugin/gitconfig.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/gitrebase.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/gitsendemail.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/go.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/gpg.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/gprof.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/group.vim
@@ -362,10 +369,12 @@ drwxr-xr-x        root/root       usr/share/vim/ftplugin/
 -rw-r--r--     root/root       usr/share/vim/ftplugin/java.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/javascript.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/jproperties.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/json.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/jsp.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/kconfig.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/kwt.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/ld.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/less.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/lftp.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/libao.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/limits.vim
@@ -417,12 +426,17 @@ drwxr-xr-x        root/root       usr/share/vim/ftplugin/
 -rw-r--r--     root/root       usr/share/vim/ftplugin/python.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/qf.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/quake.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/r.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/racc.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/readline.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/registry.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/reva.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/rhelp.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/rmd.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/rnc.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/rnoweb.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/rpl.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/rrst.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/rst.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/ruby.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/sass.vim
@@ -449,6 +463,7 @@ drwxr-xr-x  root/root       usr/share/vim/ftplugin/
 -rw-r--r--     root/root       usr/share/vim/ftplugin/tcsh.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/terminfo.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/tex.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/text.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/treetop.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/tt2html.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/udevconf.vim
@@ -459,6 +474,7 @@ drwxr-xr-x  root/root       usr/share/vim/ftplugin/
 -rw-r--r--     root/root       usr/share/vim/ftplugin/verilog.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/vhdl.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/vim.vim
+-rw-r--r--     root/root       usr/share/vim/ftplugin/vroom.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/xdefaults.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/xf86conf.vim
 -rw-r--r--     root/root       usr/share/vim/ftplugin/xhtml.vim
@@ -512,6 +528,7 @@ drwxr-xr-x  root/root       usr/share/vim/indent/
 -rw-r--r--     root/root       usr/share/vim/indent/framescript.vim
 -rw-r--r--     root/root       usr/share/vim/indent/gitconfig.vim
 -rw-r--r--     root/root       usr/share/vim/indent/gitolite.vim
+-rw-r--r--     root/root       usr/share/vim/indent/go.vim
 -rw-r--r--     root/root       usr/share/vim/indent/haml.vim
 -rw-r--r--     root/root       usr/share/vim/indent/hamster.vim
 -rw-r--r--     root/root       usr/share/vim/indent/html.vim
@@ -521,8 +538,10 @@ drwxr-xr-x root/root       usr/share/vim/indent/
 -rw-r--r--     root/root       usr/share/vim/indent/j.vim
 -rw-r--r--     root/root       usr/share/vim/indent/java.vim
 -rw-r--r--     root/root       usr/share/vim/indent/javascript.vim
+-rw-r--r--     root/root       usr/share/vim/indent/json.vim
 -rw-r--r--     root/root       usr/share/vim/indent/jsp.vim
 -rw-r--r--     root/root       usr/share/vim/indent/ld.vim
+-rw-r--r--     root/root       usr/share/vim/indent/less.vim
 -rw-r--r--     root/root       usr/share/vim/indent/lifelines.vim
 -rw-r--r--     root/root       usr/share/vim/indent/liquid.vim
 -rw-r--r--     root/root       usr/share/vim/indent/lisp.vim
@@ -547,7 +566,11 @@ drwxr-xr-x root/root       usr/share/vim/indent/
 -rw-r--r--     root/root       usr/share/vim/indent/python.vim
 -rw-r--r--     root/root       usr/share/vim/indent/r.vim
 -rw-r--r--     root/root       usr/share/vim/indent/readline.vim
+-rw-r--r--     root/root       usr/share/vim/indent/rhelp.vim
+-rw-r--r--     root/root       usr/share/vim/indent/rmd.vim
+-rw-r--r--     root/root       usr/share/vim/indent/rnoweb.vim
 -rw-r--r--     root/root       usr/share/vim/indent/rpl.vim
+-rw-r--r--     root/root       usr/share/vim/indent/rrst.vim
 -rw-r--r--     root/root       usr/share/vim/indent/rst.vim
 -rw-r--r--     root/root       usr/share/vim/indent/ruby.vim
 -rw-r--r--     root/root       usr/share/vim/indent/sass.vim
@@ -561,6 +584,7 @@ drwxr-xr-x  root/root       usr/share/vim/indent/
 -rw-r--r--     root/root       usr/share/vim/indent/systemverilog.vim
 -rw-r--r--     root/root       usr/share/vim/indent/tcl.vim
 -rw-r--r--     root/root       usr/share/vim/indent/tcsh.vim
+-rw-r--r--     root/root       usr/share/vim/indent/teraterm.vim
 -rw-r--r--     root/root       usr/share/vim/indent/tex.vim
 -rw-r--r--     root/root       usr/share/vim/indent/tf.vim
 -rw-r--r--     root/root       usr/share/vim/indent/tilde.vim
@@ -569,6 +593,7 @@ drwxr-xr-x  root/root       usr/share/vim/indent/
 -rw-r--r--     root/root       usr/share/vim/indent/verilog.vim
 -rw-r--r--     root/root       usr/share/vim/indent/vhdl.vim
 -rw-r--r--     root/root       usr/share/vim/indent/vim.vim
+-rw-r--r--     root/root       usr/share/vim/indent/vroom.vim
 -rw-r--r--     root/root       usr/share/vim/indent/xf86conf.vim
 -rw-r--r--     root/root       usr/share/vim/indent/xhtml.vim
 -rw-r--r--     root/root       usr/share/vim/indent/xinetd.vim
@@ -586,6 +611,7 @@ drwxr-xr-x  root/root       usr/share/vim/indent/
 drwxr-xr-x     root/root       usr/share/vim/plugin/
 -rw-r--r--     root/root       usr/share/vim/plugin/getscriptPlugin.vim
 -rw-r--r--     root/root       usr/share/vim/plugin/gzip.vim
+-rw-r--r--     root/root       usr/share/vim/plugin/logiPat.vim
 -rw-r--r--     root/root       usr/share/vim/plugin/matchparen.vim
 -rw-r--r--     root/root       usr/share/vim/plugin/netrwPlugin.vim
 -rw-r--r--     root/root       usr/share/vim/plugin/rrhelper.vim
@@ -768,6 +794,7 @@ drwxr-xr-x  root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/docbk.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/docbksgml.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/docbkxml.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/dockerfile.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/dosbatch.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/dosini.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/dot.vim
@@ -828,6 +855,8 @@ drwxr-xr-x  root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/gkrellmrc.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/gnash.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/gnuplot.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/go.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/godoc.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/gp.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/gpg.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/gprof.vim
@@ -884,8 +913,10 @@ drwxr-xr-x root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/jgraph.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/jovial.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/jproperties.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/json.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/jsp.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/kconfig.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/kivy.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/kix.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/kscript.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/kwt.vim
@@ -894,6 +925,7 @@ drwxr-xr-x  root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/ld.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/ldapconf.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/ldif.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/less.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/lex.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/lftp.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/lhaskell.vim
@@ -1044,12 +1076,14 @@ drwxr-xr-x      root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/rexx.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rhelp.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rib.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/rmd.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rnc.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rng.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rnoweb.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/robots.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rpcgen.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rpl.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/rrst.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rst.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/rtf.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/ruby.vim
@@ -1114,6 +1148,7 @@ drwxr-xr-x        root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/sqloracle.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/sqr.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/squid.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/srec.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/sshconfig.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/sshdconfig.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/st.vim
@@ -1139,6 +1174,7 @@ drwxr-xr-x        root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/tasm.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/tcl.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/tcsh.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/teraterm.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/terminfo.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/tex.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/texinfo.vim
@@ -1168,6 +1204,7 @@ drwxr-xr-x        root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/upstreamdat.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/upstreaminstalllog.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/upstreamlog.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/upstreamrpt.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/usserverlog.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/usw2kagtlog.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/valgrind.vim
@@ -1183,6 +1220,7 @@ drwxr-xr-x        root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/vmasm.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/voscm.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/vrml.vim
+-rw-r--r--     root/root       usr/share/vim/syntax/vroom.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/vsejcl.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/wdiff.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/web.vim
@@ -1215,4 +1253,25 @@ drwxr-xr-x       root/root       usr/share/vim/syntax/
 -rw-r--r--     root/root       usr/share/vim/syntax/z8a.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/zimbu.vim
 -rw-r--r--     root/root       usr/share/vim/syntax/zsh.vim
+drwxr-xr-x     root/root       usr/share/vim/tools/
+-rw-r--r--     root/root       usr/share/vim/tools/blink.c
+-rw-r--r--     root/root       usr/share/vim/tools/ccfilter.1
+-rw-r--r--     root/root       usr/share/vim/tools/ccfilter.c
+-rw-r--r--     root/root       usr/share/vim/tools/ccfilter_README.txt
+-rwxr-xr-x     root/root       usr/share/vim/tools/efm_filter.pl
+-rw-r--r--     root/root       usr/share/vim/tools/efm_filter.txt
+-rwxr-xr-x     root/root       usr/share/vim/tools/efm_perl.pl
+-rwxr-xr-x     root/root       usr/share/vim/tools/mve.awk
+-rw-r--r--     root/root       usr/share/vim/tools/mve.txt
+-rwxr-xr-x     root/root       usr/share/vim/tools/pltags.pl
+-rwxr-xr-x     root/root       usr/share/vim/tools/ref
+-rw-r--r--     root/root       usr/share/vim/tools/shtags.1
+-rwxr-xr-x     root/root       usr/share/vim/tools/shtags.pl
+-rw-r--r--     root/root       usr/share/vim/tools/unicode.vim
+-rwxr-xr-x     root/root       usr/share/vim/tools/vim132
+-rw-r--r--     root/root       usr/share/vim/tools/vim_vs_net.cmd
+-rwxr-xr-x     root/root       usr/share/vim/tools/vimm
+-rwxr-xr-x     root/root       usr/share/vim/tools/vimspell.sh
+-rw-r--r--     root/root       usr/share/vim/tools/vimspell.txt
+-rw-r--r--     root/root       usr/share/vim/tools/xcmdsrv_client.c
 -rw-r--r--     root/root       usr/share/vim/vimrc

diff --git a/vim/.md5sum b/vim/.md5sum
index 0baac5056e7c4126d96939495cc718abaf627335..907cb281ebb9e3b0bc7315c32e1335b7f93b8e95 100644 (file)
--- a/vim/.md5sum
+++ b/vim/.md5sum
@@ -1 +1 @@
-af80c3d62fd5b5c48a5dab2c238db226  vim-7.4.316.tar.xz
+2ebb9c9beedac71f50443ebee3d35c36  vim-7.4.890.tar.xz

diff --git a/vim/Pkgfile b/vim/Pkgfile
index 30e72b654e1f7645b7dc3f6dc6a425d0f65ff486..4da80baef53182750dc9fb7d9e585ce45b1e632a 100644 (file)
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: ncurses acl
 
 name=vim
-version=7.4.316
+version=7.4.890
 release=1
 source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)
 
@@ -27,10 +27,9 @@ EOF
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --mandir=/usr/man \
               --with-vim-name=vim \
-              --without-x \
               --with-tlib=ncurses \
+              --without-x \
               --disable-gui \
               --enable-multibyte \
               --disable-gpm \
@@ -38,19 +37,19 @@ EOF
               --cache-file=$SRC/src/auto/config.cache
 
   make VIMRTDIR=
-  make VIMRTDIR= DESTDIR=$PKG installvimbin installruntime installlinks
+  make -j1 VIMRTDIR= DESTDIR=$PKG install
 
   mv $PKG/usr/share/vim/vimrc_example.vim $PKG/usr/share/vim/vimrc
-  rm -r $PKG/usr/{man/man?/vimtutor*,share/vim/{tutor,macros}}
+  rm -r $PKG/usr/{share/man/man?/vimtutor*,share/vim/{tutor,macros}}
   rm $PKG/usr/share/vim/*/README.txt
   ln -sf vim $PKG/usr/bin/evim
   ln -sf /bin/vi $PKG/usr/bin/vi
-  ln -sf vim.1.gz $PKG/usr/man/man1/ex.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/vi.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/rvim.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/view.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/rview.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/gvim.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/ex.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/vi.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/rvim.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/view.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/rview.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/gvim.1.gz
 
   ./configure --build=$CHOST \
               --host=$CTARGET \