Revert "grub: remove grub-utils subpackage"

This reverts commit 51f7ae0bce.

srcpkgs/grub-utils

@@ -0,0 +1 @@
+grub

srcpkgs/grub/template

@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.02~rc2
-revision=4
+revision=3
 hostmakedepends="flex"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel"
@@ -14,12 +14,10 @@ homepage="http://www.gnu.org/software/grub/"
 distfiles="http://alpha.gnu.org/gnu/grub/grub-${version}.tar.xz"
 checksum=053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246
 
-replaces="grub-utils>=0"
-
 only_for_archs="i686 i686-musl x86_64 x86_64-musl"
 nopie=yes
 
-subpackages="grub-i386-efi"
+subpackages="grub-utils grub-i386-efi"
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*) subpackages+=" grub-x86_64-efi"; _GRUBX64=1;;
 esac
@@ -129,6 +127,16 @@ do_install() {
 	rm ${DESTDIR}/usr/bin/grub-sparc64-setup
 }
 
+grub-utils_package() {
+	short_desc+=" - additional utilities"
+	depends="grub>=${version}"
+	pkg_install() {
+		vmove usr/bin/grub-menulst2cfg
+		vmove usr/bin/grub-fstest
+		vmove usr/bin/grub-mkfont
+		vmove usr/bin/grub-mount
+	}
+}
 grub-x86_64-efi_package() {
 	noarch=yes
 	depends="grub>=$version dosfstools efibootmgr"