From owner-svn-ports-head@FreeBSD.ORG Wed Nov 6 07:31:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5C476DD5 for ; Wed, 6 Nov 2013 07:31:28 +0000 (UTC) (envelope-from bounces+73574-c70f-svn-ports-head=freebsd.org@sendgrid.me) Received: from o3.shared.sendgrid.net (o3.shared.sendgrid.net [208.117.48.85]) by mx1.freebsd.org (Postfix) with SMTP id 0781B2809 for ; Wed, 6 Nov 2013 07:31:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sendgrid.info; h=from:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; s=smtpapi; bh=5ALfIptF0oUeTI8jZP9sdqYPbjA=; b=YB/fmG4qrHM1ZMpQPS 8gVeVsGh8lneD5CRppoJl35/BYp1a0Qn4R8Kgu2EE67+tIomQxy8EtNMVXjPkT8V FHCZ7qOHfIT+j91027JqxGY8Kh/Vjho+xM7+XYpXJ1OhXDcdQOheDyGQ1K74qUmb U9snvvotMZdNJT/7wrRLvJ4kk= Received: by mf72 with SMTP id mf72.8716.5279F04F5 Wed, 06 Nov 2013 07:31:27 +0000 (GMT) Received: from mail.tarsnap.com (unknown [10.60.208.15]) by mi36 (SG) with ESMTP id 1422c52b5e6.6c0.2cb4d2 for ; Wed, 06 Nov 2013 01:31:27 -0600 (CST) Received: (qmail 56149 invoked from network); 6 Nov 2013 07:31:26 -0000 Received: from unknown (HELO clamshell.daemonology.net) (127.0.0.1) by ec2-107-20-205-189.compute-1.amazonaws.com with ESMTP; 6 Nov 2013 07:31:26 -0000 Received: (qmail 40244 invoked from network); 6 Nov 2013 07:29:46 -0000 Received: from unknown (HELO clamshell.daemonology.net) (127.0.0.1) by clamshell.daemonology.net with SMTP; 6 Nov 2013 07:29:46 -0000 Message-ID: <5279EFEA.2070607@freebsd.org> Date: Tue, 05 Nov 2013 23:29:46 -0800 From: Colin Percival User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Alexey Dokuchaev Subject: Re: svn commit: r332668 - in head/security: . pkesh References: <201311040605.rA465DDm028738@svn.freebsd.org> <20131106071044.GF60770@FreeBSD.org> <5279ED27.8050107@freebsd.org> <20131106072833.GG60770@FreeBSD.org> In-Reply-To: <20131106072833.GG60770@FreeBSD.org> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SG-EID: RYW4HVJU6vENNcqut+BAw7Dij1RmrEHQZJX8miHAouuk1OJfGyf25ygjN/715GbADnfjxoTv2BoQndzhiaTSCdiTQ2wUqdyDsktVlsDGcoaaznT0Vs4nO1rQERYY+sZgJulQFgwdXF0JrqVfUBBBkyV2XPQ+odKAftqqP8ECB64= Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 07:31:28 -0000 On 11/05/13 23:28, Alexey Dokuchaev wrote: > On Tue, Nov 05, 2013 at 11:17:59PM -0800, Colin Percival wrote: >> On 11/05/13 23:10, Alexey Dokuchaev wrote: >>>> +PLIST_FILES= bin/pkesh \ >>>> + %%PORTDOCS%%%%DOCSDIR%%/README >>>> +PLIST_DIRS= %%DOCSDIR%% >>> >>> Using PORTDOCS=README would allow you to 1) get tid of eye-tearing %%'s in >>> PLIST_FILES and drop PLIST_DIRS. >> >> Huh. I was confused by the [staging] wiki page since it says "Just add >> the right %%PORTDOCS%% as prefix in your pkg-plist...". > > Yes, if you prefer to list docs explicitly in pkg-list (real file), you > have to use so-called "plist subs", %%FOOBAR%%. When using PLIST_FILES > or PORTDOCS (using them often makes, esp. for short plists), you do not > need to do all the dancing with subs, it is done automagically for you. > > That said, > > PLIST_FILES= bin/pkesh > PORTDOCS= README > > is all it takes. Awesome! Please make the documentation less confusing. ;-) >>>> +do-install: >>>> + ${INSTALL_SCRIPT} ${WRKSRC}/pkesh.sh ${STAGEDIR}${PREFIX}/bin/pkesh >>>> + >>>> +post-install: >>>> + ${MKDIR} ${STAGEDIR}${DOCSDIR} >>>> + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} >>> >>> You could've simply merged all commands in do-install target. No need for >>> two of them, really. :-) >> >> The aforementioned wiki page says "Directory creation should remain in the >> post-install: target" so that's what I did... > > It mentions post-install because usually do-install simply calls install > target (via ${INSTALL_TARGET}) provided by the upstream build system. So, > using post-install is more generic, yes. However, in cases when you have > to roll your own do-install, there is no any need to split the two. Good to know. I'll go ahead and fix all of these. -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid