CVS commit: pkgsrc/sysutils/grub2

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Sep 16 13:18:54 UTC 2018

Modified Files:
        pkgsrc/sysutils/grub2: PLIST options.mk

Log Message:
grub2: add support for grub-mount

Also add some cosmetics.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/grub2/PLIST \
    pkgsrc/sysutils/grub2/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/grub2/PLIST
diff -u pkgsrc/sysutils/grub2/PLIST:1.2 pkgsrc/sysutils/grub2/PLIST:1.3
--- pkgsrc/sysutils/grub2/PLIST:1.2     Wed May 23 07:56:53 2018
+++ pkgsrc/sysutils/grub2/PLIST Sun Sep 16 13:18:54 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2018/05/23 07:56:53 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/09/16 13:18:54 triaxx Exp $
 bin/grub-editenv
 bin/grub-file
 bin/grub-fstest
@@ -13,6 +13,7 @@ bin/grub-mkpasswd-pbkdf2
 bin/grub-mkrelpath
 bin/grub-mkrescue
 bin/grub-mkstandalone
+${PLIST.fuse}bin/grub-mount
 bin/grub-render-label
 bin/grub-script-check
 bin/grub-syslinux2cfg
@@ -587,6 +588,7 @@ man/man1/grub-mkpasswd-pbkdf2.1
 man/man1/grub-mkrelpath.1
 man/man1/grub-mkrescue.1
 man/man1/grub-mkstandalone.1
+${PLIST.fuse}man/man1/grub-mount.1
 man/man1/grub-render-label.1
 man/man1/grub-script-check.1
 man/man1/grub-syslinux2cfg.1
Index: pkgsrc/sysutils/grub2/options.mk
diff -u pkgsrc/sysutils/grub2/options.mk:1.2 pkgsrc/sysutils/grub2/options.mk:1.3
--- pkgsrc/sysutils/grub2/options.mk:1.2        Fri Sep  5 12:14:24 2014
+++ pkgsrc/sysutils/grub2/options.mk    Sun Sep 16 13:18:54 2018
@@ -1,19 +1,20 @@
-# $NetBSD: options.mk,v 1.2 2014/09/05 12:14:24 gsutre Exp $
+# $NetBSD: options.mk,v 1.3 2018/09/16 13:18:54 triaxx Exp $
 #
 
 #
 # Description of options (taken from configure --help):
 # debug                        include memory manager debugging
 # freetype             build and install the `grub-mkfont' utility
+# fuse                 build and install the `grub-mount' utility
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.grub2
-PKG_SUPPORTED_OPTIONS= debug freetype
+PKG_SUPPORTED_OPTIONS= debug freetype fuse
 PKG_SUGGESTED_OPTIONS= freetype
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=           freetype
+PLIST_VARS+=           freetype fuse
 
 UNIFONT=               unifont-5.1.20080820.pcf
 SITES.${UNIFONT}.gz=   http://unifoundry.com/
@@ -21,12 +22,18 @@ SITES.${UNIFONT}.gz=        http://unifoundry.c
 post-extract: do-move-unifont
 .PHONY: do-move-unifont
 
+###
+### debug support
+###
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --enable-mm-debug
 .else
 CONFIGURE_ARGS+=       --disable-mm-debug
 .endif
 
+###
+### FreeType support
+###
 .if !empty(PKG_OPTIONS:Mfreetype)
 CONFIGURE_ARGS+=       --enable-grub-mkfont
 PLIST.freetype=                yes
@@ -39,3 +46,14 @@ do-move-unifont:
 CONFIGURE_ARGS+=       --disable-grub-mkfont
 do-move-unifont:
 .endif
+
+###
+### FUSE support
+###
+.if !empty(PKG_OPTIONS:Mfuse)
+CONFIGURE_ARGS+=       --enable-grub-mount
+PLIST.fuse=            yes
+.include "../../filesystems/fuse/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-grub-mount
+.endif