From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 24 21:55:16 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 9112F819;
 Tue, 24 Mar 2015 21:55:16 +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 63961DF9;
 Tue, 24 Mar 2015 21:55:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2OLtGDB024866;
 Tue, 24 Mar 2015 21:55:16 GMT (envelope-from kmoore@FreeBSD.org)
Received: (from kmoore@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2OLtGN0024865;
 Tue, 24 Mar 2015 21:55:16 GMT (envelope-from kmoore@FreeBSD.org)
Message-Id: <201503242155.t2OLtGN0024865@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kmoore set sender to
 kmoore@FreeBSD.org using -f
From: Kris Moore <kmoore@FreeBSD.org>
Date: Tue, 24 Mar 2015 21:55:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r382183 - 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: Tue, 24 Mar 2015 21:55:16 -0000

Author: kmoore
Date: Tue Mar 24 21:55:15 2015
New Revision: 382183
URL: https://svnweb.freebsd.org/changeset/ports/382183
QAT: https://qat.redports.org/buildarchive/r382183/

Log:
  - Fix build with updated locations to unifont / dejavu

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

Modified: head/sysutils/grub2-pcbsd/files/patch-configure.ac
==============================================================================
--- head/sysutils/grub2-pcbsd/files/patch-configure.ac	Tue Mar 24 21:41:41 2015	(r382182)
+++ head/sysutils/grub2-pcbsd/files/patch-configure.ac	Tue Mar 24 21:55:15 2015	(r382183)
@@ -5,7 +5,7 @@
  if test x"$starfield_excuse" = x; then
     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/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
-+     for dir in . /usr/src /usr/local/share/fonts/dejavu /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
++     for dir in . /usr/src /usr/local/lib/X11/fonts/dejavu /usr/share/fonts/truetype/ttf-dejavu /usr/local/share/fonts/dejavu /usr/share/fonts/truetype; do
          if test -f "$dir/DejaVuSans.$ext"; then
            DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
            break 2
@@ -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/gnu-unifont /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/lib/X11/fonts/local /usr/local/share/fonts/unifont /usr/local/share/fonts/gnu-unifont /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.