2 files changed, 29 insertions, 73 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index daa4a7a089a3..6f29bc788cdd 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -7,21 +7,21 @@
 # $FreeBSD$
 #
 
-PKGVER=		5.5.67
-DISTNAME=	vim-5.5
+PKGVER=		5.6a.12
+DISTNAME=	vim-5.6a
 PKGNAME?=	vim-${PKGVER}
 CATEGORIES=	editors
-MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
-		ftp://ftp.nuxi.com/pub/vim/unix/ \
-		ftp://ftp.vim.org/pub/misc/vim/unix/  \
-		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/  \
-		ftp://ftp.is.co.za/applications/editors/vim/  \
-		ftp://ftp.progsoc.uts.edu.au/pub/vim/
+MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
+		ftp://ftp.nuxi.com/pub/vim/unreleased/unix/ \
+		ftp://ftp.vim.org/pub/vim/unreleased/unix/  \
+		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unreleased/unix/  \
+		ftp://ftp.is.co.za/applications/editors/unreleased/vim/  \
+		ftp://ftp.progsoc.uts.edu.au/pub/unreleased/vim/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
 
 PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
-.for p in 01 02 03 04 05 06 08 09 11 12 13 14 15 17 18 19 20 21 22 23 25 26 27 29 30 32 33 34 35 36 37 38 39 40 41 42 43 44 45 47 48 49 50 51 52 53 54 55 56 57 58 59 61 63 64 65 66 67
-PATCHFILES+=	5.5.0${p}
+.for p in 01 02 03 05 06 07 08 09 10 12
+PATCHFILES+=	5.6a.0${p}
 .endfor
 
 MAINTAINER=     obrien@FreeBSD.org
@@ -29,8 +29,10 @@ MAINTAINER=     obrien@FreeBSD.org
 Y2K=		http://www.vim.org/y2k.html
 
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
-BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
+BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80 \
+		python:${PORTSDIR}/lang/python
 LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python
 USE_PERL5=	yes
 .endif
 
@@ -59,13 +61,13 @@ MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=athena" ${MAKE_FLAGS}
 .endif
 
 .if defined(PACKAGE_BUILDING)
-MAKE_FLAGS:=	CONF_OPT_PERL="--enable-perlinterp --enable-tclinterp --enable-cscope" ${MAKE_FLAGS}
+MAKE_FLAGS:=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope" ${MAKE_FLAGS}
 .endif
 
 .else	# LITE
 PLIST=		${WRKDIR}/PLIST.nogui
 MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=no --without-x" ${MAKE_FLAGS}
