diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile
index 936a0d4bb0ff..6485e1cd6b6b 100644
--- a/audio/soundtouch/Makefile
+++ b/audio/soundtouch/Makefile
@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
 USES=			autoreconf libtool pathfix
 
 OPTIONS_DEFINE=	INTEGER_SAMPLES DOCS OPENMP
-OPTIONS_DEFAULT=	${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}
+OPTIONS_DEFAULT=	${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT_amd64=	SSE
diff --git a/devel/ponscripter-sekai/Makefile b/devel/ponscripter-sekai/Makefile
index 1a443d656060..ce10b034a0c1 100644
--- a/devel/ponscripter-sekai/Makefile
+++ b/devel/ponscripter-sekai/Makefile
@@ -35,7 +35,7 @@ PLIST_FILES=	bin/ponscr \
 		share/emacs/site-lisp/ponscripter-mode.el
 
 OPTIONS_DEFINE=	DOCS MANPAGES TREMOR
-OPTIONS_DEFAULT=MANPAGES ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/TREMOR/}
+OPTIONS_DEFAULT=MANPAGES ${MACHINE_CPU:Msoftfp:C/.+/TREMOR/}
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_PLIST_FILES=\
diff --git a/games/openbor/Makefile b/games/openbor/Makefile
index c7cc65c0c901..0b25b06cae5a 100644
--- a/games/openbor/Makefile
+++ b/games/openbor/Makefile
@@ -40,7 +40,7 @@ DESKTOP_ENTRIES="OpenBOR" \
 		""
 
 OPTIONS_DEFINE=		TREMOR
-OPTIONS_DEFAULT=	${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/TREMOR/}
+OPTIONS_DEFAULT=	${MACHINE_CPU:Msoftfp:C/.+/TREMOR/}
 OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT_i386=	MMX # runtime detection
 
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index 4bce44c853b2..7e0813347696 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -6,7 +6,7 @@ OPTIONS_DEFINE+= 	BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \
 
 OPTIONS_DEFAULT+=	DBUS DTRACE FFMPEG OPTIMIZED_CFLAGS \
 			${OPTIONS_MULTI_AUDIO} \
-			${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/}
+			${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/}
 
 OPTIONS_MULTI+=		AUDIO
 OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO