diff --git a/lang/python/2.4/Makefile b/lang/python/2.4/Makefile
index a679dff9691..df3252d9dc7 100644
--- a/lang/python/2.4/Makefile
+++ b/lang/python/2.4/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.27 2010/04/15 14:11:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/04/15 18:35:02 jasper Exp $
 
 VERSION=		2.4
 PATCHLEVEL=		.6
 PKG_PATCHLEVEL=		p3
 SHARED_LIBS=		python2.4 1.0
 
-.if ${MACHINE_ARCH} == "mips64"
-BROKEN = Floating point exception while generating pyc objects
-.endif
+BROKEN-mips64 = Floating point exception while generating pyc objects
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
diff --git a/lang/python/2.5/Makefile b/lang/python/2.5/Makefile
index 9501d415cd4..24c75387211 100644
--- a/lang/python/2.5/Makefile
+++ b/lang/python/2.5/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.37 2010/04/15 14:58:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2010/04/15 18:35:02 jasper Exp $
 
 VERSION=		2.5
 PATCHLEVEL=		.4
 PKG_PATCHLEVEL=		p5
 SHARED_LIBS=		python2.5 1.0
 
-.if ${MACHINE_ARCH} == "mips64"
-BROKEN = Floating point exception while generating pyc objects
-.endif
+BROKEN-mips64 = Floating point exception while generating pyc objects
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
diff --git a/lang/python/2.6/Makefile b/lang/python/2.6/Makefile
index ba6ee89f7df..659c008cd9b 100644
--- a/lang/python/2.6/Makefile
+++ b/lang/python/2.6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/04/15 14:58:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/04/15 18:35:02 jasper Exp $
 
 VERSION=		2.6
 PATCHLEVEL=		.3
@@ -7,9 +7,7 @@ SHARED_LIBS=		python2.6 1.0
 
 # PSUBDIR=		python/${VERSION}
 
-.if ${MACHINE_ARCH} == "mips64"
-BROKEN = Floating point exception while generating pyc objects
-.endif
+BROKEN-mips64 = Floating point exception while generating pyc objects
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH:Mmips64*}
diff --git a/x11/kde/bindings3/Makefile b/x11/kde/bindings3/Makefile
index b8d41aa94ff..9c5cafd3bfc 100644
--- a/x11/kde/bindings3/Makefile
+++ b/x11/kde/bindings3/Makefile
@@ -1,8 +1,6 @@
-# $OpenBSD: Makefile,v 1.59 2010/01/27 21:43:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.60 2010/04/15 18:35:02 jasper Exp $
 
-.if ${MACHINE_ARCH} == "powerpc"
-BROKEN =			gcc spins on x_20.cpp
-.endif
+BROKEN-powerpc =	gcc spins on x_20.cpp
 
 COMMENT = 		K Desktop Environment, extra language support
 CATEGORIES =		x11 x11/kde devel