FreeNAS Code

Merge changes from ix to sf-trunk

Do-Not-Merge: changes already present in ix tree.
------------------------------------------------------------------------
r4147 | gcooper | 2011-11-20 13:46:56 -0800 (Sun, 20 Nov 2011) | 2 lines

Regenerate the devel/gobject-introspection patch to not depend unnecessarily on cairo, per PR # 161185.
------------------------------------------------------------------------
r4058 | delphij | 2011-11-14 17:43:47 -0800 (Mon, 14 Nov 2011) | 4 lines

- Use ports tree as of 2011.11.14 so we can blow away most of
ports patches;
- Add nginx, twistedCore, ujson to build.

Remove unnecessary graphics/cairo dependency in devel/gobject-introspection, per PR 161185.