diff options
| -rw-r--r-- | sysutils/grub/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/grub/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/grub/patches/patch-ae | 11 | ||||
| -rw-r--r-- | sysutils/grub/patches/patch-an | 31 |
4 files changed, 51 insertions, 7 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 964151a97b8..08269091cd4 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2010/01/22 00:27:36 heinz Exp $ +# $NetBSD: Makefile,v 1.54 2010/02/21 16:44:52 wiz Exp $ DISTNAME= grub-0.97 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ @@ -16,7 +16,9 @@ ONLY_FOR_PLATFORM= *-*-i386 NetBSD-[5-9].*-x86_64 GNU_CONFIGURE= YES USE_TOOLS+= gmake -INFO_FILES= # PLIST +INFO_FILES= YES + +INSTALLATION_DIRS= share/doc/grub BUILDLINK_TRANSFORM+= opt:-fno-builtin:-ffreestanding @@ -38,8 +40,8 @@ CONFIGURE_ARGS+= --enable-${nic} .endfor post-install: grub-netboot-install +.PHONY: grub-netboot-install grub-netboot-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ ${PREFIX}/share/doc/grub .endif @@ -48,6 +50,7 @@ grub-netboot-install: CONFIGURE_ARGS+= --enable-preset-menu=${WRKSRC}/presetmenu post-extract: grub-presetmenu +.PHONY: grub-presetmenu grub-presetmenu: ${ECHO} ${GRUB_PRESET_COMMAND} > ${WRKSRC}/presetmenu .endif diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index 5b5774d8c98..9733ebc59f6 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2007/06/25 13:05:56 tron Exp $ +$NetBSD: distinfo,v 1.23 2010/02/21 16:44:52 wiz Exp $ SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 2fd8872e6e3d3912d41d3eb8dff9371320a53bf3 SHA1 (patch-ab) = 945ee0385d82f4ea98e86acfa449bcbf2a214285 SHA1 (patch-ac) = dc7774a09ca88f6696e0680a7be39df56244eedc SHA1 (patch-ad) = 613e915a015ad22c9bd5712d416e12b1b81fdb93 -SHA1 (patch-ae) = 96d8283e90ceb3e887ba0ada05619858c52bc144 +SHA1 (patch-ae) = 9e41bd80a6aed16d7d638c808d81c34f4114578a SHA1 (patch-af) = 9447ead52940203c998afb67e38ae3d3d26097f8 SHA1 (patch-ag) = 1dd709652d457ba03dda47b64d22cd9320f81e26 SHA1 (patch-ah) = ff62b64177a0e68400c32e013cb585526db94217 @@ -16,3 +16,4 @@ SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8 SHA1 (patch-ak) = 8e67eb603e639ca47536cb191e7e29ec48b95642 SHA1 (patch-al) = 58761e867ff182ad46c42b15575395ba8c38fbd6 SHA1 (patch-am) = d848f67f7f21fa076751d14bd3235ae7351be1b7 +SHA1 (patch-an) = b86401eceed91ff49a00a1e2a7aa49009e01a875 diff --git a/sysutils/grub/patches/patch-ae b/sysutils/grub/patches/patch-ae index cc81f13a5cc..d4fcd71ef44 100644 --- a/sysutils/grub/patches/patch-ae +++ b/sysutils/grub/patches/patch-ae @@ -1,7 +1,16 @@ -$NetBSD: patch-ae,v 1.3 2005/08/21 15:08:46 jmmv Exp $ +$NetBSD: patch-ae,v 1.4 2010/02/21 16:44:52 wiz Exp $ --- stage2/shared.h 2004-06-19 18:40:09.000000000 +0200 +++ stage2/shared.h 2005-07-25 21:33:19.000000000 +0200 +@@ -911,7 +911,7 @@ int substring (const char *s1, const cha + int nul_terminate (char *str); + int get_based_digit (int c, int base); + int safe_parse_maxint (char **str_ptr, int *myint_ptr); +-int memcheck (int start, int len); ++int memcheck (unsigned long int start, unsigned long int len); + void grub_putstr (const char *str); + + #ifndef NO_DECOMPRESSION @@ -975,6 +975,8 @@ #ifndef STAGE1_5 void bsd_boot (kernel_t type, int bootdev, char *arg) diff --git a/sysutils/grub/patches/patch-an b/sysutils/grub/patches/patch-an new file mode 100644 index 00000000000..49bb1f1b4d9 --- /dev/null +++ b/sysutils/grub/patches/patch-an @@ -0,0 +1,31 @@ +$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) |