diff --git a/devel/jdk/1.6/Makefile b/devel/jdk/1.6/Makefile
index 99faab5ce7c..86a76a58aaa 100644
--- a/devel/jdk/1.6/Makefile
+++ b/devel/jdk/1.6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2013/02/07 19:06:55 kurt Exp $
+# $OpenBSD: Makefile,v 1.42 2013/02/09 14:49:50 sthen Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	amd64 i386
@@ -77,7 +77,7 @@ BUILD_DEPENDS=	archivers/zip \
 MODULES=	converters/libiconv
 WANTLIB=	X11 Xext Xi Xtst c freetype m pthread sndio stdc++ z
 
-.if ${FLAVOR:L:Mnative_bootstrap}
+.if ${FLAVOR:Mnative_bootstrap}
 INSTALLED!= (pkg_info -e "jdk->=1.6,<1.7" -q && echo yes) || echo no
 .if ${INSTALLED:L} != "yes"
 ERRORS += "Fatal: This flavor requires an installed 1.6 jdk package"
@@ -125,7 +125,7 @@ MAKE_ENV+=	ALT_BOOTDIR=${ALT_BOOTDIR} \
 		WARNINGS_ARE_ERRORS="" \
 		HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}
 
-.if !${FLAVOR:L:Mwith_ipv6}
+.if !${FLAVOR:Mwith_ipv6}
 MAKE_ENV+=	DONT_ENABLE_IPV6=YES
 .endif
 
diff --git a/devel/jdk/1.7/Makefile b/devel/jdk/1.7/Makefile
index 3dde0a630bb..b53799940ca 100644
--- a/devel/jdk/1.7/Makefile
+++ b/devel/jdk/1.7/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2013/02/07 19:06:56 kurt Exp $
+# $OpenBSD: Makefile,v 1.59 2013/02/09 14:49:50 sthen Exp $
 
 SHARED_ONLY=	Yes
 ONLY_FOR_ARCHS=	i386 amd64
@@ -50,7 +50,7 @@ PERMIT_DISTFILES_FTP=	Yes
 USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
-.if ${FLAVOR:L:Mnative_bootstrap}
+.if ${FLAVOR:Mnative_bootstrap}
 INSTALLED!= (pkg_info -qe "jdk->=1.7.0.00v0,<1.8v0" && echo yes) || echo no
 .if ${INSTALLED:L} != "yes"
 ERRORS += "Fatal: This flavor requires an installed 1.7.0.00v0 or greater jdk package"
@@ -96,7 +96,7 @@ MAKE_ENV=	ALT_BOOTDIR=${ALT_BOOTDIR} \
 
 #ALL_TARGET=	debug_build
 
-.if !${FLAVOR:L:Mwith_ipv6}
+.if !${FLAVOR:Mwith_ipv6}
 MAKE_ENV+=	DONT_ENABLE_IPV6="YES"
 .endif
 
diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index b5d38a09f7d..e3bf2629e33 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2013/02/05 10:39:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2013/02/09 14:49:50 sthen Exp $
 
 COMMENT=		discovery-based unittest extension
 
@@ -26,7 +26,7 @@ MODULES=		lang/python
 FLAVORS=		python3
 FLAVOR?=
 
-.if ${FLAVOR:L:Mpython3}
+.if ${FLAVOR:Mpython3}
 NO_REGRESS=		Yes
 .else
 REGRESS_DEPENDS=	devel/py-nose \
@@ -51,7 +51,7 @@ post-install:
 		find . ! -type d -exec ${INSTALL_DATA} {} \
 			${PREFIX}/share/examples/${MODPY_PY_PREFIX}nose/{} \;
 	rm ${PREFIX}/bin/nosetests-${MODPY_VERSION}
-.if ${FLAVOR:L:Mpython3}
+.if ${FLAVOR:Mpython3}
 	mv ${PREFIX}/bin/nosetests \
 		${PREFIX}/bin/nosetests${MODPY_BIN_SUFFIX}
 	mv ${PREFIX}/man/man1/nosetests.1 \
diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile
index d47ee2d1eeb..c9a7d99d9b1 100644
--- a/devel/py-test/Makefile
+++ b/devel/py-test/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2012/06/27 19:19:46 rpointel Exp $
+# $OpenBSD: Makefile,v 1.3 2013/02/09 14:49:50 sthen Exp $
 
 COMMENT=		cross-project testing tool for Python
 
@@ -36,7 +36,7 @@ REGRESS_DEPENDS=	devel/py-test${MODPY_FLAVOR}
 do-regress:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/py.test${MODPY_BIN_SUFFIX} testing
 
-.if ${FLAVOR:L:Mpython3}
+.if ${FLAVOR:Mpython3}
 post-install:
 	mv ${PREFIX}/bin/py.test ${PREFIX}/bin/py.test${MODPY_BIN_SUFFIX}
 .endif
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index 1b5074161d4..52ec0cb7ac1 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/09/16 09:24:56 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		unit testing framework for Python
 
@@ -23,7 +23,7 @@ FLAVOR?=
 
 MODULES=	lang/python
 
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:Mno_x11}
 BUILD_DEPENDS=	${MODPY_TKINTER_DEPENDS}
 RUN_DEPENDS=	${MODPY_TKINTER_DEPENDS}
 .endif
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 31d4cdaa46f..b8d0759264c 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2013/01/16 01:49:02 brad Exp $
+# $OpenBSD: Makefile,v 1.90 2013/02/09 14:49:50 sthen Exp $
 
 # requires ELF visibility support when on a shared arch
 ONLY_FOR_ARCHS=	${GCC3_ARCHS} ${GCC4_ARCHS} ${NO_SHARED_ARCHS}
@@ -52,13 +52,13 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
 		ac_cv_header_usb_h=no
 
-.if ${FLAVOR:L:Maa}
+.if ${FLAVOR:Maa}
 WANTLIB+=	aa
 LIB_DEPENDS+=	graphics/aalib
 CONFIGURE_ARGS+= --enable-video-aalib
 .endif
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 		 --disable-video-x11
 .else
diff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
index d2696186ccc..f36d0ba5e1d 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2012/10/29 15:19:03 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT =		fixed width fonts especially for long hacking sessions
 
@@ -30,7 +30,7 @@ USE_GMAKE =		Yes
 FLAVORS =		symquotes
 FLAVOR ?=
 
