Sun Feb 21 16:44:52 2010 UTC ()
Apply patch:
Fix problem with systems with more than 2 GB memory (notably,
x86_64-based systems).  Thanks Goswin Brederlow.

>From Debian via Andrew Daugherity in PR 36627.

Bump PKGREVISION.

pkglint cleanup while here.


(wiz)
diff -r1.53 -r1.54 pkgsrc/sysutils/grub/Makefile
diff -r1.22 -r1.23 pkgsrc/sysutils/grub/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/grub/patches/patch-ae
diff -r0 -r1.3 pkgsrc/sysutils/grub/patches/patch-an
cvs diff -r1.53 -r1.54 pkgsrc/sysutils/grub/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/grub/Makefile 2010/01/22 00:27:36 1.53
+++ pkgsrc/sysutils/grub/Makefile 2010/02/21 16:44:52 1.54
@@ -1,63 +1,66 @@ @@ -1,63 +1,66 @@
1# $NetBSD: Makefile,v 1.53 2010/01/22 00:27:36 heinz Exp $ 1# $NetBSD: Makefile,v 1.54 2010/02/21 16:44:52 wiz Exp $
2 2
3DISTNAME= grub-0.97 3DISTNAME= grub-0.97
4PKGREVISION= 8 4PKGREVISION= 9
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ 6MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/grub/ 9HOMEPAGE= http://www.gnu.org/software/grub/
10COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2 10COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15ONLY_FOR_PLATFORM= *-*-i386 NetBSD-[5-9].*-x86_64 15ONLY_FOR_PLATFORM= *-*-i386 NetBSD-[5-9].*-x86_64
16 16
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18USE_TOOLS+= gmake 18USE_TOOLS+= gmake
19INFO_FILES= # PLIST 19INFO_FILES= YES
 20
 21INSTALLATION_DIRS= share/doc/grub
20 22
21BUILDLINK_TRANSFORM+= opt:-fno-builtin:-ffreestanding 23BUILDLINK_TRANSFORM+= opt:-fno-builtin:-ffreestanding
22 24
23.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
24 26
25BUILD_DEFS+= GRUB_NETWORK_CARDS 27BUILD_DEFS+= GRUB_NETWORK_CARDS
26BUILD_DEFS+= GRUB_PRESET_COMMAND 28BUILD_DEFS+= GRUB_PRESET_COMMAND
27BUILD_DEFS+= GRUB_SCAN_ARGS 29BUILD_DEFS+= GRUB_SCAN_ARGS
28 30
29.include "../../mk/curses.buildlink3.mk" 31.include "../../mk/curses.buildlink3.mk"
30 32
31PLIST_VARS+= netboot 33PLIST_VARS+= netboot
32.if defined(GRUB_NETWORK_CARDS) 34.if defined(GRUB_NETWORK_CARDS)
33CONFIGURE_ARGS+= --enable-diskless 35CONFIGURE_ARGS+= --enable-diskless
34PLIST.netboot= yes 36PLIST.netboot= yes
35 37
36.for nic in ${GRUB_NETWORK_CARDS} 38.for nic in ${GRUB_NETWORK_CARDS}
37CONFIGURE_ARGS+= --enable-${nic} 39CONFIGURE_ARGS+= --enable-${nic}
38.endfor 40.endfor
39 41
40post-install: grub-netboot-install 42post-install: grub-netboot-install
 43.PHONY: grub-netboot-install
41grub-netboot-install: 44grub-netboot-install:
42 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub 
43 ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ 45 ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \
44 ${PREFIX}/share/doc/grub 46 ${PREFIX}/share/doc/grub
45.endif 47.endif
46 48
47.if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND) 49.if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND)
48CONFIGURE_ARGS+= --enable-preset-menu=${WRKSRC}/presetmenu 50CONFIGURE_ARGS+= --enable-preset-menu=${WRKSRC}/presetmenu
49 51
50post-extract: grub-presetmenu 52post-extract: grub-presetmenu
 53.PHONY: grub-presetmenu
