XFree86-clients-4.4.0_2 will not compile with freetype2-2.1.7_3

[Bjoern Engels]

>Submitter-Id:	current-users
>Originator:	Bjoern Engels
>Organization:	OpenIT GmbH
>Confidential:	no
>Synopsis:	XFree86-clients-4.4.0_2 will not compile with freetype2-2.1.7_3
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		sw-bug
>Release:	FreeBSD 5.2.1-RELEASE-p13 i386
>Environment:	FreeBSD buildhost.0x20.net 5.2.1-RELEASE-p13 FreeBSD 5.2.1-RELEASE-p13 #0: Thu Dec 2 14:52:04 CET 2004 root at buildhost.0x20.net:/usr/obj/usr/src/sys/NADE_20041202 i386
>Description:	
		XFree86-4 and xorg-x11 won't build with the actual ports version of
		freetype2, stopping with

		    `ft2build.h' hasn't been included yet!
		    Please always use macros to include FreeType header files.
		    Example:
		      #include <ft2build.h>
		      #error "  #include FT_FREETYPE_H

>How-To-Repeat:
		try to build XFree-4 / xorg-x11
>Fix:
		For me this patch worked fine

		--- freetype-2.1.7/include/freetype/freetype.h.orig     Mon Dec 13 19:13:45 2004
		+++ freetype-2.1.7/include/freetype/freetype.h  Mon Dec 13 19:16:35 2004
		@@ -16,6 +16,9 @@
		 /***************************************************************************/
		 
		 
		+/***************************************************************************/
		+/* commented becaue XFree86-clients will not build with this section       */
		+/* 
		 #ifndef FT_FREETYPE_H
		 #error "`ft2build.h' hasn't been included yet!"
		 #error "Please always use macros to include FreeType header files."
		@@ -23,7 +26,7 @@
		 #error "  #include <ft2build.h>"
		 #error "  #include FT_FREETYPE_H"
		 #endif
		-
		+*/
		 
		 #ifndef __FREETYPE_H__
		 #define __FREETYPE_H__