-.if ${FLAVOR:L:Msymquotes}
+.if ${FLAVOR:Msymquotes}
 post-patch:
 	${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
 .endif
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 1d49e754d5c..23bdaf67256 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2013/02/08 17:12:31 bcallah Exp $
+# $OpenBSD: Makefile,v 1.87 2013/02/09 14:49:51 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -126,7 +126,7 @@ CONFIGURE_ARGS+= --disable$s
 post-install:
 # This will fail if no_nautilus is found in FLAVOR, so make sure we don't
 # do it if it is.
-.if !${FLAVOR:L:Mno_nautilus}
+.if !${FLAVOR:Mno_nautilus}
 	rm ${PREFIX}/lib/nautilus/extensions-${MAJ_V}/*.la
 .endif
 	rm ${PREFIX}/lib/evince/4/backends/*.la
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 380b5dcfb15..ad1010a39fb 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2012/03/17 23:01:09 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-canna=		X input method for Japanese, canna support
 COMMENT-canna-wnn=	X input method for Japanese, canna and wnn support
@@ -40,10 +40,10 @@ PORT_DOCDIR=${PREFIX}/share/doc/kinput2
 pre-configure:
 	mv -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org
 	cp ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
-.if ${FLAVOR:L:Mwnn}
+.if ${FLAVOR:Mwnn}
 	echo "#define UseWnn" >>${WRKSRC}/Kinput2.conf
 .endif
-.if ${FLAVOR:L:Mcanna}
+.if ${FLAVOR:Mcanna}
 	echo "#define UseCanna" >>${WRKSRC}/Kinput2.conf
 .endif
 
diff --git a/lang/icon/interp/Makefile b/lang/icon/interp/Makefile
index e796d86e5b5..af865798018 100644
--- a/lang/icon/interp/Makefile
+++ b/lang/icon/interp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2010/11/17 08:05:17 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main=		programming language with generators, X11 and more
 COMMENT-main-no_x11=	programming language with generators
@@ -42,7 +42,7 @@ LIBDIR=${TRUEPREFIX}/lib/icon
 WANTLIB-compiler=	c
 WANTLIB-main=		c m pthread
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_TARGET=	Configure
 .else
 CONFIGURE_TARGET=	X-Configure
diff --git a/lang/lua/lua.port.mk b/lang/lua/lua.port.mk
index 46cc851b16b..42cdaf4a45f 100644
--- a/lang/lua/lua.port.mk
+++ b/lang/lua/lua.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: lua.port.mk,v 1.24 2012/12/11 22:12:12 sthen Exp $
+# $OpenBSD: lua.port.mk,v 1.25 2013/02/09 14:49:51 sthen Exp $
 
 CATEGORIES+=	lang/lua
 
@@ -21,7 +21,7 @@ FLAVORS+=		lua52
 FLAVOR?=		# empty
 
 # without a flavor, assume ${MODLUA_DEFAULT_VERSION}
-.if ${FLAVOR:L:Mlua52}
+.if ${FLAVOR:Mlua52}
 MODLUA_VERSION=		5.2
 .else
 MODLUA_VERSION?=	${MODLUA_DEFAULT_VERSION}
diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc
index e86fc0f0d61..5a3752a0635 100644
--- a/lang/php/Makefile.inc
+++ b/lang/php/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.35 2012/11/30 12:56:02 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.36 2013/02/09 14:49:51 sthen Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+=	--enable-shared \
 			--with-pdo-sqlite \
 			--enable-sqlite-utf8
 
-.if ${FLAVOR:L:Map2}
+.if ${FLAVOR:Map2}
 CONFIGURE_ARGS+=	--with-apxs2=${LOCALBASE}/sbin/apxs2
 BUILD_DEPENDS=		www/apache-httpd
 .else
@@ -316,7 +316,7 @@ RUN_DEPENDS-main=	${MODGETTEXT_RUN_DEPENDS} \
 			mail/femail,-chroot
 LIB_DEPENDS-fastcgi=	${LIB_DEPENDS-main}
 
-.if ${FLAVOR:L:Mno_suhosin}
+.if ${FLAVOR:Mno_suhosin}
 SUPDISTFILES=		suhosin-${SUHOSIN_V}.tgz:0 \
 			suhosin-patch-${SUHOSIN_PHPV}-${SUHOSIN_P_V}.patch.gz:0
 .else
@@ -341,7 +341,7 @@ pre-configure:
 		${WRKSRC}/scripts/phpize.in \
 		${WRKSRC}/scripts/php-config.in
 
-.if ${FLAVOR:L:Map2}
+.if ${FLAVOR:Map2}
 MULTI_PACKAGES :=       ${MULTI_PACKAGES:N-fpm:N-fastcgi}
 .endif
 
diff --git a/lang/python/python.port.mk b/lang/python/python.port.mk
index b3d481c1cc6..fce8f8e0fa8 100644
--- a/lang/python/python.port.mk
+++ b/lang/python/python.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: python.port.mk,v 1.57 2012/12/21 18:19:38 fgsch Exp $
+# $OpenBSD: python.port.mk,v 1.58 2013/02/09 14:49:51 sthen Exp $
 #
 #	python.port.mk - Xavier Santolaria <xavier@santolaria.net>
 #	This file is in the public domain.
@@ -13,7 +13,7 @@ MODPY_DEFAULT_VERSION_3 = 3.2
 
 FLAVOR ?=
 
-.  if ${FLAVOR:L:Mpython3}
+.  if ${FLAVOR:Mpython3}
 # define default version 3
 MODPY_VERSION ?=	${MODPY_DEFAULT_VERSION_3}
 .  else
diff --git a/lang/ruby/ruby.port.mk b/lang/ruby/ruby.port.mk
index 0cdee61899b..769363313dd 100644
--- a/lang/ruby/ruby.port.mk
+++ b/lang/ruby/ruby.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: ruby.port.mk,v 1.54 2013/01/26 17:57:51 jeremy Exp $
+# $OpenBSD: ruby.port.mk,v 1.55 2013/02/09 14:49:51 sthen Exp $
 
 # ruby module
 
@@ -53,8 +53,8 @@ FLAVOR =		ruby19
 
 # Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
 # on the FLAVOR.
-.    if ${FLAVOR:L:Mruby18}
-.      if ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mjruby} || ${FLAVOR:L:Mrbx}
+.    if ${FLAVOR:Mruby18}
+.      if ${FLAVOR:Mruby19} || ${FLAVOR:Mjruby} || ${FLAVOR:Mrbx}
 ERRORS+=		"Fatal: Conflicting flavors used: ${FLAVOR}"
 .      endif
 MODRUBY_REV=		1.8
@@ -64,20 +64,20 @@ MODRUBY_REV=		1.8
 SUBST_VARS+=	PKGPATH
 PKG_ARGS+=	-f ${PORTSDIR}/lang/ruby/ruby18.PLIST
 
-.    elif ${FLAVOR:L:Mruby19}
-.      if ${FLAVOR:L:Mruby18} || ${FLAVOR:L:Mjruby} || ${FLAVOR:L:Mrbx}
+.    elif ${FLAVOR:Mruby19}
+.      if ${FLAVOR:Mruby18} || ${FLAVOR:Mjruby} || ${FLAVOR:Mrbx}
 ERRORS+=		"Fatal: Conflicting flavors used: ${FLAVOR}"
 .      endif
 MODRUBY_REV=		1.9
 
-.    elif ${FLAVOR:L:Mjruby}
-.      if ${FLAVOR:L:Mruby18} || ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mrbx}
+.    elif ${FLAVOR:Mjruby}
+.      if ${FLAVOR:Mruby18} || ${FLAVOR:Mruby19} || ${FLAVOR:Mrbx}
 ERRORS+=		"Fatal: Conflicting flavors used: ${FLAVOR}"
 .      endif
 MODRUBY_REV=		jruby
 
-.    elif ${FLAVOR:L:Mrbx}
-.      if ${FLAVOR:L:Mruby18} || ${FLAVOR:L:Mruby19} || ${FLAVOR:L:Mjruby}
+.    elif ${FLAVOR:Mrbx}
+.      if ${FLAVOR:Mruby18} || ${FLAVOR:Mruby19} || ${FLAVOR:Mjruby}
 ERRORS+=		"Fatal: Conflicting flavors used: ${FLAVOR}"
 .      endif
 MODRUBY_REV=		rbx
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 3a7af4e0fa1..b6cf4b7a997 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.200 2013/02/08 16:33:23 brad Exp $
+# $OpenBSD: Makefile,v 1.201 2013/02/09 14:49:51 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -76,15 +76,15 @@ FLAVOR+=	no_ldap no_mysql no_postgresql
 MULTI_PACKAGES= -server
 SUBPACKAGE?=	-server
 
-.if !${FLAVOR:L:Mno_ldap}
+.if !${FLAVOR:Mno_ldap}
 MULTI_PACKAGES+=-ldap
 .endif
 
-.if !${FLAVOR:L:Mno_mysql}
+.if !${FLAVOR:Mno_mysql}
 MULTI_PACKAGES+=-mysql
 .endif
 
-.if !${FLAVOR:L:Mno_postgresql}
+.if !${FLAVOR:Mno_postgresql}
 MULTI_PACKAGES+=-postgresql
 .endif
 
diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile
index b40847a6946..84a65082540 100644
--- a/mail/hypermail/Makefile
+++ b/mail/hypermail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/11/19 07:23:06 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		generate a cross-referenced HTML mail archive
 
@@ -34,7 +34,7 @@ USE_GROFF =		Yes
 FLAVORS=		gdbm
 FLAVOR?=
 
-.if ${FLAVOR:L} == "gdbm"
+.if ${FLAVOR} == "gdbm"
 CONFIGURE_ARGS +=--with-gdbm=${LOCALBASE}
 LIB_DEPENDS +=	databases/gdbm
 WANTLIB +=	gdbm
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 6c19b3b3c3d..d462dd6f33f 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2011/03/02 16:01:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	emacs interface to PGP and GnuPG
 
@@ -21,15 +21,15 @@ FLAVOR?=	gnupg
 
 BUILD_DEPENDS=	emacs->=21,<22:editors/emacs21
 
-.if ${FLAVOR:L:Mgnupg}
+.if ${FLAVOR:Mgnupg}
 RUN_DEPENDS=	security/gnupg
 .endif
 
-.if ${FLAVOR:L:Mpgp}
+.if ${FLAVOR:Mpgp}
 RUN_DEPENDS=	pgp->=2,<3:security/pgp
 .endif
 
-.if ${FLAVOR:L:Mpgp5}
+.if ${FLAVOR:Mpgp5}
 RUN_DEPENDS=	pgp->=5,<6:security/pgp5
 .endif
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index ce333f99a09..9a7e64c086d 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2012/09/04 11:33:35 gonzalo Exp $
+# $OpenBSD: Makefile,v 1.43 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main=		mail delivery agent with filtering abilities
 COMMENT-utils=		quota tools for the Courier mail suite
@@ -62,7 +62,7 @@ DOCFILES=		${WRKSRC}/README \
 			${WRKSRC}/maildir/quotawarnmsg
 
 
-.if ${FLAVOR:L:Mpostfix}
+.if ${FLAVOR:Mpostfix}
 CONFIGURE_ARGS+=	--enable-sendmail=/usr/local/sbin/sendmail
 CONFIGURE_ARGS+=	--enable-trusted-users="root _courier _postfix"
 CONFIGURE_ARGS+=	--enable-trusted-groups="wheel _courier _postdrop"
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 552d244046c..ac9737215c6 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2012/02/16 22:27:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.75 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	mailing list manager with web interface
 
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--prefix='${MMHOME}' \
 
 FLAVORS=	postfix
 FLAVOR?=
-.if ${FLAVOR:L:Mpostfix}
+.if ${FLAVOR:Mpostfix}
 CONFIGURE_ARGS+=--with-mail-gid=_mailman
 .else
 CONFIGURE_ARGS+=--with-mail-gid=daemon
diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile
index ca53f02f364..7f0cdccf7c3 100644
--- a/mail/mozilla-thunderbird/Makefile
+++ b/mail/mozilla-thunderbird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.165 2013/01/11 23:06:36 landry Exp $
+# $OpenBSD: Makefile,v 1.166 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main =		Mozilla e-mail, rss and usenet client
 COMMENT-lightning =	Mozilla Thunderbird calendar extension
@@ -33,7 +33,7 @@ SO_VERSION =	27.0
 
 MOZILLA_LIBS = ldap60 ldif60 mozalloc mozgnome prldap60 xpcom xul calbasecomps \
 	enigmime-${XPCOM_ABI}-gcc3 subprocess-${XPCOM_ABI}-gcc3
-#.if ${FLAVOR:L:Mdebug}
+#.if ${FLAVOR:Mdebug}
 #MOZILLA_LIBS +=	addrbook bayesflt fts3tok mailview mime mimeemitter msgbase \
 #	msgcompose msgdb msgimap msglocal msgmdn msgnews vcard msgbaseutil
 #.endif
diff --git a/mail/mutt/Makefile.inc b/mail/mutt/Makefile.inc
index 8d57a3810f0..0193c7438fe 100644
--- a/mail/mutt/Makefile.inc
+++ b/mail/mutt/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.37 2011/05/04 07:49:40 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.38 2013/02/09 14:49:51 sthen Exp $
 
 CATEGORIES=	mail
 
@@ -51,7 +51,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ISPELL="${LOCALBASE}/bin/ispell"
 
-.if ${FLAVOR:L:Mslang}
+.if ${FLAVOR:Mslang}
 LIB_DEPENDS+=		devel/libslang
 CONFIGURE_ARGS+=	--with-slang="${PREFIX}"
 WANTLIB+=		m termlib slang>=14
@@ -62,7 +62,7 @@ WANTLIB+=		ncurses
 
 # compressed folder support
 DIST_COMPRESSED?=	patch-${VERSION}.rr.compressed.1.gz:0
-.if ${FLAVOR:L:Mcompressed}
+.if ${FLAVOR:Mcompressed}
 PATCHFILES+=		${DIST_COMPRESSED}
 PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--enable-compressed
@@ -70,12 +70,12 @@ CONFIGURE_ARGS+=	--enable-compressed
 SUPDISTFILES+=		${DIST_COMPRESSED}
 .endif
 
-.if ${FLAVOR:L:Mmixmaster}
+.if ${FLAVOR:Mmixmaster}
 CONFIGURE_ARGS+=	--with-mixmaster="${LOCALBASE}/sbin/mixmaster"
 RUN_DEPENDS+=		mail/mixmaster
 .endif
 
-.if ${FLAVOR:L:Midn}
+.if ${FLAVOR:Midn}
 CONFIGURE_ARGS+=	--with-idn
 LIB_DEPENDS+=		devel/libidn
 WANTLIB+=		idn>=16
diff --git a/mail/mutt/snapshot/Makefile b/mail/mutt/snapshot/Makefile
index a3b6db75215..8d877d82f6e 100644
--- a/mail/mutt/snapshot/Makefile
+++ b/mail/mutt/snapshot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2012/09/27 17:26:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.72 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	tty-based e-mail client, development version
 
@@ -21,7 +21,7 @@ CONFIGURE_ARGS= --enable-hcache \
 LIB_DEPENDS=	databases/qdbm
 BUILD_DEPENDS+=	textproc/docbook-xsl
 
-.if ${FLAVOR:L:Msasl}
+.if ${FLAVOR:Msasl}
 CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
 LIB_DEPENDS+=	security/cyrus-sasl2
 WANTLIB+=	sasl2
@@ -32,7 +32,7 @@ MUTTRCDIR=	doc/
 DIST_COMPRESSED=compressed-5302767aa6aa.gz:2
 DIST_SIDEBAR=	sidebar-5302767aa6aa.gz:2
 
-.if ${FLAVOR:L:Msidebar}
+.if ${FLAVOR:Msidebar}
 PATCHFILES+=		${DIST_SIDEBAR}
 PATCH_DIST_STRIP=	-p1
 .else
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index b0e9d0555dd..42cf0ca8f6f 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2013/01/02 04:19:54 william Exp $
+# $OpenBSD: Makefile,v 1.35 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		new MH mail handling program
 
@@ -37,7 +37,7 @@ FLAVOR?=
 CONFIGURE_ENV+=		ac_cv_header_db_h=no
 USE_GROFF =		Yes
 
-.if ${FLAVOR:L:Msasl}
+.if ${FLAVOR:Msasl}
 MODULES +=		converters/libiconv
 WANTLIB +=		sasl2
 LIB_DEPENDS+=		security/cyrus-sasl2
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 020fd995317..f6096a2a42e 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2012/04/28 10:52:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main=	fully featured POP3 and IMAP4 proxy server
 COMMENT-ldap=	LDAP backend for perdition mail proxy
@@ -66,7 +66,7 @@ LIB_DEPENDS-main=	databases/db/v4 \
 			devel/vanessa/socket \
 			devel/popt
 
-.if ${FLAVOR:L:Mno_ldap}
+.if ${FLAVOR:Mno_ldap}
 CONFIGURE_ARGS+=	--disable-ldap
 .else
 SHARED_LIBS +=  	perditiondb_ldap             0.0  # .0.0
@@ -80,7 +80,7 @@ WANTLIB-ldap= 		asn1 com_err crypto gssapi krb5 ssl util sasl2 \
 			ldap>=2 lber>=2
 .endif
 
-.if ${FLAVOR:L:Mno_mysql}
+.if ${FLAVOR:Mno_mysql}
 CONFIGURE_ARGS+=	--disable-mysql
 .else
 SHARED_LIBS +=  	perditiondb_mysql            0.0  # .0.0
@@ -94,7 +94,7 @@ WANTLIB-mysql=		crypto ssl util m z lib/mysql/mysqlclient>=10 \
 			vanessa_adt>=0.3 vanessa_logger>=0.3
 .endif
 
-.if ${FLAVOR:L:Mno_pgsql}
+.if ${FLAVOR:Mno_pgsql}
 CONFIGURE_ARGS+=	--disable-pg
 .else 
 SHARED_LIBS +=  	perditiondb_postgresql       0.0  # .0.0
diff --git a/mail/postfix/Makefile.inc b/mail/postfix/Makefile.inc
index c350afb0dbd..92c0d3d00a6 100644
--- a/mail/postfix/Makefile.inc
+++ b/mail/postfix/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.85 2012/05/16 14:40:08 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.86 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	fast, secure sendmail replacement
 
@@ -46,35 +46,35 @@ NO_REGRESS=	Yes
 FLAVORS+=	sasl2 ldap mysql pgsql db4
 FLAVOR?=
 
-.if ${FLAVOR:L:Msasl2}
+.if ${FLAVOR:Msasl2}
 LIB_DEPENDS+=	security/cyrus-sasl2
 WANTLIB+=	sasl2
 MAKE_CCARGS+=	-DUSE_CYRUS_SASL -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl
 MAKE_AUXLIBS+=	-L${LOCALBASE}/lib -lsasl2
 .endif
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 LIB_DEPENDS+=	databases/openldap>=2,<3
 WANTLIB+=	ldap>=2 lber
 MAKE_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 MAKE_AUXLIBS+=	-L${LOCALBASE}/lib -lldap -llber
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 LIB_DEPENDS+=	databases/mysql
 WANTLIB+=	lib/mysql/mysqlclient>=10
 MAKE_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 MAKE_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient
 .endif
 
-.if ${FLAVOR:L:Mpgsql}
+.if ${FLAVOR:Mpgsql}
 LIB_DEPENDS+=	databases/postgresql
 WANTLIB+=	pq>=3
 MAKE_CCARGS+=	-DHAS_PGSQL -I${LOCALBASE}/include/postgresql
 MAKE_AUXLIBS+=	-L${LOCALBASE}/lib -lpq
 .endif
 
-.if ${FLAVOR:L:Mdb4}
+.if ${FLAVOR:Mdb4}
 LIB_DEPENDS+=	databases/db/v4>=4,<5
 WANTLIB+=	lib/db4/db>=4
 MAKE_CCARGS+=	-I${LOCALBASE}/include/db4
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 18ea49fc8ba..d5a411d5c8c 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2012/03/17 10:47:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	filtering local mail delivery agent
 
@@ -27,7 +27,7 @@ FLAVORS=	lmtp
 FLAVOR?=
 
 USE_GROFF =	Yes
-.if ${FLAVOR:L:Mlmtp}
+.if ${FLAVOR:Mlmtp}
 CFLAGS+=	-DLMTP
 .endif
 
diff --git a/mail/smtp-vilter/Makefile b/mail/smtp-vilter/Makefile
index e020fe85f17..0356c1c643d 100644
--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2011/09/16 10:31:22 espie Exp $
+# $OpenBSD: Makefile,v 1.50 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	sendmail milter to scan messages for viruses and spam
 
@@ -27,7 +27,7 @@ NO_REGRESS=	Yes
 FLAVORS=	ldap
 FLAVOR?=
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 MAKE_FLAGS+=	-DENABLE_LDAP
 LIB_DEPENDS+=	databases/openldap
 WANTLIB += ldap_r lber
diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile
index a42d2c11321..c4cecffb5eb 100644
--- a/mail/solid-pop3d/Makefile
+++ b/mail/solid-pop3d/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2012/04/28 10:51:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	flexible POP3 server
 
@@ -31,7 +31,7 @@ USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
 # enable support for APOP authentication.
-.if ${FLAVOR:L:Mapop}
+.if ${FLAVOR:Mapop}
 CONFIGURE_ARGS+= --enable-userconfig --enable-apop
 .else
 CONFIGURE_ARGS+= --disable-userconfig --disable-apop
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 565ba6f15d2..471f3f178c9 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.98 2012/07/12 20:17:45 rpointel Exp $
+# $OpenBSD: Makefile,v 1.99 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT =		lightweight and user-friendly e-mail client
 
@@ -49,7 +49,7 @@ CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS= 		compface
 FLAVOR?=
 
-.if ${FLAVOR:L:Mcompface}
+.if ${FLAVOR:Mcompface}
 LIB_DEPENDS+=		mail/faces
 WANTLIB+=		compface
 CONFIGURE_ARGS +=	--enable-compface
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 34a78ffbf40..c299866096b 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2011/09/16 10:31:22 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	GRaphing, Advanced Computation and Exploration of data
 
@@ -39,10 +39,10 @@ WANTLIB +=	jpeg>=62 png>=2 t1>=5 tiff>=35 pdf>=2
 FLAVORS=	no_x11 fftw netcdf xmhtml
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=	--without-x
 NO_REGRESS=		Yes
-.  if ${FLAVOR:L:Mxmhtml}
+.  if ${FLAVOR:Mxmhtml}
 ERRORS+=	"Fatal: Flavors 'no_x11' and 'xmhtml' are mutually exclusive."
 .  endif
 .else
@@ -50,7 +50,7 @@ REGRESS_IS_INTERACTIVE=	x11
 LIB_DEPENDS+=		x11/openmotif
 WANTLIB+=		ICE SM X11 Xext Xmu Xpm Xt Xm
 MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
-.  if ${FLAVOR:L:Mxmhtml}
+.  if ${FLAVOR:Mxmhtml}
 LIB_DEPENDS +=		www/xmhtml
 WANTLIB +=		XmHTML>=1
 CONFIGURE_ARGS+=	--enable-xmhtml
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--disable-xmhtml
 CONFIGURE_ENV=		LDFLAGS=-lm
 .endif
 
-.if ${FLAVOR:L:Mfftw}
+.if ${FLAVOR:Mfftw}
 LIB_DEPENDS +=		math/fftw
 WANTLIB +=		fftw>=2
 CONFIGURE_ARGS+=	--with-fftw
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--with-fftw
 CONFIGURE_ARGS+=	--without-fftw
 .endif
 
-.if ${FLAVOR:L:Mnetcdf}
+.if ${FLAVOR:Mnetcdf}
 LIB_DEPENDS +=		math/netcdf
 WANTLIB +=		netcdf>=1
 CONFIGURE_ARGS+=	--enable-netcdf
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--disable-netcdf
 
 GRACE_DIR=${TRUEPREFIX}/grace
 post-install:
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 	ln -sf ${GRACE_DIR}/bin/grace ${PREFIX}/bin/grace
 	ln -sf ${GRACE_DIR}/bin/grace ${PREFIX}/bin/gracebat
 .else
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 2216611f2ef..1fb67a7062d 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2013/01/04 14:05:41 edd Exp $
+# $OpenBSD: Makefile,v 1.27 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		GPL computer algebra system based on DOE Macsyma
 
@@ -32,7 +32,7 @@ USE_GROFF =		Yes
 FLAVORS=		no_x11
 FLAVOR?=
 
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:Mno_x11}
 MODULES+=		x11/tk
 RUN_DEPENDS +=		${MODTK_RUN_DEPENDS} \
 			math/gnuplot
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 0017d490429..11fec431ab9 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2012/04/28 10:52:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.42 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main=	network-capable tape backup (client and tape server)
 COMMENT-client=	network-capable tape backup (client only)
@@ -70,14 +70,14 @@ USE_GROFF =	Yes
 
 # Use this flavor to speed things up if you have large AMANDA
 # databases.
-.if ${FLAVOR:L:Mdb}
+.if ${FLAVOR:Mdb}
 WANTLIB+=	lib/db4/db
 LIB_DEPENDS+=	databases/db/v4
 CONFIGURE_ARGS+= --with-db=db
 CFLAGS+=	 -L${LOCALBASE}/lib
 .endif
 
-.if ${FLAVOR:L:Mgpg}
+.if ${FLAVOR:Mgpg}
 BUILD_DEPENDS+=  security/gnupg
 CONFIGURE_ENV+=  GZIP=${LOCALBASE}/bin/gpgzip
 .endif
diff --git a/misc/cdrdao/Makefile b/misc/cdrdao/Makefile
index 9a43535ea5c..3673841c83d 100644
--- a/misc/cdrdao/Makefile
+++ b/misc/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2012/07/04 07:46:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	write audio/data CD-Rs in disk-at-once mode
 
@@ -27,7 +27,7 @@ MAKE_ENV=		CCOM="${CC}"
 FLAVORS=	audio
 FLAVOR?=
 
-.if ${FLAVOR:L:Maudio}
+.if ${FLAVOR:Maudio}
 CONFIGURE_ARGS+=	--with-lame-lib=${LOCALBASE}/lib \
 			--with-lame-include=${LOCALBASE}/include
 BUILD_DEPENDS+=		audio/libmad
diff --git a/misc/gpsd/Makefile b/misc/gpsd/Makefile
index 61603b56fae..28db79fac1b 100644
--- a/misc/gpsd/Makefile
+++ b/misc/gpsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2012/12/21 13:04:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.51 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main=		service daemon that monitors one or more GPSes
 COMMENT-x11=		GUI test apps using gpsd
@@ -49,7 +49,7 @@ BUILD_DEPENDS=		textproc/docbook-xsl
 RUN_DEPENDS-main=	${MODPY_RUN_DEPENDS}
 LIB_DEPENDS-main=	devel/libusb1
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ENV +=	LDFLAGS="-lm -pthread -lutil"
 .else
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index a250ec971cb..a51fcbd73e1 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2013/01/02 07:18:46 shadchin Exp $
+# $OpenBSD: Makefile,v 1.47 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		free Norton Commander clone with many useful features
 
@@ -25,7 +25,7 @@ USE_GROFF=		Yes
 FLAVORS=		no_x11
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=	--without-x
 .endif
 
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 1aafd9a35ca..3cdbecacfc3 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2013/02/05 14:51:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.64 2013/02/09 14:49:51 sthen Exp $
 # Please adjust www/faq/faq15.html if updating.
 
 COMMENT=	multi-screen window manager
@@ -28,12 +28,12 @@ USE_GROFF =	Yes
 FLAVORS=	static shm
 FLAVOR?=
 
-.if ${FLAVOR:L} == "static"
+.if ${FLAVOR} == "static"
 CONFIGURE_ENV=	LDFLAGS="-static"
 .else
 WANTLIB=	c curses util
 .endif
-.if ${FLAVOR:L} == "shm"
+.if ${FLAVOR} == "shm"
 PATCH_LIST=	patch-* shmpatch-*
 .endif
 
diff --git a/misc/teseq/Makefile b/misc/teseq/Makefile
index 96a4db31d9c..c46b3dd2fa1 100644
--- a/misc/teseq/Makefile
+++ b/misc/teseq/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2012/08/06 12:21:05 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	analyze terminal control sequences
 
@@ -25,7 +25,7 @@ WANTLIB=	c
 CONFIGURE_STYLE=gnu
 MAKE_FLAGS=	AM_CFLAGS=""
 
-.if ${FLAVOR:L:Mregress}
+.if ${FLAVOR:Mregress}
 BUILD_DEPENDS=	devel/check
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index b4c0a51abfa..4bc37d63fd2 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2012/09/05 16:31:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		tools to edit/modify/encode video streams
 
@@ -52,11 +52,11 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS=		quicktime optimized
 FLAVOR?=
 
-.if !${FLAVOR:L:Moptimized}
+.if !${FLAVOR:Moptimized}
 CONFIGURE_ARGS+=	--disable-simd-accel
 .endif
 
-.if ${FLAVOR:L:Mquicktime}
+.if ${FLAVOR:Mquicktime}
 LIB_DEPENDS +=		multimedia/libquicktime
 WANTLIB+=		quicktime>=2
 .else
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ba4a61b0bda..e8fd8ba92f2 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2012/03/08 12:13:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT =	create, alter and inspect Matroska files
 
@@ -54,7 +54,7 @@ USE_GROFF =	Yes
 FLAVORS =	no_x11
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS += --disable-gui --disable-wxwidgets
 .else
 LIB_DEPENDS +=	x11/wxWidgets>=2.8.10
@@ -76,7 +76,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/man/ja/$i.1 ${PREFIX}/man/ja.po
 	${INSTALL_DATA} ${WRKSRC}/doc/man/zh_CN/$i.1 ${PREFIX}/man/zh_CN.po	
 .endfor
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:Mno_x11}
 	${INSTALL_PROGRAM} ${WRKBUILD}/src/mmg/mmg ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/doc/man/mmg.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mkvtoolnix/images
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 3b6e505dc5d..188450acae1 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2013/01/19 08:42:35 brad Exp $
+# $OpenBSD: Makefile,v 1.54 2013/02/09 14:49:51 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+=--enable-a52 \
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
-.if ${FLAVOR:L:Mlzo}
+.if ${FLAVOR:Mlzo}
 CONFIGURE_ARGS+=--enable-lzo
 WANTLIB +=	lzo2
 LIB_DEPENDS+=	archivers/lzo2
@@ -107,7 +107,7 @@ PKG_ARGS+=	-Dlzo=1
 PKG_ARGS+=	-Dlzo=0
 .endif
 
-.if ${FLAVOR:L:Mmjpegtools}
+.if ${FLAVOR:Mmjpegtools}
 CONFIGURE_ARGS+=--enable-mjpegtools
 WANTLIB +=	mjpegutils-1.9
 LIB_DEPENDS+=	multimedia/mjpegtools
@@ -117,7 +117,7 @@ PKG_ARGS+=	-Dmjpegtools=1
 PKG_ARGS+=	-Dmjpegtools=0
 .endif
 
-.if ${FLAVOR:L:Mquicktime}
+.if ${FLAVOR:Mquicktime}
 CONFIGURE_ARGS+=--enable-libquicktime
 LIB_DEPENDS+=	multimedia/libquicktime
 WANTLIB +=	quicktime
@@ -127,7 +127,7 @@ PKG_ARGS+=	-Dquicktime=1
 PKG_ARGS+=	-Dquicktime=0
 .endif
 
-.if ${FLAVOR:L:Maltivec}
+.if ${FLAVOR:Maltivec}
 ONLY_FOR_ARCHS=	powerpc
 CONFIGURE_ARGS+=--enable-altivec
 .else
diff --git a/net/bird/Makefile b/net/bird/Makefile
index 890b5c52516..349716a473f 100644
--- a/net/bird/Makefile
+++ b/net/bird/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2013/01/24 10:04:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT-main=	BIRD internet routing daemon
 COMMENT-doc=	BIRD internet routing daemon (documentation)
@@ -33,7 +33,7 @@ FLAVORS=	v6
 FLAVOR?=
 SUBST_VARS+=	SIX
 
-.if ${FLAVOR:L:Mv6}
+.if ${FLAVOR:Mv6}
 FULLPKGNAME-main= bird-v6-$V
 FULLPKGPATH-main= net/bird,-main,v6
 SIX=		6
@@ -51,7 +51,7 @@ FAKE_FLAGS=	sysconfdir=${TRUEPREFIX}/share/examples/bird
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 
-.if ${FLAVOR:L:Mv6}
+.if ${FLAVOR:Mv6}
 CONFIGURE_ARGS+=--enable-ipv6
 .endif
 
diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index 0b5b92e798f..475816eaf15 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2013/01/30 21:45:42 okan Exp $
+# $OpenBSD: Makefile,v 1.48 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=		IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
@@ -45,12 +45,12 @@ SUBST_VARS=		DB_DIR
 FLAVORS =		libpurple otr
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mlibpurple}
+.if ${FLAVOR:Mlibpurple}
 CONFIGURE_ARGS +=	--purple=1
 LIB_DEPENDS +=		net/pidgin,-libpurple
 WANTLIB +=		purple
 .endif
-.if ${FLAVOR:L:Motr}
+.if ${FLAVOR:Motr}
 CONFIGURE_ARGS +=	--otr=1
 LIB_DEPENDS +=		security/libotr security/libgcrypt
 WANTLIB +=		gcrypt otr
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 7d76d02ae18..d825883d6fb 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/11/19 22:31:32 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2013/02/09 14:49:51 sthen Exp $
 
 ONLY_FOR_ARCHS=	i386
 COMMENT-main=	network file distribution system
@@ -37,7 +37,7 @@ FLAVOR?=
 
 M3FLAGS=	 -DPREFIX=${PREFIX} -DX11BASE=${X11BASE}
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 M3FLAGS+=	-DNOGUI
 .else
 WANTLIB-main=	${WANTLIB} ICE SM X11 Xaw Xext Xmu Xt pthread-stubs xcb
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index 0119cd8ce30..32ea25d6076 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2013/02/03 23:07:02 nigel Exp $
+# $OpenBSD: Makefile,v 1.60 2013/02/09 14:49:51 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -43,7 +43,7 @@ CFLAGS+=	-DNS_IN6ADDRSZ=16 -DNS_INT16SZ=2
 CONFIGURE_ARGS+= -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		-DMAN_INSTALLDIR="${TRUEPREFIX}/man"
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+= -DENABLE_GTK=off
 .else
 LIB_DEPENDS+=	x11/gtk+2
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index 12f161497ae..1f6ce19356c 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2012/04/28 10:51:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2013/02/09 14:49:51 sthen Exp $
 
 SHARED_LIBS +=  ft                   0.0      # .0.0
 
@@ -34,7 +34,7 @@ CONFIGURE_STYLE=	gnu
 SEPARATE_BUILD=		Yes
 SYSCONFDIR=		${BASESYSCONFDIR}/flow-tools
 
-.if !${FLAVOR:L:Mpgsql}
+.if !${FLAVOR:Mpgsql}
 CONFIGURE_ARGS+=	--without-postgresql
 .else
 WANTLIB +=		pq
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 9c31b245982..d47e866ebab 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2012/09/16 12:44:02 pea Exp $
+# $OpenBSD: Makefile,v 1.44 2013/02/09 14:49:51 sthen Exp $
 
 SHARED_ONLY=	Yes
 SHARED_LIBS +=  freeradius-radius    4.1      # .0.0
@@ -84,7 +84,7 @@ WANTLIB-main=		${WANTLIB} c com_err krb5 pcap pthread readline \
 PSEUDO_FLAVORS=	no_ldap no_mysql no_pgsql no_iodbc
 FLAVOR?=		
 
-.if ${FLAVOR:L:Mno_iodbc}
+.if ${FLAVOR:Mno_iodbc}
 CONFIGURE_ARGS+=	--without-rlm_sql_iodbc
 .else
 MULTI_PACKAGES+=	-iodbc
@@ -94,7 +94,7 @@ LIB_DEPENDS-iodbc=	databases/iodbc
 WANTLIB-iodbc=		iodbc>=2 pthread
 .endif
 
-.if ${FLAVOR:L:Mno_ldap}
+.if ${FLAVOR:Mno_ldap}
 CONFIGURE_ARGS+=	--without-rlm_ldap
 .else
 MULTI_PACKAGES+=	-ldap
@@ -105,7 +105,7 @@ WANTLIB-ldap=		${WANTLIB} sasl2 asn1 com_err gssapi krb5 \
 			lber>=8 ldap_r>=8 freeradius-radius>=1 pthread
 .endif
 
-.if ${FLAVOR:L:Mno_mysql}
+.if ${FLAVOR:Mno_mysql}
 CONFIGURE_ARGS+=	--without-rlm_sql_mysql
 .else
 MULTI_PACKAGES+=	-mysql
@@ -114,7 +114,7 @@ LIB_DEPENDS-mysql=	databases/mysql
 WANTLIB-mysql=		${WANTLIB} m pthread z mysqlclient_r>=16
 .endif
 
-.if ${FLAVOR:L:Mno_pgsql}
+.if ${FLAVOR:Mno_pgsql}
 CONFIGURE_ARGS+=	--without-rlm_sql_postgresql
 .else
 MULTI_PACKAGES+=	-pgsql
diff --git a/net/ices/Makefile b/net/ices/Makefile
index 2c07e57e940..7c4c0e61377 100644
--- a/net/ices/Makefile
+++ b/net/ices/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2012/03/29 13:38:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2013/02/09 14:49:51 sthen Exp $
 
 COMMENT=	icecast source for streaming MP3
 
@@ -37,7 +37,7 @@ LIB_DEPENDS=	audio/lame \
 FLAVORS=	python mp4
 FLAVOR?=
 
-.if ${FLAVOR:L:Mpython}
+.if ${FLAVOR:Mpython}
 MODULES+=	lang/python
 CONFIGURE_ARGS+=--with-python=${MODPY_BIN}
 LIB_DEPENDS+=	${MODPY_LIB_DEPENDS}
@@ -45,7 +45,7 @@ LIB_DEPENDS+=	${MODPY_LIB_DEPENDS}
 CONFIGURE_ARGS+=--without-python
 .endif
 
-.if ${FLAVOR:L:Mmp4}
+.if ${FLAVOR:Mmp4}
 CONFIGURE_ARGS+=--with-faad=${LOCALBASE}
 LIB_DEPENDS+=	audio/faad \
 		multimedia/libmp4v2
diff --git a/net/ifstat/Makefile b/net/ifstat/Makefile
index bf6020b6277..a942763f211 100644
--- a/net/ifstat/Makefile
+++ b/net/ifstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/11/16 00:10:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=		tool to monitor interface bandwidth usage
 
@@ -28,7 +28,7 @@ NO_REGRESS=		Yes
 FLAVORS=		snmp
 FLAVOR?=
 
-.if ${FLAVOR:L} == "snmp"
+.if ${FLAVOR} == "snmp"
 WANTLIB +=		netsnmp
 LIB_DEPENDS=		net/net-snmp
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
diff --git a/net/irc/Makefile b/net/irc/Makefile
index a4a3875f4b1..8b68cf40c71 100644
--- a/net/irc/Makefile
+++ b/net/irc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2013/01/18 20:54:44 gsoares Exp $
+# $OpenBSD: Makefile,v 1.35 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	internet relay chat (irc) server
 
@@ -32,7 +32,7 @@ USE_GROFF =	Yes
 FLAVORS=	ipv6 hub
 FLAVOR?=	
 
-.if ${FLAVOR:L:Mipv6}
+.if ${FLAVOR:Mipv6}
 CONFIGURE_ARGS+=	--enable-ip6
 .endif
 
@@ -46,7 +46,7 @@ WRKBUILD=	${WRKSRC}/support
 SUBST_VARS=	CONFDIR
 
 pre-configure:
-.if ${FLAVOR:L:Mhub}
+.if ${FLAVOR:Mhub}
 	@perl -pi -e 's,^/\* #define\tHUB \*/,#define\tHUB,g' ${WRKSRC}/support/config.h.dist
 .endif
 	@cp $(WRKSRC)/support/config.h.dist $(WRKSRC)/support/config.h
diff --git a/net/irssi/Makefile b/net/irssi/Makefile
index bdff4d19445..d67d799bb1c 100644
--- a/net/irssi/Makefile
+++ b/net/irssi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2012/09/01 14:36:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -38,7 +38,7 @@ CONFIGURE_ARGS+=--with-pic \
 FLAVORS=	socks
 FLAVOR?=
 
-.if ${FLAVOR:L:Msocks}
+.if ${FLAVOR:Msocks}
 CONFIGURE_ARGS+=	--with-socks
 BUILD_DEPENDS+=		security/dante
 .endif
diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile
index af985c174e3..097d3a24bb1 100644
--- a/net/isc-bind/Makefile
+++ b/net/isc-bind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/01/04 13:34:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	Berkeley Internet Name Daemon
 
@@ -33,7 +33,7 @@ MASTER_SITES0=	http://ss.vix.com/~vixie/
 FLAVORS=	ratelimit
 FLAVOR?=
 
-.if ${FLAVOR:L:Mratelimit}
+.if ${FLAVOR:Mratelimit}
 PATCHFILES+=	rl-${RV}.patch:0
 .else
 SUPDISTFILES+=	rl-${RV}.patch:0
diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index 9d2d2dbe7f6..ddbc6a7f008 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2012/08/24 07:24:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.44 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=		jabber server
 DISTNAME=		jabberd-2.0s11
@@ -43,7 +43,7 @@ CONFIGURE_ARGS=		--enable-debug \
 EXTRA_INCLUDE_PATH=	${LOCALBASE}/include
 EXTRA_LIBRARY_PATH=	${LOCALBASE}/lib
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 LIB_DEPENDS+=		databases/mysql
 WANTLIB +=		lib/mysql/mysqlclient>=10
 CONFIGURE_ARGS+=	--enable-mysql
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+=	--enable-mysql
 CONFIGURE_ARGS+=	--disable-mysql
 .endif
 
-.if ${FLAVOR:L:Mpostgresql}
+.if ${FLAVOR:Mpostgresql}
 LIB_DEPENDS+=		databases/postgresql
 WANTLIB +=		pq>=4
 CONFIGURE_ARGS+=	--enable-pgsql
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--enable-pgsql
 CONFIGURE_ARGS+=	--disable-pgsql
 .endif
 
-.if ${FLAVOR:L:Mdb}
+.if ${FLAVOR:Mdb}
 LIB_DEPENDS+=		databases/db/v4
 WANTLIB +=		lib/db4/db>=4
 CONFIGURE_ARGS+=	--enable-db
@@ -68,7 +68,7 @@ EXTRA_INCLUDE_PATH:=	${EXTRA_INCLUDE_PATH}:${LOCALBASE}/include/db4
 CONFIGURE_ARGS+=	--disable-db
 .endif
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 LIB_DEPENDS+=		databases/openldap>=2.3
 WANTLIB +=		ldap>=8 lber>=8
 CONFIGURE_ARGS+=	--enable-ldap
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
 .for s in ${STORAGES}
-.  if ${FLAVOR:L:M$s}
+.  if ${FLAVOR:M$s}
 storage_flag=1
 .  endif
 .endfor
diff --git a/net/kismet/Makefile b/net/kismet/Makefile
index 8d1528da9c9..bc1a9c9f239 100644
--- a/net/kismet/Makefile
+++ b/net/kismet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2012/06/19 12:58:24 okan Exp $
+# $OpenBSD: Makefile,v 1.29 2013/02/09 14:49:52 sthen Exp $
 # Much help came from Alexandre Anriot, Robert Nagy, Bernd Ahlers,
 # and, last but not least, Pedro la Peu.
 
@@ -59,7 +59,7 @@ WANTLIB-gpsmap=		c expat m pthread stdc++ z \
 LIB_DEPENDS-gpsmap=	graphics/ImageMagick \
 			devel/gmp
 
-.if !${FLAVOR:L:Mno_gpsmap}
+.if !${FLAVOR:Mno_gpsmap}
 MULTI_PACKAGES+=	-gpsmap
 .else
 CONFIGURE_ARGS+=	--disable-gpsmap
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 4d45ec0d862..e9b0cd4bb6b 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/11/16 17:05:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT-main=	portable low-level networking library
 COMMENT-python= python interface to libdnet
@@ -39,7 +39,7 @@ USE_GROFF =		Yes
 RUN_DEPENDS-main=
 
 CONFIGURE_ARGS +=	--without-check
-.if ${FLAVOR:L:Mno_python}
+.if ${FLAVOR:Mno_python}
 CONFIGURE_ARGS+=	--without-python
 .else
 MODULES+=		lang/python
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index b92eeb80b1f..44aa4bcb617 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2012/11/27 12:16:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -87,7 +87,7 @@ CONFIGURE_ARGS=		-DCMAKE_C_FLAGS="${CFLAGS}" \
 			-DWITH_NM:BOOL=OFF \
 			-DBIPR:BOOL=OFF
 
-.if ${FLAVOR:L:Mmozilla}
+.if ${FLAVOR:Mmozilla}
 BUILD_DEPENDS +=	devel/xulrunner/1.9,-devel>=1.9.1
 MULTI_PACKAGES +=	-mozilla
 CONFIGURE_ARGS +=	-DWITH_MOZJS:BOOL=ON
@@ -95,7 +95,7 @@ CONFIGURE_ARGS +=	-DWITH_MOZJS:BOOL=ON
 CONFIGURE_ARGS +=	-DWITH_MOZJS:BOOL=OFF
 .endif
 
-.if ${FLAVOR:L:Mwebkit}
+.if ${FLAVOR:Mwebkit}
 MULTI_PACKAGES +=	-webkit
 CONFIGURE_ARGS +=	-DWITH_WEBKIT3:BOOL=ON
 .else
diff --git a/net/minbif/Makefile b/net/minbif/Makefile
index 6ff4f5e3fec..f1aae659afc 100644
--- a/net/minbif/Makefile
+++ b/net/minbif/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2011/05/11 12:03:19 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT =	IRC-friendly instant messaging client
 
@@ -29,7 +29,7 @@ NO_REGRESS =	Yes
 #FLAVORS = full
 #FLAVOR ?=
 #
-#.if ${FLAVOR:L:Mfull}
+#.if ${FLAVOR:Mfull}
 #LIB_DEPENDS=	net/pidgin,-libpurple,audio \
 #		multimedia/gstreamer-0.10/core \
 #		net/farsight2 \
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 7780afef247..94f36730d35 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2012/10/15 10:13:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.51 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	Matt's traceroute - network diagnostic tool#'
 
@@ -24,7 +24,7 @@ CONFIGURE_STYLE=gnu
 FLAVORS=	gtk
 
 FLAVOR?=
-.if ${FLAVOR:L} == "gtk"
+.if ${FLAVOR} == "gtk"
 BROKEN= fails at runtime with "No nameservers defined"
 MODULES+=		devel/gettext
 CONFIGURE_ARGS+=	--with-gtk-prefix=${LOCALBASE}
diff --git a/net/nagios/nagios/Makefile b/net/nagios/nagios/Makefile
index a11a9f531c4..7784576e8d1 100644
--- a/net/nagios/nagios/Makefile
+++ b/net/nagios/nagios/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2013/01/14 12:14:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT-main=	host and service monitor
 COMMENT-web=	cgis and webpages for nagios
@@ -50,7 +50,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS=	chroot
 FLAVOR?=
 
-.if ${FLAVOR:L:Mchroot}
+.if ${FLAVOR:Mchroot}
 CHROOT=		/var/www
 PATCH_LIST=	patch-* chroot-*
 .else
@@ -61,7 +61,7 @@ WANTLIB=	c m
 
 PREFIX-web=	/var/www
 # overwrite RUN_DEPENDS in order to only depend on the base package
-.if ${FLAVOR:L:Mchroot}
+.if ${FLAVOR:Mchroot}
 WANTLIB-web=
 LIB_DEPENDS-web=
 RUN_DEPENDS-web= nagios-${V}-chroot:net/nagios/nagios,chroot
diff --git a/net/nagios/plugins/Makefile b/net/nagios/plugins/Makefile
index 1ff316cf1ec..52a9fe288dd 100644
--- a/net/nagios/plugins/Makefile
+++ b/net/nagios/plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2012/06/28 23:10:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.34 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT-main=	nagios base plugins
 COMMENT-fping=	fping plugin
@@ -59,7 +59,7 @@ FLAVOR?=
 
 MULTI_PACKAGES=	-main -fping -game
 
-.if ! ${FLAVOR:L:Mno_db}
+.if ! ${FLAVOR:Mno_db}
 MULTI_PACKAGES+=-ldap -mysql -pgsql
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \
 		--with-pgsql=${LOCALBASE}
@@ -68,17 +68,17 @@ CFLAGS+=	-DLDAP_DEPRECATED
 CONFIGURE_ARGS+=--without-mysql --without-pgsql
 .endif
 
-.if ! ${FLAVOR:L:Mno_ntp}
+.if ! ${FLAVOR:Mno_ntp}
 MULTI_PACKAGES+=-ntp
 BUILD_DEPENDS+=	net/ntp
 .endif
 
-.if ! ${FLAVOR:L:Mno_samba}
+.if ! ${FLAVOR:Mno_samba}
 MULTI_PACKAGES+=-samba
 BUILD_DEPENDS+=	net/samba
 .endif
 
-.if ! ${FLAVOR:L:Mno_snmp}
+.if ! ${FLAVOR:Mno_snmp}
 MULTI_PACKAGES+=-snmp
 BUILD_DEPENDS+=	net/p5-Net-SNMP \
 		net/net-snmp
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 3006f224ba3..c0b76ae454f 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2013/01/09 23:06:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.46 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -42,7 +42,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS=	avahi
 FLAVOR?=
 
-.if ${FLAVOR:L:Mavahi}
+.if ${FLAVOR:Mavahi}
 WANTLIB+=	avahi-client avahi-common dbus-1
 LIB_DEPENDS+=	net/avahi
 .else
diff --git a/net/nslint/Makefile b/net/nslint/Makefile
index 144a33302ba..459cd491c97 100644
--- a/net/nslint/Makefile
+++ b/net/nslint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/02/05 14:51:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=		performs consistency checks on BIND files
 
@@ -18,7 +18,7 @@ MASTER_SITES=		ftp://ftp.ee.lbl.gov/old/
 FLAVORS=		static
 FLAVOR?=
 
-.if ${FLAVOR:L} == "static"
+.if ${FLAVOR} == "static"
 CONFIGURE_ENV+=		LDFLAGS=-static
 .else
 WANTLIB=		c
diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 87bc928340c..b862db782b4 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2013/02/01 17:15:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.45 2013/02/09 14:49:52 sthen Exp $
 
 ONLY_FOR_ARCHS=		i386
 
@@ -68,7 +68,7 @@ post-install:
 		${PREFIX}/sbin/openafs-setup
 	chmod u+x ${PREFIX}/sbin/openafs-setup
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS+=	--enable-debug
 CONFIGURE_ARGS+=	--enable-debug-lwp
 .endif
diff --git a/net/pavuk/Makefile b/net/pavuk/Makefile
index ca46a14b4f5..0613bbf8cd1 100644
--- a/net/pavuk/Makefile
+++ b/net/pavuk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2012/06/26 10:14:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.27 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	tool to mirror contents of HTTP and FTP servers
 
@@ -30,7 +30,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GROFF =	Yes
 
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:Mno_x11}
 LIB_DEPENDS+=	x11/gtk+2
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xmu Xrandr Xrender atk-1.0 cairo expat
diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index ff950472a9e..f28ab6da9bd 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.113 2013/02/06 14:23:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.114 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -106,7 +106,7 @@ FLAVOR?=
 
 MULTI_PACKAGES= -main -finch -libpurple
 
