10 files changed, 205 insertions, 171 deletions

diff --git a/sysutils/grub2-pcbsd/Makefile b/sysutils/grub2-pcbsd/Makefile
index 043b59f4129a..89572c404940 100644
--- a/sysutils/grub2-pcbsd/Makefile
+++ b/sysutils/grub2-pcbsd/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	grub2-pcbsd
-PORTVERSION=	2.02p
-PORTREVISION=	26
+PORTVERSION=	2.02q
 CATEGORIES=	sysutils
-MASTER_SITES=   http://www.pcbsd.org/~kris/software/ \
+MASTER_SITES=	http://www.pcbsd.org/~kris/software/ \
 		ftp://ftp.pcbsd.org/pub/software/
-DISTNAME=	grub-2.02_5
+DISTNAME=	grub-2.02_7
 
 MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	Multiboot boot loader
@@ -22,10 +21,9 @@ WRKSRC=		${WRKDIR}/grub-2.02
 CONFLICTS=	grub-0* grub2-2*
 SSP_UNSAFE=	yes
 USE_GCC=	yes
-USE_AUTOTOOLS=	automake aclocal autoconf
 ACLOCAL_ARGS=	-Im4
 GNU_CONFIGURE=	yes
-USES=		bison cpe gettext gmake makeinfo python tar:xz
+USES=		autoreconf bison cpe gettext gmake makeinfo python tar:xz
 ONLY_FOR_ARCHS=	i386 amd64
 INFO=		grub grub-dev
 MAKE_JOBS_UNSAFE=	yes
@@ -86,14 +84,14 @@ 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
-	@${INSTALL_SCRIPT} ${WRKDIR}/00_header ${STAGEDIR}${PREFIX}/etc/grub.d/
-	@${INSTALL_SCRIPT} ${WRKDIR}/10_kfreebsd ${STAGEDIR}${PREFIX}/etc/grub.d/
-	@${INSTALL_SCRIPT} ${WRKDIR}/10_ktrueos ${STAGEDIR}${PREFIX}/etc/grub.d/
-	@${INSTALL_SCRIPT} ${WRKDIR}/30_os-prober ${STAGEDIR}${PREFIX}/etc/grub.d/
-	@${INSTALL_SCRIPT} ${WRKDIR}/50_otherbe ${STAGEDIR}${PREFIX}/etc/grub.d/
-	@${MV} ${STAGEDIR}${PREFIX}/etc/grub.d/40_custom ${STAGEDIR}/${PREFIX}/etc/grub.d/40_custom.dist
-
-.include <bsd.port.post.mk>
+	${RM} -rf ${STAGEDIR}${PREFIX}/lib/charset.alias
+	${INSTALL_SCRIPT} ${WRKDIR}/00_header ${STAGEDIR}${PREFIX}/etc/grub.d/
+	${INSTALL_SCRIPT} ${WRKDIR}/10_kfreebsd ${STAGEDIR}${PREFIX}/etc/grub.d/
+	${INSTALL_SCRIPT} ${WRKDIR}/10_ktrueos ${STAGEDIR}${PREFIX}/etc/grub.d/
+	${INSTALL_SCRIPT} ${WRKDIR}/30_os-prober ${STAGEDIR}${PREFIX}/etc/grub.d/
+	${INSTALL_SCRIPT} ${WRKDIR}/50_otherbe ${STAGEDIR}${PREFIX}/etc/grub.d/
+	${MV} ${STAGEDIR}${PREFIX}/etc/grub.d/40_custom ${STAGEDIR}/${PREFIX}/etc/grub.d/40_custom.dist
 
 RUN_DEPENDS:=	${RUN_DEPENDS:Ngcc*}
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/grub2-pcbsd/distinfo b/sysutils/grub2-pcbsd/distinfo
index 87abbb7dd1ce..718a5b0d1c35 100644
--- a/sysutils/grub2-pcbsd/distinfo
+++ b/sysutils/grub2-pcbsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grub-2.02_5.tar.xz) = ef44c89fa681c8308f847fa682c64d19e1bf296bbd7db0e282c1ecc9b0f9314a
-SIZE (grub-2.02_5.tar.xz) = 4994516
+SHA256 (grub-2.02_7.tar.xz) = 044588d9754142f2982478cb4e7289ab1521fd4412b2a0804ce647c3ff73feff
+SIZE (grub-2.02_7.tar.xz) = 5019120
diff --git a/sysutils/grub2-pcbsd/files/10_ktrueos.in b/sysutils/grub2-pcbsd/files/10_ktrueos.in
index 1a97652bde02..937aae3479e6 100644
--- a/sysutils/grub2-pcbsd/files/10_ktrueos.in
+++ b/sysutils/grub2-pcbsd/files/10_ktrueos.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2014 iXsystems (Kris Moore)
+# Copyright 2015 iXsystems (Kris Moore)
 # All rights reserved
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,14 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
         console=1;
     fi
 done
