This reverts commit 2e024847.

Conflicts:

	extras/contrib/Makefile

We can't use a fat set of contribs, because the headers do differ
between 32bits & 64 bits builds

example:

../x86_64-apple-darwin10/include/freetype2/freetype/config/ftconfig.h
2010-01-04 12:49:02.000000000 +0100
+++ ../i686-apple-darwin10/include/freetype2/freetype/config/ftconfig.h
2010-01-04 12:47:12.000000000 +0100
@@ -80,7 +80,7 @@
 #ifdef FT_USE_AUTOCONF_SIZEOF_TYPES

   #define SIZEOF_INT 4
   -#define SIZEOF_LONG 8
   +#define SIZEOF_LONG 4

Moreover the pkgconfig & *-config files still referenced the x86_64
directory