[pkgsrc/trunk]: pkgsrc/devel/cpuflags Updated devel/cpuflags to 1.39

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c07018421dd
branches:  trunk
changeset: 555506:7c07018421dd
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Mar 04 00:32:44 2009 +0000

description:
Updated devel/cpuflags to 1.39

- Add "Intel(r) Xeon(r) CPU           E5430" and strip leading whitespace from
  Solaris psrinfo output - from Jim Wise
- Add "Intel(R) Xeon(R) CPU           E5310" - from Felix Resch
- Add "Genuine Intel(R) CPU           T2500" - from Daniel Carosone

diffstat:

 devel/cpuflags/Makefile         |  4 ++--
 devel/cpuflags/files/subr_SunOS |  5 +++--
 devel/cpuflags/files/subr_x86   |  7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diffs (65 lines):

diff -r 15b7330bcc62 -r 7c07018421dd devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Wed Mar 04 00:09:30 2009 +0000
+++ b/devel/cpuflags/Makefile   Wed Mar 04 00:32:44 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.144 2009/02/02 17:09:46 abs Exp $
+# $NetBSD: Makefile,v 1.145 2009/03/04 00:32:44 abs Exp $
 
-DISTNAME=      cpuflags-1.38
+DISTNAME=      cpuflags-1.39
 CATEGORIES=    devel sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 15b7330bcc62 -r 7c07018421dd devel/cpuflags/files/subr_SunOS
--- a/devel/cpuflags/files/subr_SunOS   Wed Mar 04 00:09:30 2009 +0000
+++ b/devel/cpuflags/files/subr_SunOS   Wed Mar 04 00:32:44 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subr_SunOS,v 1.4 2009/01/28 23:30:50 abs Exp $
+# $NetBSD: subr_SunOS,v 1.5 2009/03/04 00:32:44 abs Exp $
 
 AWK=nawk
 SED=sed
@@ -15,7 +15,8 @@
 extract_hw_details()
     {
     hw_arch=$(/usr/bin/uname -m)
-    hw_psrinfo=$(psrinfo -pv | $AWK 'NR==3{print}') # Just gets the first CPU
+    # Just gets the first CPU
+    hw_psrinfo=$(psrinfo -pv | $AWK 'NR==3{sub(" *","");print}')
     }
 
 determine_arch()
diff -r 15b7330bcc62 -r 7c07018421dd devel/cpuflags/files/subr_x86
--- a/devel/cpuflags/files/subr_x86     Wed Mar 04 00:09:30 2009 +0000
+++ b/devel/cpuflags/files/subr_x86     Wed Mar 04 00:32:44 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: subr_x86,v 1.11 2009/02/02 17:09:46 abs Exp $
+# $NetBSD: subr_x86,v 1.12 2009/03/04 00:32:44 abs Exp $
 
 # Apparently the only way to reliably determine the architecture of a recent
 # Intel CPU is to use the cpu brand string - as they reused family and
@@ -29,13 +29,14 @@
        "VIA Nehemiah"*)                        echo '-march=c3' ;;
 
        "Genuine Intel(R) CPU           T2400"*) echo '-march=core2' ;;
+       "Genuine Intel(R) CPU           T2500"*) echo '-march=core2' ;;
        "Intel(R) Atom(TM) CPU N270 "*)         echo '-march=prescott' ;;#So far
        "Intel(R) Celeron(R) CPU        E1400"*) echo '-march=core2' ;;
        "Intel(R) Celeron(R) CPU 2.40GHz")      echo '-march=pentium4' ;;
        "Intel(R) Celeron(R) M processor "*)    echo '-march=pentium-m' ;;
        "Intel(R) Celeron(TM) CPU                1400MHz") echo '-march=pentium3' ;;
+       "Intel(R) Core 2 "*)                    echo '-march=core2' ;;
        "Intel(R) Core(TM)2 "*)                 echo '-march=core2' ;;
-       "Intel(R) Core 2 "*)                    echo '-march=core2' ;;
        "Intel(R) Pentium(R) 4 CPU"*)
            if [ -n "$cpu_feature_SSE3" ] ; then
                                                echo '-march=prescott'
@@ -45,6 +46,8 @@
        "Intel(R) Pentium(R) M processor "*)    echo '-march=pentium-m' ;;
        "Intel(R) Xeon(R) CPU            3040"*) echo '-march=core2' ;;
        "Intel(R) Xeon(R) CPU            3050"*) echo '-march=core2' ;;
+       "Intel(R) Xeon(R) CPU           E5310"*) echo '-march=core2' ;;
+       "Intel(r) Xeon(r) CPU           E5430"*) echo '-march=core2' ;;
        "Pentium(R) Dual-Core  CPU      E5200"*) echo '-march=core2' ;;
 
     esac