update cpuflags to 1.08 - switch optimize_gcc.mk to using PKGPATH

2 files changed, 26 insertions, 17 deletions

diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index f7a85c5df9f..53725f34534 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2007/04/24 22:44:20 abs Exp $
+# $NetBSD: Makefile,v 1.111 2007/08/02 11:20:16 abs Exp $
 #
 
-DISTNAME=	cpuflags-1.07
+DISTNAME=	cpuflags-1.08
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index 23190dfa384..3948f8d00bb 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.30 2006/10/12 12:41:46 abs Exp $
+# $Id: optimize_gcc.mk,v 1.31 2007/08/02 11:20:16 abs Exp $
 
 # This file is 'experimental' - which is doublespeak for unspeakably
 # ugly, and quite broken by design.
@@ -17,28 +17,37 @@
 
 COPT_FLAGS=-finline-functions -fomit-frame-pointer -ffast-math 
 
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=firefox firefox-gtk1 galeon galeon-devel
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=lua lua4
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=seamonkey # 1.0.5 gcc-4.1.2 NetBSD 4.99.3 i386
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=thunderbird thunderbird-gtk1
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=-base	# ruby18-base - NetBSD i386/3.0
-PKG_EXCLUDE_INLINE_FUNCTIONS+=qemu userppp vlc
-PKG_EXCLUDE_FAST_MATH+=firefox firefox-gtk1 # v1.0, NetBSD i386/2.0
-PKG_EXCLUDE_FAST_MATH+=qt3-libs     	# gcc3.3.3 NetBSD i386/3.0 breaks kde3
-PKG_EXCLUDE_FAST_MATH+=perl         	# perl5 '49/49!=1'
+# v1.0, NetBSD i386/2.0
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox www/firefox-gtk1
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox15 www/firefox15-gtk1
 
-CPUFLAGS_PKGNAME:=${PKGNAME:?${PKGNAME}:${DISTNAME}}
-CPUFLAGS_PKGBASE:=${PKGBASE:?${PKGBASE}:${CPUFLAGS_PKGNAME:C/-[^-{}]*$//}}
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=lang/lua
 
-.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${CPUFLAGS_PKGBASE})
+# 1.0.5 gcc-4.1.2 NetBSD 4.99.3 i386
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/seamonkey www/seamonkey-gtk1
+
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=mail/thunderbird mail/thunderbird-gtk1
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=mail/thunderbird15 mail/thunderbird15-gtk1
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=lang/ruby18-base        # NetBSD i386/3.0
+
+PKG_EXCLUDE_INLINE_FUNCTIONS+=emulators/qemu net/userppp multimedia/vlc
+
+# v1.0, NetBSD i386/2.0
+PKG_EXCLUDE_FAST_MATH+=www/firefox www/firefox-gtk1
+PKG_EXCLUDE_FAST_MATH+=www/firefox15 www/firefox15-gtk1
+
+PKG_EXCLUDE_FAST_MATH+=x11/qt3-libs    	# gcc3.3.3 NetBSD i386/3.0 breaks kde3
+PKG_EXCLUDE_FAST_MATH+=lang/perl5      	# perl5 '49/49!=1'
+
+.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGPATH})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-fomit-frame-pointer//}
 .endif
 
-.if !empty(PKG_EXCLUDE_INLINE_FUNCTIONS:M${CPUFLAGS_PKGBASE})
+.if !empty(PKG_EXCLUDE_INLINE_FUNCTIONS:M${PKGPATH})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-finline-functions//}
 .endif
 
-.if !empty(PKG_EXCLUDE_FAST_MATH:M${CPUFLAGS_PKGBASE})
+.if !empty(PKG_EXCLUDE_FAST_MATH:M${PKGPATH})
 COPT_FLAGS:=    ${COPT_FLAGS:S/-ffast-math//}
 .endif