8 files changed, 1 insertions, 292 deletions

diff --git a/MOVED b/MOVED
index 6bee759c5910..2b406639f1ae 100644
--- a/MOVED
+++ b/MOVED
@@ -4645,3 +4645,4 @@ net/py-samba||2010-10-18|Has expired: Unsupported by the upstream. Please, consi
 security/samba-vscan||2010-10-18|Removed
 net-p2p/amule2|net-p2p/amule|2010-10-05|Split to -devel and non-devel ports
 www/firefox3-devel|www/firefox|2010-10-24|Upstream development focuses on Firefox 4.0
+editors/vim5||2010-10-26|Has expired: Outdated, superceded by editors/vim7 and has security issues
diff --git a/editors/Makefile b/editors/Makefile
index 411f38e4a50b..0cadbeec33a4 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -243,7 +243,6 @@
     SUBDIR += vilearn
     SUBDIR += vim
     SUBDIR += vim-lite
-    SUBDIR += vim5
     SUBDIR += wily
     SUBDIR += winefish
     SUBDIR += wordgrinder
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
deleted file mode 100644
index 42b48ece1897..000000000000
--- a/editors/vim5/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-# ex:ts=8
-# Ports collection makefile for:  vim
-# Date created:			  Sat June 29, 1996
-# Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
-#
-# $FreeBSD$
-#
-
-PORTNAME?=	vim
-PORTVERSION=	5.8.8
-PORTREVISION=	2
-CATEGORIES?=	editors
-MASTER_SITES=	${MASTER_SITE_VIM}
-DISTNAME=	vim-${PORTVERSION:C/\.[0-9]+$//g}
-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
-PATCHFILES+=	5.8.0${p}
-.endfor
-
-MAINTAINER?=	ports@FreeBSD.org
-COMMENT=	Vi "workalike", with many additional features
-
-DEPRECATED=	Outdated, superceded by editors/vim7 and has security issues
-EXPIRATION_DATE=2010-10-26
-
-.if defined(PACKAGE_BUILDING) && !defined(LITE)
-WITH_TCL=	yes
-#USE_PERL5=	yes
-.endif
-
-LATEST_LINK?=	vim5
-DIST_SUBDIR=	vim
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
-MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib --disable-pythoninterp"
-ALL_TARGET=	#
-MAKE_JOBS_UNSAFE=	yes
-PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
-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
-
-.if !defined(LITE)
-MAKE_ARGS+=	CONF_OPT_MAX="--enable-max-features"
-I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
-
-.if defined(NO_GUI)
-WITHOUT_X11=	yes
-.endif
-
-.if !defined(WITHOUT_X11)
-.if defined(WITH_ATHENA)
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena" ${I18N}
-#MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=yes" ${I18N}
-.elif defined(WITH_GTK)
-USE_GNOME+=	gtk12
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${LOCALBASE}" ${I18N}
-.else
-USE_MOTIF=	yes
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${LOCALBASE} ${I18N}
-.endif
-.else  # WITHOUT_X11
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
-.endif # WITHOUT_X11
-
-.if defined(PACKAGE_BUILDING)
-MAKE_ARGS+=	CONF_OPT_PERL="--enable-pythoninterp --enable-tclinterp --enable-cscope"
-.endif
-
-.else	# LITE
-PKGNAMESUFFIX?=	-lite
-MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
-MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp"
-.endif	# LITE
-
-.if defined(WITH_TCL)
-BUILD_DEPENDS=	tclsh8.4:${PORTSDIR}/lang/tcl84
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
-MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp --with-tclsh=${LOCALBASE}/bin/tclsh8.4"
-.endif
-
-.include <bsd.port.pre.mk>
-
-pre-build:
-	@(cd ${WRKSRC}; ${MAKE} distclean)
-
-post-install:
-	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -s vim gvim)
-	#	below needed for `vim-lite' port
-	${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)
-	cd ${PREFIX} ;\
-	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type f -o -type l	\
-	    	| ${SORT} \
-	    	>${WRKDIR}/PLIST.share-vim
-	cd ${PREFIX} ;\
-	    ${FIND} share/vim/${DISTNAME:S/-//:S/.//}/ -type d \
-	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g' \
-		>>${WRKDIR}/PLIST.share-vim
-	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
-	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-vim"	>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
-	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim
-	cd ${WRKDIR} ; ex < ex.script
-
-.include <bsd.port.post.mk>
diff --git a/editors/vim5/distinfo b/editors/vim5/distinfo
deleted file mode 100644
index a2a9c1e88a9e..000000000000
--- a/editors/vim5/distinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 (vim/vim-5.8-src.tar.gz) = 89ab05bb5cd39eeb9e259503436c11ed
-SHA256 (vim/vim-5.8-src.tar.gz) = c220475dcfd4d1f3f63802872260dcdfe66ff738805cae80bd0f589bfd0ca0f2
-SIZE (vim/vim-5.8-src.tar.gz) = 1112952
-MD5 (vim/vim-5.8-rt.tar.gz) = f521c6e5f1b6308da9838a92c0ed5a04
-SHA256 (vim/vim-5.8-rt.tar.gz) = ea5f87249b41320b6f37d4611293e0ccf790f60311a07edf06ccdcc23ca32903
-SIZE (vim/vim-5.8-rt.tar.gz) = 1266852
-MD5 (vim/5.8.001) = ab4c6930f58979575e60a655dc386d82
-SHA256 (vim/5.8.001) = 2748bf0f8bcdbaf6b7e61e4f0ab20bf0f279fb44ee4d9ee5d5c8de7b0322cc52
-SIZE (vim/5.8.001) = 1391
-MD5 (vim/5.8.002) = af4ec645a8e9bdf1eb24e6b559918aa5
-SHA256 (vim/5.8.002) = e0d3a79b301db29936415f2cb6332d20ddf655e9d278d929919535d15b817ed2
-SIZE (vim/5.8.002) = 5187
-MD5 (vim/5.8.003) = 23cb281597b31ff8d85d303ef9ed8d15
-SHA256 (vim/5.8.003) = 68a64f6a2221873374f19c219b9f5b08fbe0d1af4d3f82ad04125bb00f09593d
-SIZE (vim/5.8.003) = 1464
-MD5 (vim/5.8.004) = cc9b36e05fe093e16010b16b6e000b41
-SHA256 (vim/5.8.004) = 636d0561d17ed9aaedae65cf481d41dc63dcf70838532296e2dbec59915f572e
-SIZE (vim/5.8.004) = 2066
-MD5 (vim/5.8.005) = 8d18f9012e6e3a608756fcb0a5174afd
-SHA256 (vim/5.8.005) = ea3bb374e16b6ff2f8d76fc497dea7eae89bdb4d6283599646877f6868aba733
-SIZE (vim/5.8.005) = 1905
-MD5 (vim/5.8.006) = e60d18ab02dad1b20051b58ce4f50ee7
-SHA256 (vim/5.8.006) = 86c53a2a53a45c894d479c97e04cac67fdd65aa57c7b46ebee5602035b7541ab
-SIZE (vim/5.8.006) = 1592
-MD5 (vim/5.8.007) = 79064f7fd3be4a5804ffb5e258d39028
-SHA256 (vim/5.8.007) = 9c481cafbfe667f9e2a59d6875edc88bdb8810c29042900e7f20405612d70ab5
-SIZE (vim/5.8.007) = 1358
-MD5 (vim/5.8.008) = f5a5884deb37f7a1587fac51bb21fc97
-SHA256 (vim/5.8.008) = e52b1baba264a078a30c50934e5099723d3c34d3622fcbb6717a98e1bf78c247
-SIZE (vim/5.8.008) = 1835
diff --git a/editors/vim5/files/patch-01 b/editors/vim5/files/patch-01
deleted file mode 100644
index 12e61ee2bc84..000000000000
--- a/editors/vim5/files/patch-01
+++ /dev/null
@@ -1,94 +0,0 @@
---- Makefile.orig	Sat Jun  1 18:57:12 2002
-+++ Makefile	Sat Jun  1 18:53:56 2002
-@@ -303,6 +303,7 @@
- 
- # just an example:
- #CONF_ARGS = --exec-prefix=/usr
-+CONF_ARGS = --prefix=$(PREFIX)
- 
- # GUI - For creating Vim with GUI (gvim) (B)
- # Uncomment this line when you don't want to get the GUI version, although you
-@@ -1446,56 +1447,56 @@
- installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
- 
- $(BINDIR)/$(EXTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
-+	#cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
- 
- $(BINDIR)/$(VIEWTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
-+	#cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
- 
- $(BINDIR)/$(GVIMTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET)
- 
- $(BINDIR)/$(GVIEWTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET)
- 
- $(BINDIR)/$(RVIMTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
- 
- $(BINDIR)/$(RVIEWTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
- 
- $(BINDIR)/$(RGVIMTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
- 
- $(BINDIR)/$(RGVIEWTARGET):
--	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
-+	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
- 
- # create links for the manual pages with various names to vim.	This is only
- # done when the links (or manpages with the same name) don't exist yet.
- installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
- 
- $(MANSUBDIR)/$(EXNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
-+	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
- 
- $(MANSUBDIR)/$(VIEWNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
-+	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
- 
- $(MANSUBDIR)/$(GVIMNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
-+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
- 
- $(MANSUBDIR)/$(GVIEWNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
-+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
- 
- $(MANSUBDIR)/$(RVIMNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
-+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
- 
- $(MANSUBDIR)/$(RVIEWNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
-+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
- 
- $(MANSUBDIR)/$(RGVIMNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
-+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
- 
- $(MANSUBDIR)/$(RGVIEWNAME).1:
--	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
-+	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
- 
- uninstall: uninstall_runtime
- 	-rm -f $(BINDIR)/$(VIMTARGET)
-@@ -1640,7 +1641,9 @@
- 	-@echo '#include "vim.h"' >> pathdef.c
- 	-@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> pathdef.c
- 	-@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' >> pathdef.c
--	-@echo 'char_u *all_cflags = (char_u *)"$(CC) -c -I$(srcdir) $(ALL_CFLAGS)";' >> pathdef.c
-+	-@echo 'char_u *all_cflags = (char_u *)' >> pathdef.c
-+	-@echo '$(CC) -c -I$(srcdir) $(ALL_CFLAGS)' | \
-+		sed -e 's/"/\\"/g' | sed -e 's/^/"/; s/$$/";/' >> pathdef.c
- 	-@echo 'char_u *all_lflags = (char_u *)"$(CC) $(LDFLAGS) -o $(VIMTARGET) $(ALL_LIBS)";' >> pathdef.c
- 	-@echo 'char_u *compiled_user = (char_u *)"' | tr -d \\012 >>pathdef.c
- 	-@whoami | tr -d \\012 >>pathdef.c
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
deleted file mode 100644
index 9742f41fb674..000000000000
--- a/editors/vim5/files/patch-02
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.orig	Wed Jun  7 05:05:11 2000
-+++ configure	Mon Oct  9 09:57:00 2000
-@@ -2841,11 +2841,11 @@
- 
-   if test "x$gtk_config_prefix" != "x" ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
--     GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+     GTK_CONFIG=${GTK_CONFIG}
-   fi
-   if test "x$gtk_config_exec_prefix" != "x" ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
--     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+     GTK_CONFIG=${GTK_CONFIG}
-   fi
-   if test "X$GTK_CONFIG" = "X"; then
-     # Extract the first word of "gtk-config", so it can be a program name with args.
diff --git a/editors/vim5/pkg-descr b/editors/vim5/pkg-descr
deleted file mode 100644
index f2086eabef32..000000000000
--- a/editors/vim5/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-Vim is a virtually compatible, extremely enhanced, version of the UNIX
-text editor vi.
-
-There are a lot of enhancements above Vi: multi level undo, multi-windows
-and buffers, syntax highlighting, command line editing, filename completion,
-on-line help, visual selection, etc..  
-
-Many features above standard vi's have been added:
-    multiple windows and buffers, multi level undo, command line history,
-    filename completion, selection highlighting, block operations (including
-    column/rectangular blocks), syntax highlighting, on-line help, etc.
-	Embeded Perl, Tcl, and Python support.
-	See ":help vi_diff" for a summary of the differences between Vim and Vi.
-
-	An X-windows aware or a full X-windows GUI version can also be built
-	that allows full use of the mouse and pull-down menus
-
-See http://www.vim.org/why.html for a full explanation of Vim's features.
-
-Portability to all UNIX platforms, AmigaOS, Archimedes, Atari MiNT, BeOS,
-M$-DOS, MacOS, OS/2, VMS, WinNT+Win95.
-
-WWW: http://www.vim.org/
diff --git a/editors/vim5/pkg-plist b/editors/vim5/pkg-plist
deleted file mode 100644
index 5ba898e5ba4d..000000000000
--- a/editors/vim5/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $FreeBSD$
-bin/vim
-bin/vimtutor
-bin/xxd
-@comment bin/ex
-@comment bin/gex
-bin/gview
-bin/gvim
-bin/rgview
-bin/rgvim
-bin/rview
-bin/rvim
-@comment bin/view
-@comment Insert PLIST.share-vim here
-@comment -=[ begin PLIST.share-vim ]=-
-@comment -=[ end PLIST.share-vim ]=-
-@dirrm share/vim