Update to Vim 5.8 beta A

3 files changed, 11 insertions, 40 deletions

diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index fe85ecd11f64..4fb1ff15017e 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -7,23 +7,25 @@
 #
 
 PORTNAME?=	vim
-PORTVERSION=	5.7.30
+PORTVERSION=	5.8.a
 CATEGORIES?=	editors
 MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
-		ftp://ftp.nuxi.com/pub/vim/unix/ \
+		ftp://relay.nuxi.com/pub/vim/unreleased/unix/ \
+		ftp://relay.nuxi.com/pub/vim/unix/ \
 		ftp://ftp.freesoftware.com/pub/vim/unix/ \
 		ftp://ftp.vim.org/pub/vim/unix/  \
+		ftp://ftp.vim.org/pub/vim/unreleased/unix/  \
 		ftp://ftp.is.co.za/applications/editors/vim/  \
 		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/  \
 		ftp://ftp.progsoc.uts.edu.au/pub/vim/unix/
 #DISTNAME=	vim-${PORTVERSION:C/.[0-9]+$//g}
-DISTNAME=	vim-5.7
+DISTNAME=	vim-5.8a
 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 07 08 10 12 13 14 15 16 17 18 19 20 21 22 23 24 25 27 28 29 30
-PATCHFILES+=	5.7.0${p}
-.endfor
+#.for p in 01 02 03 04 05 06 07 08 10 12 13 14 15 16 17 18 19 20 21 22 23 24 25 27 28 29 30
+#PATCHFILES+=	5.8.0${p}
+#.endfor
 
 MAINTAINER?=	obrien@FreeBSD.org
 
@@ -41,7 +43,7 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRI
 MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib --disable-pythoninterp"
 ALL_TARGET=	#
 PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
-MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
+MAN1=		vim.1 vimtutor.1 xxd.1
 MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
 MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1
 
@@ -95,8 +97,6 @@ post-install:
 	test -e ${PREFIX}/bin/rgvim  || (cd ${PREFIX}/bin ; ${LN} -s vim rgvim)
 	test -e ${PREFIX}/bin/gview || (cd ${PREFIX}/bin ; ${LN} -s vim gview)
 	test -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -s vim rgview)
-	@${RM} -f ${PREFIX}/man/man1/etags.1
-	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
 	cd ${PREFIX} ;\
 	    find share/vim/${DISTNAME:S/-//:S/.//}/ -type f -o -type l	\
 	    	| sort \
diff --git a/editors/vim5/distinfo b/editors/vim5/distinfo
index c60e405c690b..91aa44caff4d 100644
--- a/editors/vim5/distinfo
+++ b/editors/vim5/distinfo
@@ -1,29 +1,2 @@
-MD5 (vim/vim-5.7-src.tar.gz) = 0b2bca69c7018a8777d8d5390e23d06e
-MD5 (vim/vim-5.7-rt.tar.gz) = b7d9cbc64479e26f52e2bc58d312bd84
-MD5 (vim/5.7.001) = 4475b6a12422f070eac160eb8ca2c5a0
-MD5 (vim/5.7.002) = 921c4e4d44f1b6688c64449ff3f37cfa
-MD5 (vim/5.7.003) = 365dec5b40bcffb08060bf5d85fa6fad
-MD5 (vim/5.7.004) = 3fb81bef9aa2a8ed00afcb4de4f2304f
-MD5 (vim/5.7.005) = fe14fd3a67a74058749426795cfe5f9d
-MD5 (vim/5.7.006) = f3c5eef36c5a2d12c293d1c917ae3bad
-MD5 (vim/5.7.007) = 0b1eddade543bdd13f4a5b2b6c21ad2a
-MD5 (vim/5.7.008) = b39514242aa4273a8b6ac6682c31e319
-MD5 (vim/5.7.010) = ad101d5fa02db54c7bfadac06dc85ca1
-MD5 (vim/5.7.012) = 0d61a6cfd21ab8c2125eaadd1ec7b2c6
-MD5 (vim/5.7.013) = f0c95eb67af59edb91793bc56a08dc29
-MD5 (vim/5.7.014) = 4b24b1b725f275a3345fae89201fe7db
-MD5 (vim/5.7.015) = 2d6adfe343dda70504179acb2a18012a
-MD5 (vim/5.7.016) = 5efb2d0af8b82c5c848faac4bb6fdc15
-MD5 (vim/5.7.017) = c4116de121319a314e4b794a36745e63
-MD5 (vim/5.7.018) = 454d72e02e7a4836b0d0bb7131e46722
-MD5 (vim/5.7.019) = d3e9e224254cb369dd11a2ce920cccb7
-MD5 (vim/5.7.020) = f35ed78ef73e9f2438d651e6a50fa5d2
-MD5 (vim/5.7.021) = 31fa6a8e4d6eeabea70e6c2506e53c64
-MD5 (vim/5.7.022) = dcadf07066a1ac2bd51d94ac95fcd43d
-MD5 (vim/5.7.023) = 5d894cec54f478ceaa5aed1a51f017da
-MD5 (vim/5.7.024) = dd89b25e912dcdaf61920b9010c63e21
-MD5 (vim/5.7.025) = 4905ba456ce9f9a1217d9fbb068cce5e
-MD5 (vim/5.7.027) = 62abe4c53df85dc1ede40cb486d20cd2
-MD5 (vim/5.7.028) = 10f371b11da46a035af7d4ac1adb68a6
-MD5 (vim/5.7.029) = 3b727e71939e645b127a7fdfd308c63f
-MD5 (vim/5.7.030) = 137695bb5c01d12daf0567a557e90a96
+MD5 (vim/vim-5.8a-src.tar.gz) = 9c614b94641ba7812c88ba111888afcb
+MD5 (vim/vim-5.8a-rt.tar.gz) = 445840fb440367ec900715a4c71e0b84
diff --git a/editors/vim5/pkg-plist b/editors/vim5/pkg-plist
index c4bcbab9f6d3..5ba898e5ba4d 100644
--- a/editors/vim5/pkg-plist
+++ b/editors/vim5/pkg-plist
@@ -1,8 +1,6 @@
 @comment $FreeBSD$
 bin/vim
 bin/vimtutor
-bin/ctags
-bin/etags
 bin/xxd
 @comment bin/ex
 @comment bin/gex