-.if ${FLAVOR:L:Maudio}
+.if ${FLAVOR:Maudio}
 LIB_DEPENDS+=		multimedia/gstreamer-0.10/core>=0.10,<=0.11 \
 			multimedia/gstreamer-0.10/plugins-base
 WANTLIB+=		gstreamer-0.10 gstinterfaces-0.10
@@ -118,12 +118,12 @@ LIB_DEPENDS-main+=	libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
 LIB_DEPENDS-finch+=	libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
 .endif
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS+=	--enable-debug
 DEBUG=			-O0 -g
 .endif
 
-.if ${FLAVOR:L:Mgtkspell}
+.if ${FLAVOR:Mgtkspell}
 LIB_DEPENDS-main+=	textproc/gtkspell
 WANTLIB-main+=		enchant gtkspell
 .else
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index aadd6a4024d..f99d6697f64 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2012/05/17 21:39:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.25 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -42,7 +42,7 @@ FLAVOR?=
 BACKENDS=		gsqlite3
 
 # MySQL
-.if ${FLAVOR:L:Mno_mysql}
+.if ${FLAVOR:Mno_mysql}
 CONFIGURE_ARGS+=	--without-mysql
 .else
 MULTI_PACKAGES+=	-mysql
@@ -54,7 +54,7 @@ BACKENDS+=		gmysql
 .endif
 
 # PostgreSQL
