From 2ea7529561afb1eb65299db2633fab366af2c4ac Mon Sep 17 00:00:00 2001 From: abs Date: Sun, 1 May 2005 22:03:37 +0000 Subject: update cpuflags to 0.87: - Added linux "Mobile Intel(R) Pentium(R) 4 - M ", from pancake - Add a dist target to simplify updating freshmeat copy - Change feedback email to abs@absd.org --- devel/cpuflags/Makefile | 4 ++-- devel/cpuflags/files/Makefile | 14 ++++++++++++-- devel/cpuflags/files/cpuflags.Linux | 15 ++++++++------- devel/cpuflags/files/cpuflags.NetBSD | 4 ++-- devel/cpuflags/files/cpuflags.SunOS | 4 ++-- devel/cpuflags/files/cpuflags.mk | 4 ++-- devel/cpuflags/files/optimize_gcc.mk | 4 ++-- doc/CHANGES | 4 +++- 8 files changed, 33 insertions(+), 20 deletions(-) diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index eeb47c39fa6..fcfcdaa75b9 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.89 2005/04/29 12:56:05 abs Exp $ +# $NetBSD: Makefile,v 1.90 2005/05/01 22:03:37 abs Exp $ # -DISTNAME= cpuflags-0.86 +DISTNAME= cpuflags-0.87 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/Makefile b/devel/cpuflags/files/Makefile index 974465de0ef..612c5d35604 100644 --- a/devel/cpuflags/files/Makefile +++ b/devel/cpuflags/files/Makefile @@ -1,4 +1,6 @@ -# $Id: Makefile,v 1.1 2005/04/29 12:56:05 abs Exp $ +# $Id: Makefile,v 1.2 2005/05/01 22:03:37 abs Exp $ + +VERSION=0.87 PREFIX?=/usr/local OPSYS?=`uname` @@ -12,7 +14,7 @@ all: sed -e 's|@PREFIX@|${PREFIX}|g' cpuflags.mk > cpuflags.mk.out clean: - rm -f *.out + rm -rf *.out out install: mkdir -p ${BINDIR} ${MANDIR} ${MKDIR} @@ -20,3 +22,11 @@ install: install cpuflags.1.out ${MANDIR}/cpuflags.1 install optimize_gcc.mk ${MKDIR}/optimize_gcc.mk install cpuflags.mk.out ${MKDIR}/cpuflags.mk + +dist: + mkdir -p out/cpuflags-${VERSION} + cp Makefile *.* out/cpuflags-${VERSION} + (cd out;pax -w cpuflags-${VERSION} | bzip2 -9 > cpuflags-${VERSION}.tbz) + rm -rf out/cpuflags-${VERSION} + + diff --git a/devel/cpuflags/files/cpuflags.Linux b/devel/cpuflags/files/cpuflags.Linux index f9fdf8fe860..e03405b1715 100755 --- a/devel/cpuflags/files/cpuflags.Linux +++ b/devel/cpuflags/files/cpuflags.Linux @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: cpuflags.Linux,v 1.15 2005/04/29 12:56:05 abs Exp $ +# $NetBSD: cpuflags.Linux,v 1.16 2005/05/01 22:03:37 abs Exp $ PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH AWK=awk @@ -28,15 +28,16 @@ case $hw_machine_arch in i386) FLAGS='-march=i386' ;; i486) FLAGS='-march=i486' ;; i686) case $hw_model in - "AMD Duron(tm) ") FLAGS='-march=athlon' ;; - "AMD Duron(TM)") FLAGS='-march=athlon' ;; "AMD Athlon(tm) XP "*) FLAGS='-march=athlon-xp' ;; + "AMD Duron(TM)") FLAGS='-march=athlon' ;; + "AMD Duron(tm) ") FLAGS='-march=athlon' ;; "Celeron (Coppermine)") FLAGS='-march=pentium3' ;; - "Pentium III (Katmai)") FLAGS='-march=pentium3' ;; - "Pentium III (Coppermine)") FLAGS='-march=pentium3' ;; + "Intel(R) Pentium(R) 4 CPU "*) FLAGS='-march=pentium4' ;; "Intel(R) Pentium(R) III Mobile CPU"*) FLAGS='-march=pentium3m' ;; "Intel(R) Pentium(R) M processor"*) FLAGS='-march=pentium3m' ;; - "Intel(R) Pentium(R) 4 CPU "*) FLAGS='-march=pentium4' ;; + "Mobile Intel(R) Pentium(R) 4 - M "*) FLAGS='-march=pentium4m' ;; + "Pentium III (Coppermine)") FLAGS='-march=pentium3' ;; + "Pentium III (Katmai)") FLAGS='-march=pentium3' ;; "Intel(R) Celeron(R) CPU "*) case "$hw_flags" in *" sse2 "*) @@ -70,7 +71,7 @@ if [ -n "$opt_v" ] ; then exit fi if [ -z "$FLAGS" -a -z "$NONE" ] ; then - echo 'Unknown machine - please send details to abs@netbsd.org' >&2 + echo 'Unknown machine - please send details to abs@absd.org' >&2 display_hw_details >&2 fi diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD index ab41e5f8510..43622e029ff 100755 --- a/devel/cpuflags/files/cpuflags.NetBSD +++ b/devel/cpuflags/files/cpuflags.NetBSD @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: cpuflags.NetBSD,v 1.59 2005/03/22 08:17:26 abs Exp $ +# $NetBSD: cpuflags.NetBSD,v 1.60 2005/05/01 22:03:37 abs Exp $ PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH AWK=awk @@ -187,7 +187,7 @@ if [ -n "$opt_v" ] ; then exit fi if [ -z "$FLAGS" -a -z "$NONE" ] ; then - echo 'Unknown machine - please send details to abs@netbsd.org' >&2 + echo 'Unknown machine - please send details to abs@absd.org' >&2 display_hw_details >&2 fi diff --git a/devel/cpuflags/files/cpuflags.SunOS b/devel/cpuflags/files/cpuflags.SunOS index 1c66f5f657a..acf9f0e1044 100755 --- a/devel/cpuflags/files/cpuflags.SunOS +++ b/devel/cpuflags/files/cpuflags.SunOS @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: cpuflags.SunOS,v 1.6 2004/12/22 15:12:18 abs Exp $ +# $NetBSD: cpuflags.SunOS,v 1.7 2005/05/01 22:03:37 abs Exp $ PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH AWK=nawk @@ -41,7 +41,7 @@ if [ -n "$opt_v" ] ; then exit fi if [ -z "$FLAGS" -a -z "$NONE" ] ; then - echo 'Unknown machine - please send details to abs@netbsd.org' >&2 + echo 'Unknown machine - please send details to abs@absd.org' >&2 display_hw_details >&2 fi diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index 76ea0195a9f..9f12706cce7 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,6 +1,6 @@ -# $Id: cpuflags.mk,v 1.15 2004/03/17 00:26:55 abs Exp $ +# $Id: cpuflags.mk,v 1.16 2005/05/01 22:03:37 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc -# abs@netbsd.org - freely distributable, no warrenties, stick no bills. +# abs@absd.org - freely distributable, no warrenties, stick no bills. # Try to optimise based on CPU # Does not affect any package that overrides CFLAGS/CXXFLAGS/CCOPTIONS diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk index e17f94ab986..f1caddfbd6c 100644 --- a/devel/cpuflags/files/optimize_gcc.mk +++ b/devel/cpuflags/files/optimize_gcc.mk @@ -1,4 +1,4 @@ -# $Id: optimize_gcc.mk,v 1.20 2005/04/08 07:24:25 abs Exp $ +# $Id: optimize_gcc.mk,v 1.21 2005/05/01 22:03:37 abs Exp $ # This file is 'experimental' - which is doublespeak for unspeakably # ugly, and probably quite broken by design. @@ -6,7 +6,7 @@ # The intention is to pass additional flags to gcc to further optimise # generated code. It _will_ make it impossible to debug, may fail to # compile some code, and even generate curdled binaries. It is completely -# unsupported. Any questions should be directed to . +# unsupported. Any questions should be directed to . # -O3 would give -finline-functions and -frename-registers # As of gcc3-3.3nb4 -frename-registers still causes problems with xdm diff --git a/doc/CHANGES b/doc/CHANGES index b3ff39dd5ec..b408ebddd89 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.9996 2005/05/01 19:08:49 adrianp Exp $ +$NetBSD: CHANGES,v 1.9997 2005/05/01 22:05:37 abs Exp $ Changes to the packages collection and infrastructure in 2005: @@ -2243,3 +2243,5 @@ Changes to the packages collection and infrastructure in 2005: Updated getmail to 4.3.7 [schmonz 2005-05-01] Updated imp to 3.2.8 [adrianp 2005-05-01] Updated imp to 4.0.3 [adrianp 2005-05-01] + Updated cpuflags to 0.87 [abs 2005-05-01] + -- cgit v1.2.3