27 files changed, 88 insertions, 64 deletions

diff --git a/chinese/bg5ps/files/patch-aa b/chinese/bg5ps/files/patch-aa
index 74dae73e0c41..f4160ff737f2 100644
--- a/chinese/bg5ps/files/patch-aa
+++ b/chinese/bg5ps/files/patch-aa
@@ -1,11 +1,14 @@
---- Makefile.orig	Tue Feb 15 04:41:27 2000
-+++ Makefile	Tue Jan 30 22:01:34 2001
+
+$FreeBSD$
+
+--- Makefile.orig	Mon Feb 14 22:41:27 2000
++++ Makefile	Thu Mar 14 09:33:24 2002
 @@ -19,21 +19,22 @@
  
  CC = gcc
  INSTALL = install
 -CFLAGS =
-+CFLAGS += -I${LOCALBASE}/include
++CFLAGS += -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include
  LIBS = -lttf -lm
 -INCLUDEDIR = 
 +LIBSDIR = -L${LOCALBASE}/lib
diff --git a/chinese/ttfm/files/patch-Makefile b/chinese/ttfm/files/patch-Makefile
new file mode 100644
index 000000000000..9e4188b881ce
--- /dev/null
+++ b/chinese/ttfm/files/patch-Makefile
@@ -0,0 +1,12 @@
+
+$FreeBSD$
+
+--- Makefile	2002/03/14 07:35:10	1.1
++++ Makefile	2002/03/14 07:35:23
+@@ -1,5 +1,5 @@
+ FREETYPE_BASE=/usr/local
+-FREETYPE_INCL=$(FREETYPE_BASE)/include
++FREETYPE_INCL=$(FREETYPE_BASE)/include/freetype1
+ FREETYPE_LIB=$(FREETYPE_BASE)/lib
+ prefix=/usr
+ 
diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile
index dab154984259..745cdb24b604 100644
--- a/chinese/vflib/Makefile
+++ b/chinese/vflib/Makefile
@@ -31,7 +31,7 @@ USE_XLIB=	yes
 USE_AUTOCONF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-freetype \
-		--with-freetype-includedir=${PREFIX}/include/freetype \
+		--with-freetype-includedir=${PREFIX}/include/freetype1/freetype \
 		--with-freetype-libdir=${PREFIX}/lib
 
 pre-patch:
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index 36bff2579b0b..778279dac0bc 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -21,5 +21,6 @@ LIB_DEPENDS=    png.5:${PORTSDIR}/graphics/png \
 USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1"
 
 .include <bsd.port.mk>
diff --git a/devel/libuta/files/patch-aa b/devel/libuta/files/patch-aa
index 3633fcb70bb6..cf5ad2bb912d 100644
--- a/devel/libuta/files/patch-aa
+++ b/devel/libuta/files/patch-aa
@@ -1,5 +1,8 @@
---- configure.orig	Thu Apr 12 11:21:35 2001
-+++ configure	Thu May 17 14:44:42 2001
+
+$FreeBSD$
+
+--- configure.orig	Thu Apr 12 12:21:35 2001
++++ configure	Thu Mar 14 13:09:31 2002
 @@ -7,6 +7,9 @@
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
@@ -10,26 +13,15 @@
  # Defaults:
  ac_help=
  ac_default_prefix=/usr/local
-@@ -1829,8 +1832,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+@@ -3573,7 +3576,7 @@
  
- # Reload cache, that may have been modified by ltconfig
-@@ -1844,7 +1847,7 @@
+ CFLAGS=
+ CXXFLAGS=
+-CPPFLAGS=-Wall
++CPPFLAGS="$CPPFLAGS -Wall"
  
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ case $win32 in
+     true)
 @@ -4603,7 +4606,7 @@
      no_sdl=yes
    else
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile
index 36bff2579b0b..778279dac0bc 100644
--- a/devel/wftk/Makefile
+++ b/devel/wftk/Makefile
@@ -21,5 +21,6 @@ LIB_DEPENDS=    png.5:${PORTSDIR}/graphics/png \
 USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1"
 
 .include <bsd.port.mk>
