From 5a9e3a5b0ab7312ddc83021183f49e8cf282c7e8 Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Fri, 18 Apr 2014 17:03:05 +0000 Subject: Fix build with MKFONT and without it but with (updated) freetype present. PR: ports/187984 [1], ports/188526 [2] Submitted by: Joseph Mingrone [1] Submitted by: Andrey Zholos [2] --- sysutils/grub2/Makefile | 2 ++ sysutils/grub2/files/patch-util-grub-mkfont.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 sysutils/grub2/files/patch-util-grub-mkfont.c (limited to 'sysutils/grub2') diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile index 777eecde9ae3..9d5acbe263c3 100644 --- a/sysutils/grub2/Makefile +++ b/sysutils/grub2/Makefile @@ -48,7 +48,9 @@ PLIST_SUB+= EFIEMU=${EFIEMU} LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu MAN1+= grub-mkfont.1 +CONFIGURE_ARGS+= --enable-grub-mkfont .else +CONFIGURE_ARGS+= --disable-grub-mkfont MKFONT= "@comment " .endif diff --git a/sysutils/grub2/files/patch-util-grub-mkfont.c b/sysutils/grub2/files/patch-util-grub-mkfont.c new file mode 100644 index 000000000000..36ed69c1f538 --- /dev/null +++ b/sysutils/grub2/files/patch-util-grub-mkfont.c @@ -0,0 +1,13 @@ +--- util/grub-mkfont.c.orig ++++ util/grub-mkfont.c +@@ -39,7 +39,7 @@ + #include FT_FREETYPE_H + #include FT_TRUETYPE_TAGS_H + #include FT_TRUETYPE_TABLES_H +-#include ++#include FT_SYNTHESIS_H + + #undef __FTERRORS_H__ + #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { + + -- cgit v1.2.3