CVS commit: pkgsrc/sysutils/grub

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun 23 12:40:05 UTC 2026

Modified Files:
        pkgsrc/sysutils/grub: Makefile distinfo
Added Files:
        pkgsrc/sysutils/grub/patches: patch-lib_device.c

Log Message:
grub: fix build on -current

While here, fix some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/sysutils/grub/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/grub/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/grub/patches/patch-lib_device.c

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

Modified files:

Index: pkgsrc/sysutils/grub/Makefile
diff -u pkgsrc/sysutils/grub/Makefile:1.62 pkgsrc/sysutils/grub/Makefile:1.63
--- pkgsrc/sysutils/grub/Makefile:1.62  Tue Nov  9 10:25:13 2021
+++ pkgsrc/sysutils/grub/Makefile       Tue Jun 23 12:40:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2021/11/09 10:25:13 nia Exp $
+# $NetBSD: Makefile,v 1.63 2026/06/23 12:40:05 wiz Exp $
 
 DISTNAME=      grub-0.97
 PKGREVISION=   10
@@ -51,7 +51,7 @@ grub-netboot-install:
                ${PREFIX}/share/doc/grub
 .endif
 
-.if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND)
+.if !empty(GRUB_PRESET_COMMAND)
 CONFIGURE_ARGS+=       --enable-preset-menu=${WRKSRC}/presetmenu
 
 post-extract: grub-presetmenu

Index: pkgsrc/sysutils/grub/distinfo
diff -u pkgsrc/sysutils/grub/distinfo:1.26 pkgsrc/sysutils/grub/distinfo:1.27
--- pkgsrc/sysutils/grub/distinfo:1.26  Tue Oct 26 11:19:39 2021
+++ pkgsrc/sysutils/grub/distinfo       Tue Jun 23 12:40:05 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2021/10/26 11:19:39 nia Exp $
+$NetBSD: distinfo,v 1.27 2026/06/23 12:40:05 wiz Exp $
 
 BLAKE2s (grub-0.97.tar.gz) = e0fc5097f93d2988beeff3de4f1126e998fcbd12a894b95419290df88d98f2de
 SHA512 (grub-0.97.tar.gz) = c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
@@ -17,3 +17,4 @@ SHA1 (patch-ak) = 8e67eb603e639ca47536cb
 SHA1 (patch-al) = 58761e867ff182ad46c42b15575395ba8c38fbd6
 SHA1 (patch-am) = d848f67f7f21fa076751d14bd3235ae7351be1b7
 SHA1 (patch-an) = b86401eceed91ff49a00a1e2a7aa49009e01a875
+SHA1 (patch-lib_device.c) = ab702713b934657d46d4f2209d6bf3ef57e6f53f

Added files:

Index: pkgsrc/sysutils/grub/patches/patch-lib_device.c
diff -u /dev/null pkgsrc/sysutils/grub/patches/patch-lib_device.c:1.1
--- /dev/null   Tue Jun 23 12:40:05 2026
+++ pkgsrc/sysutils/grub/patches/patch-lib_device.c     Tue Jun 23 12:40:05 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_device.c,v 1.1 2026/06/23 12:40:05 wiz Exp $
+
+Add header for opendisk().
+
+--- lib/device.c.orig  2026-06-23 12:38:49.327131604 +0000
++++ lib/device.c
+@@ -36,6 +36,10 @@
+ #include <limits.h>
+ #include <stdarg.h>
+ 
++#ifdef __NetBSD__
++#include <util.h>
++#endif
++
+ #ifdef __linux__
+ # if !defined(__GLIBC__) || \
+         ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))