Fri Sep 5 12:14:24 2014 UTC ()
Fix PR pkg/49041 and update the dejavu-ttf dependency
to account for the font path change.


(gsutre)
diff -r1.6 -r1.7 pkgsrc/sysutils/grub2/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/grub2/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/grub2/options.mk
diff -r0 -r1.1 pkgsrc/sysutils/grub2/patches/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
diff -r0 -r1.1 pkgsrc/sysutils/grub2/patches/patch-util_getroot.c
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/grub2/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/grub2/Makefile 2014/06/01 18:08:24 1.6
+++ pkgsrc/sysutils/grub2/Makefile 2014/09/05 12:14:24 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2014/06/01 18:08:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2014/09/05 12:14:24 gsutre Exp $
2 2
3DISTNAME= grub-2.00 3DISTNAME= grub-2.00
4PKGNAME= ${DISTNAME:S/grub/grub2/} 4PKGNAME= ${DISTNAME:S/grub/grub2/}
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/ 7MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 9
10MAINTAINER= gsutre@NetBSD.org 10MAINTAINER= gsutre@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/grub/ 11HOMEPAGE= http://www.gnu.org/software/grub/
12COMMENT= GRand Unified Bootloader, version 2 12COMMENT= GRand Unified Bootloader, version 2
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15CONFLICTS= grub-[0-9]* 15CONFLICTS= grub-[0-9]*
16 16
17ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 17ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64
18 18
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/grub2/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/grub2/distinfo 2014/07/11 10:58:43 1.3
+++ pkgsrc/sysutils/grub2/distinfo 2014/09/05 12:14:24 1.4
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: distinfo,v 1.3 2014/07/11 10:58:43 jperkin Exp $ 1$NetBSD: distinfo,v 1.4 2014/09/05 12:14:24 gsutre Exp $
2 2
3SHA1 (grub-2.00.tar.gz) = fcb39b621680caf34071abcb9ec913d5da458554 3SHA1 (grub-2.00.tar.gz) = fcb39b621680caf34071abcb9ec913d5da458554
4RMD160 (grub-2.00.tar.gz) = 7a4d4fc2a22dfe169c03ec54b9c9a078679aa506 4RMD160 (grub-2.00.tar.gz) = 7a4d4fc2a22dfe169c03ec54b9c9a078679aa506
5Size (grub-2.00.tar.gz) = 8270319 bytes 5Size (grub-2.00.tar.gz) = 8270319 bytes
6SHA1 (unifont-5.1.20080820.pcf.gz) = 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a 6SHA1 (unifont-5.1.20080820.pcf.gz) = 87f8600ba24e521b5d20bdf6c4b71af8ae861e3a
7RMD160 (unifont-5.1.20080820.pcf.gz) = ddc87231a7c1e18e81a6f4578a4f0279bcd0c292 7RMD160 (unifont-5.1.20080820.pcf.gz) = ddc87231a7c1e18e81a6f4578a4f0279bcd0c292
8Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes 8Size (unifont-5.1.20080820.pcf.gz) = 1379965 bytes
9SHA1 (patch-configure) = 5bc08d640943e59c795113a4375a712c1932ccff 9SHA1 (patch-configure) = 5bc08d640943e59c795113a4375a712c1932ccff
10SHA1 (patch-grub-core_lib_posix__wrap_sys_types.h) = 7510953e7bbed347f5d53e4535c309c365ba2bcd 10SHA1 (patch-grub-core_lib_posix__wrap_sys_types.h) = 7510953e7bbed347f5d53e4535c309c365ba2bcd
11SHA1 (patch-grub-core_lib_posix__wrap_wchar.h) = 6509696c2d5e008634b710c63cb836664d0f8a89 11SHA1 (patch-grub-core_lib_posix__wrap_wchar.h) = 6509696c2d5e008634b710c63cb836664d0f8a89
 12SHA1 (patch-grub-core_lib_xzembed_xz__dec__lzma2.c) = 9b9be69e60e17b81f4e776579b093d429ac7e22c
