Update cpuflags to 0.27

    cpuflags.mk now sets CPU_FLAGS and CPU_DIR in .MAKEFLAGS to
    avoid having to call cpuflags in every sub-make. Reduces a
    'make clean' in /usr/src on a celeron 850 from 90 seconds to
    30 seconds.  What is impressive is that I managed to leave it
    that bad without being bricked...

3 files changed, 16 insertions, 20 deletions

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 2bdd6ae4668..529a55c8740 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2002/07/15 10:48:46 abs Exp $
+# $NetBSD: Makefile,v 1.27 2002/07/16 10:42:45 abs Exp $
 #
 
-DISTNAME=		cpuflags-0.26
+DISTNAME=		cpuflags-0.27
 CATEGORIES=		sysutils
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/devel/cpuflags/files/cpuflags.1 b/devel/cpuflags/files/cpuflags.1
index 00b27842db8..e93faa85b3e 100644
--- a/devel/cpuflags/files/cpuflags.1
+++ b/devel/cpuflags/files/cpuflags.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cpuflags.1,v 1.7 2002/07/15 10:48:47 abs Exp $
+.\"	$NetBSD: cpuflags.1,v 1.8 2002/07/16 10:42:45 abs Exp $
 .Dd May 31, 2001
 .Dt CPUFLAGS 1
 .Os
@@ -19,16 +19,13 @@ The makefile fragment
 .Pa /usr/pkg/share/mk/cpuflags.mk
 will set the following
 .Xr make 1
-variables. The first two are explicitly added to MAKE_ENV, while MAKE_FLAGS
-will have CCOPTIONS=${CPU_FLAGS}
-.Bl -tag -width LOWER_CPU_DIR -compact
+variables, plus add CPU_FLAGS and CPU_DIR to .MAKEFLAGS for sub-makes.
+.Bl -tag -width CPU_FLAGS -compact
 .It
 .It CPU_FLAGS
 The output of cpuflags
 .It CPU_DIR
 CPU_FLAGS with spaces stripped (eg: for use in PACKAGES)
-.It LOWER_CPU_DIR
-As CPU_FLAGS but all in lower case
 .It CFLAGS
 Has CPU_FLAGS appended
 .It CXXFLAGS
@@ -50,7 +47,8 @@ kernel or userland by adding the following to /etc/mk.conf.
 .Ed
 .Sh BUGS
 .Nm
-does not know about many cpu types yet - updates welcomed to <abs@netbsd.org>.
+still needs to learn about more cpu types - updates welcomed
+to <abs@netbsd.org>.
 .Pp
 Currently
 .Nm
diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk
index e01269ae74d..3c6f537f018 100644
--- a/devel/cpuflags/files/cpuflags.mk
+++ b/devel/cpuflags/files/cpuflags.mk
@@ -1,4 +1,4 @@
-# $Id: cpuflags.mk,v 1.4 2002/06/27 20:49:02 abs Exp $
+# $Id: cpuflags.mk,v 1.5 2002/07/16 10:42:45 abs Exp $
 # Makefile include fragment to simplify use of cpuflags in pkgsrc
 # abs@netbsd.org - freely distributable, no warrenties, stick no bills.
 
@@ -11,26 +11,24 @@
 #	CXXFLAGS	Has CPU_FLAGS appended
 #
 #	CPU_DIR		CPU_FLAGS with spaces stripped (eg: for use in PACKAGES)
-#	LOWER_CPU_DIR	As CPU_FLAGS but all lower case
-
 
 .ifndef CPU_FLAGS
 
-CPU_FLAGS!=/usr/pkg/bin/cpuflags
-CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //'
-LOWER_CPU_DIR!=echo ${CPU_DIR} | tr A-Z a-z
-# Make the flags available to make
-MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR} LOWER_CPU_DIR=${LOWER_CPU_DIR}
-
+xCPU_FLAGS!=/usr/pkg/bin/cpuflags
+xCPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //'
+# Make the flags available to sub makes
+.MAKEFLAGS+=CPU_FLAGS="${xCPU_FLAGS}" CPU_DIR="${xCPU_DIR}"
+CPU_FLAGS=${xCPU_FLAGS}
+CPU_DIR=${xCPU_DIR}
 .endif
 
 .ifdef BSD_PKG_MK
 
-# Try to catch the varuous package mechanisms
+# Try to catch the various package mechanisms
 CFLAGS+=${CPU_FLAGS}
 CXXFLAGS+=${CPU_FLAGS}
 # Override CCOPTIONS for imake
-MAKE_FLAGS+=CCOPTIONS=${CPU_FLAGS}
+MAKE_FLAGS+=CCOPTIONS="${CPU_FLAGS}"
 
 .else