From owner-freebsd-ports@FreeBSD.ORG Wed Aug 9 23:43:45 2006 Return-Path: X-Original-To: ports@FreeBSD.org Delivered-To: freebsd-ports@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3C6416A4DE; Wed, 9 Aug 2006 23:43:45 +0000 (UTC) (envelope-from jhein@timing.com) Received: from Daffy.timing.com (w.timing.com [206.168.13.218]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CE8143D46; Wed, 9 Aug 2006 23:43:45 +0000 (GMT) (envelope-from jhein@timing.com) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by Daffy.timing.com (8.13.1/8.13.1) with ESMTP id k79Nhipj033458; Wed, 9 Aug 2006 17:43:44 -0600 (MDT) (envelope-from jhein@timing.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.13.6/8.13.6) with ESMTP id k79NhcO5049906; Wed, 9 Aug 2006 17:43:38 -0600 (MDT) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.13.6/8.13.6/Submit) id k79NhcWq049902; Wed, 9 Aug 2006 17:43:38 -0600 (MDT) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Message-ID: <17626.29481.909830.326948@gromit.timing.com> Date: Wed, 9 Aug 2006 17:43:37 -0600 From: John E Hein To: =?ISO-8859-1?Q?G=E1bor_K=F6vesd=E1n?= In-Reply-To: <44DA6FC9.3040404@FreeBSD.org> References: <17626.25183.846983.515718@gromit.timing.com> <17626.25444.563099.956775@gromit.timing.com> <44DA6FC9.3040404@FreeBSD.org> X-Mailer: VM 7.19 under Emacs 21.3.1 X-Virus-Scanned: ClamAV version 0.87.1, clamav-milter version 0.87 on Daffy.timing.com X-Virus-Status: Clean Cc: ports@FreeBSD.org Subject: Re: support for DESTDIR: security/openssh-portable X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Aug 2006 23:43:45 -0000 G=E1bor K=F6vesd=E1n wrote at 01:29 +0200 on Aug 10, 2006: > John E Hein wrote: > > John E Hein wrote at 16:31 -0600 on Aug 9, 2006: > > > Now that ports/Mk does the right thing for DESTDIR (thanks to G=E1= bor), > > > here's a patch that supports DESTDIR properly for > > > security/openssh-portable: > > > = > > [snip] > > > @@ -171,29 +171,33 @@ post-extract: > > > post-patch: > > > @${REINPLACE_CMD} -e 's|-ldes|-lcrypto|g' ${WRKSRC}/configure > > > = > > > +.if defined(DESTDIR) && !empty(DESTDIR) > > > +CHROOTDESTDIR=3D${CHROOT} ${DESTDIR} > > > +.endif > > > + > > [snip] > > > .endif > > > - if ! pw groupshow sshd; then pw groupadd sshd -g 22; fi > > > - if ! pw usershow sshd; then pw useradd sshd -g sshd -u 22 \ > > > + if ! ${CHROOTDESTDIR} pw groupshow sshd; then ${CHROOTDESTDIR} = pw groupadd sshd -g 22; fi > > > + if ! ${CHROOTDESTDIR} pw usershow sshd; then ${CHROOTDESTDIR} p= w useradd sshd -g sshd -u 22 \ > > > -h - -d ${EMPTYDIR} -s /nonexistent -c "sshd privilege separat= ion"; fi > > > > Gabor, you may want to define CHROOTDESTDIR (or name it whatever you= > > want) as a convenience var in bsd.port.mk > > > > I suspect lots of ports will want to use it. > > = > Might be good, but personally I think ${CHROOT} ${DESTDIR} is more = > trivial (easier to read and understand) and only longer with 4 = > characters. One might wonder at first look what CHROOTDESTDIR is. Well, the part that makes it annoying to duplicate in all ports is not the two separate words (CHROOT DESTDIR), but that you have to test defined(DESTDIR) && !empty(DESTDIR) before you can figure out whether to use ${CHROOT} ${DESTDIR} or not. So having that test to assign CHROOTDESTDIR or leave it empty in bsd.port.mk allows the port writer to just always invoke it without having to worry about testing for DESTDIR.