[pkgsrc/trunk]: pkgsrc/doc Update cpuflags to 0.79:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e99bc3a9f097
branches:  trunk
changeset: 486082:e99bc3a9f097
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Dec 22 15:12:18 2004 +0000

description:
Update cpuflags to 0.79:
    - Shuffle the various cpuflags.<OS> to group more common lines
    - Use nawk on solaris [Jonathan A. Kollasch PR pkg/26572]
    - Add Linux 'Intel(R) Pentium(R) 4 CPU'
    - Add NetBSD/i386 'AMD Athlon Model 4 (Thunderbird)' [Rob Quinn]
    - Add NetBSD/macppc 604e [John Klos]
    - Add NetBSD/chocolate [Al]

diffstat:

 devel/cpuflags/Makefile              |   4 ++--
 devel/cpuflags/files/cpuflags.Linux  |  29 ++++++++++++++++-------------
 devel/cpuflags/files/cpuflags.NetBSD |  28 ++++++++++++++++------------
 devel/cpuflags/files/cpuflags.SunOS  |  24 +++++++++++++-----------
 doc/CHANGES                          |   3 ++-
 5 files changed, 49 insertions(+), 39 deletions(-)

diffs (209 lines):

diff -r bbfe0f422b16 -r e99bc3a9f097 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Wed Dec 22 14:50:30 2004 +0000
+++ b/devel/cpuflags/Makefile   Wed Dec 22 15:12:18 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.81 2004/11/14 21:51:05 abs Exp $
+# $NetBSD: Makefile,v 1.82 2004/12/22 15:12:18 abs Exp $
 #
 
-DISTNAME=      cpuflags-0.78
+DISTNAME=      cpuflags-0.79
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r bbfe0f422b16 -r e99bc3a9f097 devel/cpuflags/files/cpuflags.Linux
--- a/devel/cpuflags/files/cpuflags.Linux       Wed Dec 22 14:50:30 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.Linux       Wed Dec 22 15:12:18 2004 +0000
@@ -1,16 +1,8 @@
 #!/bin/sh
-# $NetBSD: cpuflags.Linux,v 1.11 2004/11/14 21:51:05 abs Exp $
+# $NetBSD: cpuflags.Linux,v 1.12 2004/12/22 15:12:18 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
-if [ "$1" = -v ] ; then
-    shift
-    opt_v=1
-fi
-if [ -n "$1" ]; then
-    CC=$1
-else
-    CC=gcc
-fi
+AWK=awk
 
 display_hw_details()
     {
@@ -25,8 +17,8 @@
     echo "Unable to open /proc/cpuinfo"
     hw_model=Unknown
 else
-    hw_model=$(awk -F: '/^model name/{sub(" ","",$2);print $2;exit}' /proc/cpuinfo)
-    hw_flags=$(awk -F: '/^flags/{sub(" ","",$2);print $2;exit}' /proc/cpuinfo)
+    hw_model=$($AWK -F: '/^model name/{sub(" ","",$2);print $2;exit}' /proc/cpuinfo)
+    hw_flags=$($AWK -F: '/^flags/{sub(" ","",$2);print $2;exit}' /proc/cpuinfo)
 fi
 
 case $hw_machine_arch in
@@ -40,6 +32,7 @@
        "Celeron (Coppermine)")         FLAGS='-march=pentium3'         ;;
        "Pentium III (Coppermine)")     FLAGS='-march=pentium3'         ;;
        "Intel(R) Pentium(R) M processor"*) FLAGS='-march=pentium3m'    ;;
+       "Intel(R) Pentium(R) 4 CPU "*)  FLAGS='-march=pentium4'         ;;
        "Intel(R) Celeron(R) CPU "*)
            case "$hw_flags" in
                *" sse2 "*)
@@ -54,6 +47,16 @@
 ############
 # Everything from this point common between all cpuflags variants.
 
+if [ "$1" = -v ] ; then
+    shift
+    opt_v=1
+fi
+if [ -n "$1" ]; then
+    CC=$1
+else
+    CC=gcc
+fi
+
 if [ -n "$opt_v" ] ; then
     if [ -z "$NONE" ] ; then
        echo "CPUFLAGS=Unknown"
@@ -77,7 +80,7 @@
 
 if [ -n "$FLAGS" ]; then
     gcc_ver=`${CC} -dumpversion | sed 's/^egcs-//'`
-    FLAGS=`awk -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
+    FLAGS=`$AWK -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
        { if (gcc_ver < $1){map[$2] = ""$3} }
        END { while (flags in map) {flags = map[flags]} print flags }
        ' <<EOD
diff -r bbfe0f422b16 -r e99bc3a9f097 devel/cpuflags/files/cpuflags.NetBSD
--- a/devel/cpuflags/files/cpuflags.NetBSD      Wed Dec 22 14:50:30 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.NetBSD      Wed Dec 22 15:12:18 2004 +0000
@@ -1,16 +1,8 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.57 2004/11/14 21:51:05 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.58 2004/12/22 15:12:18 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
-if [ "$1" = -v ] ; then
-    shift
-    opt_v=1
-fi
-if [ -n "$1" ]; then
-    CC=$1
-else
-    CC=gcc
-fi
+AWK=awk
 
 display_hw_details()
     {
@@ -86,6 +78,7 @@
        *AMD\ K6*)                      FLAGS='-march=k6'               ;;
        *AMD\ Duron*)                   FLAGS='-march=athlon'           ;;
        *AMD\ Athlon\ 4*)               FLAGS='-march=athlon-4'         ;;
