Xft2 doesn't build

[esd@…]

Xft2 won't build on my system, but I have to admit that I'm not entirely sure why. Here's the console output:

---> Building Xft2 with target all Error: Target com.apple.build returned: shell command "cd "/Users/esd/Projects/darwinports/dports/ x11/Xft2/work/xft-2.1.2" && make all" returned error 2 Command output: make all-am if /bin/sh ./libtool --mode=compile gcc -DHAVE_CONFIG_H -I. -I. -I. -I/opt/local/include -I/usr/ X11R6/include -I/opt/local/include -I/opt/local/include/freetype2 -I/opt/local/include -I/opt/local/ include -g -O2 -MT xftcolor.lo -MD -MP -MF ".deps/xftcolor.Tpo" \

-c -o xftcolor.lo test -f 'xftcolor.c' || echo './'xftcolor.c; \

then mv ".deps/xftcolor.Tpo" ".deps/xftcolor.Plo"; \ else rm -f ".deps/xftcolor.Tpo"; exit 1; \ fi

gcc -DHAVE_CONFIG_H -I. -I. -I. -I/opt/local/include -I/usr/X11R6/include -I/opt/local/include -I/

opt/local/include/freetype2 -I/opt/local/include -I/opt/local/include -g -O2 -MT xftcolor.lo -MD -MP -MF .deps/xftcolor.Tpo -c xftcolor.c -fno-common -o .libs/xftcolor.o In file included from Xft.h:41,

from xftint.h:39, from xftcolor.c:25:

/opt/local/include/freetype2/freetype/freetype.h:20:2: #error "`ft2build.h' hasn't been included yet!" /opt/local/include/freetype2/freetype/freetype.h:21:2: #error "Please always use macros to include FreeType header files." /opt/local/include/freetype2/freetype/freetype.h:22:2: #error "Example:" /opt/local/include/freetype2/freetype/freetype.h:23:2: #error " #include <ft2build.h>" /opt/local/include/freetype2/freetype/freetype.h:24:2: #error " #include FT_FREETYPE_H" make[1]: * [xftcolor.lo] Error 1 make: * [all] Error 2

[toby@…]

This is because it's trying to link against freetype 2.1.7. I'm willing to bet it'll need patches similar to those made to fontconfig. I'll look into this later today.

[toby@…]

Fix attached. Bryan, can you commit this change?

[toby@…]

patch for Portfile

[toby@…]

patch for Xft.h

[blb@…]

Committed, thanks Evan for the catch and Toby for the patch.