-.if ${FLAVOR:L:Mno_pgsql}
+.if ${FLAVOR:Mno_pgsql}
 CONFIGURE_ARGS+=	--without-pgsql
 .else
 MULTI_PACKAGES+=	-pgsql
@@ -67,7 +67,7 @@ BACKENDS+=		gpgsql
 .endif
 
 # LDAP
-.if ${FLAVOR:L:Mno_ldap}
+.if ${FLAVOR:Mno_ldap}
 CONFIGURE_ARGS+=	--without-ldap
 .else
 MULTI_PACKAGES+=	-ldap
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 7aa0a4dcb25..d8bb1010d8b 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2012/10/30 14:18:25 giovanni Exp $
+# $OpenBSD: Makefile,v 1.62 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	small, easy to set up, fast and very secure FTP server
 
@@ -34,7 +34,7 @@ MODULES=	converters/libiconv
 FLAVORS=	ldap mysql postgresql virtual_chroot
 FLAVOR?=
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 LIB_DEPENDS+= 	openldap-client->=2,<3:databases/openldap
 WANTLIB +=	ldap>=2 lber
 CONFIGURE_ARGS+= --with-ldap="${LOCALBASE}"
@@ -42,7 +42,7 @@ DOCS+=	README.LDAP pureftpd.schema
 CONF_FILE+= pureftpd-ldap.conf
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 LIB_DEPENDS+=	databases/mysql
 WANTLIB +=	lib/mysql/mysqlclient>=10
 CONFIGURE_ARGS+= --with-mysql="${LOCALBASE}"
@@ -51,7 +51,7 @@ CONF_FILE+= pureftpd-mysql.conf
 WANTLIB+=	m z
 .endif
 
