--- ./Makefile	2018-11-04 23:47:14.000000000 +0300
+++ ./Makefile	2018-12-30 23:41:49.509587000 +0300
@@ -1,40 +1,43 @@ 
-# Created by: sem@FreeBSD.org
-# $FreeBSD: head/sysutils/grub2/Makefile 484145 2018-11-04 20:47:14Z gerald $
+# Created by: sem@FreeBSD.org$
+# $FreeBSD$
 
-PORTNAME=	grub2
-PORTVERSION=	2.00
-PORTREVISION=	13
-CATEGORIES=	sysutils
-MASTER_SITES=	GNU/grub
-DISTNAME=	grub-${PORTVERSION}
+PORTNAME=	grub
+DISTVERSION=	2.03
+CATEGORIES=	myports
+MASTER_SITES=	http://git.savannah.gnu.org/cgit/grub.git/snapshot/
+DISTNAME=	grub-563b1da6e6ae7af46cc8354cadb5dab416989f0a
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bergerkos@yahoo.co.uk
 COMMENT=	Multiboot boot loader
 
 LICENSE=	GPLv3
 
-DEPRECATED=	Unmaintained (more than five years), not updated (one-and-a-half years), does not build with modern compilers	# PR232961
-EXPIRATION_DATE=2019-02-04
-
 ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		help2man:misc/help2man
 
-USES=		autoreconf bison cpe gettext gmake tar:xz
-USE_GCC=	7	# Fails to build with GCC 8, cf. PR 232961, or clang
+USES=		iconv bison gmake python autoreconf:build gettext-runtime
 
-GNU_CONFIGURE=	yes
-INFO=		grub grub-dev
-MAKE_JOBS_UNSAFE=	yes
+RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
+
 SSP_UNSAFE=	yes
+CC?=		gcc
+CXX?=		g++
+GNU_CONFIGURE=	yes
+USE_GCC=	yes
 
-CPE_PRODUCT=	grub
-CPE_VENDOR=	gnu
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
 
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+MAKE_JOBS_UNSAFE=	yes
+
 CONFIGURE_ARGS=	--disable-werror --localedir=${PREFIX}/share/locale
-CONFIGURE_ENV=	CPP="${CC} -E" \
-		LEX=${LOCALBASE}/bin/flex
+CONFIGURE_ENV=	CC="${LOCALBASE}/bin/gcc8" \
+		CPP="${CC} -E"
 
 OPTIONS_DEFINE=	MKFONT FUSE
 OPTIONS_SUB=	yes
@@ -56,12 +59,11 @@ 
 PLIST_SUB+=	EFIEMU=""
 .endif
 
