- respect CC.

- include proper path to freetype headers.
This commit is contained in:
brad 2001-03-07 21:48:38 +00:00
parent 0823800cb1
commit 55f1deea05
2 changed files with 14 additions and 22 deletions

View File

@ -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

View File

@ -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