Fix PR pkg/49041 and update the dejavu-ttf dependency

to account for the font path change.

5 files changed, 62 insertions, 5 deletions

diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 097704bdf43..23fc511b70a 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2014/06/01 18:08:24 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/09/05 12:14:24 gsutre Exp $
 
 DISTNAME=		grub-2.00
 PKGNAME=		${DISTNAME:S/grub/grub2/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.gnu.org/gnu/grub/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/grub2/distinfo b/sysutils/grub2/distinfo
index 954533e2e5d..80740143d50 100644
--- a/sysutils/grub2/distinfo
+++ b/sysutils/grub2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2014/07/11 10:58:43 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2014/09/05 12:14:24 gsutre Exp $
 
 SHA1 (grub-2.00.tar.gz) = fcb39b621680caf34071abcb9ec913d5da458554
 RMD160 (grub-2.00.tar.gz) = 7a4d4fc2a22dfe169c03ec54b9c9a078679aa506
@@ -9,9 +9,11 @@ Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
 SHA1 (patch-configure) = 5bc08d640943e59c795113a4375a712c1932ccff
 SHA1 (patch-grub-core_lib_posix__wrap_sys_types.h) = 7510953e7bbed347f5d53e4535c309c365ba2bcd
 SHA1 (patch-grub-core_lib_posix__wrap_wchar.h) = 6509696c2d5e008634b710c63cb836664d0f8a89
+SHA1 (patch-grub-core_lib_xzembed_xz__dec__lzma2.c) = 9b9be69e60e17b81f4e776579b093d429ac7e22c
 SHA1 (patch-grub-core_loader_i386_pc_plan9.c) = 07c909c02210ef59647185cd9b7f43b35d58515c
 SHA1 (patch-grub-core_script_yylex.l) = 1645d167b90d1862b2d9990dfe7c357778d9a952
 SHA1 (patch-stpcpy-1.diff) = d31f8d607900fdde950d3828279d5b3b09812a39
 SHA1 (patch-stpcpy-2-gen.diff) = 8b2d08cfe798386eec7d70a3946e7a9430e75254
+SHA1 (patch-util_getroot.c) = 009b499772c864cc82dee75658442a071327a1c9
 SHA1 (patch-util_grub-mkfont.c) = c93b8497672ea038f65af7d8cf0db021fd023761
 SHA1 (patch-util_grub.d_10__netbsd.in) = c7ad93fc60594233d71962e625320091d8cc67e5
diff --git a/sysutils/grub2/options.mk b/sysutils/grub2/options.mk
index 20e7715a5c8..5761841de90 100644
--- a/sysutils/grub2/options.mk
+++ b/sysutils/grub2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2012/07/29 21:44:13 gsutre Exp $
+# $NetBSD: options.mk,v 1.2 2014/09/05 12:14:24 gsutre Exp $
 #
 
 #
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--disable-mm-debug
 CONFIGURE_ARGS+=	--enable-grub-mkfont
 PLIST.freetype=		yes
 DISTFILES+=		${UNIFONT}.gz
-BUILD_DEPENDS+=		dejavu-ttf>=2.30:../../fonts/dejavu-ttf
+BUILD_DEPENDS+=		dejavu-ttf>=2.34nb1:../../fonts/dejavu-ttf
 do-move-unifont:
 	${MV} ${WRKDIR}/${UNIFONT} ${WRKSRC}/unifont.pcf
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/sysutils/grub2/patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c b/sysutils/grub2/patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
new file mode 100644
index 00000000000..b7a33251255
--- /dev/null
+++ b/sysutils/grub2/patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-grub-core_lib_xzembed_xz__dec__lzma2.c,v 1.1 2014/09/05 12:14:24 gsutre Exp $
+
+Make -Wattributes not cause error.
+Upstream commit 64463dfde40b4cf5e551899d656d3ef50b7a008a.
+
+--- grub-core/lib/xzembed/xz_dec_lzma2.c.orig	2010-12-01 14:45:43.000000000 +0000
++++ grub-core/lib/xzembed/xz_dec_lzma2.c
+@@ -24,6 +24,8 @@
+ #include "xz_private.h"
+ #include "xz_lzma2.h"
+ 
++#pragma GCC diagnostic warning "-Wattributes"
++
+ /*
+  * Range decoder initialization eats the first five bytes of each LZMA chunk.
+  */
diff --git a/sysutils/grub2/patches/patch-util_getroot.c b/sysutils/grub2/patches/patch-util_getroot.c
new file mode 100644
index 00000000000..2e84f449662
--- /dev/null
+++ b/sysutils/grub2/patches/patch-util_getroot.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-util_getroot.c,v 1.1 2014/09/05 12:14:24 gsutre Exp $
+
+Fix grub-emu build.
+
+* exec_pipe: Define only on Linux or when either libzfs or libnvpair is unavailable.
+* find_root_devices_from_poolname: Remove unused path variable.
+
+Taken from upstream commit 794c8c33758792627113ae98ec495b9856960d92.
+
+--- util/getroot.c.orig	2012-06-22 15:42:07.000000000 +0000
++++ util/getroot.c
+@@ -220,6 +220,9 @@ xgetcwd (void)
+ 
+ #if !defined (__MINGW32__) && !defined (__CYGWIN__) && !defined (__GNU__)
+ 
++#if (defined (__linux__) || \
++     !defined (HAVE_LIBZFS) || !defined (HAVE_LIBNVPAIR))
++
+ static pid_t
+ exec_pipe (char **argv, int *fd)
+ {
+@@ -258,6 +261,8 @@ exec_pipe (char **argv, int *fd)
+     }
+ }
+ 
++#endif
++
+ static char **
+ find_root_devices_from_poolname (char *poolname)
+ {
+@@ -269,7 +274,7 @@ find_root_devices_from_poolname (char *p
+   zpool_handle_t *zpool;
+   libzfs_handle_t *libzfs;
+   nvlist_t *config, *vdev_tree;
+-  nvlist_t **children, **path;
++  nvlist_t **children;
+   unsigned int nvlist_count;
+   unsigned int i;
+   char *device = 0;