+       *AMD\ Athlon\ Model\ 4\ \(Thunderbird\)*) FLAGS='-march=athlon-tbird';;
        *AMD\ Athlon\ MP*)              FLAGS='-march=athlon-mp'        ;;
        *AMD\ K7\ \(Athlon\)\ XP\ *)    FLAGS='-march=athlon-xp'        ;;
        *AMD\ Athlon\ XP\ *)            FLAGS='-march=athlon-xp'        ;;
@@ -135,7 +128,8 @@
        603\ *)                 FLAGS='-mcpu=603'       ;; # Untested
        603e\ *|603ev\ *)       FLAGS='-mcpu=603e'      ;; # Umax C500 / PM4400
        604\ *)                 FLAGS='-mcpu=604'       ;; # Mac 8500
-       604ev\ *)               FLAGS='-mcpu=604e'      ;; # upgr B&W G3
+       604e\ *)                FLAGS='-mcpu=604e'      ;; # upgr B&W G3
+       604ev\ *)               FLAGS='-mcpu=604e'      ;; # usually 604e
        620\ *)                 FLAGS='-mcpu=620'       ;; # Untested
        7400\ *)                FLAGS='-mcpu=7400'      ;; # AGP G4/400 Mac
        7410\ *)                FLAGS='-mcpu=7400'      ;; # powerbook g4
@@ -173,6 +167,16 @@
 ############
 # Everything from this point common between all cpuflags variants.
 
+if [ "$1" = -v ] ; then
+    shift
+    opt_v=1
+fi
+if [ -n "$1" ]; then
+    CC=$1
+else
+    CC=gcc
+fi
+
 if [ -n "$opt_v" ] ; then
     if [ -z "$NONE" ] ; then
        echo "CPUFLAGS=Unknown"
@@ -196,7 +200,7 @@
 
 if [ -n "$FLAGS" ]; then
     gcc_ver=`${CC} -dumpversion | sed 's/^egcs-//'`
-    FLAGS=`awk -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
+    FLAGS=`$AWK -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
        { if (gcc_ver < $1){map[$2] = ""$3} }
        END { while (flags in map) {flags = map[flags]} print flags }
        ' <<EOD
diff -r bbfe0f422b16 -r e99bc3a9f097 devel/cpuflags/files/cpuflags.SunOS
--- a/devel/cpuflags/files/cpuflags.SunOS       Wed Dec 22 14:50:30 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.SunOS       Wed Dec 22 15:12:18 2004 +0000
@@ -1,16 +1,8 @@
 #!/bin/sh
-# $NetBSD: cpuflags.SunOS,v 1.5 2004/11/03 18:16:27 abs Exp $
+# $NetBSD: cpuflags.SunOS,v 1.6 2004/12/22 15:12:18 abs Exp $
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 
-if [ "$1" = -v ] ; then
-    shift
-    opt_v=1
-fi
-if [ -n "$1" ]; then
-    CC=$1
-else
-    CC=gcc
-fi
+AWK=nawk
 
 display_hw_details()
     {
@@ -29,6 +21,16 @@
 ############
 # Everything from this point common between all cpuflags variants.
 
+if [ "$1" = -v ] ; then
+    shift
+    opt_v=1
+fi
+if [ -n "$1" ]; then
+    CC=$1
+else
+    CC=gcc
+fi
+
 if [ -n "$opt_v" ] ; then
     if [ -z "$NONE" ] ; then
        echo "CPUFLAGS=Unknown"
@@ -52,7 +54,7 @@
 
 if [ -n "$FLAGS" ]; then
     gcc_ver=`${CC} -dumpversion | sed 's/^egcs-//'`
-    FLAGS=`awk -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
+    FLAGS=`$AWK -F: -v "flags=$FLAGS" -v "gcc_ver=$gcc_ver" '
        { if (gcc_ver < $1){map[$2] = ""$3} }
        END { while (flags in map) {flags = map[flags]} print flags }
        ' <<EOD
diff -r bbfe0f422b16 -r e99bc3a9f097 doc/CHANGES
--- a/doc/CHANGES       Wed Dec 22 14:50:30 2004 +0000
+++ b/doc/CHANGES       Wed Dec 22 15:12:18 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.8404 2004/12/22 14:51:39 abs Exp $
+$NetBSD: CHANGES,v 1.8405 2004/12/22 15:13:37 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -6470,4 +6470,5 @@
        Updated gibgsf to 1.11.1 [drochner 2004-12-22]
        Added gnumeric-1.4.1 [drochner 2004-12-22]
        Updated rconfig to 0.42 [abs 2004-12-22]
+       Updated cpuflags to 0.79 [abs 2004-12-22]