[pkgsrc/trunk]: pkgsrc/devel/cpuflags Update cpuflags to 0.60:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/94342728ad65
branches:  trunk
changeset: 466588:94342728ad65
user:      abs <abs%pkgsrc.org@localhost>
date:      Tue Jan 20 23:38:46 2004 +0000

description:
Update cpuflags to 0.60:
        Set CPU_DIR and MAKE_ENV even if CPU_FLAGS is already set.

diffstat:

 devel/cpuflags/Makefile          |   4 ++--
 devel/cpuflags/files/cpuflags.mk |  15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (48 lines):

diff -r 3a103cd8373d -r 94342728ad65 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Tue Jan 20 22:51:06 2004 +0000
+++ b/devel/cpuflags/Makefile   Tue Jan 20 23:38:46 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2003/12/04 10:13:26 abs Exp $
+# $NetBSD: Makefile,v 1.63 2004/01/20 23:38:46 abs Exp $
 #
 
-DISTNAME=      cpuflags-0.59
+DISTNAME=      cpuflags-0.60
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 3a103cd8373d -r 94342728ad65 devel/cpuflags/files/cpuflags.mk
--- a/devel/cpuflags/files/cpuflags.mk  Tue Jan 20 22:51:06 2004 +0000
+++ b/devel/cpuflags/files/cpuflags.mk  Tue Jan 20 23:38:46 2004 +0000
@@ -1,4 +1,4 @@
-# $Id: cpuflags.mk,v 1.11 2003/10/02 16:10:00 abs Exp $
+# $Id: cpuflags.mk,v 1.12 2004/01/20 23:38:46 abs Exp $
 # Makefile include fragment to simplify use of cpuflags in pkgsrc
 # abs%netbsd.org@localhost - freely distributable, no warrenties, stick no bills.
 
@@ -12,17 +12,20 @@
 #
 #      CPU_DIR         CPU_FLAGS with spaces stripped (eg: for use in PACKAGES)
 
-.ifndef CPU_FLAGS
-
-.if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no"
+.ifndef CPU_FLAGS 
+. if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no"
 CPU_FLAGS!=/usr/pkg/bin/cpuflags ${CC}
-.else
+. else
 CPU_FLAGS!=/usr/pkg/bin/cpuflags
+. endif
 .endif
 
+.ifndef CPU_DIR
 CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //'
+.endif
+
+.if empty(MAKEFLAGS:MCPU_FLAGS=)
 MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR="${CPU_DIR}"                 # For sub makes
-
 .endif
 
 .ifdef BSD_PKG_MK                      # Try to catch various package opts