From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 23 16:18:07 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 ESMTPS id 2CD83775;
 Sun, 23 Mar 2014 16:18:07 +0000 (UTC)
Received: from prod2.absolight.net (mx3.absolight.net
 [IPv6:2a01:678:2:100::25])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E1B71A62;
 Sun, 23 Mar 2014 16:18:06 +0000 (UTC)
Received: from prod2.absolight.net (localhost [127.0.0.1])
 by prod2.absolight.net (Postfix) with ESMTP id 6E32DBDC65;
 Sun, 23 Mar 2014 17:18:05 +0100 (CET)
Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205])
 by prod2.absolight.net (Postfix) with ESMTPA id 2A868BDC5A;
 Sun, 23 Mar 2014 17:18:05 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
 by atuin.in.mat.cc (Postfix) with ESMTP id E5CE5D23ABDB;
 Sun, 23 Mar 2014 17:18:04 +0100 (CET)
Date: Sun, 23 Mar 2014 17:18:04 +0100
From: Mathieu Arnold <mat@FreeBSD.org>
To: Bryan Drewery <bdrewery@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject: Re: svn commit: r348866 - head/ports-mgmt/poudriere-devel
Message-ID: <79C5E9B2B1255838D240E362@atuin.in.mat.cc>
In-Reply-To: <532F08B7.8010602@FreeBSD.org>
References: <201403231540.s2NFeBjV061182@svn.freebsd.org>
 <9753239EA269BEFE3D11835F@atuin.in.mat.cc> <532F08B7.8010602@FreeBSD.org>
X-Mailer: Mulberry/4.0.8 (Mac OS X)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Mar 2014 16:18:07 -0000



+--On 23 mars 2014 11:15:51 -0500 Bryan Drewery <bdrewery@FreeBSD.org>
wrote:
| On 3/23/2014 11:11 AM, Mathieu Arnold wrote:
|> +--On 23 mars 2014 15:40:11 +0000 Bryan Drewery <bdrewery@FreeBSD.org>
|> wrote:
|> |  .include <bsd.port.options.mk>
|> |  
|> | +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 <bsd.port.options.mk>

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.

-- 
Mathieu Arnold