Update to 0.96:

New in 0.96 - 2005-01-30:
* The command "fallback" supports mutiple fallback entries.
* The command "savedefault" supports an optional argument which
  is the number of next boot entry or the special keyword `fallback'.
* New utility "grub-set-default".
* New section "Making your system robust" in the manual.

4 files changed, 28 insertions, 30 deletions

diff --git a/sysutils/grub/MESSAGE b/sysutils/grub/MESSAGE
index 43b9c8cc2bd..b230b78c098 100644
--- a/sysutils/grub/MESSAGE
+++ b/sysutils/grub/MESSAGE
@@ -1,11 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/12/29 14:38:18 hubertf Exp $
+$NetBSD: MESSAGE,v 1.5 2005/02/19 10:23:13 wiz Exp $
 
-Because NetBSD already uses /boot for a different purpose, this
-version of GRUB has been compiled to look in /grub for its files
-(specifically, menu.lst and the loaders).  If your root filesystem
-is of a type not supported directly by grub (e.g., lfs), you may
-have difficulties.  See the info docs for more details.
+If your root filesystem is of a type not supported directly by grub
+(e.g., lfs), you may have difficulties.  See the info docs for more
+details.
 
 GRUB is not actually installed on your disk until you run a command
 such as
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 92a4649ae2b..f47418b7781 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/10/03 00:18:15 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/02/19 10:23:13 wiz Exp $
 #
 
-DISTNAME=	grub-0.95
-PKGREVISION=	2
+DISTNAME=	grub-0.96
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://alpha.gnu.org/gnu/grub/
 
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
index e61774daee0..1a8c3a94a54 100644
--- a/sysutils/grub/PLIST
+++ b/sysutils/grub/PLIST
@@ -1,30 +1,31 @@
-@comment $NetBSD: PLIST,v 1.11 2004/08/02 16:47:40 recht Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/02/19 10:23:13 wiz Exp $
 bin/mbchk
 man/man1/mbchk.1
 man/man8/grub-install.8
 man/man8/grub-md5-crypt.8
 man/man8/grub-terminfo.8
 man/man8/grub.8
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/e2fs_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/fat_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ffs_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/iso9660_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/jfs_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/minix_stage1_5
+${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub
+${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/reiserfs_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage1
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2_eltorito
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ufs2_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/vstafs_stage1_5
+lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/xfs_stage1_5
 sbin/grub
 sbin/grub-install
 sbin/grub-md5-crypt
+sbin/grub-set-default
 sbin/grub-terminfo
 ${NETBOOT}share/doc/grub/README.netboot
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/e2fs_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/fat_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ffs_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/iso9660_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/jfs_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/minix_stage1_5
-${NETBOOT}share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub
-${NETBOOT}share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/reiserfs_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage1
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2_eltorito
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ufs2_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/vstafs_stage1_5
-share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/xfs_stage1_5
-@dirrm share/grub/${MACHINE_ARCH}-${LOWER_VENDOR}
-@dirrm share/grub
+@dirrm lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}
+@dirrm lib/grub
 ${NETBOOT}@dirrm share/doc/grub
diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
index 396f5048f5b..4ef23d00dea 100644
--- a/sysutils/grub/distinfo
+++ b/sysutils/grub/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2004/06/20 20:57:17 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2005/02/19 10:23:13 wiz Exp $
 
-SHA1 (grub-0.95.tar.gz) = 826d13f21f9a8574d2850d9434f8580f5830c717
-Size (grub-0.95.tar.gz) = 976017 bytes
+SHA1 (grub-0.96.tar.gz) = 2520b03c8990ffe900cfc4fabd800d1056014f48
+Size (grub-0.96.tar.gz) = 985761 bytes
 SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
 SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
 SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba