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.

Fix plist.

Update netatalk to 2.2.1.

Fix net/netatalk compilation from scratch with -DWITHOUT_APPLETALK specified.

Part of the fix is derived from PR 160181. The pkg-plist portion will need to be contributed back upstream after adjusting it for 2.2.1.

Remove half-baked work introduced in the original patch provided by imp@, so that we're more in line with what's _actually_ done in the netatalk port. This partially resolves ticket 847.

Commit forgotten files for avahi fix.

Backport two netatalk revisions that fixes crashes if avahi is not started.

Add my patches backported from netatalk repository.

Fix netatalk patch to deal with change in ports tree, along the way grab the latest update to the netatalk port from the FreeBSD ports tree

afpd needs to start after avahi. This resolves the issues with afpd dying at boot time.