From 55f1deea057f9771657fc0e1953aa967262dfd2b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 7 Mar 2001 21:48:38 +0000
Subject: [PATCH] - respect CC. - include proper path to freetype headers.

---
 x11/xmbdfed/Makefile         | 30 +++++++++++-------------------
 x11/xmbdfed/patches/patch-aa |  6 +++---
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/x11/xmbdfed/Makefile b/x11/xmbdfed/Makefile
index be0ec6c787d..b38c7e6d79d 100644
--- a/x11/xmbdfed/Makefile
+++ b/x11/xmbdfed/Makefile
@@ -1,35 +1,27 @@
-# OpenBSD makefile for:	xmbdfed
-# Version required:	2.7
-# Date created:		May 19 1998
-# Whom:			Angelos D. Keromytis
-#
-# $OpenBSD: Makefile,v 1.6 2000/12/26 19:03:30 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.7 2001/03/07 21:48:38 brad Exp $
 
 DISTNAME=	xmbdfed-4.4
 CATEGORIES=	x11
-NEED_VERSION=	1.230
+NEED_VERSION=	1.336
 MASTER_SITES=	ftp://crl.nmsu.edu/CLR/multiling/General/
 
+LIB_DEPENDS=	ttf.1.3::print/freetype
+
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=	Yes
-
-LIB_DEPENDS=	ttf.1.3::print/freetype
-
 USE_MOTIF=	Yes
 
-MAKE_FLAGS=	CFLAGS='${CFLAGS}' STATIC='' \
-	FTYPE_LIBS='-L${LOCALBASE}/lib -lttf' \
-	FTYPE_DEFS='-DHAVE_FREETYPE' \
-	FTYPE_INCS='-I${LOCALBASE}/include' \
-	HBFDEFS='-Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""' \
-	INCS='-I${X11BASE}/include -I${LOCALBASE}/include $$(FTYPE_INCS)' \
-	LIBS='-L${X11BASE}/lib -L${LOCALBASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext $$(FTYPE_LIBS)'
-
+MAKE_FLAGS=	CC='${CC}' CFLAGS='${CFLAGS}' STATIC='' \
+		FTYPE_LIBS='-L${LOCALBASE}/lib -lttf' \
+		FTYPE_DEFS='-DHAVE_FREETYPE' \
+		FTYPE_INCS='-I${LOCALBASE}/include/freetype' \
+		HBFDEFS='-Dunix -DIN_MEMORY -DGUNZIP_CMD="\"/usr/bin/gunzip -c\""' \
+		INCS='-I${X11BASE}/include -I${LOCALBASE}/include $$(FTYPE_INCS)' \
+		LIBS='-L${X11BASE}/lib -L${LOCALBASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext $$(FTYPE_LIBS)'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/xmbdfed ${PREFIX}/bin
diff --git a/x11/xmbdfed/patches/patch-aa b/x11/xmbdfed/patches/patch-aa
index 4062fac19b2..0be6a02b28a 100644
--- a/x11/xmbdfed/patches/patch-aa
+++ b/x11/xmbdfed/patches/patch-aa
@@ -1,11 +1,11 @@
---- bdf.h.orig	Tue Apr  4 01:16:17 2000
-+++ bdf.h	Tue Apr  4 01:16:37 2000
+--- bdf.h.orig	Thu Mar 16 15:08:51 2000
++++ bdf.h	Wed Mar  7 16:47:07 2001
 @@ -41,7 +41,7 @@
  
  #ifdef HAVE_FREETYPE
  #include <freetype.h>
 -#include <extend/ftxsbit.h>
-+#include <freetype/ftxsbit.h>
++#include <ftxsbit.h>
  #endif /* HAVE_FREETYPE */
  
  #ifdef __cplusplus