Date: Wed, 9 Aug 2006 17:43:37 -0600 From: John E Hein <jhein@timing.com> To: =?ISO-8859-1?Q?G=E1bor_K=F6vesd=E1n?= <gabor@FreeBSD.org> Cc: ports@FreeBSD.org Subject: Re: support for DESTDIR: security/openssh-portable Message-ID: <17626.29481.909830.326948@gromit.timing.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?17626.29481.909830.326948>