From f860aa0fbbaa133ec8341fdb111c178ac8f904a0 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 11 Apr 2006 14:35:48 +0000
Subject: [PATCH] Don't use the carat (^) in class matches, as it is not
 supported by some shells. Use precendency order instead.

Should fix PR 33236.
---
 bootstrap/bootstrap   | 7 +++++--
 bootstrap/mkbinarykit | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index d552ac0c9f25..e1848e37e7a0 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -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 @@ DragonFly)
 	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 --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit
index 54a69f896561..4613480da436 100755
--- a/bootstrap/mkbinarykit
+++ b/bootstrap/mkbinarykit
@@ -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 @@ AIX)
 	;;
 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
 		;;