From owner-svn-ports-all@FreeBSD.ORG Sun Nov 16 22:55:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67CE0642; Sun, 16 Nov 2014 22:55:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A551680; Sun, 16 Nov 2014 22:55:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAGMtBSF055226; Sun, 16 Nov 2014 22:55:11 GMT (envelope-from alfred@FreeBSD.org) Received: (from alfred@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAGMtAaW055221; Sun, 16 Nov 2014 22:55:10 GMT (envelope-from alfred@FreeBSD.org) Message-Id: <201411162255.sAGMtAaW055221@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: alfred set sender to alfred@FreeBSD.org using -f From: Alfred Perlstein Date: Sun, 16 Nov 2014 22:55:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372654 - in head/editors/vim: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Nov 2014 22:55:11 -0000 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 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