xsrc/40285: "xft-config --cflags" for native xorg lacks /usr/X11R7/include/freetype2

[emilianogavilan%gmail.com@localhost]

>Number:         40285
>Category:       xsrc
>Synopsis:       "xft-config --cflags" for native xorg lacks 
>/usr/X11R7/include/freetype2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 28 15:25:00 +0000 2008
>Originator:     Emiliano
>Release:        5.0_BETA
>Organization:
Gavilan
>Environment:
NetBSD cacharro.amymec.com.ar 5.0_BETA NetBSD 5.0_BETA (GENERIC) #0: Fri Dec 26 
08:33:52 PST 2008  
builds@wb28:/home/builds/ab/netbsd-5/amd64/200812260002Z-obj/home/builds/ab/netbsd-5/src/sys/arch/amd64/compile/GENERIC
 amd64
>Description:
The value returned by "/usr/X11R7/bin/xft-config --cflags" is incorrect

$ /usr/X11R7/bin/xft-config --cflags                                           
-I/usr/X11R7/include

<X11/Xft/Xft.h> includes <ft2build.h>
<ft2build.h> includes <freetype/config/ftheader.h>

The last header is not rooted in /usr/X11R7/include but in
/usr/X11R7/include/freetype2, which should be added to the
"xft-config --cflags" output.
>How-To-Repeat:
Run a configure script for any package which determines the compiling
flags by means of "xft-config --cflags". One of this packages is
Tk 8.5.6/8.6b1
>Fix:
$ diff -u /usr/X11R7/bin/xft-config.orig   /usr/X11R7/bin/xft-config  
--- /usr/X11R7/bin/xft-config.orig      2008-12-28 13:20:53.000000000 -0200
+++ /usr/X11R7/bin/xft-config   2008-12-28 13:22:34.000000000 -0200
@@ -6,7 +6,7 @@
 includedir="${prefix}/include"
 version="2.1.12"
 freetypelibs="-lfreetype -lz"
-freetypecflags=""
+freetypecflags="-I${includedir}/freetype2"
 fontconfiglibs="-lfontconfig"
 fontconfigcflags=""
 xrenderlibs="-lXrender"