diff --git a/devel/wftk/files/patch-aa b/devel/wftk/files/patch-aa
index 3633fcb70bb6..cf5ad2bb912d 100644
--- a/devel/wftk/files/patch-aa
+++ b/devel/wftk/files/patch-aa
@@ -1,5 +1,8 @@
---- configure.orig	Thu Apr 12 11:21:35 2001
-+++ configure	Thu May 17 14:44:42 2001
+
+$FreeBSD$
+
+--- configure.orig	Thu Apr 12 12:21:35 2001
++++ configure	Thu Mar 14 13:09:31 2002
 @@ -7,6 +7,9 @@
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
@@ -10,26 +13,15 @@
  # Defaults:
  ac_help=
  ac_default_prefix=/usr/local
-@@ -1829,8 +1832,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+@@ -3573,7 +3576,7 @@
  
- # Reload cache, that may have been modified by ltconfig
-@@ -1844,7 +1847,7 @@
+ CFLAGS=
+ CXXFLAGS=
+-CPPFLAGS=-Wall
++CPPFLAGS="$CPPFLAGS -Wall"
  
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ case $win32 in
+     true)
 @@ -4603,7 +4606,7 @@
      no_sdl=yes
    else
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index eee405cf8c55..10f27b648154 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -28,7 +28,8 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG} \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+		CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-compile-type=optim
 INSTALLS_SHLIB=	yes
diff --git a/games/powerpak/files/Makefile.FreeBSD b/games/powerpak/files/Makefile.FreeBSD
index 36d93f9b984c..01a4c21eb80f 100644
--- a/games/powerpak/files/Makefile.FreeBSD
+++ b/games/powerpak/files/Makefile.FreeBSD
@@ -1,6 +1,6 @@
 CC?=gcc
 LOCALBASE?=/usr/local
-CFLAGS+=-Wall -I${LOCALBASE}/include
+CFLAGS+=-Wall -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include
 LIBS=-L${LOCALBASE}/lib -lm -lSDL -lttf
 OBJECTS=powerpak.o img.o img_gif.o img_ppm.o img_tif.o img_pcx.o img_bmp.o img_png.o img_jpg.o img_xxx.o \
 PowerDraw/powerdraw.o PowerDraw/gfx.o PowerDraw/primitives.o PowerDraw/sprites.o PowerDraw/truetype.o \
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 6b0a21c35315..f8ac2adfb2d6 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -23,7 +23,8 @@ USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile
index f960d74b6770..ab3167cca5d3 100644
--- a/graphics/p5-Imager/Makefile
+++ b/graphics/p5-Imager/Makefile
@@ -24,7 +24,8 @@ LIB_DEPENDS=	t1:${PORTSDIR}/devel/t1lib \
 
 USE_FREETYPE=	yes
 PERL_CONFIGURE=	yes
-CONFIGURE_ENV=	IM_LIBPATH="${LOCALBASE}/lib"
+CONFIGURE_ENV=	IM_LIBPATH="${LOCALBASE}/lib" \
+		IM_INCPATH="${LOCALBASE}/include/freetype1/freetype"
 USE_GMAKE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index 9ef833cdbd7b..a4ac6f27fdaa 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 SHARE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 PYDIST_SETUP=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
-INC_DIRS=	["${LOCALBASE}/include","${X11BASE}/include","${LOCALBASE}/include/freetype"]
+INC_DIRS=	["${LOCALBASE}/include/freetype1","${LOCALBASE}/include","${X11BASE}/include","${LOCALBASE}/include/freetype"]
 LIB_DIRS=	["${LOCALBASE}/lib","${X11BASE}/lib"]
 REPATCH=	cd ${WRKSRC} && ${SED}
 REPATCHSUBST=	-e 's@^\(.*libraries.*\)$$@\1include_dirs=${INC_DIRS},library_dirs=${LIB_DIRS},@g'
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 17934b790901..3167c2bb39f4 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--with-gzip --enable-opi		\
 		--with-t1-library=${LOCALBASE}/lib	\
 		--with-t1-includes=${LOCALBASE}/include	\
 		--with-freetype-library=${LOCALBASE}/lib \
