[pkgsrc/trunk]: pkgsrc/sysutils/grub2 grub2: be consistent about ifdef macros...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5224d9b5f24
branches:  trunk
changeset: 387785:b5224d9b5f24
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Nov 25 15:51:01 2018 +0000

description:
grub2: be consistent about ifdef macros to fix the build for the weird case
of netbsd current broken zfs userland exposure.

diffstat:

 sysutils/grub2/distinfo                     |   3 ++-
 sysutils/grub2/patches/patch-util_getroot.c |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r 0044c3cc7d79 -r b5224d9b5f24 sysutils/grub2/distinfo
--- a/sysutils/grub2/distinfo   Sun Nov 25 15:10:31 2018 +0000
+++ b/sysutils/grub2/distinfo   Sun Nov 25 15:51:01 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2018/05/23 07:56:53 triaxx Exp $
+$NetBSD: distinfo,v 1.8 2018/11/25 15:51:01 maya Exp $
 
 SHA1 (grub-2.02.tar.gz) = 2f778cf62a3126bae71ce428b512bffc964cf7d0
 RMD160 (grub-2.02.tar.gz) = 8428eba6ddd26cd36a852c99d343b2b7650e90ac
@@ -9,3 +9,4 @@
 SHA512 (unifont-5.1.20080820.pcf.gz) = 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649
 Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
 SHA1 (patch-grub-core_osdep_bsd_hostdisk.c) = 4cd60bf75811c3f72ed47ccc6dd2dec7bc77f991
+SHA1 (patch-util_getroot.c) = 7c2f148ffa778872de4f59b6fcf365bd1a497acf
diff -r 0044c3cc7d79 -r b5224d9b5f24 sysutils/grub2/patches/patch-util_getroot.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/grub2/patches/patch-util_getroot.c       Sun Nov 25 15:51:01 2018 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-util_getroot.c,v 1.3 2018/11/25 15:51:01 maya Exp $
+
+Be consistent about macros. The required headers are only
+included if both libzfs and libnvpair are detected.
+
+--- util/getroot.c.orig        2017-04-24 09:16:00.000000000 +0000
++++ util/getroot.c
+@@ -456,7 +456,7 @@ grub_util_biosdisk_is_present (const cha
+   return ret;
+ }
+ 
+-#ifdef HAVE_LIBZFS
++#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+ static libzfs_handle_t *__libzfs_handle;
+ 
+ static void