From owner-svn-ports-all@FreeBSD.ORG Sun Mar 23 17:49:10 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id 0E08F1EC; Sun, 23 Mar 2014 17:49:10 +0000 (UTC) Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7FD21B5; Sun, 23 Mar 2014 17:49:09 +0000 (UTC) Received: from [192.168.2.1] (dhcp-108-170-169-46.cable.user.start.ca [108.170.169.46]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by apnoea.adamw.org (Postfix) with ESMTPSA id 41354121CB8; Sun, 23 Mar 2014 13:49:08 -0400 (EDT) From: "Adam Weinberger" To: "Bryan Drewery" Subject: Re: svn commit: r348866 - head/ports-mgmt/poudriere-devel Date: Sun, 23 Mar 2014 13:49:06 -0400 Message-ID: In-Reply-To: <532F09E2.6090309@FreeBSD.org> References: <201403231540.s2NFeBjV061182@svn.freebsd.org> <9753239EA269BEFE3D11835F@atuin.in.mat.cc> <532F08B7.8010602@FreeBSD.org> <79C5E9B2B1255838D240E362@atuin.in.mat.cc> <532F09E2.6090309@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-Mailer: MailMate (1.7.2r4025) Cc: Mathieu Arnold , svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 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, 23 Mar 2014 17:49:10 -0000 On 23 Mar 2014, at 12:20, Bryan Drewery wrote: > On 3/23/2014 11:18 AM, Mathieu Arnold wrote: >> >> >> +--On 23 mars 2014 11:15:51 -0500 Bryan Drewery >> >> wrote: >> | On 3/23/2014 11:11 AM, Mathieu Arnold wrote: >> |> +--On 23 mars 2014 15:40:11 +0000 Bryan Drewery >> >> |> wrote: >> |> | .include >> |> | >> |> | +post-install: >> |> | .if ${PORT_OPTIONS:MZSH} >> |> | -PLIST_FILES+= share/zsh/site-functions/_poudriere >> |> | -PLIST_DIRSTRY+= share/zsh/site-functions >> |> | -PLIST_DIRSTRY+= share/zsh/ >> |> | -.else >> |> | -MAKE_ENV+= NO_ZSH=yes >> |> | + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ >> |> | + ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ >> |> | + ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ >> |> | .endif >> |> >> |> I think you could do without the include and always install the >> file. >> |> >> | >> | What? >> >> Replace: >> >> .include >> >> post-install: >> .if ${PORT_OPTIONS:MZSH} >> @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ >> ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ >> ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ >> .endif >> >> With: >> >> post-install: >> @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ >> ${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \ >> ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ >> >> The package won't register the file if the option is disabled, and it >> removes the need for make to parse bsd.port.mk twice. >> > > And then there is a stage orphan. > > No. Staging only installs things listed in the plist. If the ZSH option is enabled, that file is in the plist. Stage orphans are files that never get installed, no matter which options are selected. The poudriere-devel port installs things into DATDIR without checking whether NOPORTDATA is defined. The port installs manpages without checked whether NO_INSTALL_MANPAGES is defined. Yet, magically, those options continue to work. Just install everything into STAGEDIR, and let the plist do the heavy lifting for you. # Adam -- Adam Weinberger adamw@adamw.org http://www.adamw.org