+
+# Set the default output as dual console / serial
+# This is so we can run properly in bhyve and other serial use cases
+# If the user manually sets GRUB_TERMINAL, we will ignore this default
+if [ -z "$GRUB_TERMINAL" ] ; then
+  out="-D -h"
+fi
+
 if [ "x$serial" = "x1" ]; then
     if [ "x$console" = "x1" ]; then
         out="-Dh"
@@ -322,7 +330,7 @@ EOF
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
-    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
@@ -338,7 +346,7 @@ EOF
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
-    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
@@ -354,7 +362,7 @@ EOF
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
-    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
diff --git a/sysutils/grub2-pcbsd/files/50_otherbe.in b/sysutils/grub2-pcbsd/files/50_otherbe.in
index b59eeec8e402..1359e0649df4 100644
--- a/sysutils/grub2-pcbsd/files/50_otherbe.in
+++ b/sysutils/grub2-pcbsd/files/50_otherbe.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2014 iXsystems (Kris Moore)
+# Copyright 2015 iXsystems (Kris Moore)
 # All rights reserved
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,14 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
         console=1;
     fi
 done
+
+# Set the default output as dual console / serial
+# This is so we can run properly in bhyve and other serial use cases
+# If the user manually sets GRUB_TERMINAL, we will ignore this default
+if [ -z "$GRUB_TERMINAL" ] ; then
+  out="-D -h"
+fi
+
 if [ "x$serial" = "x1" ]; then
     if [ "x$console" = "x1" ]; then
         out="-Dh"
@@ -326,7 +334,7 @@ EOF
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
-    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
@@ -342,7 +350,7 @@ EOF
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
-    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
@@ -358,7 +366,7 @@ EOF
 EOF
     # Get the dataset guts
     cat /tmp/.grubdataset.$$.1
-    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel"
+    echo "    kfreebsd ${shortdataset}/@/boot/kernel/kernel ${out}"
     echo "    kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
     cat /tmp/.grubdataset.$$.2
 
diff --git a/sysutils/grub2-pcbsd/files/patch-configure.ac b/sysutils/grub2-pcbsd/files/patch-configure.ac
index f8f8e0ea2cc0..0410fc189060 100644
--- a/sysutils/grub2-pcbsd/files/patch-configure.ac
+++ b/sysutils/grub2-pcbsd/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2014-03-03 11:00:26.000000000 -0500
-+++ configure.ac	2014-06-05 13:24:29.290891223 -0400
-@@ -1389,7 +1389,7 @@
+--- configure.ac.orig	2015-06-03 14:54:01 UTC
++++ configure.ac
+@@ -1459,7 +1459,7 @@ fi
  
  if test x"$starfield_excuse" = x; then
     for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
@@ -9,7 +9,7 @@
          if test -f "$dir/DejaVuSans.$ext"; then
            DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
            break 2
-@@ -1411,7 +1411,7 @@
+@@ -1481,7 +1481,7 @@ AC_SUBST([DJVU_FONT_SOURCE])
  FONT_SOURCE=
  
  for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
