From e0965b3a9112564a32dbd13393802f807cfd90b6 Mon Sep 17 00:00:00 2001
From: pvalchev <pvalchev@openbsd.org>
Date: Fri, 11 Apr 2003 16:20:21 +0000
Subject: [PATCH] fix Xft after XFree update; ok maintainer Jim Geovedi

---
 x11/xfce/Makefile                   |  4 ++--
 x11/xfce/patches/patch-libs_utils_h | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 x11/xfce/patches/patch-libs_utils_h

diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 802c03ca1d9..25a31d49e2a 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2002/11/28 20:35:43 margarida Exp $
+# $OpenBSD: Makefile,v 1.20 2003/04/11 16:20:21 pvalchev Exp $
 
 COMMENT=	"CDE like desktop with Gtk"
 
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--disable-arts \
 		--with-xpm="${X11BASE}" \
 		--enable-xft=yes \
 		--enable-taskbar
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/freetype2" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/xfce/patches/patch-libs_utils_h b/x11/xfce/patches/patch-libs_utils_h
new file mode 100644
index 00000000000..ed92328caeb
--- /dev/null
+++ b/x11/xfce/patches/patch-libs_utils_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-libs_utils_h,v 1.1 2003/04/11 16:20:21 pvalchev Exp $
+--- libs/utils.h.orig	Thu Apr 10 13:29:21 2003
++++ libs/utils.h	Thu Apr 10 13:28:59 2003
+@@ -10,6 +10,7 @@
+ #include <ctype.h>
+ 
+ #ifdef HAVE_X11_XFT_XFT_H
++#  include <freetype2/freetype/freetype.h>
+ #  include <X11/Xft/Xft.h>
+ #endif
+