-.if ${FLAVOR:L:Mpostgresql}
+.if ${FLAVOR:Mpostgresql}
 LIB_DEPENDS+=	databases/postgresql
 WANTLIB +=	pq>=2
 CONFIGURE_ARGS+= --with-pgsql="${LOCALBASE}"
@@ -60,7 +60,7 @@ CONF_FILE+= pureftpd-pgsql.conf
 WANTLIB+=	m z
 .endif
 
-.if ${FLAVOR:L:Mvirtual_chroot}
+.if ${FLAVOR:Mvirtual_chroot}
 CONFIGURE_ARGS+= --with-virtualchroot
 .endif
 
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 07012bb9515..8330b7bcd6b 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2013/01/04 00:24:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	multi-threaded routing daemon
 
@@ -47,7 +47,7 @@ FAKE_FLAGS=	exampledir='${PREFIX}/share/examples/quagga' \
 FLAVORS=	snmp
 FLAVOR?=
 
-.if ${FLAVOR:L:Msnmp}
+.if ${FLAVOR:Msnmp}
 LIB_DEPENDS=	net/net-snmp
 WANTLIB+=	crypto netsnmp
 CONFIGURE_ARGS+= --enable-snmp
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 25ada70361e..2eeb1bc2ca7 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2012/09/18 11:28:23 jasper Exp $
+# $OpenBSD: Makefile,v 1.69 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT =	mirroring/synchronization over low bandwidth links
 
@@ -32,7 +32,7 @@ CONFIGURE_ARGS =--with-included-popt \
 		--with-rsh="ssh -T" \
 		--with-nobody-group=_rsync
 
-.if ${FLAVOR:L:Miconv}
+.if ${FLAVOR:Miconv}
 CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE}/include' \
 		LDFLAGS='-L${LOCALBASE}/lib'
 MODULES += converters/libiconv
diff --git a/net/samba/Makefile b/net/samba/Makefile
index a1f882669ed..505c2f44cda 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.176 2013/01/30 23:22:05 brad Exp $
+# $OpenBSD: Makefile,v 1.177 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -94,18 +94,18 @@ FLAVOR?=
 
 MULTI_PACKAGES=		-main -docs
 
-.if ${FLAVOR:L:Mldap} && ${FLAVOR:L:Mads}
+.if ${FLAVOR:Mldap} && ${FLAVOR:Mads}
 ERRORS+= "Fatal: ldap and ads flavors conflict"
 .endif
 
-.if ${FLAVOR:L:Mldap} || ${FLAVOR:L:Mads}
+.if ${FLAVOR:Mldap} || ${FLAVOR:Mads}
 LIB_DEPENDS+=	databases/openldap
 WANTLIB +=	ldap lber
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
-.if ${FLAVOR:L:Mads}
+.if ${FLAVOR:Mads}
 CONFIGURE_ARGS+=	--with-krb5="${WRKDIR}/usr"
 
 # Merged build cruft needs loads of work. Disable until ready.
diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index 521d4b1c100..b63447173af 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2012/03/08 12:13:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.66 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	Secure Internet Live Conferencing (SILC) server
 
@@ -31,7 +31,7 @@ BUILD_DEPENDS+=	devel/yasm
 FLAVORS=	operops
 FLAVOR?=
 
-.if ${FLAVOR:L:Moperops}
+.if ${FLAVOR:Moperops}
 PATCH_LIST+=	patch-* operops-*
 .endif
 
diff --git a/net/unison/Makefile.inc b/net/unison/Makefile.inc
index 5cbeb5742fa..674d13f108b 100644
--- a/net/unison/Makefile.inc
+++ b/net/unison/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.20 2012/11/30 19:38:09 chrisz Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2013/02/09 14:49:52 sthen Exp $
 
 DISTNAME=	unison-$V
 CATEGORIES=	net
@@ -22,7 +22,7 @@ USE_GMAKE=	Yes
 FLAVORS=	no_x11
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 MAKE_FLAGS=	UISTYLE=text
 .else
 MODULES +=	devel/gettext
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 18337c6c437..687b1ccff99 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2012/12/08 14:24:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.30 2013/02/09 14:49:52 sthen Exp $
 COMMENT=	enhanced talk that allows for multiple parties
 
 DISTNAME=	ytalk-3.1.1
@@ -21,7 +21,7 @@ CONFIGURE_STYLE= autoconf dest
 FLAVORS=	no_x11
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+= --without-x
 .else
 WANTLIB+=	ICE SM X11 pthread-stubs xcb
diff --git a/plan9/rc/Makefile b/plan9/rc/Makefile
index 14e85de1ad7..7c5c1339445 100644
--- a/plan9/rc/Makefile
+++ b/plan9/rc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2012/03/29 13:38:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	shell (clone of plan9 shell)
 
@@ -35,17 +35,17 @@ FLAVOR+=readline
 FLAVOR+=editline
 .endif
 
-.if ${FLAVOR:L} == "readline"
+.if ${FLAVOR} == "readline"
 CONFIGURE_ARGS+= --with-readline
 WANTLIB+=		readline termcap
-.elif ${FLAVOR:L} == "editline"
+.elif ${FLAVOR} == "editline"
 DISTFILES=	${DISTNAME}.tar.gz editline-1.5.tar.gz:0
 EDITLINE=	${WRKSRC}/../editline
 CONFIGURE_ARGS+= --with-editline
 CONFIGURE_ENV=	LIBS="-L${EDITLINE}"
 .endif
 
-.if ${FLAVOR:L} == "editline"
+.if ${FLAVOR} == "editline"
 pre-configure:
 	@echo "===>  Compiling editline"
 	@cd ${EDITLINE} && ${MAKE_PROGRAM}
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 3b2ca951b0a..2c17a2309ee 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2013/02/07 07:39:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.52 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	format files for printing on PostScript printers
 
@@ -35,7 +35,7 @@ BUILD_DEPENDS=	devel/gperf
 FLAVORS=	a4
 FLAVOR?=
 
-.if ${FLAVOR:L} == "a4"
+.if ${FLAVOR} == "a4"
 PAPERSIZE=	A4
 BUILD_DEPENDS+=	print/psutils,a4
 RUN_DEPENDS+=	psutils-*-a4:print/psutils,a4
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 36ab1a17b3b..03b36f99875 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/11/20 09:48:39 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=		convert ASCII files to PostScript
 
@@ -27,7 +27,7 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--disable-nls
 USE_GROFF =		Yes
 
-.if !${FLAVOR:L:Ma4}
+.if !${FLAVOR:Ma4}
 CONFIGURE_ARGS+=	--with-media=Letter
 .endif
 
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 41592c7d7d4..094d8670ef4 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2012/02/18 09:08:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	print multiple pages per sheet on PostScript printer
 
@@ -25,7 +25,7 @@ ALL_TARGET=	default
 MAKE_FLAGS=	CC='${CC}' CFLAGS='${CFLAGS} $${DEFS}' PREFIX='${PREFIX}'
 USE_GROFF =	Yes
 
-.if ${FLAVOR:L} == "a4"
+.if ${FLAVOR} == "a4"
 MAKE_FLAGS+=	PAGESIZE=A4
 .else
 MAKE_FLAGS+=	PAGESIZE=Letter
diff --git a/print/psdim/Makefile b/print/psdim/Makefile
index d6e293d375f..8c603bc0b41 100644
--- a/print/psdim/Makefile
+++ b/print/psdim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2012/03/29 13:38:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=		intelligent n-up printing
 
@@ -32,7 +32,7 @@ SEPARATE_BUILD=		Yes
 FLAVORS=		a4
 FLAVOR?=
 
-.if defined(FLAVOR) && ${FLAVOR:L} == "a4"
+.if defined(FLAVOR) && ${FLAVOR} == "a4"
 CONFIGURE_ARGS+=	--enable-a4
 .endif
 
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index f6113491169..62285423502 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2012/04/28 12:16:29 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	utilities for manipulating PostScript documents
 
@@ -30,7 +30,7 @@ USE_GROFF =	Yes
 FLAVORS=	a4
 FLAVOR?=
 
-.if ${FLAVOR:L} == a4
+.if ${FLAVOR} == a4
 PAPERSIZE=	a4
 .else
 PAPERSIZE=	letter
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 920629d3bdf..d575900a9f7 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2012/10/28 12:08:52 jasper Exp $
+# $OpenBSD: Makefile,v 1.46 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -55,7 +55,7 @@ CONFIGURE_ARGS +=	-DCMAKE_SKIP_RPATH:BOOL=1 \
 			-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
 			-DCMAKE_C_FLAGS="${CFLAGS}"
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS+=-DWANT_DEBUG=1
 .endif
 
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index ac8ede91a55..4c3f497ceda 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2010/11/20 09:48:40 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	tools to convert Xfig's .fig files
 
@@ -29,7 +29,7 @@ FLAVORS=	a4
 FLAVOR?=
 WANTLIB=	X11 Xpm c m z png>=2
 
-.if ${FLAVOR:L:Ma4}
+.if ${FLAVOR:Ma4}
 PATCH_LIST=	patch-* a4-*
 .endif
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 6d6dff72804..b7afba0c5e9 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2013/01/07 19:35:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.69 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
@@ -48,7 +48,7 @@ FLAVOR?=
 BRKFLAVORMSG=	choose either mysql, pgsql or sqlite3
 PKG_ARGS?=	-Dsql=0
 
-.if ${FLAVOR:L:Mdb4}
+.if ${FLAVOR:Mdb4}
 CONFIGURE_ARGS+=--with-dblib=berkeley \
 		--with-bdb-libdir="${LOCALBASE}/lib/db4" \
 		--with-bdb-incdir="${LOCALBASE}/include/db4"
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=--with-dblib=ndbm \
 		--without-bdb-incdir
 .endif
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 WANTLIB+=	ssl
 LIB_DEPENDS+=	openldap-client->=2,<3:databases/openldap
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} \
@@ -70,8 +70,8 @@ WANTLIB +=	lber lber-2.4 ldap ldap-2.4
 CONFIGURE_ARGS+=--without-ldap
 .endif
 
-.if ${FLAVOR:L:Mmysql}
-.if ${FLAVOR:L:Mpgsql} || ${FLAVOR:L:Msqlite3}
+.if ${FLAVOR:Mmysql}
+.if ${FLAVOR:Mpgsql} || ${FLAVOR:Msqlite3}
 ERRORS+=	${BRKFLAVORMSG}
 .endif
 PKG_ARGS=	-Dsql=1
@@ -83,8 +83,8 @@ CONFIGURE_ARGS+=--enable-sql \
 		--without-sqlite3
 .endif
 
-.if ${FLAVOR:L:Mpgsql}
-.if ${FLAVOR:L:Mmysql} || ${FLAVOR:L:Msqlite3}
+.if ${FLAVOR:Mpgsql}
+.if ${FLAVOR:Mmysql} || ${FLAVOR:Msqlite3}
 ERRORS+=	${BRKFLAVORMSG}
 .endif
 PKG_ARGS=	-Dsql=1
@@ -97,8 +97,8 @@ CONFIGURE_ARGS+=--enable-sql \
 CFLAGS+=	-I${LOCALBASE}/include/postgresql
 .endif
 
-.if ${FLAVOR:L:Msqlite3}
-.if ${FLAVOR:L:Mmysql} || ${FLAVOR:L:Mpgsql}
+.if ${FLAVOR:Msqlite3}
+.if ${FLAVOR:Mmysql} || ${FLAVOR:Mpgsql}
 ERRORS+=		${BRKFLAVORMSG}
 .endif
 PKG_ARGS=	-Dsql=1
@@ -120,11 +120,11 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cyrus-sasl
 	${INSTALL_DATA} ${WRKSRC}/doc/{*.html,*.txt} ${PREFIX}/share/doc/cyrus-sasl
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cyrus-sasl
-.if ${FLAVOR:L:Mmysql} || ${FLAVOR:L:Mpgsql} || ${FLAVOR:L:Msqlite3}
+.if ${FLAVOR:Mmysql} || ${FLAVOR:Mpgsql} || ${FLAVOR:Msqlite3}
 	${INSTALL_DATA} ${FILESDIR}/Sendmail.conf-sql \
 		${PREFIX}/share/examples/cyrus-sasl
 .endif
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 	${INSTALL_DATA} ${WRKSRC}/saslauthd/LDAP_SASLAUTHD \
 		${PREFIX}/share/doc/cyrus-sasl
 	${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${FILESDIR}/saslauthd.conf \
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 62a104a2412..a52aec22424 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2011/09/25 14:42:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.58 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	sniffing tools for penetration testing
 
@@ -30,7 +30,7 @@ USE_GROFF =		Yes
 FLAVORS=	no_x11
 FLAVOR?=
 
-.if ${FLAVOR:L} == "no_x11"
+.if ${FLAVOR} == "no_x11"
 CONFIGURE_ARGS+=	--without-x
 .else
 WANTLIB+=	ICE SM X11 Xmu
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 12558e5e045..3d819f5e1e9 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.83 2012/12/31 16:34:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.84 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	GNU privacy guard - a free PGP replacement
 
@@ -46,14 +46,14 @@ MAKE_FLAGS=	LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \
 FLAVORS=	card ldap
 FLAVOR?=
 
-.if ${FLAVOR:L:Mcard}
+.if ${FLAVOR:Mcard}
 LIB_DEPENDS+=		devel/libusb-compat
 WANTLIB +=		usb pthread
 .else
 CONFIGURE_ARGS+=	--disable-card-support --without-libusb
 .endif
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 CONFIGURE_ARGS+=	--enable-ldap
 LIB_DEPENDS+=		databases/openldap
 WANTLIB +=		ldap>=8
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 1368ec497c3..5bd53126591 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2012/10/31 10:26:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT = 	gnu privacy guard - a free PGP replacement
 
@@ -44,7 +44,7 @@ LIB_DEPENDS =		archivers/bzip2 \
 			net/curl \
 			devel/pth
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 CONFIGURE_ARGS +=	--enable-ldap
 WANTLIB +=		ldap
 LIB_DEPENDS +=		databases/openldap
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index d08ee5197b0..cfb703ddcd3 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2012/10/15 15:18:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT-main=	parallelized login hacker
 COMMENT-gui=	GTK frontend for hydra
@@ -35,7 +35,7 @@ NO_REGRESS=	Yes
 MAKE_FLAGS=	CC=${CC}
 CFLAGS +=	-I${LOCALBASE}/include
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 ALL_TARGET=	hydra pw-inspector
 
 do-install:
diff --git a/security/nessus/core/Makefile b/security/nessus/core/Makefile
index 33367a5f176..a26a0626837 100644
--- a/security/nessus/core/Makefile
+++ b/security/nessus/core/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2012/06/29 08:33:20 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	network security scanner
 DISTNAME=	nessus-core-${V}
@@ -13,7 +13,7 @@ LIB_DEPENDS=	security/nessus/libnasl
 BUILD_DEPENDS=	devel/bison
 USE_GROFF =	Yes
 
-.if empty(FLAVOR:L:Mno_x11)
+.if empty(FLAVOR:Mno_x11)
 MODULES=	devel/gettext
 WANTLIB += 	X11 Xcomposite Xcursor Xdamage Xext Xfixes
 WANTLIB += 	Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
diff --git a/security/ophcrack/Makefile b/security/ophcrack/Makefile
index bdd67de3451..6e1251eacd0 100644
--- a/security/ophcrack/Makefile
+++ b/security/ophcrack/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2012/04/28 08:28:22 benoit Exp $
+# $OpenBSD: Makefile,v 1.8 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT =		password cracker based on rainbow tables
 
@@ -32,7 +32,7 @@ AUTOCONF_VERSION =	2.59
 FLAVORS =		gui
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mgui}
+.if ${FLAVOR:Mgui}
 WANTLIB +=		ICE SM X11 Xext Xi Xinerama Xrender expat fontconfig
 WANTLIB +=		freetype glib-2.0 gobject-2.0 gthread-2.0 png
 WANTLIB +=		pthread-stubs stdc++ xcb z
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index 7d1a95eb55d..d202e1f0c27 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2010/12/03 11:46:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2013/02/09 14:49:52 sthen Exp $
 
 COMMENT=	perl module to create/verify PGP signatures
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 FLAVORS=	pgp
 FLAVOR?=
 