12SHA1 (patch-grub-core_loader_i386_pc_plan9.c) = 07c909c02210ef59647185cd9b7f43b35d58515c 13SHA1 (patch-grub-core_loader_i386_pc_plan9.c) = 07c909c02210ef59647185cd9b7f43b35d58515c
13SHA1 (patch-grub-core_script_yylex.l) = 1645d167b90d1862b2d9990dfe7c357778d9a952 14SHA1 (patch-grub-core_script_yylex.l) = 1645d167b90d1862b2d9990dfe7c357778d9a952
14SHA1 (patch-stpcpy-1.diff) = d31f8d607900fdde950d3828279d5b3b09812a39 15SHA1 (patch-stpcpy-1.diff) = d31f8d607900fdde950d3828279d5b3b09812a39
15SHA1 (patch-stpcpy-2-gen.diff) = 8b2d08cfe798386eec7d70a3946e7a9430e75254 16SHA1 (patch-stpcpy-2-gen.diff) = 8b2d08cfe798386eec7d70a3946e7a9430e75254
 17SHA1 (patch-util_getroot.c) = 009b499772c864cc82dee75658442a071327a1c9
16SHA1 (patch-util_grub-mkfont.c) = c93b8497672ea038f65af7d8cf0db021fd023761 18SHA1 (patch-util_grub-mkfont.c) = c93b8497672ea038f65af7d8cf0db021fd023761
17SHA1 (patch-util_grub.d_10__netbsd.in) = c7ad93fc60594233d71962e625320091d8cc67e5 19SHA1 (patch-util_grub.d_10__netbsd.in) = c7ad93fc60594233d71962e625320091d8cc67e5
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/grub2/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/grub2/options.mk 2012/07/29 21:44:13 1.1
+++ pkgsrc/sysutils/grub2/options.mk 2014/09/05 12:14:24 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2012/07/29 21:44:13 gsutre Exp $ 1# $NetBSD: options.mk,v 1.2 2014/09/05 12:14:24 gsutre Exp $
2# 2#
3 3
4# 4#
5# Description of options (taken from configure --help): 5# Description of options (taken from configure --help):
6# debug include memory manager debugging 6# debug include memory manager debugging
7# freetype build and install the `grub-mkfont' utility 7# freetype build and install the `grub-mkfont' utility
8# 8#
9 9
10PKG_OPTIONS_VAR= PKG_OPTIONS.grub2 10PKG_OPTIONS_VAR= PKG_OPTIONS.grub2
11PKG_SUPPORTED_OPTIONS= debug freetype 11PKG_SUPPORTED_OPTIONS= debug freetype
12PKG_SUGGESTED_OPTIONS= freetype 12PKG_SUGGESTED_OPTIONS= freetype
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
@@ -21,21 +21,21 @@ SITES.${UNIFONT}.gz= http://unifoundry.c @@ -21,21 +21,21 @@ SITES.${UNIFONT}.gz= http://unifoundry.c
21post-extract: do-move-unifont 21post-extract: do-move-unifont
22.PHONY: do-move-unifont 22.PHONY: do-move-unifont
23 23
24.if !empty(PKG_OPTIONS:Mdebug) 24.if !empty(PKG_OPTIONS:Mdebug)
25CONFIGURE_ARGS+= --enable-mm-debug 25CONFIGURE_ARGS+= --enable-mm-debug
26.else 26.else
27CONFIGURE_ARGS+= --disable-mm-debug 27CONFIGURE_ARGS+= --disable-mm-debug
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Mfreetype) 30.if !empty(PKG_OPTIONS:Mfreetype)
31CONFIGURE_ARGS+= --enable-grub-mkfont 31CONFIGURE_ARGS+= --enable-grub-mkfont
32PLIST.freetype= yes 32PLIST.freetype= yes
33DISTFILES+= ${UNIFONT}.gz 33DISTFILES+= ${UNIFONT}.gz
34BUILD_DEPENDS+= dejavu-ttf>=2.30:../../fonts/dejavu-ttf 34BUILD_DEPENDS+= dejavu-ttf>=2.34nb1:../../fonts/dejavu-ttf
35do-move-unifont: 35do-move-unifont:
36 ${MV} ${WRKDIR}/${UNIFONT} ${WRKSRC}/unifont.pcf 36 ${MV} ${WRKDIR}/${UNIFONT} ${WRKSRC}/unifont.pcf
37.include "../../graphics/freetype2/buildlink3.mk" 37.include "../../graphics/freetype2/buildlink3.mk"
38.else 38.else
39CONFIGURE_ARGS+= --disable-grub-mkfont 39CONFIGURE_ARGS+= --disable-grub-mkfont
40do-move-unifont: 40do-move-unifont:
41.endif 41.endif
File Added: pkgsrc/sysutils/grub2/patches/Attic/patch-grub-core_lib_xzembed_xz__dec__lzma2.c
$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.
  */
File Added: pkgsrc/sysutils/grub2/patches/patch-util_getroot.c
$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;