-		--with-freetype-includes=${LOCALBASE}/include/freetype
+		--with-freetype-includes=${LOCALBASE}/include/freetype1/freetype
 .if defined(A4)
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index e06c74804585..52e66d21a53a 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -27,8 +27,8 @@ USE_XLIB=	yes
 USE_AUTOCONF_VER=213
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-freetype \
-		--with-freetype-includedir=${PREFIX}/include/freetype \
-		--with-freetype-libdir=${PREFIX}/lib
+		--with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
+		--with-freetype-libdir=${LOCALBASE}/lib
 
 pre-install:
 	@(cd ${WRKSRC}/tools; \
diff --git a/korean/ftghostscript5/files/patch-aa b/korean/ftghostscript5/files/patch-aa
index 2ebed0730990..4f7760806018 100644
--- a/korean/ftghostscript5/files/patch-aa
+++ b/korean/ftghostscript5/files/patch-aa
@@ -94,7 +94,7 @@
   # We don't include -ansi, because this gets in the way of the platform-
   #   specific stuff that <math.h> typically needs; nevertheless, we expect
   #   gcc to accept ANSI-style function prototypes and function definitions.
-! XCFLAGS=-I$(prefix)/include -I$(prefix)/include/freetype
+! XCFLAGS=-I$(prefix)/include -I$(prefix)/include/freetype1/freetype
   
 ! CFLAGS+=-O $(GCFLAGS) $(XCFLAGS)
   
diff --git a/korean/ghostscript55httf/files/patch-aa b/korean/ghostscript55httf/files/patch-aa
index a46df2d6b748..63d606616413 100644
--- a/korean/ghostscript55httf/files/patch-aa
+++ b/korean/ghostscript55httf/files/patch-aa
@@ -47,7 +47,7 @@
  XCFLAGS=
  
 -CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++CFLAGS+=-I$(prefix)/include/freetype1
  
  # Define platform flags for ld.
  # SunOS 4.n may need -Bstatic.
diff --git a/misc/magicpoint/files/patch-configure b/misc/magicpoint/files/patch-configure
new file mode 100644
index 000000000000..4a24cb77ee74
--- /dev/null
+++ b/misc/magicpoint/files/patch-configure
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- configure	2002/03/14 10:49:01	1.1
++++ configure	2002/03/14 10:50:56
+@@ -1777,8 +1777,8 @@
+  			ac_cv_ft_lib="$dir/lib"
+  			ac_cv_ft_libpath="libttf.a"
+  		fi
+- 		if test -d $dir/include -a -f $dir/include/freetype.h; then
+- 			ac_cv_ft_include="$dir/include"
++ 		if test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then
++ 			ac_cv_ft_include="$dir/include/freetype1/freetype"
+  		elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then
+  			ac_cv_ft_include="$dir/include/freetype"
+ 		fi
diff --git a/print/gfontview/Makefile b/print/gfontview/Makefile
index 74b08eaa9654..a48edf0b00c8 100644
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@@ -21,7 +21,8 @@ USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include" \
 		SPOOLER="/usr/bin/lpr" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
diff --git a/print/perlftlib/files/patch-ac b/print/perlftlib/files/patch-ac
index 293d170b8567..9ff7ad62040c 100644
--- a/print/perlftlib/files/patch-ac
+++ b/print/perlftlib/files/patch-ac
@@ -5,6 +5,6 @@
      'LIBS'	=> ['-L/usr/local/lib -lttf'],   # e.g., '-lm' 
      'DEFINE'	=> '',     # e.g., '-DHAVE_SOMETHING' 
 -    'INC'	=> '-I/usr/local/include',     # e.g., '-I/usr/include/other' 
-+    'INC'	=> '-I/usr/local/include/freetype',     # e.g., '-I/usr/include/other' 
++    'INC'	=> '-I/usr/local/include/freetype1/freetype',     # e.g., '-I/usr/include/other' 
  );
 