-.if ${FLAVOR:L:Mpgp}
+.if ${FLAVOR:Mpgp}
 RUN_DEPENDS=	pgp->=5,<6:security/pgp5
 CONFIGURE_ARGS=	PGPV="${LOCALBASE}/bin/pgpv" PGPS="${LOCALBASE}/bin/pgps" PGPSTYLE="PGP5"
 .else
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 5a916c48385..1c2bfc94c21 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2012/07/02 16:36:33 mpi Exp $
+# $OpenBSD: Makefile,v 1.29 2013/02/09 14:49:52 sthen Exp $
 
 SHARED_ONLY =		Yes
 
@@ -51,7 +51,7 @@ do-configure:
 post-install:
 	${INSTALL_DATA_DIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.if ${FLAVOR:L:Mpython3}
+.if ${FLAVOR:Mpython3}
 	mv ${PREFIX}/share/doc/py-crypto ${PREFIX}/share/doc/py3-crypto
 .endif
 
diff --git a/security/shash/Makefile b/security/shash/Makefile
index ca75e5d8116..54a60d4a3c7 100644
--- a/security/shash/Makefile
+++ b/security/shash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2013/02/05 14:51:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	generates or checks digests or mac
 
@@ -24,7 +24,7 @@ USE_GROFF =		Yes
 FLAVORS=		static
 FLAVOR?=
 
-.if ${FLAVOR:L:Mstatic}
+.if ${FLAVOR:Mstatic}
 BUILD_DEPENDS+=		security/mhash
 CONFIGURE_ARGS+=	--enable-static-link
 .else
diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index 7a9eba3fcab..60d811489a8 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2011/03/07 17:44:16 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	protect against brute force attacks on sshd and others
 
@@ -24,7 +24,7 @@ NO_REGRESS=	Yes
 FLAVORS =	tcpd
 FLAVOR?=
 
-.if ${FLAVOR:L:Mtcpd}
+.if ${FLAVOR:Mtcpd}
 CONFIGURE_ARGS = --with-firewall=hosts
 .else
 CONFIGURE_ARGS = --with-firewall=pf 
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 18349142f08..26bf6074659 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/22 09:34:10 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	portable, encrypted, compressed tunnel
 
@@ -30,7 +30,7 @@ USE_GROFF =	Yes
 
 BUILD_DEPENDS=	archivers/bzip2
 
-.if ${FLAVOR:L:Mudp_spoof}
+.if ${FLAVOR:Mudp_spoof}
 WANTLIB +=	lib/libnet-1.0/net=0
 LIB_DEPENDS+=	libnet->=1.0,<1.1:net/libnet/1.0
 LIBNET_DEFS=	`libnet-config-1.0 --defines`
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index e07c785f14a..92b3a08443a 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2013/02/05 14:51:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	extended C-shell with many useful features
 
@@ -23,7 +23,7 @@ WANTLIB=	c termlib
 FLAVORS=	static
 FLAVOR?=
 
-.if ${FLAVOR:L} == "static"
+.if ${FLAVOR} == "static"
 CONFIGURE_ENV=	LDFLAGS="-static"
 .endif
 
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 406095d7391..2edd4bc6a3e 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2012/08/27 13:39:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT-main =		daemon for controlling APC UPSes
 COMMENT-cgi =		CGI scripts for web monitoring
@@ -60,7 +60,7 @@ WANTLIB-cgi =		c pthread gd
 LIB_DEPENDS-cgi =	graphics/gd
 RUN_DEPENDS-cgi =
 
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:Mno_x11}
 MULTI_PACKAGES +=	-x11
 CONFIGURE_ARGS +=	--enable-gapcmon
 LIB_DEPENDS-x11 =	devel/gconf2 \
diff --git a/sysutils/clusterit/Makefile b/sysutils/clusterit/Makefile
index 8960d50a1d2..155c965b49e 100644
--- a/sysutils/clusterit/Makefile
+++ b/sysutils/clusterit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2012/10/29 15:19:03 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=		suite of clustering tools based on IBM's PSSP
 
@@ -29,7 +29,7 @@ FLAVOR?=
 X11_SUBDIRS=		dvt rvt
 USE_GROFF =		Yes
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS=		--without-x11
 .else
 WANTLIB+=		X11 pthread-stubs util xcb
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 72f5f56f1be..2c0cd622248 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2012/12/31 09:36:38 chrisz Exp $
+# $OpenBSD: Makefile,v 1.37 2013/02/09 14:49:53 sthen Exp $
 
 ONLY_FOR_ARCHS= ${APM_ARCHS}
 
@@ -36,8 +36,8 @@ USE_LIBTOOL=	Yes
 FLAVORS=	no_x11 audacious xmms2
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11}
-.  if ${FLAVOR:L:Maudacious} || ${FLAVOR:L:Mxmms2}
+.if ${FLAVOR:Mno_x11}
+.  if ${FLAVOR:Maudacious} || ${FLAVOR:Mxmms2}
 ERRORS+="Fatal: nonsense combination of flavors"
 .  else
 CONFIGURE_ARGS+=--disable-double-buffer \
@@ -53,7 +53,7 @@ WANTLIB += Imlib2 X11 Xdamage Xext Xfixes Xft
 WANTLIB += Xrender expat fontconfig freetype xcb
 .endif
 
-.if ${FLAVOR:L:Maudacious}
+.if ${FLAVOR:Maudacious}
 CONFIGURE_ARGS+=--enable-audacious=yes
 LIB_DEPENDS +=	audio/audacious devel/harfbuzz
 WANTLIB +=	GL ICE Xau Xcomposite Xcursor Xdmcp Xi Xinerama \
@@ -66,7 +66,7 @@ WANTLIB +=	GL ICE Xau Xcomposite Xcursor Xdmcp Xi Xinerama \
 		pthread-stubs SM stdc++ xcb-render xcb-shm
 .endif
 
-.if ${FLAVOR:L:Mxmms2}
+.if ${FLAVOR:Mxmms2}
 CONFIGURE_ARGS+=--enable-xmms2
 LIB_DEPENDS+=	audio/xmms2
 WANTLIB+=	xmmsclient
diff --git a/sysutils/gkrellm/gkrellm/Makefile b/sysutils/gkrellm/gkrellm/Makefile
index b63eb81d232..2c939575385 100644
--- a/sysutils/gkrellm/gkrellm/Makefile
+++ b/sysutils/gkrellm/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2012/09/01 14:36:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.66 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -30,7 +30,7 @@ PSEUDO_FLAVORS=	no_client
 FLAVOR?=
 
 MULTI_PACKAGES=	-main
-.if !${FLAVOR:L:Mno_client}
+.if !${FLAVOR:Mno_client}
 MULTI_PACKAGES+=-client
 .else
 WRKBUILD=	${WRKDIST}/server
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index a8b5e8855e4..670587143e0 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2012/03/29 13:39:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	read/write/list/format DOS disks under Unix
 
@@ -29,7 +29,7 @@ USE_GROFF =	Yes
 FLAVORS=	no_x11
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS=		--with-x=no
 .else
 WANTLIB+=		ICE SM X11 Xau pthread-stubs xcb
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index aa626930629..51700e2de53 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2013/02/05 14:49:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.68 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT-main=		UPS monitoring program supporting many brands
 COMMENT-cgi=		CGIs for monitoring Nut-based UPSs
@@ -67,13 +67,13 @@ PSEUDO_FLAVORS=		no_snmp no_xml
 FLAVOR?=
 MULTI_PACKAGES=		-main -cgi
 
-.if ${FLAVOR:L:Mno_snmp}
+.if ${FLAVOR:Mno_snmp}
 CONFIGURE_ARGS+=	--without-snmp
 .else
 MULTI_PACKAGES+=	-snmp
 .endif
 
-.if ${FLAVOR:L:Mno_xml}
+.if ${FLAVOR:Mno_xml}
 CONFIGURE_ARGS+=	--without-neon
 .else
 MULTI_PACKAGES+=	-xml
diff --git a/telephony/kamailio/Makefile b/telephony/kamailio/Makefile
index 68d7c9f4af6..b7c9ea7f311 100644
--- a/telephony/kamailio/Makefile
+++ b/telephony/kamailio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2012/12/02 20:21:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.23 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT-main =		mature and flexible open source SIP server
 
@@ -80,7 +80,7 @@ MAKE_FLAGS =	FLAVOUR=kamailio \
 		LIBsrutils_VERSION=${LIBsrutils_VERSION}
 
 PSEUDO_FLAVORS +=	no_postgresql
-.if !${FLAVOR:L:Mno_postgresql}
+.if !${FLAVOR:Mno_postgresql}
 MULTI_PACKAGES +=	-postgresql
 COMMENT-postgresql =	kamailio postgresql module
 KAMAILIO_MODULES +=	db_postgres
@@ -89,7 +89,7 @@ LIB_DEPENDS-postgresql =databases/postgresql,-main telephony/kamailio,-main
 .endif
 
 PSEUDO_FLAVORS +=	no_mysql
-.if !${FLAVOR:L:Mno_mysql}
+.if !${FLAVOR:Mno_mysql}
 MULTI_PACKAGES +=	-mysql
 COMMENT-mysql =		kamailio mysql module
 KAMAILIO_MODULES +=	db_mysql
@@ -99,7 +99,7 @@ LIB_DEPENDS-mysql =	databases/mysql,-main telephony/kamailio,-main
 .endif
 
 PSEUDO_FLAVORS +=	no_ldap
-.if !${FLAVOR:L:Mno_ldap}
+.if !${FLAVOR:Mno_ldap}
 MULTI_PACKAGES +=	-ldap
 COMMENT-ldap =		kamailio LDAP modules
 KAMAILIO_MODULES +=	ldap h350
@@ -108,7 +108,7 @@ LIB_DEPENDS-ldap =	databases/openldap,-main telephony/kamailio,-main
 .endif
 
 PSEUDO_FLAVORS +=	no_xmlrpc
-.if !${FLAVOR:L:Mno_xmlrpc}
+.if !${FLAVOR:Mno_xmlrpc}
 MULTI_PACKAGES +=	-xmlrpc
 COMMENT-xmlrpc =	kamailio XML-RPC module
 KAMAILIO_MODULES +=	mi_xmlrpc
@@ -119,7 +119,7 @@ LIB_DEPENDS-xmlrpc =	net/xmlrpc-c telephony/kamailio,-main
 .endif
 
 PSEUDO_FLAVORS +=	no_snmpstats
-.if !${FLAVOR:L:Mno_snmpstats}
+.if !${FLAVOR:Mno_snmpstats}
 MULTI_PACKAGES +=	-snmpstats
 COMMENT-snmpstats =	kamailio snmpstats module
 KAMAILIO_MODULES +=	snmpstats
@@ -128,7 +128,7 @@ LIB_DEPENDS-snmpstats =	net/net-snmp telephony/kamailio,-main
 .endif
 
 PSEUDO_FLAVORS +=	no_carrierroute
-.if !${FLAVOR:L:Mno_carrierroute}
+.if !${FLAVOR:Mno_carrierroute}
 MULTI_PACKAGES +=	-carrierroute
 COMMENT-carrierroute =	kamailio carrierroute module
 KAMAILIO_MODULES +=	carrierroute
@@ -140,7 +140,7 @@ LIB_DEPENDS-carrierroute = devel/libconfuse \
 .endif
 
 PSEUDO_FLAVORS +=	no_perl
-.if !${FLAVOR:L:Mno_perl}
+.if !${FLAVOR:Mno_perl}
 MULTI_PACKAGES +=	-perl
 COMMENT-perl =		kamailio perl modules
 KAMAILIO_MODULES +=	perl perlvdb
@@ -151,7 +151,7 @@ RUN_DEPENDS-perl =	databases/p5-ldap
 
 # TODO
 #PSEUDO_FLAVORS +=	no_radius
-#.if !${FLAVOR:L:Mno_radius}
+#.if !${FLAVOR:Mno_radius}
 #MULTI_PACKAGES +=	-radius
 #COMMENT-radius =	kamailio RADIUS modules
 #KAMAILIO_MODULES +=	auth_radius misc_radius peering
diff --git a/textproc/catdoc/Makefile b/textproc/catdoc/Makefile
index 16fba317504..25da38be1e7 100644
--- a/textproc/catdoc/Makefile
+++ b/textproc/catdoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2013/01/14 13:17:50 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	MS Word, Excel, Powerpoint ==> ASCII or TeX
 
@@ -20,7 +20,7 @@ WANTLIB=	c m
 FLAVORS=	tk
 FLAVOR?=
 
-.if ${FLAVOR:L:Mtk}
+.if ${FLAVOR:Mtk}
 MODULES=	x11/tk
 RUN_DEPENDS=	${MODTK_RUN_DEPENDS}
 CONFIGURE_ARGS+=--with-wish=${MODTK_BIN}
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 6a8f8534677..ee9157d5e6b 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2011/09/27 21:29:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.45 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -32,7 +32,7 @@ MODPY_DISTUTILS_BUILDARGS=	--with-libexpat=/usr \
 FLAVORS=pyexpat
 FLAVOR?=
 
-.if ${FLAVOR:L:Mpyexpat}
+.if ${FLAVOR:Mpyexpat}
 WANTLIB += expat
 .endif
 
diff --git a/textproc/ruby-hyperestraier/Makefile b/textproc/ruby-hyperestraier/Makefile
index 204e72699bb..c3df189cb1f 100644
--- a/textproc/ruby-hyperestraier/Makefile
+++ b/textproc/ruby-hyperestraier/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2012/09/21 13:17:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -23,7 +23,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=hyperestraier/}
 
 FLAVORS =		ruby19
 FLAVOR ?=		
-.if ${FLAVOR:L:Mruby19}
+.if ${FLAVOR:Mruby19}
 MODRUBY_REV =		1.9
 FULLPKGNAME =		ruby19-hyperestraier-1.0.0
 BIN_SUFFIX =		19
@@ -50,7 +50,7 @@ pre-configure:
 	${SUBST_CMD} ${WRKSRC}/estcmd.rb
 
 post-install:
-.if ${FLAVOR:L:Mruby19}
+.if ${FLAVOR:Mruby19}
 	mv ${PREFIX}/bin/estcmd{,19}.rb
 .endif
 	${INSTALL_DATA_DIR} ${MODRUBY_EXAMPLEDIR}/hyperestraier
diff --git a/textproc/sphinx/Makefile b/textproc/sphinx/Makefile
index 20bad5f0b4e..73a0fb59d8d 100644
--- a/textproc/sphinx/Makefile
+++ b/textproc/sphinx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2012/12/21 11:32:39 landry Exp $
+# $OpenBSD: Makefile,v 1.12 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT =	free open-source SQL full-text search engine
 BROKEN-hppa =	internal compiler error: internal consistency failure