51grub-presetmenu: 54grub-presetmenu:
52 ${ECHO} ${GRUB_PRESET_COMMAND} > ${WRKSRC}/presetmenu 55 ${ECHO} ${GRUB_PRESET_COMMAND} > ${WRKSRC}/presetmenu
53.endif 56.endif
54 57
55.if defined(GRUB_SCAN_ARGS) 58.if defined(GRUB_SCAN_ARGS)
56CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS} 59CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
57.endif 60.endif
58 61
59SUBST_CLASSES+= grubterm 62SUBST_CLASSES+= grubterm
60SUBST_STAGE.grubterm= post-patch 63SUBST_STAGE.grubterm= post-patch
61SUBST_MESSAGE.grubterm= Changing references to <term.h> to <grubterm.h> 64SUBST_MESSAGE.grubterm= Changing references to <term.h> to <grubterm.h>
62SUBST_FILES.grubterm= grub/*.c stage2/Makefile.in stage2/*.c 65SUBST_FILES.grubterm= grub/*.c stage2/Makefile.in stage2/*.c
63SUBST_SED.grubterm= -e "s,<term.h>,<grubterm.h>,g" 66SUBST_SED.grubterm= -e "s,<term.h>,<grubterm.h>,g"
cvs diff -r1.22 -r1.23 pkgsrc/sysutils/grub/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/grub/distinfo 2007/06/25 13:05:56 1.22
+++ pkgsrc/sysutils/grub/distinfo 2010/02/21 16:44:52 1.23
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.22 2007/06/25 13:05:56 tron Exp $ 1$NetBSD: distinfo,v 1.23 2010/02/21 16:44:52 wiz Exp $
2 2
3SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb 3SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb
4RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 4RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0
5Size (grub-0.97.tar.gz) = 971783 bytes 5Size (grub-0.97.tar.gz) = 971783 bytes
6SHA1 (patch-aa) = 2fd8872e6e3d3912d41d3eb8dff9371320a53bf3 6SHA1 (patch-aa) = 2fd8872e6e3d3912d41d3eb8dff9371320a53bf3
7SHA1 (patch-ab) = 945ee0385d82f4ea98e86acfa449bcbf2a214285 7SHA1 (patch-ab) = 945ee0385d82f4ea98e86acfa449bcbf2a214285
8SHA1 (patch-ac) = dc7774a09ca88f6696e0680a7be39df56244eedc 8SHA1 (patch-ac) = dc7774a09ca88f6696e0680a7be39df56244eedc
9SHA1 (patch-ad) = 613e915a015ad22c9bd5712d416e12b1b81fdb93 9SHA1 (patch-ad) = 613e915a015ad22c9bd5712d416e12b1b81fdb93
10SHA1 (patch-ae) = 96d8283e90ceb3e887ba0ada05619858c52bc144 10SHA1 (patch-ae) = 9e41bd80a6aed16d7d638c808d81c34f4114578a
11SHA1 (patch-af) = 9447ead52940203c998afb67e38ae3d3d26097f8 11SHA1 (patch-af) = 9447ead52940203c998afb67e38ae3d3d26097f8
12SHA1 (patch-ag) = 1dd709652d457ba03dda47b64d22cd9320f81e26 12SHA1 (patch-ag) = 1dd709652d457ba03dda47b64d22cd9320f81e26
13SHA1 (patch-ah) = ff62b64177a0e68400c32e013cb585526db94217 13SHA1 (patch-ah) = ff62b64177a0e68400c32e013cb585526db94217
14SHA1 (patch-ai) = 60088cf6786a364da37e19fbb5df4c6fd7641016 14SHA1 (patch-ai) = 60088cf6786a364da37e19fbb5df4c6fd7641016
15SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8 15SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
16SHA1 (patch-ak) = 8e67eb603e639ca47536cb191e7e29ec48b95642 16SHA1 (patch-ak) = 8e67eb603e639ca47536cb191e7e29ec48b95642
17SHA1 (patch-al) = 58761e867ff182ad46c42b15575395ba8c38fbd6 17SHA1 (patch-al) = 58761e867ff182ad46c42b15575395ba8c38fbd6
18SHA1 (patch-am) = d848f67f7f21fa076751d14bd3235ae7351be1b7 18SHA1 (patch-am) = d848f67f7f21fa076751d14bd3235ae7351be1b7
 19SHA1 (patch-an) = b86401eceed91ff49a00a1e2a7aa49009e01a875
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/grub/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/sysutils/grub/patches/patch-ae 2005/08/21 15:08:46 1.3
+++ pkgsrc/sysutils/grub/patches/patch-ae 2010/02/21 16:44:52 1.4
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-ae,v 1.3 2005/08/21 15:08:46 jmmv Exp $ 1$NetBSD: patch-ae,v 1.4 2010/02/21 16:44:52 wiz Exp $
2 2
3--- stage2/shared.h 2004-06-19 18:40:09.000000000 +0200 3--- stage2/shared.h 2004-06-19 18:40:09.000000000 +0200
4+++ stage2/shared.h 2005-07-25 21:33:19.000000000 +0200 4+++ stage2/shared.h 2005-07-25 21:33:19.000000000 +0200
 5@@ -911,7 +911,7 @@ int substring (const char *s1, const cha
 6 int nul_terminate (char *str);
 7 int get_based_digit (int c, int base);
 8 int safe_parse_maxint (char **str_ptr, int *myint_ptr);
 9-int memcheck (int start, int len);
 10+int memcheck (unsigned long int start, unsigned long int len);
 11 void grub_putstr (const char *str);
 12
 13 #ifndef NO_DECOMPRESSION
5@@ -975,6 +975,8 @@ 14@@ -975,6 +975,8 @@
6 #ifndef STAGE1_5 15 #ifndef STAGE1_5
7 void bsd_boot (kernel_t type, int bootdev, char *arg) 16 void bsd_boot (kernel_t type, int bootdev, char *arg)
8 __attribute__ ((noreturn)); 17 __attribute__ ((noreturn));
9+int freebsd_value(char arg); 18+int freebsd_value(char arg);
10+int netbsd_value(char arg); 19+int netbsd_value(char arg);
11  20
12 /* Define flags for load_image here. */ 21 /* Define flags for load_image here. */
13 /* Don't pass a Linux's mem option automatically. */ 22 /* Don't pass a Linux's mem option automatically. */
File Added: pkgsrc/sysutils/grub/patches/patch-an
$NetBSD: patch-an,v 1.3 2010/02/21 16:44:52 wiz Exp $

--- stage2/char_io.c
+++ stage2/char_io.c
@@ -1175,13 +1175,13 @@
 #endif /* ! STAGE1_5 */
 
 int
-memcheck (int addr, int len)
+memcheck (unsigned long int addr, unsigned long int len)
 {
 #ifdef GRUB_UTIL
-  auto int start_addr (void);
-  auto int end_addr (void);
+  auto unsigned long int start_addr (void);
+  auto int unsigned long end_addr (void);
   
-  auto int start_addr (void)
+  auto unsigned long int start_addr (void)
     {
       int ret;
 # if defined(HAVE_START_SYMBOL)
@@ -1192,7 +1192,7 @@
       return ret;
     }

-  auto int end_addr (void)
+  auto unsigned long int end_addr (void)
     {
       int ret;
 # if defined(HAVE_END_SYMBOL)