diff --git a/print/py-freetype/files/patch-Setup.w32 b/print/py-freetype/files/patch-Setup.w32
index 1aab0ed61418..dc2126f30f9f 100644
--- a/print/py-freetype/files/patch-Setup.w32
+++ b/print/py-freetype/files/patch-Setup.w32
@@ -7,4 +7,4 @@ $FreeBSD$
  #[MGW32]swig_options.extend(['-shadow', '-docstring'])
 -freetypec freetype_wrap.c -I../../lib -I../../lib/extend -L../../lib -lttf.dll
 +*shared*
-+freetypec freetype_wrap.c -I${LOCALBASE}/include/freetype -L${LOCALBASE}/lib -lttf
++freetypec freetype_wrap.c -I${LOCALBASE}/include/freetype1/freetype -L${LOCALBASE}/lib -lttf
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
index 06400acfc811..d5b19f96eca8 100644
--- a/print/ttftot42/Makefile
+++ b/print/ttftot42/Makefile
@@ -14,6 +14,6 @@ MAINTAINER=	nakai@FreeBSD.org
 
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	"CFLAGS=-I${LOCALBASE}/include/freetype"
+CONFIGURE_ENV=	"CFLAGS=-I${LOCALBASE}/include/freetype1/freetype"
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index c87d20e1a0ec..f6d0b8b82ef8 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -18,7 +18,7 @@ USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
 
 do-build:
-	cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/freetype \
+	cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/freetype1/freetype \
 		ttmkfdir.c -o ttmkfdir -L${LOCALBASE}/lib -lttf
 
 do-install:
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index 4fe57b110448..0d4143648db4 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -18,7 +18,7 @@
 -#FTYPE_INCS = -I/usr/local/include
 -#FTYPE_LIBS = -L/user/local/lib -lttf
 -#FTYPE_DEFS = -DHAVE_FREETYPE
-+FTYPE_INCS = -I${LOCALBASE}/include/freetype
++FTYPE_INCS = -I${LOCALBASE}/include/freetype1/freetype
 +FTYPE_LIBS = -L${LOCALBASE}/lib -lttf
 +FTYPE_DEFS = -DHAVE_FREETYPE
  
diff --git a/x11-servers/XttXF86srv-common/files/Imakefile b/x11-servers/XttXF86srv-common/files/Imakefile
index 7560f6eabb1b..0b2a0cf6f604 100644
--- a/x11-servers/XttXF86srv-common/files/Imakefile
+++ b/x11-servers/XttXF86srv-common/files/Imakefile
@@ -35,7 +35,7 @@ initialize::
 	${ECHO_MSG} "  Now checking your XFree86 environment."; \
 	rm -f ${CONFFILE}; \
 	${ECHO} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \
-	${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include/freetype" >> ${CONFFILE}; \
+	${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include/freetype1/freetype" >> ${CONFFILE}; \
 	${ECHO} "#undef XF86SVGAServer" >> ${CONFFILE}; \
 	${ECHO} "#undef XF86VGA16Server" >> ${CONFFILE}; \
 	${ECHO} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index bdd28df136bd..d22ac8e14052 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -36,7 +36,8 @@ USE_IMLIB=	yes
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --with-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index bdd28df136bd..d22ac8e14052 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -36,7 +36,8 @@ USE_IMLIB=	yes
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --with-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index bdd28df136bd..d22ac8e14052 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -36,7 +36,8 @@ USE_IMLIB=	yes
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --with-included-gettext
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
+			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4"
 
 .include <bsd.port.pre.mk>