[pkgsrc/trunk]: pkgsrc On NetBSD, recognize ld(4) disk devices attached to HW...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2582bfb70fa8
branches:  trunk
changeset: 502994:2582bfb70fa8
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Nov 12 06:35:24 2005 +0000

description:
On NetBSD, recognize ld(4) disk devices attached to HW raid controllers,
e.g. aac(4), amr(4), twe(4), etc., so that we can install grub onto
them.  Bump PKGREVISION of sysutils/grub to 0.97nb3.

diffstat:

 doc/CHANGES                    |   3 ++-
 sysutils/grub/Makefile         |   4 ++--
 sysutils/grub/distinfo         |   4 ++--
 sysutils/grub/patches/patch-ai |  19 ++++++++++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 4386d9696680 -r 2582bfb70fa8 doc/CHANGES
--- a/doc/CHANGES       Sat Nov 12 06:23:40 2005 +0000
+++ b/doc/CHANGES       Sat Nov 12 06:35:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11899 2005/11/12 04:15:12 minskim Exp $
+$NetBSD: CHANGES,v 1.11900 2005/11/12 06:35:27 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -5177,3 +5177,4 @@
        Updated databases/py-psycopg to 1.1.21 [joerg 2005-11-11]
        Updated multimedia/vlc to 0.7.2nb6 [wiz 2005-11-11]
        Added mail/esmtp version 0.5.1 [minskim 2005-11-12]
+       Updated sysutils/grub to 0.97nb3 [jlam 2005-11-12]
diff -r 4386d9696680 -r 2582bfb70fa8 sysutils/grub/Makefile
--- a/sysutils/grub/Makefile    Sat Nov 12 06:23:40 2005 +0000
+++ b/sysutils/grub/Makefile    Sat Nov 12 06:35:24 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2005/09/24 00:20:44 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/11/12 06:35:24 jlam Exp $
 #
 
 DISTNAME=      grub-0.97
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://alpha.gnu.org/gnu/grub/
 
diff -r 4386d9696680 -r 2582bfb70fa8 sysutils/grub/distinfo
--- a/sysutils/grub/distinfo    Sat Nov 12 06:23:40 2005 +0000
+++ b/sysutils/grub/distinfo    Sat Nov 12 06:35:24 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2005/10/23 19:53:24 rillig Exp $
+$NetBSD: distinfo,v 1.18 2005/11/12 06:35:24 jlam Exp $
 
 SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb
 RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0
@@ -6,5 +6,5 @@
 SHA1 (patch-ac) = c2c657af9b4ed15991d642a1359cb65d61662df6
 SHA1 (patch-ad) = 613e915a015ad22c9bd5712d416e12b1b81fdb93
 SHA1 (patch-ae) = 96d8283e90ceb3e887ba0ada05619858c52bc144
-SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
+SHA1 (patch-ai) = 60088cf6786a364da37e19fbb5df4c6fd7641016
 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
diff -r 4386d9696680 -r 2582bfb70fa8 sysutils/grub/patches/patch-ai
--- a/sysutils/grub/patches/patch-ai    Sat Nov 12 06:23:40 2005 +0000
+++ b/sysutils/grub/patches/patch-ai    Sat Nov 12 06:35:24 2005 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-ai,v 1.1 2003/07/13 17:35:05 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2005/11/12 06:35:24 jlam Exp $
 
---- util/grub-install.in.orig  Mon May 20 13:21:50 2002
+--- util/grub-install.in.orig  2004-07-24 14:57:31.000000000 -0400
 +++ util/grub-install.in
-@@ -297,7 +297,7 @@ fi
+@@ -119,10 +119,10 @@ convert () {
+                   | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"`
+       ;;
+     netbsd* | knetbsd*-gnu)
+-      tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([sw]d[0-9]*\).*$%r\1d%' \
++      tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([lsw]d[0-9]*\).*$%r\1d%' \
+           | sed 's%r\{0,1\}\(fd[0-9]*\).*$%r\1a%'`
+       tmp_part=`echo "$1" \
+-          | sed "s%.*/r\{0,1\}[sw]d[0-9]\([abe-p]\)%\1%"`
++          | sed "s%.*/r\{0,1\}[lsw]d[0-9]\([abe-p]\)%\1%"`
+       ;;
+     *)
+       echo "grub-install does not support your OS yet." 1>&2
+@@ -321,7 +321,7 @@ fi
  # Stage 1.5 does not exist.
  
  # Create the GRUB directory if it is not present.