macosx-port relationship to bsd-port: child or fork?

[Stephen Bannasch]

Is the macosx-port a fork of bsd-port or a derivation? Will macosx-port be regularly merging changes from bsd-port into 
macosx-port?

About 3 weeks ago bsd-port merged in jdk-b122, while macosx-port is still based off a merge from  jdk-b120.

One reason I'm curious is because jdk7 released jdk-b123 with many important changes on Dec 23 
(http://blogs.sun.com/jrose/entry/invokedynamic_in_build_123) and I'd like to see both bsd-port and macosx-port stay up-to-date 
with changes like this.

I skimmed the macosx-port changeset in some of the consituent repos (hotspot, jdk, langtools) and a large number look like they 
could be be included in bsd-port -- which would make sense if macosx-port is bsd-port PLUS macosx changes but not as important 
if macosx-port is a fork.

Here's the diff of the last push from mswingler to macosx-port/jdk:

   http://hg.openjdk.java.net/macosx-port/macosx-port/jdk/rev/a91793b807d5

Here are some recent changes in bsd-port which I assume might be useful in macosx-port:

   Changeset: 3e3f95d3d951
   Author:    Greg Lewis <glewis at eyesbeyond.com>
   Date:      2010-12-13 00:57 -0800
   URL:       http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/3e3f95d3d951

. Make rlen a size_t rather than a int.  This is the correct argument type
   to pass to sysctl and fixes a crash on 64 bit architectures where size_t
   is 64 bits rather than 32 bits.

And these more recent pushes to fix a linking problem on MacOS X PPC

   Changeset: 5f3f352944f8
   Author:    kurt
   Date:      2011-01-04 21:43 -0500
   URL:       http://hg.openjdk.java.net/bsd-port/bsd-port/hotspot/rev/5f3f352944f8

   Summary: Add missing function to correct zero link error on PPC.

   ! src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp

   Changeset: 004aaf53de56
   Author:    kurt
   Date:      2011-01-04 21:44 -0500
   URL:       http://hg.openjdk.java.net/bsd-port/bsd-port/hotspot/rev/004aaf53de56

   Summary: Disable assert for zero build to correct zero fastdebug builds