svn commit: r372654 - in head/editors/vim: . files

[Alfred Perlstein]

Author: alfred (src committer)
Date: Sun Nov 16 22:55:10 2014
New Revision: 372654
URL: https://svnweb.freebsd.org/changeset/ports/372654
QAT: https://qat.redports.org/buildarchive/r372654/

Log:
  Use vimrc from distribution.
  
  Suggested by: many.

Deleted:
  head/editors/vim/files/vimrc
Modified:
  head/editors/vim/Makefile
  head/editors/vim/pkg-plist

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Sun Nov 16 21:56:22 2014	(r372653)
+++ head/editors/vim/Makefile	Sun Nov 16 22:55:10 2014	(r372654)
@@ -58,7 +58,7 @@ INSTALL_WRKSRC=	${WRKDIR}/${VIM_VER}/src
 WRKSRC=		${WRKDIR}/${VIM_VER}
 
 PLIST_SUB=	VIM_VER=${VIM_VER}
-PORTDATA=	*
+PORTDATA=	${VIM_VER}
 
 VIM_VER=	${PORTNAME}${PORTVERSION:R:S/.//g}
 
@@ -126,6 +126,9 @@ IGNORE=		this port has new UI option (CO
 
 .if ${PORT_OPTIONS:MDEFAULT_VIMRC}
 DEFAULT_VIMRC_LOCATION=${PREFIX}/share/vim
+PLIST_SUB+=	DEFAULT_VIMRC="@sample "
+.else
+PLIST_SUB+=	DEFAULT_VIMRC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCONSOLE} || ${PORT_OPTIONS:MX11}
@@ -191,7 +194,8 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${STAGEDIR}${DATADIR}/${VIM_VER}/keymap/
 	${TOUCH} ${STAGEDIR}${DATADIR}/${VIM_VER}/lang/.keepme
 .if ${PORT_OPTIONS:MDEFAULT_VIMRC}
-	${INSTALL_DATA} ${FILESDIR}/vimrc ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/vimrc
+	${INSTALL_DATA} ${WRKSRC}/runtime/vimrc_example.vim ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/vimrc
+	${INSTALL_DATA} ${WRKSRC}/runtime/gvimrc_example.vim ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/gvimrc
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/editors/vim/pkg-plist
==============================================================================
--- head/editors/vim/pkg-plist	Sun Nov 16 21:56:22 2014	(r372653)
+++ head/editors/vim/pkg-plist	Sun Nov 16 22:55:10 2014	(r372654)
@@ -184,3 +184,5 @@ man/man1/xxd.1.gz
 %%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/vimdiff.1.gz
 %%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/vimtutor.1.gz
 %%NON_LITE%%%%NLS%%man/ru.UTF-8/man1/xxd.1.gz
+%%DEFAULT_VIMRC%%share/vim/vimrc
+%%DEFAULT_VIMRC%%share/vim/gvimrc