-post-patch:
-	@${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
-	@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
+pre-configure:
+	@cd ${WRKSRC} && ${SH} autogen.sh
 
-post-configure:
-	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \
-		${WRKSRC}/grub-core
+post-install:
+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias
+	@${RM} -Rf ${STAGEDIR}${PREFIX}/info
 
 .include <bsd.port.post.mk>
--- ./distinfo	2013-08-03 23:02:27.000000000 +0400
+++ ./distinfo	2018-12-29 20:22:45.476311000 +0300
@@ -1,2 +1,3 @@ 
-SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
-SIZE (grub-2.00.tar.xz) = 5136412
+TIMESTAMP = 1546104165
+SHA256 (grub-563b1da6e6ae7af46cc8354cadb5dab416989f0a.tar.gz) = 5d63e50fd352b8fa5a4155f8e5827c78b3fdb695e9a601b1c2ba59bc3df457f1
+SIZE (grub-563b1da6e6ae7af46cc8354cadb5dab416989f0a.tar.gz) = 5681123
--- ./pkg-descr	2016-05-19 13:53:05.000000000 +0300
+++ ./pkg-descr	2017-03-19 18:48:09.973945000 +0300
@@ -1,5 +1,5 @@ 
 GNU GRUB is a multiboot boot loader.  It was derived from GRUB, the GRand
-Unified Bootloader, which was originally designed and implemented by Erich
+Unified Bootloader, which was originally designed and implemented by Erich 
 Stefan Boleyn.
 
 This port does not install GRUB on the master boot record of your hard drive.
--- ./pkg-plist	2014-11-22 12:13:35.000000000 +0300
+++ ./pkg-plist	2018-12-29 20:46:43.910411000 +0300
@@ -1,56 +1,27 @@ 
-%%FUSE%%bin/grub-mount
-%%FUSE%%man/man1/grub-mount.1.gz
-%%MKFONT%%bin/grub-mkfont
-%%MKFONT%%man/man1/grub-mkfont.1.gz
-%%MKFONT%%share/grub/themes/starfield/dejavu_10.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_12.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_bold_14.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_14.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_16.pf2
-%%MKFONT%%share/grub/themes/starfield/blob_w.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_c.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_e.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_ne.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_n.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_nw.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_se.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_s.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_sw.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_w.png
-%%MKFONT%%share/grub/themes/starfield/slider_c.png
-%%MKFONT%%share/grub/themes/starfield/slider_n.png
-%%MKFONT%%share/grub/themes/starfield/slider_s.png
-%%MKFONT%%share/grub/themes/starfield/starfield.png
-%%MKFONT%%share/grub/themes/starfield/README
-%%MKFONT%%share/grub/themes/starfield/terminal_box_c.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_e.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_ne.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_n.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_nw.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_se.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_s.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_sw.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_w.png
-%%MKFONT%%share/grub/themes/starfield/theme.txt
-%%MKFONT%%share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
 bin/grub-editenv
+bin/grub-file
 bin/grub-fstest
+bin/grub-glue-efi
 bin/grub-kbdcomp
 bin/grub-menulst2cfg
+bin/grub-mkfont
 bin/grub-mkimage
 bin/grub-mklayout
+bin/grub-mknetdir
 bin/grub-mkpasswd-pbkdf2
 bin/grub-mkrelpath
-bin/grub-mkstandalone
 bin/grub-mkrescue
+bin/grub-mkstandalone
+bin/grub-render-label
 bin/grub-script-check
-etc/grub.d/00_header
-etc/grub.d/30_os-prober
-etc/grub.d/40_custom
-etc/grub.d/41_custom
-etc/grub.d/10_kfreebsd
-etc/grub.d/README
+bin/grub-syslinux2cfg
 etc/bash_completion.d/grub
+%%ETCDIR%%.d/00_header
+%%ETCDIR%%.d/10_kfreebsd
+%%ETCDIR%%.d/30_os-prober
+%%ETCDIR%%.d/40_custom
+%%ETCDIR%%.d/41_custom
+%%ETCDIR%%.d/README
 lib/grub/i386-pc/acpi.mod
 lib/grub/i386-pc/acpi.module
 lib/grub/i386-pc/adler32.mod
@@ -65,6 +36,8 @@ 
 lib/grub/i386-pc/all_video.module
 lib/grub/i386-pc/aout.mod
 lib/grub/i386-pc/aout.module
+lib/grub/i386-pc/archelp.mod
+lib/grub/i386-pc/archelp.module
 lib/grub/i386-pc/at_keyboard.mod
 lib/grub/i386-pc/at_keyboard.module
 lib/grub/i386-pc/ata.mod
@@ -85,22 +58,42 @@ 
 lib/grub/i386-pc/boot.img
 lib/grub/i386-pc/boot.mod
 lib/grub/i386-pc/boot.module
+lib/grub/i386-pc/boot_hybrid.image
+lib/grub/i386-pc/boot_hybrid.img
 lib/grub/i386-pc/bsd.mod
 lib/grub/i386-pc/bsd.module
+lib/grub/i386-pc/bswap_test.mod
+lib/grub/i386-pc/bswap_test.module
 lib/grub/i386-pc/btrfs.mod
 lib/grub/i386-pc/btrfs.module
 lib/grub/i386-pc/bufio.mod
 lib/grub/i386-pc/bufio.module
 lib/grub/i386-pc/cat.mod
 lib/grub/i386-pc/cat.module
+lib/grub/i386-pc/cbfs.mod
+lib/grub/i386-pc/cbfs.module
+lib/grub/i386-pc/cbls.mod
+lib/grub/i386-pc/cbls.module
+lib/grub/i386-pc/cbmemc.mod
+lib/grub/i386-pc/cbmemc.module
+lib/grub/i386-pc/cbtable.mod
+lib/grub/i386-pc/cbtable.module
+lib/grub/i386-pc/cbtime.mod
+lib/grub/i386-pc/cbtime.module
 lib/grub/i386-pc/cdboot.image
 lib/grub/i386-pc/cdboot.img
 lib/grub/i386-pc/chain.mod
 lib/grub/i386-pc/chain.module
+lib/grub/i386-pc/cmdline_cat_test.mod
+lib/grub/i386-pc/cmdline_cat_test.module
+lib/grub/i386-pc/cmosdump.mod
+lib/grub/i386-pc/cmosdump.module
 lib/grub/i386-pc/cmostest.mod
 lib/grub/i386-pc/cmostest.module
 lib/grub/i386-pc/cmp.mod
 lib/grub/i386-pc/cmp.module
+lib/grub/i386-pc/cmp_test.mod
+lib/grub/i386-pc/cmp_test.module
 lib/grub/i386-pc/command.lst
 lib/grub/i386-pc/config.h
 lib/grub/i386-pc/configfile.mod
@@ -120,16 +113,24 @@ 
 lib/grub/i386-pc/cryptodisk.module
 lib/grub/i386-pc/cs5536.mod
 lib/grub/i386-pc/cs5536.module
+lib/grub/i386-pc/ctz_test.mod
+lib/grub/i386-pc/ctz_test.module
 lib/grub/i386-pc/date.mod
 lib/grub/i386-pc/date.module
 lib/grub/i386-pc/datehook.mod
 lib/grub/i386-pc/datehook.module
 lib/grub/i386-pc/datetime.mod
 lib/grub/i386-pc/datetime.module
+lib/grub/i386-pc/disk.mod
+lib/grub/i386-pc/disk.module
 lib/grub/i386-pc/diskboot.image
 lib/grub/i386-pc/diskboot.img
 lib/grub/i386-pc/diskfilter.mod
 lib/grub/i386-pc/diskfilter.module
+lib/grub/i386-pc/div.mod
+lib/grub/i386-pc/div.module
+lib/grub/i386-pc/div_test.mod
+lib/grub/i386-pc/div_test.module
 lib/grub/i386-pc/dm_nv.mod
 lib/grub/i386-pc/dm_nv.module
 lib/grub/i386-pc/drivemap.mod
@@ -138,12 +139,14 @@ 
 lib/grub/i386-pc/echo.module
 lib/grub/i386-pc/efiemu.mod
 lib/grub/i386-pc/efiemu.module
-%%EFIEMU%%lib/grub/i386-pc/efiemu32.o
-%%EFIEMU%%lib/grub/i386-pc/efiemu64.o
+lib/grub/i386-pc/efiemu32.o
+lib/grub/i386-pc/efiemu64.o
 lib/grub/i386-pc/ehci.mod
 lib/grub/i386-pc/ehci.module
 lib/grub/i386-pc/elf.mod
 lib/grub/i386-pc/elf.module
+lib/grub/i386-pc/eval.mod
+lib/grub/i386-pc/eval.module
 lib/grub/i386-pc/exfat.mod
 lib/grub/i386-pc/exfat.module
 lib/grub/i386-pc/exfctest.mod
@@ -154,6 +157,9 @@ 
 lib/grub/i386-pc/extcmd.module
 lib/grub/i386-pc/fat.mod
 lib/grub/i386-pc/fat.module
+lib/grub/i386-pc/fdt.lst
+lib/grub/i386-pc/file.mod
+lib/grub/i386-pc/file.module
 lib/grub/i386-pc/font.mod
 lib/grub/i386-pc/font.module
 lib/grub/i386-pc/freedos.mod
@@ -175,6 +181,10 @@ 
 lib/grub/i386-pc/gcry_crc.module
 lib/grub/i386-pc/gcry_des.mod
 lib/grub/i386-pc/gcry_des.module
+lib/grub/i386-pc/gcry_dsa.mod
+lib/grub/i386-pc/gcry_dsa.module
+lib/grub/i386-pc/gcry_idea.mod
+lib/grub/i386-pc/gcry_idea.module
 lib/grub/i386-pc/gcry_md4.mod
 lib/grub/i386-pc/gcry_md4.module
 lib/grub/i386-pc/gcry_md5.mod
@@ -185,6 +195,8 @@ 
 lib/grub/i386-pc/gcry_rijndael.module
 lib/grub/i386-pc/gcry_rmd160.mod
 lib/grub/i386-pc/gcry_rmd160.module
+lib/grub/i386-pc/gcry_rsa.mod
+lib/grub/i386-pc/gcry_rsa.module
 lib/grub/i386-pc/gcry_seed.mod
 lib/grub/i386-pc/gcry_seed.module
 lib/grub/i386-pc/gcry_serpent.mod
@@ -212,6 +224,10 @@ 
 lib/grub/i386-pc/gfxmenu.module
 lib/grub/i386-pc/gfxterm.mod
 lib/grub/i386-pc/gfxterm.module
+lib/grub/i386-pc/gfxterm_background.mod
+lib/grub/i386-pc/gfxterm_background.module
+lib/grub/i386-pc/gfxterm_menu.mod
+lib/grub/i386-pc/gfxterm_menu.module
 lib/grub/i386-pc/gmodule.pl
 lib/grub/i386-pc/gptsync.mod
 lib/grub/i386-pc/gptsync.module
@@ -233,6 +249,8 @@ 
 lib/grub/i386-pc/hfs.module
 lib/grub/i386-pc/hfsplus.mod
 lib/grub/i386-pc/hfsplus.module
+lib/grub/i386-pc/hfspluscomp.mod
+lib/grub/i386-pc/hfspluscomp.module
 lib/grub/i386-pc/http.mod
 lib/grub/i386-pc/http.module
 lib/grub/i386-pc/iorw.mod
@@ -251,6 +269,8 @@ 
 lib/grub/i386-pc/keystatus.module
 lib/grub/i386-pc/ldm.mod
 lib/grub/i386-pc/ldm.module
+lib/grub/i386-pc/legacy_password_test.mod
+lib/grub/i386-pc/legacy_password_test.module
 lib/grub/i386-pc/legacycfg.mod
 lib/grub/i386-pc/legacycfg.module
 lib/grub/i386-pc/linux.mod
@@ -281,6 +301,12 @@ 
 lib/grub/i386-pc/lzma_decompress.img
 lib/grub/i386-pc/lzopio.mod
 lib/grub/i386-pc/lzopio.module
+lib/grub/i386-pc/macbless.mod
+lib/grub/i386-pc/macbless.module
+lib/grub/i386-pc/macho.mod
+lib/grub/i386-pc/macho.module
+lib/grub/i386-pc/mda_text.mod
+lib/grub/i386-pc/mda_text.module
 lib/grub/i386-pc/mdraid09.mod
 lib/grub/i386-pc/mdraid09.module
 lib/grub/i386-pc/mdraid09_be.mod
@@ -309,12 +335,20 @@ 
 lib/grub/i386-pc/mmap.module
 lib/grub/i386-pc/moddep.lst
 lib/grub/i386-pc/modinfo.sh
+lib/grub/i386-pc/morse.mod
+lib/grub/i386-pc/morse.module
+lib/grub/i386-pc/mpi.mod
+lib/grub/i386-pc/mpi.module
 lib/grub/i386-pc/msdospart.mod
 lib/grub/i386-pc/msdospart.module
+lib/grub/i386-pc/mul_test.mod
+lib/grub/i386-pc/mul_test.module
 lib/grub/i386-pc/multiboot.mod
 lib/grub/i386-pc/multiboot.module
 lib/grub/i386-pc/multiboot2.mod
 lib/grub/i386-pc/multiboot2.module
+lib/grub/i386-pc/nativedisk.mod
+lib/grub/i386-pc/nativedisk.module
 lib/grub/i386-pc/net.mod
 lib/grub/i386-pc/net.module
 lib/grub/i386-pc/newc.mod
@@ -331,6 +365,8 @@ 
 lib/grub/i386-pc/ntldr.module
 lib/grub/i386-pc/odc.mod
 lib/grub/i386-pc/odc.module
+lib/grub/i386-pc/offsetio.mod
+lib/grub/i386-pc/offsetio.module
 lib/grub/i386-pc/ohci.mod
 lib/grub/i386-pc/ohci.module
 lib/grub/i386-pc/part_acorn.mod
@@ -341,6 +377,8 @@ 
 lib/grub/i386-pc/part_apple.module
 lib/grub/i386-pc/part_bsd.mod
 lib/grub/i386-pc/part_bsd.module
+lib/grub/i386-pc/part_dfly.mod
+lib/grub/i386-pc/part_dfly.module
 lib/grub/i386-pc/part_dvh.mod
 lib/grub/i386-pc/part_dvh.module
 lib/grub/i386-pc/part_gpt.mod
@@ -365,8 +403,12 @@ 
 lib/grub/i386-pc/pata.module
 lib/grub/i386-pc/pbkdf2.mod
 lib/grub/i386-pc/pbkdf2.module
+lib/grub/i386-pc/pbkdf2_test.mod
+lib/grub/i386-pc/pbkdf2_test.module
 lib/grub/i386-pc/pci.mod
 lib/grub/i386-pc/pci.module
+lib/grub/i386-pc/pcidump.mod
+lib/grub/i386-pc/pcidump.module
 lib/grub/i386-pc/plan9.mod
 lib/grub/i386-pc/plan9.module
 lib/grub/i386-pc/play.mod
@@ -377,6 +419,10 @@ 
 lib/grub/i386-pc/priority_queue.module
 lib/grub/i386-pc/probe.mod
 lib/grub/i386-pc/probe.module
+lib/grub/i386-pc/procfs.mod
+lib/grub/i386-pc/procfs.module
+lib/grub/i386-pc/progress.mod
+lib/grub/i386-pc/progress.module
 lib/grub/i386-pc/pxe.mod
 lib/grub/i386-pc/pxe.module
 lib/grub/i386-pc/pxeboot.image
@@ -387,6 +433,8 @@ 
 lib/grub/i386-pc/raid5rec.module
 lib/grub/i386-pc/raid6rec.mod
 lib/grub/i386-pc/raid6rec.module
+lib/grub/i386-pc/random.mod
+lib/grub/i386-pc/random.module
 lib/grub/i386-pc/read.mod
 lib/grub/i386-pc/read.module
 lib/grub/i386-pc/reboot.mod
@@ -415,14 +463,28 @@ 
 lib/grub/i386-pc/serial.module
 lib/grub/i386-pc/setjmp.mod
 lib/grub/i386-pc/setjmp.module
+lib/grub/i386-pc/setjmp_test.mod
+lib/grub/i386-pc/setjmp_test.module
 lib/grub/i386-pc/setpci.mod
 lib/grub/i386-pc/setpci.module
 lib/grub/i386-pc/sfs.mod
 lib/grub/i386-pc/sfs.module
+lib/grub/i386-pc/shift_test.mod
+lib/grub/i386-pc/shift_test.module
+lib/grub/i386-pc/signature_test.mod
+lib/grub/i386-pc/signature_test.module
 lib/grub/i386-pc/sleep.mod
 lib/grub/i386-pc/sleep.module
+lib/grub/i386-pc/sleep_test.mod
+lib/grub/i386-pc/sleep_test.module
+lib/grub/i386-pc/spkmodem.mod
+lib/grub/i386-pc/spkmodem.module
 lib/grub/i386-pc/squash4.mod
 lib/grub/i386-pc/squash4.module
+lib/grub/i386-pc/strtoull_test.mod
+lib/grub/i386-pc/strtoull_test.module
+lib/grub/i386-pc/syslinuxcfg.mod
+lib/grub/i386-pc/syslinuxcfg.module
 lib/grub/i386-pc/tar.mod
 lib/grub/i386-pc/tar.module
 lib/grub/i386-pc/terminal.lst
@@ -436,20 +498,28 @@ 
 lib/grub/i386-pc/test_blockarg.module
 lib/grub/i386-pc/testload.mod
 lib/grub/i386-pc/testload.module
+lib/grub/i386-pc/testspeed.mod
+lib/grub/i386-pc/testspeed.module
 lib/grub/i386-pc/tftp.mod
 lib/grub/i386-pc/tftp.module
 lib/grub/i386-pc/tga.mod
 lib/grub/i386-pc/tga.module
 lib/grub/i386-pc/time.mod
 lib/grub/i386-pc/time.module
+lib/grub/i386-pc/tr.mod
+lib/grub/i386-pc/tr.module
 lib/grub/i386-pc/trig.mod
 lib/grub/i386-pc/trig.module
 lib/grub/i386-pc/true.mod
 lib/grub/i386-pc/true.module
+lib/grub/i386-pc/truecrypt.mod
+lib/grub/i386-pc/truecrypt.module
 lib/grub/i386-pc/udf.mod
 lib/grub/i386-pc/udf.module
 lib/grub/i386-pc/ufs1.mod
 lib/grub/i386-pc/ufs1.module
+lib/grub/i386-pc/ufs1_be.mod
+lib/grub/i386-pc/ufs1_be.module
 lib/grub/i386-pc/ufs2.mod
 lib/grub/i386-pc/ufs2.module
 lib/grub/i386-pc/uhci.mod
@@ -466,10 +536,14 @@ 
 lib/grub/i386-pc/usbserial_ftdi.module
 lib/grub/i386-pc/usbserial_pl2303.mod
 lib/grub/i386-pc/usbserial_pl2303.module
+lib/grub/i386-pc/usbserial_usbdebug.mod
+lib/grub/i386-pc/usbserial_usbdebug.module
 lib/grub/i386-pc/usbtest.mod
 lib/grub/i386-pc/usbtest.module
 lib/grub/i386-pc/vbe.mod
 lib/grub/i386-pc/vbe.module
+lib/grub/i386-pc/verify.mod
+lib/grub/i386-pc/verify.module
 lib/grub/i386-pc/vga.mod
 lib/grub/i386-pc/vga.module
 lib/grub/i386-pc/vga_text.mod
@@ -481,18 +555,24 @@ 
 lib/grub/i386-pc/video_bochs.module
 lib/grub/i386-pc/video_cirrus.mod
 lib/grub/i386-pc/video_cirrus.module
+lib/grub/i386-pc/video_colors.mod
+lib/grub/i386-pc/video_colors.module
 lib/grub/i386-pc/video_fb.mod
 lib/grub/i386-pc/video_fb.module
 lib/grub/i386-pc/videoinfo.mod
 lib/grub/i386-pc/videoinfo.module
 lib/grub/i386-pc/videotest.mod
 lib/grub/i386-pc/videotest.module
+lib/grub/i386-pc/videotest_checksum.mod
+lib/grub/i386-pc/videotest_checksum.module
 lib/grub/i386-pc/xfs.mod
 lib/grub/i386-pc/xfs.module
 lib/grub/i386-pc/xnu.mod
 lib/grub/i386-pc/xnu.module
 lib/grub/i386-pc/xnu_uuid.mod
 lib/grub/i386-pc/xnu_uuid.module
+lib/grub/i386-pc/xnu_uuid_test.mod
+lib/grub/i386-pc/xnu_uuid_test.module
 lib/grub/i386-pc/xzio.mod
 lib/grub/i386-pc/xzio.module
 lib/grub/i386-pc/zfs.mod
@@ -501,61 +581,39 @@ 
 lib/grub/i386-pc/zfscrypt.module
 lib/grub/i386-pc/zfsinfo.mod
 lib/grub/i386-pc/zfsinfo.module
-sbin/grub-bios-setup
-sbin/grub-probe
-sbin/grub-install
-sbin/grub-mkconfig
-sbin/grub-mknetdir
-sbin/grub-ofpathname
-sbin/grub-set-default
-sbin/grub-sparc64-setup
-sbin/grub-reboot
-share/grub/grub-mkconfig_lib
-share/locale/ast/LC_MESSAGES/grub.mo
-share/locale/ca/LC_MESSAGES/grub.mo
-share/locale/da/LC_MESSAGES/grub.mo
-share/locale/de/LC_MESSAGES/grub.mo
-share/locale/de@hebrew/LC_MESSAGES/grub.mo
-share/locale/de_CH/LC_MESSAGES/grub.mo
-share/locale/en@arabic/LC_MESSAGES/grub.mo
-share/locale/en@cyrillic/LC_MESSAGES/grub.mo
-share/locale/en@greek/LC_MESSAGES/grub.mo
-share/locale/en@hebrew/LC_MESSAGES/grub.mo
-share/locale/en@piglatin/LC_MESSAGES/grub.mo
-share/locale/en@quot/LC_MESSAGES/grub.mo
-share/locale/eo/LC_MESSAGES/grub.mo
-share/locale/fi/LC_MESSAGES/grub.mo
-share/locale/fr/LC_MESSAGES/grub.mo
-share/locale/hu/LC_MESSAGES/grub.mo
-share/locale/id/LC_MESSAGES/grub.mo
-share/locale/it/LC_MESSAGES/grub.mo
-share/locale/ja/LC_MESSAGES/grub.mo
-share/locale/nl/LC_MESSAGES/grub.mo
-share/locale/pa/LC_MESSAGES/grub.mo
-share/locale/pl/LC_MESSAGES/grub.mo
-share/locale/ru/LC_MESSAGES/grub.mo
-share/locale/sv/LC_MESSAGES/grub.mo
-share/locale/uk/LC_MESSAGES/grub.mo
-share/locale/vi/LC_MESSAGES/grub.mo
-share/locale/zh_CN/LC_MESSAGES/grub.mo
-share/locale/zh_TW/LC_MESSAGES/grub.mo
 man/man1/grub-editenv.1.gz
+man/man1/grub-file.1.gz
 man/man1/grub-fstest.1.gz
+man/man1/grub-glue-efi.1.gz
 man/man1/grub-kbdcomp.1.gz
 man/man1/grub-menulst2cfg.1.gz
+man/man1/grub-mkfont.1.gz
 man/man1/grub-mkimage.1.gz
 man/man1/grub-mklayout.1.gz
+man/man1/grub-mknetdir.1.gz
 man/man1/grub-mkpasswd-pbkdf2.1.gz
 man/man1/grub-mkrelpath.1.gz
 man/man1/grub-mkrescue.1.gz
 man/man1/grub-mkstandalone.1.gz
+man/man1/grub-render-label.1.gz
 man/man1/grub-script-check.1.gz
+man/man1/grub-syslinux2cfg.1.gz
 man/man8/grub-bios-setup.8.gz
 man/man8/grub-install.8.gz
+man/man8/grub-macbless.8.gz
 man/man8/grub-mkconfig.8.gz
-man/man8/grub-mknetdir.8.gz
 man/man8/grub-ofpathname.8.gz
 man/man8/grub-probe.8.gz
 man/man8/grub-reboot.8.gz
 man/man8/grub-set-default.8.gz
 man/man8/grub-sparc64-setup.8.gz
+sbin/grub-bios-setup
+sbin/grub-install
+sbin/grub-macbless
+sbin/grub-mkconfig
+sbin/grub-ofpathname
+sbin/grub-probe
+sbin/grub-reboot
+sbin/grub-set-default
+sbin/grub-sparc64-setup
+%%DATADIR%%/grub-mkconfig_lib