-MAKE_FLAGS:=	CONF_OPT_PERL="--disable-perlinterp --disable-tclinterp" ${MAKE_FLAGS}
+MAKE_FLAGS:=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp" ${MAKE_FLAGS}
 .endif	# LITE
 
 pre-build:
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
index 7699aa4ac6f1..38e06083ed62 100644
--- a/editors/vim/distinfo
+++ b/editors/vim/distinfo
@@ -1,60 +1,14 @@
-MD5 (vim/vim-5.5-src.tar.gz) = c3014937c2b9f4ea471a8274715e846c
-MD5 (vim/vim-5.5-rt.tar.gz) = 26d122c71bb413b59b019e730cd563a6
-MD5 (vim/5.5.001) = cf1a306f5252deb91d496c650dab84f3
-MD5 (vim/5.5.002) = af4322beadc6409d80eeb4a99338038c
-MD5 (vim/5.5.003) = c24b0f55bebc91a26879762cdc05b948
-MD5 (vim/5.5.004) = 517f5280a6a2349342c1ee548c712d7c
-MD5 (vim/5.5.005) = 0aef2b7de818beb4a3e3aac339a1189e
-MD5 (vim/5.5.006) = 0f255a8a9b9d7017c1fb219e4c9a5be5
-MD5 (vim/5.5.008) = 05898d7797886a21fa0be0b0ad21f01b
-MD5 (vim/5.5.009) = bd9eadc15c6afa35b8f83cdaf73d7f2e
-MD5 (vim/5.5.011) = c35cd3766f8e9f5222be3788b901721a
-MD5 (vim/5.5.012) = 64adfbb86fe181739e817cbf8b6725e7
-MD5 (vim/5.5.013) = 1d64007235933513031d104add750ed8
-MD5 (vim/5.5.014) = 8fcccfedd43a72d01b2c521e19142415
-MD5 (vim/5.5.015) = 8bcaa97888849b4e7900e97e7ea0a2f0
-MD5 (vim/5.5.017) = bf2f6bf84db1bbb38e5f339d572977d0
-MD5 (vim/5.5.018) = 6def3f411ce04a47584b818fdb44f3c8
-MD5 (vim/5.5.019) = 85c24a6904eed207024a7ae55a189c2b
-MD5 (vim/5.5.020) = 82e15dbc87fbf8e05d378db1dd0b7439
-MD5 (vim/5.5.021) = 7c9fcdda17418a87b3462620cb352c1b
-MD5 (vim/5.5.022) = ef7da1efdb20c014b8fa81c55476b4d9
-MD5 (vim/5.5.023) = 49fc66ff54392ac76fe093b6f59f7b6f
-MD5 (vim/5.5.025) = 8626585f80fc8571518c27abda501451
-MD5 (vim/5.5.026) = c0a8a42dddfc7e13980e762b6c209386
-MD5 (vim/5.5.027) = 252c03b1ac35f3553d8dd3ba90edfcf4
-MD5 (vim/5.5.029) = 288b4e7e20751dd89f23fcbc7d25a8bc
-MD5 (vim/5.5.030) = 7e59fa9254e67534a4f4b359109a7cd7
-MD5 (vim/5.5.032) = 9a64bf100e2a3e3d422a42b47ce32296
-MD5 (vim/5.5.033) = 9ee94ceb69ac85530fb7d5745076b9ac
-MD5 (vim/5.5.034) = 118b90d43cd0e040ae951a8b37c5d151
-MD5 (vim/5.5.035) = 5d717357854c173f0784032b05f56d79
-MD5 (vim/5.5.036) = 0d9b15018158a5d2bd4f7a565294eeb1
-MD5 (vim/5.5.037) = 9dd407546e067f28eab9137290943148
-MD5 (vim/5.5.038) = 4f9f904893aeee3ca2b9daf782458ee5
-MD5 (vim/5.5.039) = 41488a357e1d7b21a6c328939fcae3de
-MD5 (vim/5.5.040) = c30bf04065a27d0c43b09885e0aa32ea
-MD5 (vim/5.5.041) = a1d4d5c93322bef55b01f1be97fe5dc5
-MD5 (vim/5.5.042) = f439a8dd8e94a40f1b62bf261a4a5d8a
-MD5 (vim/5.5.043) = c63501350444b038405d00c7f2f18170
-MD5 (vim/5.5.044) = 8fc437db0d7b4cbce23a414d68c1f84f
-MD5 (vim/5.5.045) = 916941ad02ecd4d629c87b9ff2f44a76
-MD5 (vim/5.5.047) = 3800bb7c0341c9c29e46ff8e21a14be0
-MD5 (vim/5.5.048) = c417a7fe5b46cb1bb31f1fefac3c92d5
-MD5 (vim/5.5.049) = 4fffabfa18ca7b63f9c429ce18207bc3
-MD5 (vim/5.5.050) = fb352bfa734efca0f221530d4293a2a5
-MD5 (vim/5.5.051) = 9219396b6052db873b63b6ee1af335a2
-MD5 (vim/5.5.052) = a6677f2afe9c908bd2a73eef7c44e17d
-MD5 (vim/5.5.053) = 27c9e8ac8f9e9c4858efe98b2c4c65fb
-MD5 (vim/5.5.054) = 681c3dc547fe1b4241a1db336ddefa2e
-MD5 (vim/5.5.055) = 622482c290302b374e35a3dd60916b15
-MD5 (vim/5.5.056) = 0a0334dbfcfa1fd4ca96a84755794ffd
-MD5 (vim/5.5.057) = e68b2f860353473d6675064e6b228c73
-MD5 (vim/5.5.058) = b8c94315e2552605a4858d27c2bc861c
-MD5 (vim/5.5.059) = bcb05e510c839d4927d8e3a012b7417e
-MD5 (vim/5.5.061) = 005ffb9c7258c1145316be553b6b4fa6
-MD5 (vim/5.5.063) = e20965c803e15afe69593ad388d6f7f1
-MD5 (vim/5.5.064) = b703f13dce8aa31684c6e8411f848289
-MD5 (vim/5.5.065) = e02f34cdc8850fd54639ea706fb69e7f
-MD5 (vim/5.5.066) = caca4831ce66d8f197d53b73e96784b4
-MD5 (vim/5.5.067) = 47898a38a20c838589c7b3b49890a040
+MD5 (vim/vim-5.6a-src.tar.gz) = e7290ec4c012e610cd60bb41d3acf1af
+MD5 (vim/vim-5.6a-rt.tar.gz) = 9ee2be9b8b9373c1120aff0547508c40
+MD5 (vim/5.6a.001) = ce460f04da6344a65220cd53d7c6dc9e
+MD5 (vim/5.6a.002) = 8ff258a74a1b9adc10baa2e5e61a7cd4
+MD5 (vim/5.6a.003) = 9885f305c18ec004e7fb5b9859839c19
+MD5 (vim/5.6a.004) = a3ee9cc8421b60eace9ee2a9106bd01a
+MD5 (vim/5.6a.005) = ff790d18cbc01e5559d4f6dc90704124
+MD5 (vim/5.6a.006) = b72f1781e9121eafda9b01a7a4dedeaf
+MD5 (vim/5.6a.007) = b27706323e41ca9ec3f3aea95a6754eb
+MD5 (vim/5.6a.008) = 2e3485f82d2f455a590093f8f809b602
+MD5 (vim/5.6a.009) = d9fb155167f36d5d9d062c2618492d24
+MD5 (vim/5.6a.010) = 032bbc97c1e5895b90dca5d2cff5fd8c
+MD5 (vim/5.6a.011) = a557d047d959eecb402ecfa9006ff6d3
+MD5 (vim/5.6a.012) = e17a3cee1c0c5dd4e65e41f45a427ffa