Upgrade to version 5.5

3 files changed, 15 insertions, 59 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 1cf39a34ee9f..79d98a02131c 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,8 +7,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	vim-5.4
-PKGNAME?=	vim-5.4.49
+DISTNAME=	vim-5.5
+PKGNAME?=	vim-5.5
 CATEGORIES=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 		ftp://ftp.nuxi.com/pub/vim/unix/ \
@@ -19,12 +19,7 @@ MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
 
 PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
-PATCHFILES=	5.4.1 5.4.2 5.4.3 5.4.4 5.4.5 5.4.6 5.4.7 5.4.8 5.4.9 5.4.10 \
-		5.4.11 5.4.12 5.4.13 5.4.14 5.4.15 5.4.16 5.4.17 5.4.18 \
-		5.4.19 5.4.20 5.4.21 5.4.22 5.4.23 5.4.24 5.4.25 5.4.26 5.4.27 \
-		5.4.28 5.4.29 5.4.30 5.4.31 5.4.32 5.4.33 5.4.34 5.4.35 5.4.36 \
-		5.4.37 5.4.38 5.4.39 5.4.40 5.4.41 5.4.42 5.4.43 5.4.44 5.4.45 \
-		5.4.46 5.4.47 5.4.48 5.4.49
+PATCHFILES=
 
 MAINTAINER=     obrien@FreeBSD.org
 
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 0418c92dfa11..94c0ad31dc44 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,51 +1,2 @@
-MD5 (vim/vim-5.4-src.tar.gz) = 8aabff5a884ad436543fbfab70487c70
-MD5 (vim/vim-5.4-rt.tar.gz) = 0e0c1ffa2a8afa62e8886440f015d937
-MD5 (vim/5.4.1) = 4b608f68ff164fa5c70f1bf141e475e2
-MD5 (vim/5.4.2) = c36094dede48c486e92f7a7b0a66fd27
-MD5 (vim/5.4.3) = 093845ae0a41bcf899ad2965f873c554
-MD5 (vim/5.4.4) = 5b878104455ca15fb432babb9ef34e2f
-MD5 (vim/5.4.5) = 345dbd90aa88429bb6c8b4c7c254424f
-MD5 (vim/5.4.6) = ad20bc0c74471a391350fd192a347cda
-MD5 (vim/5.4.7) = 97ea990109165698120c5d2513994a80
-MD5 (vim/5.4.8) = 2fad5cc9c79c92e7633b563002a07eda
-MD5 (vim/5.4.9) = c1df0bd04fb7416e1c6579fe3d810442
-MD5 (vim/5.4.10) = 120881e46624c2e04631a40afa5eb337
-MD5 (vim/5.4.11) = 229989f6a73c85cc02025e498f30a9a6
-MD5 (vim/5.4.12) = 4e80681a49410d26e62a100344340b92
-MD5 (vim/5.4.13) = 8ae022655aaa4854e31d13e6c7ab4bec
-MD5 (vim/5.4.14) = 9a1bfceff095c6fbe5963aefeee4fee4
-MD5 (vim/5.4.15) = 192d34b8099dc9fe3b877e6e9a823192
-MD5 (vim/5.4.16) = 1b4490fd90aff15443cd69817023b848
-MD5 (vim/5.4.17) = fc02b35d914838653f3e74a76be2f227
-MD5 (vim/5.4.18) = b6085fcd4dd7087e56749c86234d3ad9
-MD5 (vim/5.4.19) = 374168de2adbfa021a5777ee9ef85ffc
-MD5 (vim/5.4.20) = b7946310f9128f50cd9b3debb6d89d5d
-MD5 (vim/5.4.21) = c17f82e5e028cb4a555a5d42612fcbce
-MD5 (vim/5.4.22) = 332f16f71ca04286b71256f4a4fd30a2
-MD5 (vim/5.4.23) = 46a76a0e8e9c21932f1e718e6bfcd56e
-MD5 (vim/5.4.24) = 3e77697e93800dd461967924de17e1fe
-MD5 (vim/5.4.25) = ebe0a88310ce19c1682d31be4e3ebe7c
-MD5 (vim/5.4.26) = a68fbf5ab53c08a36d07d23f6b1a2f6b
-MD5 (vim/5.4.27) = e8200fc4f4b8bd2297f1587115daf711
-MD5 (vim/5.4.28) = 5fe9108d64deb56e556a8939c117067c
-MD5 (vim/5.4.29) = 93285c4d575d9e8f5d3737d0bd9ec238
-MD5 (vim/5.4.30) = 037751ddb71e78dfa684e7f35302b15c
-MD5 (vim/5.4.31) = 0cd78c1fc537708b317c89ad406492d1
-MD5 (vim/5.4.32) = 29934bc0ec7837681683079ff5a0d50a
-MD5 (vim/5.4.33) = e8daf2204606da1ad74e1c43d3f5ddc8
-MD5 (vim/5.4.34) = 9704552c2999e8c037e29a56b7071d4d
-MD5 (vim/5.4.35) = 72bada60972db15e3a56af8ba81cf691
-MD5 (vim/5.4.36) = cd00cb888da3f9562647c992201f93e1
-MD5 (vim/5.4.37) = 7272b30f51534a5b21fa2f7ad065678b
-MD5 (vim/5.4.38) = aed8e8e3e2910b33b0c15ed79944b338
-MD5 (vim/5.4.39) = f990829776b69d28b30acbc775f6a93c
-MD5 (vim/5.4.40) = 22c0c3cf7f540fc2550b870127dab6e4
-MD5 (vim/5.4.41) = 476d8a2e0142f05e903c435abb9adf8a
-MD5 (vim/5.4.42) = 69c1d7d0dec0cf83dd3307df48dbded0
-MD5 (vim/5.4.43) = 8f4db94938ee1693b35bbb5bd0c2096c
-MD5 (vim/5.4.44) = 67f3153a90719c50e4226e937e0d9c25
-MD5 (vim/5.4.45) = b3e35c0e09525a50be1a3acfa7b3c697
-MD5 (vim/5.4.46) = db564c2efee6ed4fb04103c2d77b756e
-MD5 (vim/5.4.47) = 584916b4b9b18914fcd7019254d5a984
-MD5 (vim/5.4.48) = a3411ad6d80d8d98a8e6b1143ccf7e66
-MD5 (vim/5.4.49) = 6c0f5c4343f2accabf12ec1db0daf082
+MD5 (vim/vim-5.5-src.tar.gz) = c3014937c2b9f4ea471a8274715e846c
+MD5 (vim/vim-5.5-rt.tar.gz) = 26d122c71bb413b59b019e730cd563a6
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
index e2279a96dc89..dee25fa6da12 100644
--- a/editors/vim/pkg-plist
+++ b/editors/vim/pkg-plist
@@ -16,6 +16,7 @@ bin/rvim
 share/vim/%%VIM_VER%%/doc/autocmd.txt
 share/vim/%%VIM_VER%%/doc/change.txt
 share/vim/%%VIM_VER%%/doc/cmdline.txt
