6 files changed, 66 insertions, 22 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 12b4320c2e0..58bc610db89 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 16:36:03 mrauch Exp $
 #
 
 DISTNAME=	grub-0.93
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 
diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
index c4f342e35f7..ebe9340a766 100644
--- a/sysutils/grub/distinfo
+++ b/sysutils/grub/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/10/26 12:28:50 mrauch Exp $
+$NetBSD: distinfo,v 1.7 2004/01/24 16:36:03 mrauch Exp $
 
 SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8
 Size (grub-0.93.tar.gz) = 891032 bytes
@@ -13,4 +13,6 @@ SHA1 (patch-ah) = cecaf3e1510a3fdba2d3412b59c434d5d247b11b
 SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
 SHA1 (patch-ak) = 24d59bdc00b35dee736196fcb937a4142c3392ca
-SHA1 (patch-al) = 1ec528662029be190c963e0425effb5bb54f1dcf
+SHA1 (patch-am) = b1fd1977b97dd7aa8056eeaa5beecb624b3374d0
+SHA1 (patch-an) = 64150a001f39d32f0c867b9818fcef4a8cd649b2
+SHA1 (patch-ao) = 59532f4f268286cedf8344df1ce34f57305fd994
diff --git a/sysutils/grub/patches/patch-al b/sysutils/grub/patches/patch-al
deleted file mode 100644
index fdba7e4824d..00000000000
--- a/sysutils/grub/patches/patch-al
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-al,v 1.1 2003/10/26 12:28:50 mrauch Exp $
-
---- stage2/char_io.c.orig	2002-12-03 00:49:07.000000000 +0100
-+++ stage2/char_io.c
-@@ -1257,6 +1257,13 @@ grub_memset (void *start, int c, int len
-   return errnum ? NULL : start;
- }
- 
-+#undef memcpy
-+void *
-+memcpy (void *to, const void *from, int len)
-+{
-+return grub_memmove (to, from, len);
-+} 
-+
- #ifndef STAGE1_5
- char *
- grub_strcpy (char *dest, const char *src)
diff --git a/sysutils/grub/patches/patch-am b/sysutils/grub/patches/patch-am
new file mode 100644
index 00000000000..cbe25820330
--- /dev/null
+++ b/sysutils/grub/patches/patch-am
@@ -0,0 +1,19 @@
+$NetBSD: patch-am,v 1.1 2004/01/24 16:36:03 mrauch Exp $
+
+--- stage2/builtins.c.orig	2002-12-04 05:41:57.000000000 +0100
++++ stage2/builtins.c
+@@ -4202,12 +4202,12 @@ terminfo_func (char *arg, int flags)
+ 	  return errnum;
+ 	}
+ 
+-      ti_set_term (term);
++      ti_set_term (&term);
+     }
+   else
+     {
+       /* No option specifies printing out current settings.  */
+-      term = ti_get_term ();
++      ti_get_term (&term);
+ 
+       grub_printf ("name=%s\n", term.name);
+       grub_printf ("cursor_address=%s\n", term.cursor_address);
diff --git a/sysutils/grub/patches/patch-an b/sysutils/grub/patches/patch-an
new file mode 100644
index 00000000000..3194e5ff58f
--- /dev/null
+++ b/sysutils/grub/patches/patch-an
@@ -0,0 +1,26 @@
+$NetBSD: patch-an,v 1.1 2004/01/24 16:36:03 mrauch Exp $
+
+--- stage2/terminfo.c.orig	2002-11-29 20:07:38.000000000 +0100
++++ stage2/terminfo.c
+@@ -245,15 +245,15 @@ ti_exit_standout_mode (void)
+ 
+ /* set the current terminal emulation to use */
+ void 
+-ti_set_term (struct terminfo new)
++ti_set_term (const struct terminfo *new)
+ {
+-  term = new;
++  grub_memmove (&term, new, sizeof (struct terminfo));
+ }
+ 
+-/* return the current terminal emulation */
+-struct terminfo
+-ti_get_term(void)
++/* get the current terminal emulation */
++void
++ti_get_term(struct terminfo *copy)
+ {
+-  return term;
++  grub_memmove (copy, &term, sizeof (struct terminfo));
+ }
+ 
diff --git a/sysutils/grub/patches/patch-ao b/sysutils/grub/patches/patch-ao
new file mode 100644
index 00000000000..d68ee278905
--- /dev/null
+++ b/sysutils/grub/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2004/01/24 16:36:03 mrauch Exp $
+
+--- stage2/terminfo.h.orig	2002-11-29 20:07:14.000000000 +0100
++++ stage2/terminfo.h
+@@ -40,8 +40,8 @@ char *ti_escape_string (const char *in);
+ char *ti_unescape_memory (const char *in, const char *end);
+ char *ti_unescape_string (const char *in);
+ 
+-void ti_set_term (struct terminfo term);
+-struct terminfo ti_get_term (void);
++void ti_set_term (const struct terminfo *new);
++void ti_get_term (struct terminfo *copy);
+ 
+ void ti_cursor_address (int x, int y);
+ void ti_clear_screen (void);