@@ -37,7 +37,7 @@ CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS =	pgsql
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mpgsql}
+.if ${FLAVOR:Mpgsql}
 CONFIGURE_ARGS +=--with-pgsql \
 		--without-mysql
 LIB_DEPENDS +=	databases/postgresql
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 7460f610d11..5769bf125c8 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/11/03 20:13:20 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	curses-based URL ripper
 
@@ -25,7 +25,7 @@ NO_REGRESS=	Yes
 FLAVORS=	slang
 FLAVOR?=
 
-.if ${FLAVOR:L:Mslang}
+.if ${FLAVOR:Mslang}
 WANTLIB+=	slang curses m
 LIB_DEPENDS=	devel/libslang
 CONFIGURE_ARGS=	--with-slang=${LOCALBASE}
diff --git a/www/apache-httpd/Makefile b/www/apache-httpd/Makefile
index 7f1d43208c4..6e04552dfdc 100644
--- a/www/apache-httpd/Makefile
+++ b/www/apache-httpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/10/18 08:12:16 giovanni Exp $
+# $OpenBSD: Makefile,v 1.33 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	apache HTTP server
 
@@ -27,7 +27,7 @@ LIB_DEPENDS=		devel/pcre
 FLAVORS=		ldap
 FLAVOR?=
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 CONFIGURE_ARGS+=	--with-ldap --enable-ldap --enable-authnz-ldap
 WANTLIB+=		asn1 com_err gssapi krb5 sasl2 ldap lber
 LIB_DEPENDS+=		databases/openldap
@@ -104,7 +104,7 @@ post-install:
 	mv ${PREFIX}/sbin/${i} ${PREFIX}/sbin/${i}2
 .endfor
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ap2-mod_auth_ldap
 .for i in mod_ldap.html mod_authnz_ldap.html.en \
 	mod_authnz_ldap.html mod_ldap.html.en
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index a977e09ac28..26774d2942f 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/08/03 12:51:24 edd Exp $
+# $OpenBSD: Makefile,v 1.30 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=		full-featured text WWW browser
 DISTNAME=		elinks-0.11.7
@@ -42,7 +42,7 @@ MODULES=		converters/libiconv
 FLAVORS=		lua no_x11 #js
 FLAVOR?=
 
-.if ${FLAVOR:L:Mlua}
+.if ${FLAVOR:Mlua}
 BROKEN=			has this ever worked?
 CONFIGURE_ARGS+=	--with-lua
 LIB_DEPENDS+=		lang/lua
@@ -51,7 +51,7 @@ WANTLIB+=		m lua>=5.1
 CONFIGURE_ARGS+=	--without-lua
 .endif
 
-.if ${FLAVOR:L:Mno_x11}
+.if ${FLAVOR:Mno_x11}
 CONFIGURE_ARGS+=	--without-x
 .else
 CONFIGURE_ARGS+=	--with-x
@@ -62,7 +62,7 @@ WANTLIB+=		X11
 # this release due to security concerns. When this is port is
 # updated to 0.12.x it can be enabled again.
 #
-#.if ${FLAVOR:L:Mjs}
+#.if ${FLAVOR:Mjs}
 #CONFIGURE_ARGS+=	--with-spidermonkey
 #LIB_DEPENDS+=		lang/spidermonkey
 #WANTLIB+=		pthread js>=2.0
diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index 4ffab668f84..75922eb5a1a 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2012/11/10 10:37:27 landry Exp $
+# $OpenBSD: Makefile,v 1.8 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY =	Yes
 COMMENT =	Java web browser plugin
@@ -39,7 +39,7 @@ BUILD_DEPENDS =	archivers/zip \
 TAR =		${LOCALBASE}/bin/gtar
 USE_GMAKE =	Yes
 
-.if ${FLAVOR:L:Mgtk3}
+.if ${FLAVOR:Mgtk3}
 CONFIGURE_ARGS +=	--with-gtk=3
 LIB_DEPENDS =	x11/gtk+3
 WANTLIB += cairo-gobject gdk-3 gtk-3
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 65d5e30f791..0644c520937 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.106 2013/01/25 08:00:23 brad Exp $
+# $OpenBSD: Makefile,v 1.107 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -45,13 +45,13 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS=	ldap mysql
 FLAVOR?=
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 CONFIGURE_ARGS+= --with-ldap
 LIB_DEPENDS+=	databases/openldap
 WANTLIB+=	sasl2 asn1 com_err gssapi krb5 lber ldap
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 CONFIGURE_ARGS+= --with-mysql
 LIB_DEPENDS+=	databases/mysql
 WANTLIB +=	mysqlclient>=10
diff --git a/www/links+/Makefile b/www/links+/Makefile
index 5c897d98260..f4af969de31 100644
--- a/www/links+/Makefile
+++ b/www/links+/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2013/01/05 11:06:39 rpe Exp $
+# $OpenBSD: Makefile,v 1.48 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	graphics and text browser
 
@@ -31,7 +31,7 @@ USE_GROFF =	Yes
 FLAVORS=	no_x11
 FLAVOR?=
 
-.if !${FLAVOR:L:Mno_x11}
+.if !${FLAVOR:Mno_x11}
 LIB_DEPENDS+=	graphics/jpeg \
 		graphics/png \
 		graphics/tiff
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 26d795954ad..90a63a2f0f6 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2012/10/03 06:36:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.55 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT =	lightweight web browser
 
@@ -24,7 +24,7 @@ NO_REGRESS =	Yes
 FLAVORS =	gtk3
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mgtk3}
+.if ${FLAVOR:Mgtk3}
 CONFIGURE_ARGS +=	--enable-gtk3
 LIB_DEPENDS =	www/webkit,gtk3 \
 		x11/gnome/gcr \
diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index 32206ee80e6..cf4badc4fe3 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/09/17 10:29:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	turns Apache into an MP3 or Ogg streaming server
 
@@ -32,11 +32,11 @@ NO_REGRESS=	Yes
 EXAMPLESRC=	${WRKSRC}/support
 CONF=		${EXAMPLESRC}/mp3.conf
 
-.if ${FLAVOR:L:Mmysql} && ${FLAVOR:L:Mpostgresql}
+.if ${FLAVOR:Mmysql} && ${FLAVOR:Mpostgresql}
 ERRORS+= "Fatal: mutually exclusive flavors: ${FLAVORS}"
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 LIB_DEPENDS+=	databases/mysql
 CONFIGURE_ARGS+=--with-mysql="${LOCALBASE}/bin"
 CONF=		${EXAMPLESRC}/mp3_with_mysql.conf
@@ -44,7 +44,7 @@ EXAMPLES+=	${EXAMPLESRC}/mysql_schema
 WANTLIB+=	crypto lib/mysql/mysqlclient>=10 m ssl z
 .endif
 
-.if ${FLAVOR:L:Mpostgresql}
+.if ${FLAVOR:Mpostgresql}
 LIB_DEPENDS+=	databases/postgresql
 CONFIGURE_ARGS+=--with-postgres="${LOCALBASE}"
 CONF=		${FILESDIR}/mp3_with_postgresql.conf
diff --git a/www/mozilla/mozilla.port.mk b/www/mozilla/mozilla.port.mk
index a1b241555c1..962ba21753b 100644
--- a/www/mozilla/mozilla.port.mk
+++ b/www/mozilla/mozilla.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: mozilla.port.mk,v 1.50 2013/01/11 22:51:44 landry Exp $
+# $OpenBSD: mozilla.port.mk,v 1.51 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY =	Yes
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc64
@@ -134,7 +134,7 @@ CONFIGURE_ARGS +=--disable-freetypetest		\
 FLAVORS +=	debug
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS +=	--enable-debug \
 			--enable-profiling \
 			--enable-debug-symbols=yes \
diff --git a/www/mozplugger/Makefile b/www/mozplugger/Makefile
index fa3a6b988ae..38da484b352 100644
--- a/www/mozplugger/Makefile
+++ b/www/mozplugger/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY =		Yes
 
@@ -27,7 +27,7 @@ FLAVOR ?=
 
 # set TMPDIR before starting browser. A 'mozdebug'
 # file is generated in that location.
-.if ${FLAVOR:L} == "debug"
+.if ${FLAVOR} == "debug"
 DEBUG =		-g
 CFLAGS +=	-DDEBUG
 .endif
diff --git a/www/nginx/Makefile.inc b/www/nginx/Makefile.inc
index 30eef2e8f82..320b90fe8d2 100644
--- a/www/nginx/Makefile.inc
+++ b/www/nginx/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2012/09/24 19:29:05 jeremy Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	robust and small HTTP server and mail proxy server
 
@@ -58,14 +58,14 @@ LUADISTFILES+=		simpl-ngx_devel_kit-v0.2.17-0-gbc97eea.tar.gz:0
 LUADISTFILES+=		chaoslawful-lua-nginx-module-v0.6.1-0-ge282c1c.tar.gz:0
 SUBSTFILES=		conf/nginx.conf
 
-.if ${FLAVOR:L:Mpassenger}
+.if ${FLAVOR:Mpassenger}
 CONFIGURE_ARGS+=	--add-module=${LOCALBASE}/lib/phusion-passenger19/ext/nginx
 BUILD_DEPENDS+=		www/ruby-passenger,-main,ruby19
 RUN_DEPENDS+=		ruby-passenger-*|ruby19-passenger-*:www/ruby-passenger,-main
 WANTLIB+=		m pthread stdc++
 .endif
 
-.if ${FLAVOR:L:Mlua}
+.if ${FLAVOR:Mlua}
 CONFIGURE_ARGS+=	--add-module=${WRKSRC}/simpl-ngx_devel_kit
 CONFIGURE_ARGS+=	--add-module=${WRKSRC}/chaoslawful-lua-nginx-module
 CONFIGURE_ENV+=		MODLUA_INCL_DIR=${MODLUA_INCL_DIR} \
@@ -82,7 +82,7 @@ SUPDISTFILES+=		${LUADISTFILES}
 NO_REGRESS=		Yes
 ALL_TARGET=
 
-.if ${FLAVOR:L:Mlua}
+.if ${FLAVOR:Mlua}
 pre-patch:
 	cd ${WRKSRC} && \
 	    mv ../simpl-ngx_devel_kit-* simpl-ngx_devel_kit && \
diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile
index 685271900a8..7426bfb78f9 100644
--- a/www/pecl-APC/Makefile
+++ b/www/pecl-APC/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2012/09/05 09:24:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	Alternative PHP Cache
 
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--enable-apc
 FLAVORS=	shm
 FLAVOR?=
 
-.if ${FLAVOR:L:Mshm}
+.if ${FLAVOR:Mshm}
 CONFIGURE_ARGS+=	--disable-apc-mmap
 .endif
 
diff --git a/www/rt/Makefile b/www/rt/Makefile
index 3ed61919d84..5d6f6d68faf 100644
--- a/www/rt/Makefile
+++ b/www/rt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2013/02/07 18:22:30 robert Exp $
+# $OpenBSD: Makefile,v 1.23 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=		industrial-grade ticketing system
 
@@ -104,10 +104,10 @@ BUILD_DEPENDS+=		security/gnupg \
 FLAVORS=		pgsql sqlite
 FLAVOR?=
 
-.if ${FLAVOR:L:Mpgsql}
+.if ${FLAVOR:Mpgsql}
 RUN_DEPENDS+=		databases/p5-DBD-Pg
 CONFIGURE_ARGS+=	--with-db-type=Pg
-.elif ${FLAVOR:L:Msqlite}
+.elif ${FLAVOR:Msqlite}
 RUN_DEPENDS+=		databases/p5-DBD-SQLite
 CONFIGURE_ARGS+=	--with-db-type=SQLite
 .else
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 0fff3fce333..3ec8296a29a 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2013/01/21 08:30:01 rpe Exp $
+# $OpenBSD: Makefile,v 1.16 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=		Squid Analysis Report Generator
 
@@ -39,7 +39,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfgaux
 FLAVORS=		ldap
 FLAVOR?=
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 CONFIGURE_ARGS+=	--with-ldap
 LIB_DEPENDS+=		databases/openldap
 WANTLIB+=		ldap
diff --git a/www/squid/Makefile b/www/squid/Makefile
index f213560eb14..a85daf53b3b 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.145 2013/02/07 19:13:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.146 2013/02/09 14:49:53 sthen Exp $
 
 MULTI_PACKAGES=	-main -ntlm
 
@@ -108,7 +108,7 @@ FAKE_FLAGS=	sysconfdir=$E \
 		DEFAULT_MIME_TABLE=$E/mime.conf
 REGRESS_DEPENDS= devel/cppunit
 
-.if !${FLAVOR:L:Mno_ldap}
+.if !${FLAVOR:Mno_ldap}
 MULTI_PACKAGES+= -ldap
 BASIC_AUTH+=	LDAP
 DIGEST_AUTH+=	LDAP
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index e27ea35e783..edf3856cfae 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2013/01/02 11:21:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	WWW and FTP proxy cache and accelerator
 
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=--datadir="${PREFIX}/share/squid" \
 		--with-pthreads \
 		--enable-follow-x-forwarded-for
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 BASIC_AUTH+=	LDAP
 DIGEST_AUTH+=	ldap
 EXTERNAL_ACL+=	ldap_group
@@ -69,7 +69,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${FLAVOR:L:Mntlm}
+.if ${FLAVOR:Mntlm}
 AUTH+=         ntlm
 BASIC_AUTH+=   SMB
 EXTERNAL_ACL+= wbinfo_group
@@ -77,7 +77,7 @@ RUN_DEPENDS+=  net/samba,ads
 CONFIGURE_ARGS+=--enable-ntlm-auth-helpers="fakeauth SMB"
 .endif
 
-.if ${FLAVOR:L:Msnmp}
+.if ${FLAVOR:Msnmp}
 CONFIGURE_ARGS+=--enable-snmp
 .endif
 
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 02cfb8dcac3..13434502633 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2012/11/30 15:53:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT =		filter, redirector and access controller for Squid
 
@@ -43,7 +43,7 @@ REGRESS_TARGET =	test
 FLAVORS =	ldap mysql
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mldap}
+.if ${FLAVOR:Mldap}
 LIB_DEPENDS +=		databases/openldap
 WANTLIB +=		ldap
 CONFIGURE_ARGS +=	--with-ldap=yes
@@ -51,7 +51,7 @@ CONFIGURE_ARGS +=	--with-ldap=yes
 CONFIGURE_ARGS +=	--with-ldap=no
 .endif
 
-.if ${FLAVOR:L:Mmysql}
+.if ${FLAVOR:Mmysql}
 LIB_DEPENDS +=		databases/mysql
 CONFIGURE_ARGS +=	--with-mysql=${LOCALBASE}
 WANTLIB +=		mysqlclient z
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 30af537c17a..04878af077a 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2012/02/20 18:25:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.81 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	pager/text-based web browser
 
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--disable-xface \
 NO_REGRESS=	Yes
 USE_GROFF=	Yes
 
-.if ${FLAVOR:L:Mimage}
+.if ${FLAVOR:Mimage}
 LIB_DEPENDS+=	x11/gtk+2
 CONFIGURE_ARGS+=--with-imagelib=gtk2
 WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
@@ -45,7 +45,7 @@ WANTLIB += pthread-stubs xcb xcb-render xcb-shm
 CONFIGURE_ARGS+=--enable-image=no
 .endif
 
