- remove freetype workaround patch which is no longer necessary

- reorder header paths
--
MAINTAINER ok

x11/xfce/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2003/04/11 16:20:21 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.21 2003/04/22 15:00:25 brad Exp $
 
 COMMENT=	"CDE like desktop with Gtk"
 
@@ -34,9 +34,9 @@ CONFIGURE_ARGS=	--disable-arts \
 		--with-libiconv-prefix="${LOCALBASE}" \
 		--with-locale-dir="${PREFIX}/share/locale" \
 		--with-xpm="${X11BASE}" \
-		--enable-xft=yes \
+		--enable-xft \
 		--enable-taskbar
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/freetype2" \
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>

x11/xfce/patches/patch-libs_utils_h

@@ -1,11 +0,0 @@
-$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
-