grub2: fix build error

pkgsrc changes:
---------------
  * The unifont 5.1.20080820 that was manually included in $WRKDIR made the
    native freetype2 fail in FT_Get_Char_Index() function while the pkgsrc
    freetype2 succeeded. The package now depends on fonts/unifont for build
    because the version 13.0.02 of unifont fixes the FT_Get_Char_Index()
    failure.
  * Bump revision

4 files changed, 36 insertions, 19 deletions

diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 7e1447a3d59..04131807f5b 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2020/05/02 16:53:54 triaxx Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/09 12:17:52 triaxx Exp $
 
 DISTNAME=		grub-2.04
 PKGNAME=		${DISTNAME:S/grub/grub2/}
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.gnu.org/gnu/grub/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
@@ -120,13 +121,13 @@ SUBST_SED.fix-paths-1=		-e 's,\(\$${sysconfdir}"\{0\,1\}\)/grub.d,\1,g'
 SUBST_SED.fix-paths-1+=		-e 's,\(\$${sysconfdir}"\{0\,1\}\)/default/grub,\1/default.conf,g'
 
 #
-# Adjust the search paths for DejaVu fonts in configure.
+# Adjust the search paths for fonts in configure.
 #
-SUBST_CLASSES+=			fix-dejavu
-SUBST_STAGE.fix-dejavu=		pre-configure
-SUBST_MESSAGE.fix-dejavu=	Fixing dejavu search paths in configure.
-SUBST_FILES.fix-dejavu=		configure
-SUBST_SED.fix-dejavu=		-e 's, \(/usr/share/fonts/dejavu\), \1 ${PREFIX}/share/fonts/X11/TTF,g'
+SUBST_CLASSES+=			fix-fonts
+SUBST_STAGE.fix-fonts=		pre-configure
+SUBST_MESSAGE.fix-fonts=	Fixing fonts search paths in configure.
+SUBST_FILES.fix-fonts=		configure
+SUBST_VARS.fix-fonts=		PREFIX
 
 #
 # Do not use `\t' with sed, as it's not portable.
diff --git a/sysutils/grub2/distinfo b/sysutils/grub2/distinfo
index f77f188d6df..1915296cc38 100644
--- a/sysutils/grub2/distinfo
+++ b/sysutils/grub2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/05/02 16:53:54 triaxx Exp $
+$NetBSD: distinfo,v 1.10 2020/05/09 12:17:52 triaxx Exp $
 
 SHA1 (grub-2.04.tar.gz) = de58e12e02c4d60ef0f24057bde6abde8474c3e1
 RMD160 (grub-2.04.tar.gz) = f990ff7dc3e4fa6f1048b87b192a0ae7cf3b3c63
@@ -8,6 +8,7 @@ SHA1 (unifont-5.1.20080820.pcf.gz) = 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a
 RMD160 (unifont-5.1.20080820.pcf.gz) = ddc87231a7c1e18e81a6f4578a4f0279bcd0c292
 SHA512 (unifont-5.1.20080820.pcf.gz) = 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649
 Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
+SHA1 (patch-configure) = 9c84557e13f6ce747a5e30e383aa3599a2c607b7
 SHA1 (patch-grub-core_osdep_bsd_hostdisk.c) = 2c7251081082d671d21343b5e95300a6779b4b21
 SHA1 (patch-grub-core_osdep_generic_blocklist.c) = e1bf4511edfea1754204ffb5fb2a6a5a777b8b94
 SHA1 (patch-util_getroot.c) = 7c2f148ffa778872de4f59b6fcf365bd1a497acf
diff --git a/sysutils/grub2/options.mk b/sysutils/grub2/options.mk
index 633ea64c032..1f05a781f09 100644
--- a/sysutils/grub2/options.mk
+++ b/sysutils/grub2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/09/16 13:18:54 triaxx Exp $
+# $NetBSD: options.mk,v 1.4 2020/05/09 12:17:52 triaxx Exp $
 #
 
 #
@@ -16,12 +16,6 @@ PKG_SUGGESTED_OPTIONS=	freetype
 
 PLIST_VARS+=		freetype fuse
 
-UNIFONT=		unifont-5.1.20080820.pcf
-SITES.${UNIFONT}.gz=	http://unifoundry.com/
-
-post-extract: do-move-unifont
-.PHONY: do-move-unifont
-
 ###
 ### debug support
 ###
@@ -37,14 +31,11 @@ CONFIGURE_ARGS+=	--disable-mm-debug
 .if !empty(PKG_OPTIONS:Mfreetype)
 CONFIGURE_ARGS+=	--enable-grub-mkfont
 PLIST.freetype=		yes
-DISTFILES+=		${UNIFONT}.gz
 BUILD_DEPENDS+=		dejavu-ttf>=2.34nb1:../../fonts/dejavu-ttf
-do-move-unifont:
-	${MV} ${WRKDIR}/${UNIFONT} ${WRKSRC}/unifont.pcf
+BUILD_DEPENDS+=		unifont-[0-9]*:../../fonts/unifont
 .include "../../graphics/freetype2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-grub-mkfont
-do-move-unifont:
 .endif
 
 ###
diff --git a/sysutils/grub2/patches/patch-configure b/sysutils/grub2/patches/patch-configure
new file mode 100644
index 00000000000..a55eb8e587b
--- /dev/null
+++ b/sysutils/grub2/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.3 2020/05/09 12:17:52 triaxx Exp $
+
+* Fix font search paths for dejavu-tff and unifont.
+
+--- configure.orig	2019-07-04 14:06:35.000000000 +0000
++++ configure
+@@ -33881,7 +33881,7 @@ fi
+ 
+ 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 @PREFIX@/share/fonts/X11/misc @PREFIX@/share/fonts/truetype/ttf-dejavu @PREFIX@/share/fonts/dejavu @PREFIX@/share/fonts/truetype @PREFIX@/share/fonts/X11/TTF; do
+         if test -f "$dir/DejaVuSans.$ext"; then
+           DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
+           break 2
+@@ -33903,7 +33903,7 @@ fi
+ FONT_SOURCE=
+ 
+ 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 @PREFIX@/share/fonts/X11/misc @PREFIX@/share/fonts/unifont @PREFIX@/share/fonts/uni @PREFIX@/share/fonts/truetype/unifont @PREFIX@/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.