Fix universal builds of libgcrypt.

SIZEOF_UNSIGNED_LONG was incorrectly set to 8 on i386, use a patch from
macports to make it depend on arch.
Merge github.com:xnyhps/homebrew into libotr4.0.0