[pkgsrc/trunk]: pkgsrc/devel/cpuflags Fix an Athlon detection glitch: the "At...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b49bbb60e596
branches:  trunk
changeset: 462921:b49bbb60e596
user:      rh <rh%pkgsrc.org@localhost>
date:      Sun Oct 19 00:24:28 2003 +0000

description:
Fix an Athlon detection glitch: the "Athlon Model 1" is neither an
"Athlon MP" nor a "Pentium Pro".  Correct this by testing for the special
cases first rather than trying to be clever in the generic test.
Bump package version to 0.58

diffstat:

 devel/cpuflags/Makefile              |  4 ++--
 devel/cpuflags/files/cpuflags.NetBSD |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 6458c3f17568 -r b49bbb60e596 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Sat Oct 18 23:25:36 2003 +0000
+++ b/devel/cpuflags/Makefile   Sun Oct 19 00:24:28 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2003/10/02 16:10:00 abs Exp $
+# $NetBSD: Makefile,v 1.61 2003/10/19 00:24:28 rh Exp $
 #
 
-DISTNAME=      cpuflags-0.57
+DISTNAME=      cpuflags-0.58
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 6458c3f17568 -r b49bbb60e596 devel/cpuflags/files/cpuflags.NetBSD
--- a/devel/cpuflags/files/cpuflags.NetBSD      Sat Oct 18 23:25:36 2003 +0000
+++ b/devel/cpuflags/files/cpuflags.NetBSD      Sun Oct 19 00:24:28 2003 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.42 2003/10/02 16:10:00 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.43 2003/10/19 00:24:28 rh Exp $
 
 if [ -x /sbin/sysctl ] ;then
     SYSCTL=/sbin/sysctl
@@ -66,10 +66,10 @@
        *AMD\ K6-2*)            FLAGS='-march=k6-2'             ;;
        *AMD\ K6*)              FLAGS='-march=k6'               ;;
        *AMD\ Duron*)           FLAGS='-march=athlon'           ;;
-       *AMD\ K7*|*AMD\ Athlon*^[4XM]*) FLAGS='-march=athlon'   ;;
        *AMD\ Athlon\ 4*)       FLAGS='-march=athlon-4'         ;;
        *AMD\ Athlon\ MP*)      FLAGS='-march=athlon-mp'        ;;
        *AMD\ Athlon\ XP*)      FLAGS='-march=athlon-xp'        ;;
+       *AMD\ K7*|*AMD\ Athlon*) FLAGS='-march=athlon'          ;;
        *386-class*)            FLAGS='-march=i386'             ;;
        *486-class*)            FLAGS='-march=i486'             ;;
        *586-class*)            FLAGS='-march=pentium'          ;;