[pkgsrc/trunk]: pkgsrc/bootstrap Don't use the carat (^) in class matches, as...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5316d81a2767
branches:  trunk
changeset: 511201:5316d81a2767
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 11 14:35:48 2006 +0000

description:
Don't use the carat (^) in class matches, as it is not supported by
some shells. Use precendency order instead.

Should fix PR 33236.

diffstat:

 bootstrap/bootstrap   |  7 +++++--
 bootstrap/mkbinarykit |  6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r d59c60dd60dc -r 5316d81a2767 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Apr 11 14:13:21 2006 +0000
+++ b/bootstrap/bootstrap       Tue Apr 11 14:35:48 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.49 2006/04/10 18:29:24 joerg Exp $
+# $NetBSD: bootstrap,v 1.50 2006/04/11 14:35:48 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -317,7 +317,10 @@
        check_prog mtreeprog mtree
        machine_arch=`uname -p`
        case `uname -r` in
-       1.0* | 1.1 | 1.1[^0-9]* | 1.2.* | 1.3.*)
+       1.1[0-9]*)
+               [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"
+               ;;
+       1.0* | 1.1 | 1.2.* | 1.3.*)
                ;;
        *)
                [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"
diff -r d59c60dd60dc -r 5316d81a2767 bootstrap/mkbinarykit
--- a/bootstrap/mkbinarykit     Tue Apr 11 14:13:21 2006 +0000
+++ b/bootstrap/mkbinarykit     Tue Apr 11 14:35:48 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: mkbinarykit,v 1.14 2006/04/10 18:29:24 joerg Exp $
+# $NetBSD: mkbinarykit,v 1.15 2006/04/11 14:35:48 joerg Exp $
 #
 # Make a binary bootstrap kit and place it in targetdir (or current
 # working directory if not specified). The mk.conf.example file is
@@ -41,7 +41,9 @@
        ;;
 DragonFly)
        case "$osrev" in
-       1.0* | 1.1 | 1.1[^0-9]* | 1.2.* | 1.3.*)
+       1.1[0-9]*)
+               ;;
+       1.0* | 1.1 | 1.2.* | 1.3.*)
                # Don't use the ports /var/db/pkg
                pkgdbdir=$prefix/pkgdb
                ;;