From owner-svn-ports-all@FreeBSD.ORG Mon Nov 17 15:34:12 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 2A2088E1; Mon, 17 Nov 2014 15:34:12 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id E37B26BE; Mon, 17 Nov 2014 15:34:11 +0000 (UTC) Received: from [10.0.1.100] (c-76-21-10-192.hsd1.ca.comcast.net [76.21.10.192]) by elvis.mu.org (Postfix) with ESMTPSA id D9944341F867; Mon, 17 Nov 2014 07:34:11 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r372654 - in head/editors/vim: . files From: Alfred Perlstein X-Mailer: iPhone Mail (12B411) In-Reply-To: <20141117152620.GC48896@ivaldir.etoilebsd.net> Date: Mon, 17 Nov 2014 07:34:12 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: <0734A3BC-F975-45A7-8819-E6E5892AFE92@mu.org> References: <201411162255.sAGMtAaW055221@svn.freebsd.org> <20141117064309.GB48896@ivaldir.etoilebsd.net> <305A5CEB-E71C-4148-A8D5-A0B74C32B23B@mu.org> <20141117152620.GC48896@ivaldir.etoilebsd.net> To: Baptiste Daroussin Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , Alfred Perlstein , "ports-committers@freebsd.org" 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 15:34:12 -0000 > On Nov 17, 2014, at 7:26 AM, Baptiste Daroussin wrote: >=20 >> On Mon, Nov 17, 2014 at 07:21:41AM -0800, Alfred Perlstein wrote: >>=20 >>=20 >>>> On Nov 16, 2014, at 10:43 PM, Baptiste Daroussin wro= te: >>>>=20 >>>> On Sun, Nov 16, 2014 at 10:55:10PM +0000, Alfred Perlstein wrote: >>>> 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/ >>>>=20 >>>> Log: >>>> Use vimrc from distribution. >>>>=20 >>>> Suggested by: many. >>>>=20 >>>> Deleted: >>>> head/editors/vim/files/vimrc >>>> Modified: >>>> head/editors/vim/Makefile >>>> head/editors/vim/pkg-plist >>>>=20 >>>> Modified: head/editors/vim/Makefile >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D >>>> --- 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=3D ${WRKDIR}/${VIM_VER}/src >>>> WRKSRC=3D ${WRKDIR}/${VIM_VER} >>>>=20 >>>> PLIST_SUB=3D VIM_VER=3D${VIM_VER} >>>> -PORTDATA=3D * >>>> +PORTDATA=3D ${VIM_VER} >>>>=20 >>>> VIM_VER=3D ${PORTNAME}${PORTVERSION:R:S/.//g} >>>>=20 >>>> @@ -126,6 +126,9 @@ IGNORE=3D this port has new UI option (CO >>>>=20 >>>> .if ${PORT_OPTIONS:MDEFAULT_VIMRC} >>>> DEFAULT_VIMRC_LOCATION=3D${PREFIX}/share/vim >>>> +PLIST_SUB+=3D DEFAULT_VIMRC=3D"@sample " >>> @sample only works if the file itself is suffixed by .sample >>=20 >> So=20 >> 1) the installed file needs to have .sample as suffix. Example: "file.sam= ple" >> 2) it will actually be installed as "file"? >>=20 >> So I can: >> 1) fix the post-install target to install files as vimrc.example AND >> 2) fix the pkg-plist to call the file vimrc.example as well? > https://www.freebsd.org/doc/en/books/porters-handbook/plist-keywords.html#= plist-keywords-sample-example Unless I read wrong then my understanding of @sample is correct.=20 I'll send a diff for review shortly. =20 >=20 > regards, > Bapt