Date: Mon, 24 Jun 2002 11:58:10 -0700 From: Peter Wemm <peter@wemm.org> To: Dag-Erling Smorgrav <des@ofug.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh-portable - Imported sources Message-ID: <20020624185810.74888380E@overcee.wemm.org> In-Reply-To: <xzpk7oor13h.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
Dag-Erling Smorgrav wrote:
> Peter Wemm <peter@wemm.org> writes:
> > BTW; I wish you hadn't imported the openbsd-compat and contrib/*. We real
ly
> > dont need caldera startup scripts, nor cygwin stuff etc. [...]
> > Likewise, do not import formatted man pages etc. [...]
>
> That's why I asked cvs@ to nuke it so I could redo the import
> properly.
Heh, I hadn't read that mailbox yet.
> > If there is anyth
ing
> > significant in openbsd-compat that we are missing, then it should probably
be
> > checked out for going into libc instead. There wasn't anything obvious the
re.
>
> The cost of nuking openbsd-compat is taking a number of files off the
> vendor branch that we otherwise wouldn't have to.
Can you give some examples of why? (No, this isn't an inquisition, I'd just
like to know if it is because we have to fix other stuff in the tree elsewhere
or if this is bogosity due to the de-bsd-ification in the -portable version?)
If it is just fixing a handful of include file paths, I'd rather that we
used sed to fix them as part of the build.
eg: from cc1/Makefile
SRCS= main.c c-parse+%DIKED.c c-lang.c c-decl.c
c-parse+%DIKED.c: c-parse.c
sed -e "s/malloc/xmalloc/g" \
-e "s/realloc/xrealloc/g" \
${.ALLSRC} > ${.TARGET}
or from libstdc++/Makefile:
strstream-fixed.cc: ${SRCDIR}/src/strstream.cc
sed -e 's,^#include <strstream.h>,#include <backward/strstream.h>,g' \
< ${SRCDIR}/src/strstream.cc > strstream-fixed.cc
(ignoring the unresolved debate about whether /usr/include/c++/backward should
be on the default c++ include path or not)
Cheers,
-Peter
--
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com
"All of this is for nothing if we don't go to the stars" - JMS/B5
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020624185810.74888380E>