diff --git a/games/quake/Makefile b/games/quake/Makefile
index d7918ef0693..84ef65f438a 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2008/01/11 16:48:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2008/05/07 17:34:33 simon Exp $
 
 COMMENT-main=		Quake/Quake-world client
 COMMENT-server=		Quake world server
@@ -35,35 +35,25 @@ CONFIGURE_ARGS=		--enable-release
 CONFIGURE_ARGS+=	--bindir=/bin
 CONFIGURE_ARGS+=	--with-opengl=no --with-opengl-includes=no
 
-BRKFLAVORMSG=		choose either sdl, ggi or x11
 
-.if ${FLAVOR:L:Msdl}
-.if ${FLAVOR:L:Mggi} || ${FLAVOR:L:Mx11}
-BROKEN=			${BRKFLAVORMSG}
-.endif
+.if ${FLAVOR:L} == sdl
 WANTLIB+=		pthread
 LIB_DEPENDS-main=	SDL::devel/sdl
 CONFIGURE_ARGS+=	--with-sdl=${LOCALBASE} --without-ggi
 MAKE_FLAGS=		HAS_X11=no
 CFLAGS+=		-pthread
-.elif ${FLAVOR:L:Mggi}
-.if ${FLAVOR:L:Msdl} || ${FLAVOR:L:Mx11}
-BROKEN=			${BRKFLAVORMSG}
-.endif
+.elif ${FLAVOR:L} == ggi
 WANTLIB+=		pthread
 LIB_DEPENDS-main=	ggi::graphics/ggi
 CONFIGURE_ARGS+=	--with-ggi=${LOCALBASE} --without-sdl
 MAKE_FLAGS=		HAS_X11=no
 CFLAGS+=		-pthread
-.elif ${FLAVOR:L:Mx11}
-.if ${FLAVOR:L:Mggi} || ${FLAVOR:L:Msdl}
-BROKEN=			${BRKFLAVORMSG}
-.endif
+.elif ${FLAVOR:L} == x11
 CONFIGURE_ARGS+=	--without-sdl --without-ggi
 MAKE_FLAGS=	
 WANTLIB-main=		c m X11 Xext
 .else
-ERRORS="Need some non empty flavor"
+BROKEN=			choose either sdl, ggi or x11
 .endif
 
 WRKDIST=	${WRKDIR}/quakeforge