From owner-svn-ports-all@FreeBSD.ORG  Fri Apr 18 17:03:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 96E3567F;
 Fri, 18 Apr 2014 17:03:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 83AFA16A6;
 Fri, 18 Apr 2014 17:03:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3IH36xx050159;
 Fri, 18 Apr 2014 17:03:06 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3IH36Hl050155;
 Fri, 18 Apr 2014 17:03:06 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201404181703.s3IH36Hl050155@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Fri, 18 Apr 2014 17:03:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351550 - in head/sysutils/grub2: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Apr 2014 17:03:06 -0000

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@ftfl.ca> [1]
  Submitted by:	Andrey Zholos <aaz@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[] = { 
+
+