svn commit: r351550 - in head/sysutils/grub2: . files

[Juergen Lock]

Author: nox
Date: Fri Apr 18 17:03:05 2014
New Revision: 351550
URL: http://svnweb.freebsd.org/changeset/ports/351550
QAT: https://qat.redports.org/buildarchive/r351550/

Log:
  Fix build with MKFONT and without it but with (updated) freetype present.
  
  PR:		ports/187984 [1], ports/188526 [2]
  Submitted by:	Joseph Mingrone <jrm at ftfl.ca> [1]
  Submitted by:	Andrey Zholos <aaz at q-fu.com> [2]

Added:
  head/sysutils/grub2/files/patch-util-grub-mkfont.c   (contents, props changed)
Modified:
  head/sysutils/grub2/Makefile

Modified: head/sysutils/grub2/Makefile
==============================================================================
--- head/sysutils/grub2/Makefile	Fri Apr 18 15:26:03 2014	(r351549)
+++ head/sysutils/grub2/Makefile	Fri Apr 18 17:03:05 2014	(r351550)
@@ -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
 

Added: head/sysutils/grub2/files/patch-util-grub-mkfont.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/grub2/files/patch-util-grub-mkfont.c	Fri Apr 18 17:03:05 2014	(r351550)
@@ -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 <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+ 
+ #undef __FTERRORS_H__
+ #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
+
+