From owner-svn-ports-all@FreeBSD.ORG  Sun Mar 22 10:07:36 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9A984AC5;
 Sun, 22 Mar 2015 10:07:36 +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 6B3E5B5D;
 Sun, 22 Mar 2015 10:07:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MA7aj8001446;
 Sun, 22 Mar 2015 10:07:36 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MA7Zk5001444;
 Sun, 22 Mar 2015 10:07:35 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201503221007.t2MA7Zk5001444@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 22 Mar 2015 10:07:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381894 - in head/sysutils/grub2-pcbsd: . 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.18-1
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: Sun, 22 Mar 2015 10:07:36 -0000

Author: bapt
Date: Sun Mar 22 10:07:35 2015
New Revision: 381894
URL: https://svnweb.freebsd.org/changeset/ports/381894
QAT: https://qat.redports.org/buildarchive/r381894/

Log:
  Fix detection of unifont

Modified:
  head/sysutils/grub2-pcbsd/Makefile
  head/sysutils/grub2-pcbsd/files/patch-configure.ac

Modified: head/sysutils/grub2-pcbsd/Makefile
==============================================================================
--- head/sysutils/grub2-pcbsd/Makefile	Sun Mar 22 09:50:01 2015	(r381893)
+++ head/sysutils/grub2-pcbsd/Makefile	Sun Mar 22 10:07:35 2015	(r381894)
@@ -55,7 +55,7 @@ PLIST_SUB+=	EFIEMU=${EFIEMU}
 .if ${PORT_OPTIONS:MMKFONT}
 LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 BUILD_DEPENDS+=	${LOCALBASE}//fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
+		${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 MAN1+=		grub-mkfont.1
 CONFIGURE_ARGS+=	--enable-grub-mkfont
 .else

Modified: head/sysutils/grub2-pcbsd/files/patch-configure.ac
==============================================================================
--- head/sysutils/grub2-pcbsd/files/patch-configure.ac	Sun Mar 22 09:50:01 2015	(r381893)
+++ head/sysutils/grub2-pcbsd/files/patch-configure.ac	Sun Mar 22 10:07:35 2015	(r381894)
@@ -14,7 +14,7 @@
  
  for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
 -  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
-+  for dir in . /usr/src /usr/local/share/fonts/local /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
++  for dir in . /usr/src /usr/local/share/fonts/gnu-unifont /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do
      if test -f "$dir/unifont.$ext"; then
        md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')"
        # PCF and BDF from version 6.3 isn't hanled properly by libfreetype.