From owner-svn-ports-all@FreeBSD.ORG Mon Nov 17 18:23:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21D6ADE8; Mon, 17 Nov 2014 18:23:40 +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 E949EF9C; Mon, 17 Nov 2014 18:23:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHINd8k099839; Mon, 17 Nov 2014 18:23:39 GMT (envelope-from alfred@FreeBSD.org) Received: (from alfred@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHINdPZ099837; Mon, 17 Nov 2014 18:23:39 GMT (envelope-from alfred@FreeBSD.org) Message-Id: <201411171823.sAHINdPZ099837@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: alfred set sender to alfred@FreeBSD.org using -f From: Alfred Perlstein Date: Mon, 17 Nov 2014 18:23:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372677 - head/editors/vim 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: Mon, 17 Nov 2014 18:23:40 -0000 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 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