Index: editors/vim/Makefile
===================================================================
--- editors/vim/Makefile
+++ editors/vim/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vim
 PORTVERSION=	8.0.0252
+PORTREVISION?=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 
@@ -14,7 +15,7 @@
 LICENSE_FILE=	${WRKSRC}/runtime/doc/uganda.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=		CSCOPE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE
+OPTIONS_DEFINE=		CSCOPE DEFAULT_NOMOUSE DEFAULT_VIMRC EXUBERANT_CTAGS NLS XTERM_SAVE
 OPTIONS_SINGLE=		UI
 OPTIONS_SINGLE_UI=	ATHENA CONSOLE GNOME GTK2 GTK3 MOTIF X11
 OPTIONS_GROUP=		LANGBIND
@@ -22,6 +23,7 @@
 OPTIONS_SUB=		yes
 
 DEFAULT_VIMRC_DESC=	Install bundled vimrc as default setting
+DEFAULT_NOMOUSE_DESC= Disable mouse from default settings
 EXUBERANT_CTAGS_DESC=	Use exctags instead of ctags
 XTERM_SAVE_DESC=	Restore xterm screen after exit
 
@@ -187,6 +189,10 @@
 	${SED} -e '/set nocompatible/d' ${FILESDIR}/vimrc > ${STAGEDIR}${ETCDIR}/gvimrc.sample
 	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${ETCDIR}/vimrc.sample
 
+post-install-DEFAULT_NOMOUSE-on:
+	${SED} -i '' -e 's/set mouse=a/set mouse= " mouse support disabled by vim port DISABLE_DEFAULT_MOUSE option/' \
+		${STAGEDIR}${PREFIX}/share/vim/${VIM_VER}/defaults.vim
+
 post-install-NLS-off:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap