2 files changed, 22 insertions, 15 deletions

diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 9d94a2baa1df..a6975e473b6f 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -23,8 +23,7 @@ USE_GCC=	yes
 USE_AUTOTOOLS=	automake aclocal autoconf
 ACLOCAL_ARGS=	-Im4
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		bison gettext
+USES=		bison gettext gmake
 ONLY_FOR_ARCHS=	i386 amd64
 INFO=		grub grub-dev
 MAKE_JOBS_UNSAFE=	yes
@@ -37,15 +36,6 @@ OPTIONS_DEFINE=	MKFONT FUSE
 MKFONT_DESC=	Build grub-mkfont (require freetype2)
 FUSE_DESC=	Build grub-mount (require FUSE)
 
-MAN1=		grub-editenv.1 grub-mklayout.1 grub-mkpasswd-pbkdf2.1 \
-		grub-fstest.1 grub-script-check.1 grub-kbdcomp.1 \
-		grub-mkstandalone.1 grub-mkrelpath.1 grub-mkrescue.1 \
-		grub-menulst2cfg.1 grub-mkimage.1
-MAN8=		grub-reboot.8 grub-set-default.8 grub-probe.8 \
-		grub-mkconfig.8 grub-bios-setup.8 grub-mknetdir.8 \
-		grub-install.8 grub-sparc64-setup.8 grub-ofpathname.8
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "amd64"
@@ -67,7 +57,6 @@ PLIST_SUB+=	MKFONT=${MKFONT}
 .if ${PORT_OPTIONS:MFUSE}
 LIB_DEPENDS+=	fuse:${PORTSDIR}/sysutils/fusefs-libs
 CONFIGURE_ARGS+=	--enable-grub-mount
-MAN1+=		grub-mount.1
 .else
 CONFIGURE_ARGS+=	--disable-grub-mount
 FUSE=		"@comment "
@@ -82,7 +71,4 @@ post-patch:
 post-configure:
 	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 ${WRKSRC}/grub-core
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/grub2/pkg-plist b/sysutils/grub2/pkg-plist
index 7b6ab8c1c15a..fb5d55c7d75a 100644
--- a/sysutils/grub2/pkg-plist
+++ b/sysutils/grub2/pkg-plist
@@ -1,4 +1,5 @@
 %%FUSE%%bin/grub-mount
+%%FUSE%%man/man1/grub-mount.1
 %%MKFONT%%bin/grub-mkfont
 %%MKFONT%%share/grub/themes/starfield/dejavu_10.pf2
 %%MKFONT%%share/grub/themes/starfield/dejavu_12.pf2
@@ -537,6 +538,26 @@ 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-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
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/de@hebrew/LC_MESSAGES