Iain Hibbert <plunky@rya-online.net> writes:

> Hi,
>    I have been working here on bluetooth socket support and as part of
> that, I am borrowing userland from FreeBSD.  I have questions about
> preparing this for import to NetBSD (when that happens :)
>
> FreeBSD source does not always follow our share/misc/style - is this
> important for imported userland software?

Yes, it is. :-)

> When arranging this for import, do I need to arrange that the import goes
> in stages so that my changes are extractable?

Depends.
If there's a lot of shared code you can make your file look like:

#ifdef __FreeBSD__
...
#endif
#ifdef __NetBSD__
...
#endif

etc.

> what should I do with $FreeBSD: ..$ tags, just leave them alone?

You should leave them so that one knows from what revision did that
file came from FreeBSD.

-- 
  Rui Paulo			<rpaulo@{NetBSD{,-PT}.org,fnop.net}>