diff --git a/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c b/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c
index 2f1db76fb002..b2e3d9793f4f 100644
--- a/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c
+++ b/sysutils/grub2-pcbsd/files/patch-grub-core_loader_i386_bsd.c
@@ -1,8 +1,6 @@
-diff --git grub-core/loader/i386/bsd.c grub-core/loader/i386/bsd.c
-index 8f691e0..8c7decd 100644
---- grub-core/loader/i386/bsd.c
+--- grub-core/loader/i386/bsd.c.orig	2015-01-30 16:34:55 UTC
 +++ grub-core/loader/i386/bsd.c
-@@ -415,11 +415,14 @@ grub_freebsd_add_meta_module (const char *filename, const char *type,
+@@ -416,11 +416,14 @@ grub_freebsd_add_meta_module (const char
  			      grub_addr_t addr, grub_uint32_t size)
  {
    const char *name;
diff --git a/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c b/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c
index a249ef819861..5ed32e5fd0ae 100644
--- a/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c
+++ b/sysutils/grub2-pcbsd/files/patch-grub-core_partmap_gpt.c
@@ -1,6 +1,6 @@
---- grub-core/partmap/gpt.c.orig	2014-12-02 14:37:43.000000000 +0800
-+++ grub-core/partmap/gpt.c	2014-12-02 14:37:49.000000000 +0800
-@@ -37,6 +37,7 @@
+--- grub-core/partmap/gpt.c.orig	2014-10-20 16:16:07 UTC
++++ grub-core/partmap/gpt.c
+@@ -37,6 +37,7 @@ static const grub_gpt_part_type_t grub_g
  
  #ifdef GRUB_UTIL
  static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
@@ -8,7 +8,7 @@
  #endif
  
  /* 512 << 7 = 65536 byte sectors.  */
-@@ -155,7 +156,8 @@
+@@ -155,7 +156,8 @@ find_usable_region (grub_disk_t disk __a
    disk->partition = p2;
  
    /* If there's an embed region, it is in a dedicated partition.  */
diff --git a/sysutils/grub2-pcbsd/files/patch-util_grub-mkconfig.in b/sysutils/grub2-pcbsd/files/patch-util_grub-mkconfig.in
index 40f522ace4ed..3fb66966ecc0 100644
--- a/sysutils/grub2-pcbsd/files/patch-util_grub-mkconfig.in
+++ b/sysutils/grub2-pcbsd/files/patch-util_grub-mkconfig.in
@@ -1,6 +1,6 @@
---- util/grub-mkconfig.in.orig	2014-03-03 11:00:26.000000000 -0500
-+++ util/grub-mkconfig.in	2014-07-03 11:31:47.013881961 -0400
-@@ -278,3 +278,11 @@
+--- util/grub-mkconfig.in.orig	2015-06-03 14:54:01 UTC
++++ util/grub-mkconfig.in
+@@ -281,3 +281,11 @@ fi
  
  gettext "done" >&2
  echo >&2
diff --git a/sysutils/grub2-pcbsd/pkg-message b/sysutils/grub2-pcbsd/pkg-message
index 29a352b80b6e..0add3bac5340 100644
--- a/sysutils/grub2-pcbsd/pkg-message
+++ b/sysutils/grub2-pcbsd/pkg-message
@@ -9,3 +9,12 @@ menuentry "FreeBSD" {
 }
 Or use grub-mkconfig to create the config file.
 #############################################################
+
+This version of grub includes support for PC-BSD style boot
+environments. For it to properly detect / populate your
+BE menus you must have your root zpool setup in the following
+manner:
+
+<tank>/ROOT/<be>
+
+Where <tank> is your zpool, and <be> is your '/' mountpoint.
diff --git a/sysutils/grub2-pcbsd/pkg-plist b/sysutils/grub2-pcbsd/pkg-plist
index 3542842634ad..9e884ebcc596 100644
--- a/sysutils/grub2-pcbsd/pkg-plist
+++ b/sysutils/grub2-pcbsd/pkg-plist
@@ -36,132 +36,33 @@
 %%MKFONT%%share/grub/ascii.pf2
 %%MKFONT%%share/grub/euro.pf2
 %%MKFONT%%share/grub/unicode.pf2
-%%MKFONT%%share/grub/widthspec.h
 %%MKFONT%%man/man1/grub-mkfont.1.gz
 bin/grub-editenv
+bin/grub-file
 bin/grub-fstest
+bin/grub-glue-efi
 bin/grub-kbdcomp
 bin/grub-menulst2cfg
 bin/grub-mkimage
-bin/grub-mknetdir
 bin/grub-mklayout
+bin/grub-mknetdir
 bin/grub-mkpasswd-pbkdf2
 bin/grub-mkrelpath
-bin/grub-mkstandalone
 bin/grub-mkrescue
-bin/grub-script-check
-bin/grub-file
-bin/grub-glue-efi
+bin/grub-mkstandalone
 bin/grub-render-label
+bin/grub-script-check
 bin/grub-syslinux2cfg
-sbin/grub-macbless
-lib/grub/i386-pc/archelp.mod
-lib/grub/i386-pc/archelp.module
-lib/grub/i386-pc/boot_hybrid.image
-lib/grub/i386-pc/boot_hybrid.img
-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/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/disk.mod
-lib/grub/i386-pc/disk.module
-lib/grub/i386-pc/div_test.mod
-lib/grub/i386-pc/div_test.module
-lib/grub/i386-pc/eval.mod
-lib/grub/i386-pc/eval.module
-lib/grub/i386-pc/file.mod
-lib/grub/i386-pc/file.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_rsa.mod
-lib/grub/i386-pc/gcry_rsa.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/hfspluscomp.mod
-lib/grub/i386-pc/hfspluscomp.module
-lib/grub/i386-pc/legacy_password_test.mod
-lib/grub/i386-pc/legacy_password_test.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/morse.mod
-lib/grub/i386-pc/morse.module
-lib/grub/i386-pc/mpi.mod
-lib/grub/i386-pc/mpi.module
-lib/grub/i386-pc/nativedisk.mod
-lib/grub/i386-pc/nativedisk.module
-lib/grub/i386-pc/offsetio.mod
-lib/grub/i386-pc/offsetio.module
-lib/grub/i386-pc/part_dfly.mod
-lib/grub/i386-pc/part_dfly.module
-lib/grub/i386-pc/pbkdf2_test.mod
-lib/grub/i386-pc/pbkdf2_test.module
-lib/grub/i386-pc/pcidump.mod
-lib/grub/i386-pc/pcidump.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/setjmp_test.mod
-lib/grub/i386-pc/setjmp_test.module
-lib/grub/i386-pc/signature_test.mod
-lib/grub/i386-pc/signature_test.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/syslinuxcfg.mod
-lib/grub/i386-pc/syslinuxcfg.module
-lib/grub/i386-pc/testspeed.mod
-lib/grub/i386-pc/testspeed.module
-lib/grub/i386-pc/tr.mod
-lib/grub/i386-pc/tr.module
-lib/grub/i386-pc/truecrypt.mod
-lib/grub/i386-pc/truecrypt.module
-lib/grub/i386-pc/ufs1_be.mod
-lib/grub/i386-pc/ufs1_be.module
-lib/grub/i386-pc/usbserial_usbdebug.mod
-lib/grub/i386-pc/usbserial_usbdebug.module
-lib/grub/i386-pc/verify.mod
-lib/grub/i386-pc/verify.module
-lib/grub/i386-pc/video_colors.mod
-lib/grub/i386-pc/video_colors.module
-lib/grub/i386-pc/videotest_checksum.mod
-lib/grub/i386-pc/videotest_checksum.module
-lib/grub/i386-pc/xnu_uuid_test.mod
-lib/grub/i386-pc/xnu_uuid_test.module
-man/man1/grub-file.1.gz
-man/man1/grub-glue-efi.1.gz
-man/man1/grub-mknetdir.1.gz
-man/man1/grub-render-label.1.gz
-man/man1/grub-syslinux2cfg.1.gz
-man/man8/grub-macbless.8.gz
+etc/bash_completion.d/grub
 etc/grub.d/00_header
+etc/grub.d/10_kfreebsd
+etc/grub.d/10_ktrueos
 etc/grub.d/30_os-prober
 etc/grub.d/40_custom.dist
 etc/grub.d/41_custom
 etc/grub.d/50_otherbe
-etc/grub.d/10_kfreebsd
-etc/grub.d/10_ktrueos
 etc/grub.d/README
-etc/bash_completion.d/grub
+info/dir
 lib/grub/i386-pc/acpi.mod
 lib/grub/i386-pc/acpi.module
 lib/grub/i386-pc/adler32.mod
@@ -176,6 +77,8 @@ lib/grub/i386-pc/all_video.mod
 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
@@ -196,22 +99,42 @@ lib/grub/i386-pc/boot.image
 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
@@ -231,16 +154,24 @@ lib/grub/i386-pc/cryptodisk.mod
 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
@@ -249,12 +180,14 @@ lib/grub/i386-pc/echo.mod
 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
@@ -265,6 +198,8 @@ lib/grub/i386-pc/extcmd.mod
 lib/grub/i386-pc/extcmd.module
 lib/grub/i386-pc/fat.mod
 lib/grub/i386-pc/fat.module
+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
@@ -286,6 +221,10 @@ lib/grub/i386-pc/gcry_crc.mod
 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
@@ -296,6 +235,8 @@ lib/grub/i386-pc/gcry_rijndael.mod
 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
@@ -323,6 +264,10 @@ lib/grub/i386-pc/gfxmenu.mod
 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
@@ -344,6 +289,8 @@ lib/grub/i386-pc/hfs.mod
 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
@@ -362,6 +309,8 @@ lib/grub/i386-pc/keystatus.mod
 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
@@ -392,6 +341,12 @@ lib/grub/i386-pc/lzma_decompress.image
 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
@@ -420,12 +375,20 @@ lib/grub/i386-pc/mmap.mod
 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
@@ -442,6 +405,8 @@ lib/grub/i386-pc/ntldr.mod
 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
@@ -452,6 +417,8 @@ lib/grub/i386-pc/part_apple.mod
 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
@@ -476,8 +443,12 @@ lib/grub/i386-pc/pata.mod
 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
@@ -488,6 +459,10 @@ lib/grub/i386-pc/priority_queue.mod
 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
@@ -526,14 +501,26 @@ lib/grub/i386-pc/serial.mod
 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/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
@@ -547,20 +534,28 @@ lib/grub/i386-pc/test_blockarg.mod
 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
@@ -577,10 +572,14 @@ lib/grub/i386-pc/usbserial_ftdi.mod
 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
@@ -592,18 +591,24 @@ lib/grub/i386-pc/video_bochs.mod
 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
@@ -612,15 +617,42 @@ lib/grub/i386-pc/zfscrypt.mod
 lib/grub/i386-pc/zfscrypt.module
 lib/grub/i386-pc/zfsinfo.mod
 lib/grub/i386-pc/zfsinfo.module
+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-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-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-probe
 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
-sbin/grub-reboot
 share/grub/grub-mkconfig_lib
+share/grub/widthspec.h
 share/locale/ast/LC_MESSAGES/grub.mo
 share/locale/ca/LC_MESSAGES/grub.mo
 share/locale/da/LC_MESSAGES/grub.mo
@@ -648,22 +680,3 @@ 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-fstest.1.gz
-man/man1/grub-kbdcomp.1.gz
-man/man1/grub-menulst2cfg.1.gz
-man/man1/grub-mkimage.1.gz
-man/man1/grub-mklayout.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-script-check.1.gz
-man/man8/grub-bios-setup.8.gz
-man/man8/grub-install.8.gz
-man/man8/grub-mkconfig.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