+share/vim/%%VIM_VER%%/doc/develop.txt
 share/vim/%%VIM_VER%%/doc/digraph.txt
 share/vim/%%VIM_VER%%/doc/editing.txt
 share/vim/%%VIM_VER%%/doc/eval.txt
@@ -83,6 +84,7 @@ share/vim/%%VIM_VER%%/syntax/amiga.vim
 share/vim/%%VIM_VER%%/syntax/asm.vim
 share/vim/%%VIM_VER%%/syntax/asmh8300.vim
 share/vim/%%VIM_VER%%/syntax/asn.vim
+share/vim/%%VIM_VER%%/syntax/aspvbs.vim
 share/vim/%%VIM_VER%%/syntax/atlas.vim
 share/vim/%%VIM_VER%%/syntax/ave.vim
 share/vim/%%VIM_VER%%/syntax/awk.vim
@@ -90,6 +92,7 @@ share/vim/%%VIM_VER%%/syntax/basic.vim
 share/vim/%%VIM_VER%%/syntax/bib.vim
 share/vim/%%VIM_VER%%/syntax/btm.vim
 share/vim/%%VIM_VER%%/syntax/c.vim
+share/vim/%%VIM_VER%%/syntax/change.vim
 share/vim/%%VIM_VER%%/syntax/clean.vim
 share/vim/%%VIM_VER%%/syntax/clipper.vim
 share/vim/%%VIM_VER%%/syntax/cobol.vim
