Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Nov 2014 18:23:39 +0000 (UTC)
From:      Alfred Perlstein <alfred@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r372677 - head/editors/vim
Message-ID:  <201411171823.sAHINdPZ099837@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: alfred (src committer)
Date: Mon Nov 17 18:23:38 2014
New Revision: 372677
URL: https://svnweb.freebsd.org/changeset/ports/372677
QAT: https://qat.redports.org/buildarchive/r372677/

Log:
  Fix @sample usage.
  
  With help from: bapt, xmj

Modified:
  head/editors/vim/Makefile
  head/editors/vim/pkg-plist

Modified: head/editors/vim/Makefile
==============================================================================
--- head/editors/vim/Makefile	Mon Nov 17 18:08:14 2014	(r372676)
+++ head/editors/vim/Makefile	Mon Nov 17 18:23:38 2014	(r372677)
@@ -126,9 +126,6 @@ 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}
@@ -194,8 +191,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} ${WRKSRC}/runtime/vimrc_example.vim ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/vimrc
-	${INSTALL_DATA} ${WRKSRC}/runtime/gvimrc_example.vim ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/gvimrc
+	${INSTALL_DATA} ${WRKSRC}/runtime/vimrc_example.vim ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/vimrc.sample
+	${INSTALL_DATA} ${WRKSRC}/runtime/gvimrc_example.vim ${STAGEDIR}${DEFAULT_VIMRC_LOCATION}/gvimrc.sample
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/editors/vim/pkg-plist
==============================================================================
--- head/editors/vim/pkg-plist	Mon Nov 17 18:08:14 2014	(r372676)
+++ head/editors/vim/pkg-plist	Mon Nov 17 18:23:38 2014	(r372677)
@@ -184,5 +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
+%%DEFAULT_VIMRC%%@sample share/vim/vimrc.sample
+%%DEFAULT_VIMRC%%@sample share/vim/gvimrc.sample



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411171823.sAHINdPZ099837>