[pkgsrc/trunk]: pkgsrc/devel/cpuflags update cpuflags to 0.93 - fix a make-br...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c11bc39aedb5
branches:  trunk
changeset: 499470:c11bc39aedb5
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Sep 23 13:24:17 2005 +0000

description:
update cpuflags to 0.93 - fix a make-braino in workaround for PKGNAME setting

diffstat:

 devel/cpuflags/Makefile              |   4 ++--
 devel/cpuflags/files/optimize_gcc.mk |  13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 94aad980c312 -r c11bc39aedb5 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile   Fri Sep 23 13:09:48 2005 +0000
+++ b/devel/cpuflags/Makefile   Fri Sep 23 13:24:17 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2005/09/20 10:58:23 abs Exp $
+# $NetBSD: Makefile,v 1.96 2005/09/23 13:24:17 abs Exp $
 #
 
-DISTNAME=      cpuflags-0.92
+DISTNAME=      cpuflags-0.93
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 94aad980c312 -r c11bc39aedb5 devel/cpuflags/files/optimize_gcc.mk
--- a/devel/cpuflags/files/optimize_gcc.mk      Fri Sep 23 13:09:48 2005 +0000
+++ b/devel/cpuflags/files/optimize_gcc.mk      Fri Sep 23 13:24:17 2005 +0000
@@ -1,4 +1,4 @@
-# $Id: optimize_gcc.mk,v 1.24 2005/09/20 10:58:23 abs Exp $
+# $Id: optimize_gcc.mk,v 1.25 2005/09/23 13:24:17 abs Exp $
 
 # This file is 'experimental' - which is doublespeak for unspeakably
 # ugly, and quite broken by design.
@@ -20,11 +20,6 @@
 
 # This is a horrible mess, but how else to adjust per package?
 
-TMPPKGNAME=${PKGNAME}
-TMPPKGNAME?=${DISTNAME}
-PKGBASE?=${TMPPKGNAME:C/-[^-]*$//}
-TMPPKGNAME=
-
 COPT_FLAGS+=-ffast-math -fomit-frame-pointer
 
 PKG_EXCLUDE_OMIT_FRAME_POINTER+=firefox firefox-gtk1 galeon galeon-devel
@@ -36,6 +31,10 @@
 PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 koffice
 .endif
 
+TMPPKGNAME=${PKGNAME}
+TMPPKGNAME?=${DISTNAME}
+PKGBASE?=${TMPPKGNAME:C/-[^-]*$//}
+
 .if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGBASE})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-fomit-frame-pointer//}
 .endif
@@ -48,6 +47,8 @@
 COPT_FLAGS:=    ${COPT_FLAGS:S/-ffast-math//}
 .endif
 
+TMPPKGNAME=
+
 CFLAGS+=${COPT_FLAGS}
 CXXFLAGS+=${COPT_FLAGS}
 MAKE_FLAGS+=CCOPTIONS="${COPT_FLAGS}"  # Override CCOPTIONS for imake