@@ -99,7 +102,9 @@ share/vim/%%VIM_VER%%/syntax/cpp.vim
 share/vim/%%VIM_VER%%/syntax/csh.vim
 share/vim/%%VIM_VER%%/syntax/css.vim
 share/vim/%%VIM_VER%%/syntax/cterm.vim
+share/vim/%%VIM_VER%%/syntax/cweb.vim
 share/vim/%%VIM_VER%%/syntax/dcl.vim
+share/vim/%%VIM_VER%%/syntax/def.vim
 share/vim/%%VIM_VER%%/syntax/diff.vim
 share/vim/%%VIM_VER%%/syntax/diva.vim
 share/vim/%%VIM_VER%%/syntax/dosbatch.vim
@@ -150,6 +155,7 @@ share/vim/%%VIM_VER%%/syntax/make.vim
 share/vim/%%VIM_VER%%/syntax/man.vim
 share/vim/%%VIM_VER%%/syntax/manual.vim
 share/vim/%%VIM_VER%%/syntax/maple.vim
+share/vim/%%VIM_VER%%/syntax/masm.vim
 share/vim/%%VIM_VER%%/syntax/master.vim
 share/vim/%%VIM_VER%%/syntax/matlab.vim
 share/vim/%%VIM_VER%%/syntax/mf.vim
@@ -197,6 +203,7 @@ share/vim/%%VIM_VER%%/syntax/scheme.vim
 share/vim/%%VIM_VER%%/syntax/sdl.vim
 share/vim/%%VIM_VER%%/syntax/sed.vim
 share/vim/%%VIM_VER%%/syntax/sgml.vim
+share/vim/%%VIM_VER%%/syntax/sgmllnx.vim
 share/vim/%%VIM_VER%%/syntax/sh.vim
 share/vim/%%VIM_VER%%/syntax/sicad.vim
 share/vim/%%VIM_VER%%/syntax/simula.vim
@@ -208,6 +215,7 @@ share/vim/%%VIM_VER%%/syntax/slrnsc.vim
 share/vim/%%VIM_VER%%/syntax/sm.vim
 share/vim/%%VIM_VER%%/syntax/smil.vim
 share/vim/%%VIM_VER%%/syntax/spec.vim
+share/vim/%%VIM_VER%%/syntax/spice.vim
 share/vim/%%VIM_VER%%/syntax/spup.vim
 share/vim/%%VIM_VER%%/syntax/sql.vim
 share/vim/%%VIM_VER%%/syntax/squid.vim
@@ -227,6 +235,8 @@ share/vim/%%VIM_VER%%/syntax/vhdl.vim
 share/vim/%%VIM_VER%%/syntax/vim.vim
 share/vim/%%VIM_VER%%/syntax/viminfo.vim
 share/vim/%%VIM_VER%%/syntax/vrml.vim
+share/vim/%%VIM_VER%%/syntax/web.vim
+share/vim/%%VIM_VER%%/syntax/winbatch.vim
 share/vim/%%VIM_VER%%/syntax/whitespace.vim
 share/vim/%%VIM_VER%%/syntax/xdefaults.vim
 share/vim/%%VIM_VER%%/syntax/xmath.vim