-.if ${FLAVOR:L:Mjapanese}
+.if ${FLAVOR:Mjapanese}
 FULLPKGNAME=	ja-${PKGNAME}${FLAVOR_EXT:S/-japanese//}
 CATEGORIES+=	japanese
 CONFIGURE_ARGS+=--enable-japanese=E
diff --git a/www/webkit/Makefile b/www/webkit/Makefile
index b08b878f03e..a0ed4c22651 100644
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.76 2012/12/21 13:22:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.77 2013/02/09 14:49:53 sthen Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 
@@ -96,7 +96,7 @@ FLAVOR ?=
 # eases PLIST/PFRAGs
 SUBST_VARS =	WEBKIT_API_VERSION GTK_API_VERSION
 
-.if ${FLAVOR:L:Mgtk3}
+.if ${FLAVOR:Mgtk3}
 FULLPKGNAME =	webkit-gtk3-${V}
 LIB_DEPENDS +=	x11/gtk+3,-main
 WANTLIB +=	cairo-gobject gailutil-3 gdk-3 gtk-3
@@ -116,7 +116,7 @@ SHARED_LIBS += webkitgtk-${WEBKIT_API_VERSION}		4.0 #.13.2
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/Source/WebCore/plugins/PluginDatabase.cpp
 
-.if ${FLAVOR:L:Mgtk3}
+.if ${FLAVOR:Mgtk3}
 post-install:
 	mv ${PREFIX}/bin/GtkLauncher ${PREFIX}/bin/GtkLauncher-3
 .endif
diff --git a/www/xcache/Makefile b/www/xcache/Makefile
index b9eb987885f..684be0c879f 100644
--- a/www/xcache/Makefile
+++ b/www/xcache/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2012/09/11 23:41:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -43,7 +43,7 @@ NO_REGRESS=	Yes
 FLAVORS=	coverager
 FLAVOR?=
 
-.if ${FLAVOR:L:Mcoverager}
+.if ${FLAVOR:Mcoverager}
 CONFIGURE_ARGS+=	--enable-xcache-coverager
 .endif
 
@@ -62,7 +62,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/xcache.ini \
 		${PREFIX}/share/examples/php-${MODPHP_VERSION}
 
-.if ${FLAVOR:L:Mcoverager}
+.if ${FLAVOR:Mcoverager}
 	${INSTALL_DATA_DIR} ${WRKINST}${WEBROOT}/xcache/coverager
 	cd ${WRKSRC}/coverager && ${INSTALL_DATA} * ${WRKINST}${WEBROOT}/xcache/coverager
 .endif
diff --git a/x11/e17/Makefile.inc b/x11/e17/Makefile.inc
index c841d29444f..93a6c57ba09 100644
--- a/x11/e17/Makefile.inc
+++ b/x11/e17/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.17 2013/01/28 08:17:15 rpe Exp $
+# $OpenBSD: Makefile.inc,v 1.18 2013/02/09 14:49:53 sthen Exp $
 
 CATEGORIES ?=		x11
 
@@ -25,7 +25,7 @@ SUBST_VARS +=		FULLARCH OSREV VERSION
 
 #FLAVORS = debug
 #FLAVOR ?=
-#.if ${FLAVOR:L:Mdebug}
+#.if ${FLAVOR:Mdebug}
 #CFLAGS +=		-O0 -g
 #INSTALL_STRIP =
 #.endif
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 14fe42e2528..00ec5b3bcbc 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2012/12/17 18:37:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT=	color X11 terminal emulator with transparency support
 COMMENT-kanji=	color japanese terminal emulator with transparency support
@@ -50,7 +50,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 FLAVORS=	kanji
 FLAVOR?=
 
-.if ${FLAVOR:L:Mkanji}
+.if ${FLAVOR:Mkanji}
 FULLPKGNAME=	ja-eterm-$V
 CATEGORIES+=	japanese
 CONFIGURE_ARGS+=--enable-multi-charset=kanji
diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index bda228951d0..5459b7675ec 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2012/05/19 18:31:07 shadchin Exp $
+# $OpenBSD: Makefile,v 1.56 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT-main=	multiple virtual desktop window manager, with icons
 COMMENT-fvicons=multiple virtual desktop window manager icons
@@ -43,7 +43,7 @@ MULTI_PACKAGES=	-main -fvwm2 -fvicons
 FLAVORS=	rplay debug
 FLAVOR?=
 
-.if ${FLAVOR:L:Mrplay}
+.if ${FLAVOR:Mrplay}
 LIB_DEPENDS+=	audio/rplay
 CONFIGURE_ARGS+= --with-rplay-includes="${LOCALBASE}/include" \
 		 --with-rplay-library="${LOCALBASE}/lib"
@@ -52,7 +52,7 @@ WANTLIB += rplay
 CONFIGURE_ARGS+= --without-rplay-library
 .endif
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS+= --enable-debug-msgs
 .endif
 
diff --git a/x11/gnome/gvfs/Makefile b/x11/gnome/gvfs/Makefile
index 5dbfdf1241a..d37e5e29639 100644
--- a/x11/gnome/gvfs/Makefile
+++ b/x11/gnome/gvfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.82 2012/11/12 18:01:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.83 2013/02/09 14:49:53 sthen Exp $
 
 COMMENT-main=	GNOME Virtual File System
 COMMENT-smb=	samba module for GVFS
@@ -71,7 +71,7 @@ MULTI_PACKAGES=		-main
 PSEUDO_FLAVORS=		no_smb
 FLAVOR?=
 
-.if ${FLAVOR:L:Mno_smb}
+.if ${FLAVOR:Mno_smb}
 CONFIGURE_ARGS+= --disable-samba
 .else
 CONFIGURE_ARGS+= --enable-samba
diff --git a/x11/gnome/libgda/Makefile b/x11/gnome/libgda/Makefile
index 37bb98a796b..42afbff7b87 100644
--- a/x11/gnome/libgda/Makefile
+++ b/x11/gnome/libgda/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2012/10/01 12:49:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.68 2013/02/09 14:49:53 sthen Exp $
 
 # XXX add vala to MODGNOME_TOOLS on update
 
@@ -105,7 +105,7 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} \
 			textproc/libxslt \
 			graphics/gdk-pixbuf2
 
-.if ${FLAVOR:L:Mno_ui}
+.if ${FLAVOR:Mno_ui}
 CONFIGURE_ARGS+=	--without-ui
 .else
 MULTI_PACKAGES+=	-ui
@@ -127,7 +127,7 @@ LIB_DEPENDS-ui=		${LIB_DEPENDS} \
 			x11/gtksourceview3
 .endif
 
-.if ${FLAVOR:L:Mno_mysql}
+.if ${FLAVOR:Mno_mysql}
 CONFIGURE_ARGS+=	--without-mysql
 .else
 RUN_DEPENDS-mysql=	${MODGETTEXT_RUN_DEPENDS}
@@ -140,7 +140,7 @@ LIB_DEPENDS-mysql=	${LIB_DEPENDS} \
 CONFIGURE_ARGS+=	--with-mysql="${LOCALBASE}"
 .endif
 
-.if ${FLAVOR:L:Mno_pgsql}
+.if ${FLAVOR:Mno_pgsql}
 CONFIGURE_ARGS+=	--without-postgres
 .else
 RUN_DEPENDS-pgsql=	${MODGETTEXT_RUN_DEPENDS}
diff --git a/x11/kde/kde.port.mk b/x11/kde/kde.port.mk
index a7823cecb5d..9115c6bbe80 100644
--- a/x11/kde/kde.port.mk
+++ b/x11/kde/kde.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: kde.port.mk,v 1.37 2013/01/23 21:10:37 zhuk Exp $
+# $OpenBSD: kde.port.mk,v 1.38 2013/02/09 14:49:53 sthen Exp $
 
 SHARED_ONLY ?=	Yes
 
@@ -20,7 +20,7 @@ MODKDE_CONFIGURE_ARGS +=	--includedir=${PREFIX}/include/kde
 MODKDE_CONFIGURE_ARGS +=	--with-xdmdir=/var/X11/kdm
 MODKDE_CONFIGURE_ARGS +=	--enable-mitshm
 MODKDE_CONFIGURE_ARGS +=	--with-xinerama
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 MODKDE_CONFIGURE_ARGS +=	--enable-debug=yes
 .else
 MODKDE_CONFIGURE_ARGS +=	--disable-debug
diff --git a/x11/kde4/Makefile.inc b/x11/kde4/Makefile.inc
index a74f8642eb6..4bbaec63eb9 100644
--- a/x11/kde4/Makefile.inc
+++ b/x11/kde4/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2010/07/10 16:57:22 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2013/02/09 14:49:53 sthen Exp $
 
 FLAVOR ?=
 FLAVORS ?=		debug
@@ -30,7 +30,7 @@ CONFIGURE_ENV +=		QTDIR=${MODQT_LIBDIR} HOME=${WRKDIR}
 SEPARATE_BUILD =		simple
 
 #CONFIGURE_ARGS +=	--debug-output --debug-trycompile
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS +=	-DCMAKE_BUILD_TYPE:String=Debug
 .else
 CONFIGURE_ARGS +=	-DCMAKE_BUILD_TYPE:String=Release
diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 525d479160f..762ae37233a 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.213 2013/01/21 16:23:05 brad Exp $
+# $OpenBSD: Makefile,v 1.214 2013/02/09 14:49:54 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -176,19 +176,19 @@ CONFIGURE_ARGS += --target=generic-openbsd
 FLAVORS =	debug aa jack
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS += --enable-debug=3 \
 		--disable-sighandler
 .endif
 
-.if ${FLAVOR:L:Maa}
+.if ${FLAVOR:Maa}
 LIB_DEPENDS +=	graphics/aalib
 WANTLIB +=	aa>=1.3
 .else
 CONFIGURE_ARGS += --disable-aa
 .endif
 
-.if ${FLAVOR:L:Mjack}
+.if ${FLAVOR:Mjack}
 LIB_DEPENDS +=	audio/jack
 WANTLIB +=	jack
 .else
diff --git a/x11/ogle/Makefile b/x11/ogle/Makefile
index 6b520ed6e92..a612a45f9a5 100644
--- a/x11/ogle/Makefile
+++ b/x11/ogle/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2012/05/03 06:51:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2013/02/09 14:49:54 sthen Exp $
 
 ONLY_FOR_ARCHS =	alpha i386 powerpc sparc64 amd64
 
@@ -43,7 +43,7 @@ FLAVOR ?=
 USE_LIBTOOL =	Yes
 CONFIGURE_ARGS =	--disable-oss --disable-sunaudio --enable-obsdaudio
 
-.if ${FLAVOR:L} == "altivec"
+.if ${FLAVOR} == "altivec"
 ONLY_FOR_ARCHS =	powerpc
 CONFIGURE_ARGS +=	--enable-altivec
 .else
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index e9b5c7592c7..2f3be1e0034 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.103 2012/08/18 12:41:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.104 2013/02/09 14:49:54 sthen Exp $
 
 COMMENT-main=		C++ X11 GUI toolkit
 COMMENT-examples=	examples and tutorial for qt3
@@ -97,7 +97,7 @@ CONFIGURE_ARGS=	-qt-gif -system-libmng -system-libpng -system-libjpeg -system-zl
 
 MULTI_PACKAGES+=-main -html -examples -mysql -postgresql -sqlite2
 
-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS+=-debug
 PKGDEBUG=-debug
 FLAVOR += no_examples
@@ -207,7 +207,7 @@ PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig
 
 post-configure:
 	perl -pi.bak -e 's,-L(\Q${WRKDIST}\E|\Q$$(LOCALBASE)\E)/lib,,' ${WRKDIST}/lib/qt-mt.pc
-.if !${FLAVOR:L:Mdebug}
+.if !${FLAVOR:Mdebug}
 	@cd ${WRKSRC} && cp -R examples examples-src
 	@find ${WRKSRC}/examples-src -name '*.orig' |xargs rm -f
 	@find ${WRKSRC}/examples-src -name '.moc' |xargs rm -rf
diff --git a/x11/tk/8.5/Makefile b/x11/tk/8.5/Makefile
index 22732f7138f..c2cd625aa7b 100644
--- a/x11/tk/8.5/Makefile
+++ b/x11/tk/8.5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2012/11/19 15:10:48 stu Exp $
+# $OpenBSD: Makefile,v 1.28 2013/02/09 14:49:54 sthen Exp $
 
 COMMENT =		graphical toolkit for Tcl
 
@@ -54,7 +54,7 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 FLAVORS =		threaded
 FLAVOR ?=
 
-.if ${FLAVOR:L:Mthreaded}
+.if ${FLAVOR:Mthreaded}
 CONFIGURE_ARGS +=	--enable-threads
 WANTLIB +=		pthread
 LIB_DEPENDS +=		tcl->=8.5.13,<8.5.14-threaded:lang/tcl/8.5,threaded
diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index 73297024cba..7efc31cb825 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.164 2013/02/06 13:07:05 brad Exp $
+# $OpenBSD: Makefile,v 1.165 2013/02/09 14:49:54 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -160,7 +160,7 @@ FLAVOR?=
 
 MULTI_PACKAGES=	-main
 
-.if !${FLAVOR:L:Mno_jack}
+.if !${FLAVOR:Mno_jack}
 MULTI_PACKAGES+=-jack
 .endif
 
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index a48e87b94cf..1802cb99c76 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2012/12/13 16:34:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2013/02/09 14:49:54 sthen Exp $
 
 COMMENT=		wm-dockapp; A popup menu of icons that launch programs
 
@@ -24,7 +24,7 @@ LIB_DEPENDS=		devel/libdockapp
 FLAVORS=		gdk_pixbuf
 FLAVOR?=
 
-.if ${FLAVOR:L:Mgdk_pixbuf}
+.if ${FLAVOR:Mgdk_pixbuf}
 MAKE_FLAGS=		GDKPIXBUF2=1
 LIB_DEPENDS+=		graphics/gdk-pixbuf2
 CFLAGS+=		-pthread
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index 761ac48f86a..244d2328eac 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2011/09/16 12:29:18 espie Exp $
+# $OpenBSD: Makefile,v 1.67 2013/02/09 14:49:54 sthen Exp $
 
 COMMENT=	display the Earth on X11
 
@@ -28,7 +28,7 @@ RUN_DEPENDS=	geo/openbsd-developers
 
 FLAVORS=	no_map
 FLAVOR?=
-.if ${FLAVOR:L:Mno_map}
+.if ${FLAVOR:Mno_map}
 DISTFILES=	${DISTNAME}-no-map${EXTRACT_SUFX}
 
 # Kludge install for no map around
diff --git a/x11/xruskb/Makefile b/x11/xruskb/Makefile
index b1058b139ab..f2ed87cea12 100644
--- a/x11/xruskb/Makefile
+++ b/x11/xruskb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2012/09/04 19:02:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2013/02/09 14:49:54 sthen Exp $
 
 COMMENT=	english-russian keyboard switcher for X11
 
@@ -21,7 +21,7 @@ CONFIGURE_STYLE=gnu
 FLAVORS=	motif
 FLAVOR?=
 
-.if ${FLAVOR:L:Mmotif}
+.if ${FLAVOR:Mmotif}
 LIB_DEPENDS+=	x11/openmotif
 WANTLIB+=	Xm
 CONFIGURE_ARGS=	--with-toolkit=motif