diff options
| author | joerg <joerg@pkgsrc.org> | 2006-04-11 14:35:48 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-04-11 14:35:48 +0000 |
| commit | f860aa0fbbaa133ec8341fdb111c178ac8f904a0 (patch) | |
| tree | 3ccd5de3f33dee73b149414961d8e83b15c3f60b /bootstrap | |
| parent | 82136ee63dd21a93ecff37a5572eb5aff78a7a60 (diff) | |
| download | pkgsrc-f860aa0fbbaa133ec8341fdb111c178ac8f904a0.tar.gz | |
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 (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 7 | ||||
| -rwxr-xr-x | bootstrap/mkbinarykit | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index d552ac0c9f2..e1848e37e7a 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 54a69f89656..4613480da43 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 ;; |