293 files changed, 618 insertions, 642 deletions

diff --git a/CHANGES b/CHANGES
index db95e7014785..e67d9c31a0ab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,15 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20140505:
+AUTHOR: bapt@FreeBSD.org
+
+  :U and :L syntax is not supported anymore in the ports tree, :tu and :tl
+  should be used instead
+
+  This makes the ports tree incompatible with make(1) version that does not
+  support :tu and :tl (aka FreeBSD 8.3 and earlier)
+
 20140428:
 AUTHOR: bapt@FreeBSD.org
 
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index 0d2dd761c101..b4efb82155c8 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -65,7 +65,7 @@ CMAKE_BUILD_TYPE?=	Debug
 CMAKE_BUILD_TYPE?=	Release
 .endif #defined(WITH_DEBUG)
 
-PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:L}"
+PLIST_SUB+=		CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}"
 
 .if defined(STRIP) && ${STRIP} != ""
 INSTALL_TARGET?=	install/strip
diff --git a/Mk/Uses/qmail.mk b/Mk/Uses/qmail.mk
index a25886a537f8..d4d43ae3473b 100644
--- a/Mk/Uses/qmail.mk
+++ b/Mk/Uses/qmail.mk
@@ -42,7 +42,7 @@ _QMAIL_VALID_SLAVEPORTS=	ldap mysql spamcontrol tls
 
 .  if defined(QMAIL_SLAVEPORT)
 .    for slave in ${_QMAIL_VALID_SLAVEPORTS}
-.      if ${QMAIL_SLAVEPORT:L} == ${slave}
+.      if ${QMAIL_SLAVEPORT:tl} == ${slave}
 _QMAIL_SLAVEPORT_OKAY=	true
 .      endif
 .    endfor
@@ -53,7 +53,7 @@ IGNORE=	Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${
 .  endif
 
 .  if defined(QMAIL_SLAVEPORT)
-_QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L}
+_QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:tl}
 .  else
 _QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
 .  endif
diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk
index 1f84ccbc1417..a2621391c6fe 100644
--- a/Mk/Uses/scons.mk
+++ b/Mk/Uses/scons.mk
@@ -26,7 +26,7 @@ MAKE_ENV+=		PKGCONFIGDIR="${PKGCONFIGDIR}" \
 			CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \
 			LIBPATH="${LIBPATH}" CPPPATH="${CPPPATH}"
 .if !defined(NO_STAGE)
-MAKE_ARGS+=		${DESTDIRNAME:L}=${STAGEDIR}
+MAKE_ARGS+=		${DESTDIRNAME:tl}=${STAGEDIR}
 .endif
 
 .endif
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index 7e23c58ebb29..5cf4fdd2e3c7 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -147,7 +147,7 @@ IGNORE=		lowercase WITH_STATIC_MODULES="${WITH_STATIC_MODULES}"\
 # Setting "@comment " as default.
 .for module in ${AVAILABLE_MODULES:O}
 ${module}_PLIST_SUB=	"@comment "
-_DISABLE_MODULES+=		--disable-${module:L}
+_DISABLE_MODULES+=		--disable-${module:tl}
 .endfor
 
 # Configure
@@ -219,17 +219,17 @@ APACHE_MODULES+=	${module}
 .if defined(WITH_STATIC_MODULES)
 .  for module in ${APACHE_MODULES}
 .    if ${WITH_STATIC_MODULES:M${module}}
-_CONFIGURE_ARGS+=	--enable-${module:L}
+_CONFIGURE_ARGS+=	--enable-${module:tl}
 .    else
-_CONFIGURE_ARGS+=	--enable-${module:L}=shared
+_CONFIGURE_ARGS+=	--enable-${module:tl}=shared
 .    endif
 .  endfor
 CONFIGURE_ARGS+=	${_CONFIGURE_ARGS:O}
 .elif defined(WITH_STATIC_APACHE) || defined(WITH_ALL_STATIC_MODULES)
 WITH_STATIC_MODULES=	${APACHE_MODULES}
-CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES:O:L}"
+CONFIGURE_ARGS+=	--enable-modules="${APACHE_MODULES:O:tl}"
 .else
-CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES:O:L}"
+CONFIGURE_ARGS+=	--enable-mods-shared="${APACHE_MODULES:O:tl}"
 .endif
 
 # ====================================
diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk
index 1b445b26b3fc..5fc74c7e1e0c 100644
--- a/Mk/bsd.autotools.mk
+++ b/Mk/bsd.autotools.mk
@@ -320,7 +320,7 @@ AUTOTOOLS_VARS=		${AUTOMAKE_VARS} ${AUTOCONF_VARS} ${LIBTOOL_VARS}
 
 .if defined(AUTOTOOLS_VARS) && !empty(AUTOTOOLS_VARS)
 . for var in AUTOTOOLS CONFIGURE MAKE SCRIPTS
-${var:U}_ENV+=		${AUTOTOOLS_VARS}
+${var:tu}_ENV+=		${AUTOTOOLS_VARS}
 . endfor
 .endif
 
diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk
index ca1fdb42bf95..5dfc25567109 100644
--- a/Mk/bsd.database.mk
+++ b/Mk/bsd.database.mk
@@ -331,8 +331,8 @@ _DB_6P=		6
 
 # Override the global WITH_BDB_VER with the
 # port specific <UNIQUENAME>_WITH_BDB_VER
-.if defined(${UNIQUENAME:U:S,-,_,}_WITH_BDB_VER)
-WITH_BDB_VER=	${${UNIQUENAME:U:S,-,_,}_WITH_BDB_VER}
+.if defined(${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER)
+WITH_BDB_VER=	${${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER}
 .endif
 
 .if defined(WITH_BDB_VER)
@@ -345,7 +345,7 @@ USE_BDB=	${WITH_BDB_VER}
 _WANT_BDB_VER=	${USE_BDB}
 
 # Assume the default bdb version as 41
-.if ${USE_BDB:L} == "yes"
+.if ${USE_BDB:tl} == "yes"
 _WANT_BDB_VER=	41+
 .endif
 
@@ -492,7 +492,7 @@ BAD_VAR+=	${var},
 .  endif
 . endfor
 . if defined(BAD_VAR)
-_IGNORE_MSG=	Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:U:S,-,_,}_WITH_BDB_VER to select Berkeley DB version
+_IGNORE_MSG=	Obsolete variable(s) ${BAD_VAR} use WITH_BDB_VER or ${UNIQUENAME:tu:S,-,_,}_WITH_BDB_VER to select Berkeley DB version
 .  if defined(IGNORE)
 IGNORE+= ${_IGNORE_MSG}
 .  else
@@ -506,7 +506,7 @@ IGNORE=	${_IGNORE_MSG}
 # Handling SQLite dependency
 .if defined(USE_SQLITE)
 
-.if ${USE_SQLITE:L} == "yes"
+.if ${USE_SQLITE:tl} == "yes"
 _SQLITE_VER=	3
 .else
 _SQLITE_VER=	 ${USE_SQLITE}
@@ -531,7 +531,7 @@ IGNORE=		cannot install: unknown SQLite version: ${_SQLITE_VER}
 USE_FIREBIRD=	${WITH_FIREBIRD_VER}
 .endif
 
-.if ${USE_FIREBIRD:L} == "yes"
+.if ${USE_FIREBIRD:tl} == "yes"
 FIREBIRD_VER=	25
 .else
 FIREBIRD_VER=	${USE_FIREBIRD}
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index b5afed4cb0d9..22fa364dd42c 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -15,7 +15,7 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 .for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
-${_l:U}_DEFAULT=	${lang:C/.*=//g}
+${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .endfor
 
 APACHE_DEFAULT?=	2.2
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
index ef74b35a577c..59cfb3d68905 100644
--- a/Mk/bsd.efl.mk
+++ b/Mk/bsd.efl.mk
@@ -288,8 +288,8 @@ _USE_EFL_EVAS_ENGINES_UQ+=	${COMP}
 . endfor
 
 . for COMP in ${_USE_EFL_EVAS_ENGINES_UQ}
-BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
-RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
+BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
+RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
 . endfor
 
 .endif #USE_EFL_EVAS_ENGINES
@@ -316,8 +316,8 @@ _USE_EFL_EVAS_LOADERS_UQ+=	${COMP}
 . endfor
 
 . for COMP in ${_USE_EFL_EVAS_LOADERS_UQ}
-BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
-RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:L}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
+BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
+RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
 . endfor
 
 .endif #USE_EFL_EVAS_LOADERS
@@ -398,7 +398,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
-PLIST_SUB+=	E17_ARCH=${OPSYS:L}${OSREL}-${ARCH}
+PLIST_SUB+=	E17_ARCH=${OPSYS:tl}${OSREL}-${ARCH}
 
 .if defined(_USE_EFL_LIBRT_HACK)
 #
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index d390e52ad04c..6f27465c268f 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -75,7 +75,7 @@ _FPC_ALL_UNITS=	a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi fcl-async
 _FPC_CFG_UNITS=	fastcgi fcl-web
 
 .if defined(WANT_FPC_BASE)
-.       if ${WANT_FPC_BASE:L} == "yes"
+.       if ${WANT_FPC_BASE:tl} == "yes"
 USE_FPC=	gdbint graph hash httpd22 httpd24 ibase mysql odbc oracle pasjpeg paszlib \
 		postgres pthreads regexpr sqlite
 .       else
@@ -84,14 +84,14 @@ IGNORE= unknown value, please use "yes" instead of
 .endif
 
 .if defined(WANT_FPC_ALL)
-.	if ${WANT_FPC_ALL:L} == "yes"
+.	if ${WANT_FPC_ALL:tl} == "yes"
 USE_FPC=	${_FPC_ALL_UNITS}
 .	else
 IGNORE=	unknown value, please use "yes" instead of
 .	endif
 .endif
 
-.if ${USE_FPC:L} != "yes"
+.if ${USE_FPC:tl} != "yes"
 .	for UNITS in ${USE_FPC}
 .		if ${_FPC_ALL_UNITS:M${UNITS}}==""
 IGNORE= cannot install: unknown FPC unit ${UNITS}
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 3cb46090bf81..e69fe468370f 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -452,7 +452,7 @@ MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
 MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
 
 .if ${ARCH} == amd64
-CONFIGURE_TARGET=x86_64-unknown-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=x86_64-unknown-${OPSYS:tl}${OSREL}
 . if ${USE_MOZILLA:M-nss}
 USE_BINUTILS=	# intel-gcm.s
 CFLAGS+=	-B${LOCALBASE}/bin
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk
index 26d3db597676..636d3a186c4e 100644
--- a/Mk/bsd.java.mk
+++ b/Mk/bsd.java.mk
@@ -410,7 +410,7 @@ do-build:
 
 # Then test if a JAVAC has to be set (JAVA_BUILD==jdk)
 .		if defined(JAVA_BUILD)
-.			if (${JAVA_BUILD:U} == "JDK") && !defined(JAVAC)
+.			if (${JAVA_BUILD:tu} == "JDK") && !defined(JAVAC)
 JAVAC?=			${JAVA_HOME}/bin/javac
 .			endif
 .		endif
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk
index 4a3c3cdb74e4..3c86773594bb 100644
--- a/Mk/bsd.linux-rpm.mk
+++ b/Mk/bsd.linux-rpm.mk
@@ -130,7 +130,7 @@ linux-rpm-clean-portdocs:
 
 .  if defined(AUTOMATIC_PLIST)
 
-.    if ${USE_LINUX} == "f10" || ${USE_LINUX:L} == "yes"
+.    if ${USE_LINUX} == "f10" || ${USE_LINUX:tl} == "yes"
 _LINUX_BASE_SUFFIX=		f10
 .    else
 # other linux_base ports do not provide a pkg-plist file
diff --git a/Mk/bsd.lua.mk b/Mk/bsd.lua.mk
index c163e7f0d7d3..2ca4fe790c77 100644
--- a/Mk/bsd.lua.mk
+++ b/Mk/bsd.lua.mk
@@ -243,7 +243,7 @@ IGNORE?=				selected multiple values for WANT_LUA: ${_WANT_LUA}
 .		endif
 _HAVE_LUA=				#
 # Check for all versions.
-.		if ${_WANT_LUA:L} == "yes"
+.		if ${_WANT_LUA:tl} == "yes"
 .			for comp in ${_LUA_COMPS_ALL}
 .				for ver in ${_LUA_VERS_ALL}
 _LUA_COMP=				_LUA_FILE_${comp}_${ver}
@@ -534,7 +534,7 @@ BUILD_DEPENDS+=			${_LUA_FILE_${comp_part}_${_LUA_VER}}:${PORTSDIR}/${_LUA_PORT_
 RUN_DEPENDS+=			${_LUA_FILE_${comp_part}_${_LUA_VER}}:${PORTSDIR}/${_LUA_PORT_${comp_part}_${_LUA_VER}}
 .			endif
 .		else
-${_LUA_DEP_TYPE:U}_DEPENDS+=	${_LUA_FILE_${comp_part}_${_LUA_VER}}:${PORTSDIR}/${_LUA_PORT_${comp_part}_${_LUA_VER}}
+${_LUA_DEP_TYPE:tu}_DEPENDS+=	${_LUA_FILE_${comp_part}_${_LUA_VER}}:${PORTSDIR}/${_LUA_PORT_${comp_part}_${_LUA_VER}}
 .		endif
 .	endfor
 .endfor
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 5130a813babc..129d2cf76c6b 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -434,7 +434,7 @@ SUB_LIST:=	${SUB_LIST} ${opt}="@comment " NO_${opt}=""
 .    if defined(${opt}_USE)
 .      for option in ${${opt}_USE}
 _u=		${option:C/=.*//g}
-USE_${_u:U}+=	${option:C/.*=//g:C/,/ /g}
+USE_${_u:tu}+=	${option:C/.*=//g:C/,/ /g}
 .      endfor
 .    endif
 .    if defined(${opt}_CONFIGURE_ENABLE)
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk
index 04c438e5bba8..55a5ddaa4be9 100644
--- a/Mk/bsd.php.mk
+++ b/Mk/bsd.php.mk
@@ -276,7 +276,7 @@ php-ini:
 .endif
 
 # Extensions
-.if defined(_POSTMKINCLUDED) && ${USE_PHP:L} != "yes"
+.if defined(_POSTMKINCLUDED) && ${USE_PHP:tl} != "yes"
 # non-version specific components
 _USE_PHP_ALL=	apc bcmath bitset bz2 calendar ctype curl dba dom \
 		exif fileinfo filter ftp gd gettext gmp \
@@ -389,7 +389,7 @@ ext=		${extension}
 BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${PORTSDIR}/${hash_DEPENDS}
 .				endif
 RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/hash.so:${PORTSDIR}/${hash_DEPENDS}
-.			elif ${ext:L} != "yes"
+.			elif ${ext:tl} != "yes"
 check-makevars::
 			@${ECHO_CMD} "Unknown extension ${extension} for PHP ${PHP_VER}."
 			@${FALSE}
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 0615300e4a73..b5dc7310b672 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1138,8 +1138,6 @@ PKG_ENV+=		PORTSDIR=${PORTSDIR}
 
 # make sure bmake treats -V as expected
 .MAKE.EXPAND_VARIABLES= yes
-# tell bmake we use the old :L :U modifiers
-.MAKE.FreeBSD_UL= yes
 
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
@@ -1368,7 +1366,7 @@ IGNORE=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
 .endif
 DISTVERSION?=	${PORTVERSION:S/:/::/g}
 .elif defined(DISTVERSION)
-PORTVERSION=	${DISTVERSION:L:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
+PORTVERSION=	${DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
 .endif
 
 PORTREVISION?=	0
@@ -1530,7 +1528,7 @@ USES+=	gmake
 .endif
 
 .if defined(USE_DOS2UNIX)
-.if ${USE_DOS2UNIX:U}=="YES"
+.if ${USE_DOS2UNIX:tu}=="YES"
 DOS2UNIX_REGEX?=	.*
 .else
 .if ${USE_DOS2UNIX:M*/*}
@@ -1752,7 +1750,7 @@ BINUTILS?=	ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \
 	READELF SIZE STRINGS
 BINUTILS_NO_MAKE_ENV?=
 . for b in ${BINUTILS}
-${b}=	${LOCALBASE}/bin/${b:C/PP/++/:L}
+${b}=	${LOCALBASE}/bin/${b:C/PP/++/:tl}
 .  if defined(GNU_CONFIGURE) || defined(BINUTILS_CONFIGURE)
 CONFIGURE_ENV+=	${b}="${${b}}"
 .  endif
@@ -1766,7 +1764,7 @@ MAKE_ENV+=	${b}="${${b}}"
 .include "${PORTSDIR}/Mk/bsd.ldap.mk"
 .endif
 
-.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
+.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES"
 SUB_FILES+=	${USE_RC_SUBR}
 .endif
 
@@ -1774,10 +1772,10 @@ SUB_FILES+=	${USE_RC_SUBR}
 SUB_FILES+=	${USE_RCORDER}
 .endif
 
-.if defined(USE_LDCONFIG) && ${USE_LDCONFIG:L} == "yes"
+.if defined(USE_LDCONFIG) && ${USE_LDCONFIG:tl} == "yes"
 USE_LDCONFIG=	${PREFIX}/lib
 .endif
-.if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:L} == "yes"
+.if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:tl} == "yes"
 IGNORE=			has USE_LDCONFIG32 set to yes, which is not correct
 .endif
 
@@ -1802,7 +1800,7 @@ STRIP_CMD=	${TRUE}
 
 # Allow the user to specify another linux_base version.
 .	if defined(OVERRIDE_LINUX_BASE_PORT)
-.		if ${USE_LINUX:L} == yes
+.		if ${USE_LINUX:tl} == yes
 USE_LINUX=	${OVERRIDE_LINUX_BASE_PORT}
 .		endif
 .	endif
@@ -1813,7 +1811,7 @@ USE_LINUX=	${OVERRIDE_LINUX_BASE_PORT}
 .	if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX})
 LINUX_BASE_PORT=	${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX}
 .	else
-.		if ${USE_LINUX:L} == "yes"
+.		if ${USE_LINUX:tl} == "yes"
 LINUX_BASE_PORT=	${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
 .		else
 IGNORE=		cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT
@@ -1840,7 +1838,7 @@ _GL_glw_LIB_DEPENDS=		libGLw.so:${PORTSDIR}/graphics/libGLw
 _GL_glut_LIB_DEPENDS=		libglut.so:${PORTSDIR}/graphics/freeglut
 
 .if defined(USE_GL)
-. if ${USE_GL:L} == "yes"
+. if ${USE_GL:tl} == "yes"
 USE_GL=		glu
 . endif
 . for _component in ${USE_GL}
@@ -2924,13 +2922,13 @@ _COUNT=1
 # MAN${sect} is for man pages installed for all languages in MANLANG for a given
 # section.
 .if defined(MAN${sect})
-_MANPAGES+=	${MAN${sect}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:L}/%}
+_MANPAGES+=	${MAN${sect}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:tl}/%}
 .endif
 
 # Language specific MAN${sect} variables are for man pages installed in that
 # language, but not necessarily all languages in MANLANG.
-.if defined(MAN${sect}_${manlang:S%^man/%%:U})
-_MANPAGES+=	${MAN${sect}_${manlang:S%^man/%%:U}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:L}/%}
+.if defined(MAN${sect}_${manlang:S%^man/%%:tu})
+_MANPAGES+=	${MAN${sect}_${manlang:S%^man/%%:tu}:S%^%${MAN${sect}PREFIX}/${manlang}/man${sect:tl}/%}
 .endif
 
 .endfor
@@ -2942,7 +2940,7 @@ _MANPAGES+=	${MAN${sect}_${manlang:S%^man/%%:U}:S%^%${MAN${sect}PREFIX}/${manlan
 # of MAN${sect}PREFIX.
 .for sect in 1 2 3 4 5 6 7 8 9 L N
 .if defined(MAN${sect}_EN)
-_MANPAGES+=	${MAN${sect}_EN:S%^%${MAN${sect}PREFIX}/man/man${sect:L}/%}
+_MANPAGES+=	${MAN${sect}_EN:S%^%${MAN${sect}PREFIX}/man/man${sect:tl}/%}
 .endif
 .endfor
 
@@ -3222,7 +3220,7 @@ DEPENDS_ARGS+=	NOCLEANDEPENDS=yes
 ################################################################
 .if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
 	&& !defined(OPTIONS_GROUP) && !defined(OPTIONS_RADIO) \
-	|| defined(CONFIG_DONE_${UNIQUENAME:U}) || \
+	|| defined(CONFIG_DONE_${UNIQUENAME:tu}) || \
 	defined(PACKAGE_BUILDING) || defined(BATCH))
 _OPTIONS_OK=yes
 .endif
@@ -4684,7 +4682,7 @@ check-checksum-algorithms:
 	@ \
 	${checksum_init} \
 	\
-	for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+	for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
 		eval alg_executable=\$$$$alg; \
 		if [ -z "$$alg_executable" ]; then \
 			${ECHO_MSG} "Checksum algorithm $$alg: Couldn't find the executable."; \
@@ -4707,7 +4705,7 @@ makesum: check-checksum-algorithms
 		${checksum_init} \
 		\
 		for file in ${_CKSUMFILES}; do \
-			for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+			for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
 				eval alg_executable=\$$$$alg; \
 				\
 				if [ $$alg_executable != "NO" ]; then \
@@ -4718,7 +4716,7 @@ makesum: check-checksum-algorithms
 		done \
 	)
 	@for file in ${_IGNOREFILES}; do \
-		for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+		for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
 			${ECHO_CMD} "$$alg ($$file) = IGNORE" >> ${DISTINFO_FILE}; \
 		done; \
 	done
@@ -4733,7 +4731,7 @@ checksum: fetch check-checksum-algorithms
 		for file in ${_CKSUMFILES}; do \
 			ignored="true"; \
 			_file=$${file#${DIST_SUBDIR}/*};	\
-			for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+			for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
 				ignore="false"; \
 				eval alg_executable=\$$$$alg; \
 				\
@@ -4788,7 +4786,7 @@ checksum: fetch check-checksum-algorithms
 			_file=$${file#${DIST_SUBDIR}/*};	\
 			ignored="true"; \
 			alreadymatched="false"; \
-			for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+			for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
 				ignore="false"; \
 				eval alg_executable=\$$$$alg; \
 				\
@@ -4926,7 +4924,7 @@ _INSTALL_DEPENDS=	\
 		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}";
 
 .for deptype in PKG EXTRACT PATCH FETCH BUILD RUN
-${deptype:L}-depends:
+${deptype:tl}-depends:
 .if defined(${deptype}_DEPENDS)
 .if !defined(NO_DEPENDS)
 	@set -e ; for i in `${ECHO_CMD} "${${deptype}_DEPENDS}"`; do \
@@ -5584,7 +5582,7 @@ apply-slist:
 .endfor
 .for i in pkg-message pkg-install pkg-deinstall pkg-req
 .if ${SUB_FILES:M${i}*}!=""
-${i:S/-//:U}=	${WRKDIR}/${SUB_FILES:M${i}*}
+${i:S/-//:tu}=	${WRKDIR}/${SUB_FILES:M${i}*}
 .endif
 .endfor
 .endif
@@ -5637,8 +5635,8 @@ generate-plist:
 .endfor
 
 .for reinplace in ${PLIST_REINPLACE}
-.if defined(PLIST_REINPLACE_${reinplace:U})
-	@${SED} -i "" -e '${PLIST_REINPLACE_${reinplace:U}}' ${TMPPLIST}
+.if defined(PLIST_REINPLACE_${reinplace:tu})
+	@${SED} -i "" -e '${PLIST_REINPLACE_${reinplace:tu}}' ${TMPPLIST}
 .endif
 .endfor
 
@@ -5799,7 +5797,7 @@ add-plist-post:
 .endif
 
 .if !target(install-rc-script)
-.if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
+.if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES"
 install-rc-script:
 .if defined(USE_RCORDER)
 	@${ECHO_MSG} "===> Staging early rc.d startup script(s)"
@@ -5810,7 +5808,7 @@ install-rc-script:
 	done
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 .endif
-.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
+.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES"
 	@${ECHO_MSG} "===> Staging rc.d startup script(s)"
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
 	@for i in ${USE_RC_SUBR}; do \
@@ -6169,7 +6167,7 @@ showconfig:
 .for otype in MULTI GROUP SINGLE RADIO
 .  for m in ${OPTIONS_${otype}}
 .    if empty(${m}_DESC)
-		@${ECHO_MSG} "====> Options available for the ${otype:L} ${m}${${otype}_EOL}"
+		@${ECHO_MSG} "====> Options available for the ${otype:tl} ${m}${${otype}_EOL}"
 .    else
 		@${ECHO_MSG} "====> ${${m}_DESC}${${otype}_EOL}"
 .    endif
@@ -6642,43 +6640,43 @@ _${_t}_REAL_SUSEQ+=	${s}
 # target noting that config is no longer needed.
 .if !target(${target}) && defined(_OPTIONS_OK)
 _PHONY_TARGETS+= ${target}
-${target}: ${${target:U}_COOKIE}
+${target}: ${${target:tu}_COOKIE}
 .elif !target(${target})
 ${target}: config-conditional
-	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${${target:U}_COOKIE}
+	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:tu}=1 ${${target:tu}_COOKIE}
 .elif target(${target}) && defined(IGNORE)
 .endif
 
-.if !exists(${${target:U}_COOKIE})
+.if !exists(${${target:tu}_COOKIE})
 
 # Define the real target behavior. Depend on the target's *_DEP. Execute
 # the target's *_SEQ. Also handle su and USE_SUBMAKE needs.
-.if ${UID} != 0 && defined(_${target:U}_REAL_SUSEQ) && !defined(INSTALL_AS_USER)
+.if ${UID} != 0 && defined(_${target:tu}_REAL_SUSEQ) && !defined(INSTALL_AS_USER)
 .  if defined(USE_SUBMAKE)
-${${target:U}_COOKIE}: ${_${target:U}_DEP}
-	@cd ${.CURDIR} && ${MAKE} ${_${target:U}_REAL_SEQ}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
+	@cd ${.CURDIR} && ${MAKE} ${_${target:tu}_REAL_SEQ}
 .  else  # !USE_SUBMAKE
-${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_REAL_SEQ}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_REAL_SEQ}
 .  endif # USE_SUBMAKE
 	@${ECHO_MSG} "===>  Switching to root credentials for '${target}' target"
 	@cd ${.CURDIR} && \
-		${SU_CMD} "${MAKE} ${_${target:U}_REAL_SUSEQ}"
+		${SU_CMD} "${MAKE} ${_${target:tu}_REAL_SUSEQ}"
 	@${ECHO_MSG} "===>  Returning to user credentials"
 	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
 .else # No SU needed
 .  if defined(USE_SUBMAKE)
-${${target:U}_COOKIE}: ${_${target:U}_DEP}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
 	@cd ${.CURDIR} && \
-		${MAKE} ${_${target:U}_REAL_SEQ} ${_${target:U}_REAL_SUSEQ}
+		${MAKE} ${_${target:tu}_REAL_SEQ} ${_${target:tu}_REAL_SUSEQ}
 	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
 .  else # !USE_SUBMAKE
-${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_REAL_SEQ} ${_${target:U}_REAL_SUSEQ}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_REAL_SEQ} ${_${target:tu}_REAL_SUSEQ}
 	@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
 .  endif # USE_SUBMAKE
 .endif # SU needed
 
 .else # exists(cookie)
-${${target:U}_COOKIE}::
+${${target:tu}_COOKIE}::
 	@if [ -e ${.TARGET} ]; then \
 		${DO_NADA}; \
 	else \
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 390a9e939b78..f5364b7f7cae 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -187,7 +187,7 @@ Python_Include_MAINTAINER=	python@FreeBSD.org
 #
 # PYEASYINSTALL_OSARCH
 #					- Platform identifier for easy_install.
-#					  default: -${OPSYS:L}-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}-${ARCH}
+#					  default: -${OPSYS:tl}-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}-${ARCH}
 #							   if PYEASYINSTALL_ARCHDEP is defined.
 #
 # PYEASYINSTALL_CMD - Full file path to easy_install command.
@@ -416,7 +416,7 @@ PYTHON_INCLUDEDIR=		${PYTHONBASE}/include/${PYTHON_VERSION}${PYTHON_ABIVER}
 PYTHON_LIBDIR=			${PYTHONBASE}/lib/${PYTHON_VERSION}
 PYTHON_PKGNAMEPREFIX=	py${PYTHON_SUFFIX}-
 PYTHON_PKGNAMESUFFIX=	-py${PYTHON_SUFFIX}
-PYTHON_PLATFORM=		${OPSYS:L}${OSREL:C/\.[0-9.]*//}
+PYTHON_PLATFORM=		${OPSYS:tl}${OSREL:C/\.[0-9.]*//}
 PYTHON_SITELIBDIR=		${PYTHON_LIBDIR}/site-packages
 
 PYTHONPREFIX_INCLUDEDIR=	${PYTHON_INCLUDEDIR:S;${PYTHONBASE};${PREFIX};}
@@ -448,7 +448,7 @@ MAKE_ENV+=						PYTHONPATH=${PYEASYINSTALL_SITELIBDIR}
 .endif
 
 .if defined(PYEASYINSTALL_ARCHDEP)
-PYEASYINSTALL_OSARCH?=			-${OPSYS:L}-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}-${ARCH}
+PYEASYINSTALL_OSARCH?=			-${OPSYS:tl}-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}-${ARCH}
 MAKE_ENV+=						_PYTHON_HOST_PLATFORM=${PYEASYINSTALL_OSARCH}
 .endif
 PYEASYINSTALL_EGG?=				${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}${PYEASYINSTALL_OSARCH}.egg
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index d042eca1a7fd..c4449adb52e6 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -243,9 +243,9 @@ RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \
 			--docdir="${RUBY_DOCDIR}" \
 			--with-soname=ruby${RUBY_SUFFIX}
 
-CONFIGURE_TARGET?=	${ARCH}-portbld-${OPSYS:L}${OSREL:C/\..*//}
+CONFIGURE_TARGET?=	${ARCH}-portbld-${OPSYS:tl}${OSREL:C/\..*//}
 
-RUBY_ARCH?=		${ARCH}-${OPSYS:L}${OSREL:C/\..*//}
+RUBY_ARCH?=		${ARCH}-${OPSYS:tl}${OSREL:C/\..*//}
 RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
 _RUBY_SYSLIBDIR?=	${PREFIX}/lib
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 80d0a21bfe61..5400bb3066dd 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -954,7 +954,7 @@ MASTER_SITE_PERL_CPAN_BY+= \
 _PERL_CPAN_FLAG=${MASTER_SITE_SUBDIR:C/(CPAN):.*$/\1/}
 _PERL_CPAN_ID=	${MASTER_SITE_SUBDIR:C/^CPAN:(.)(.)(.*)$/\1\/\1\2\/\1\2\3/}
 
-.if !empty(_PERL_CPAN_ID) && ${_PERL_CPAN_FLAG:L} == "cpan"
+.if !empty(_PERL_CPAN_ID) && ${_PERL_CPAN_FLAG:tl} == "cpan"
     _PERL_CPAN_SORT=authors/id/${_PERL_CPAN_ID}
     MASTER_SITE_PERL_CPAN=${MASTER_SITE_PERL_CPAN_BY:S/%CPANSORT%/${_PERL_CPAN_SORT}/:S/%SUBDIR%\///}
 .else
@@ -1501,7 +1501,7 @@ MASTER_SITES_ABBREVS=	CPAN:PERL_CPAN \
 			RG:RUBYGEMS \
 			RF:RUBYFORGE
 MASTER_SITES_SUBDIRS=	APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
-			BERLIOS:${PORTNAME:L} \
+			BERLIOS:${PORTNAME:tl} \
 			CENKES:myports \
 			CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
 			CSME:myports \
@@ -1514,16 +1514,16 @@ MASTER_SITES_SUBDIRS=	APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
 			HORDE:${PORTNAME} \
 			LOGILAB:${PORTNAME} \
 			MATE:${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} \
-			MOZDEV:${PORTNAME:L} \
+			MOZDEV:${PORTNAME:tl} \
 			NETLIB:${PORTNAME} \
 			PERL_CPAN:${PORTNAME:C/-.*//} \
 			PNET:${PNET_MASTER_SITE_SUBDIR} \
 			PYTHON:${PYTHON_MASTER_SITE_SUBDIR} \
 			RUBY_DBI:${RUBY_DBI_MASTER_SITE_SUBDIR} \
 			RUBY_GNOME:${RUBY_GNOME_MASTER_SITE_SUBDIR} \
-			SAVANNAH:${PORTNAME:L} \
-			SOURCEFORGE:${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION} \
-			RUBYFORGE:${PORTNAME:L}
+			SAVANNAH:${PORTNAME:tl} \
+			SOURCEFORGE:${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION} \
+			RUBYFORGE:${PORTNAME:tl}
 
 .if defined(MASTER_SITES) && ${MASTER_SITES:N*\:/*}
 
diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index b5106021bea7..3d9adc229e6c 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -78,21 +78,21 @@ CONFLICTS_TETEX= \
 	latex2e-[0-9]*
 
 # override the user configuration
-.if !empty(USE_TEX:U:MTETEX)
+.if !empty(USE_TEX:tu:MTETEX)
 TEX_DEFAULT=	tetex
-.elif !empty(USE_TEX:U:MTEXLIVE)
+.elif !empty(USE_TEX:tu:MTEXLIVE)
 TEX_DEFAULT=	texlive
 .endif
 
-.if !empty(TEX_DEFAULT:U:MTETEX)
+.if !empty(TEX_DEFAULT:tu:MTETEX)
 CONFLICTS_INSTALL+=	${CONFLICTS_TEXLIVE}
-.elif !empty(TEX_DEFAULT:U:MTEXLIVE)
+.elif !empty(TEX_DEFAULT:tu:MTEXLIVE)
 CONFLICTS_INSTALL+=	${CONFLICTS_TETEX}
 .else
 .error malformed TEX_DEFAULT: ${TEX_DEFAULT}
 .endif
 
-_TEX_LABEL:=	${TEX_DEFAULT:U:S/TEXLIVE/TEX/}
+_TEX_LABEL:=	${TEX_DEFAULT:tu:S/TEXLIVE/TEX/}
 
 _USE_TETEX_TEXMF=	${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf
 _USE_TEX_TEXMF=		${LOCALBASE}/${TEXMFDISTDIR}/README:${PORTSDIR}/print/texlive-texmf
@@ -146,13 +146,13 @@ _USE_TEX_FULL=	texmf base web2c infra \
 		dvipsk dvipdfmx xdvik \
 		kpathsea:lib ptexenc:lib
 
-.if !empty(USE_TEX:U:MFULL)
+.if !empty(USE_TEX:tu:MFULL)
 USE_TEX:=	${_USE_${_TEX_LABEL}_FULL}
 .endif
 
-.for _UU in ${USE_TEX:U}
+.for _UU in ${USE_TEX:tu}
 _U:=	${_UU}	# ugly but necessary in for loop
-. if !empty(_U:U:MKPATHSEA) || !empty(_U:U:MPTEXENC)
+. if !empty(_U:tu:MKPATHSEA) || !empty(_U:tu:MPTEXENC)
 _U:=	${_U}:lib
 . endif
 . if empty(_U:M*\:*)
@@ -160,7 +160,7 @@ _C:=	BUILD RUN
 . else
 _C:=	${_U:C/.*://}
 . endif
-. for _CC in ${_C:U}
+. for _CC in ${_C:tu}
 TEX_${_CC}_DEPENDS+=${_USE_${_TEX_LABEL}_${_UU:C/:.*$//}}
 . endfor
 .endfor
@@ -207,14 +207,14 @@ post-install-script: do-texhash
 . for F in ${TEX_FORMATS}
 do-fmtutil: do-fmtutil-$F post-install-$F
 do-fmtutil-$F:
-	@${TEST} -n '${TEX_FORMAT_${F:U}}'
+	@${TEST} -n '${TEX_FORMAT_${F:tu}}'
 	@${TEST} -r ${LOCALBASE}/${FMTUTIL_CNF}
 	@exec < ${LOCALBASE}/${FMTUTIL_CNF} && \
 		${RM} ${LOCALBASE}/${FMTUTIL_CNF} && \
 		(${GREP} -v "\#$F\$$"; \
-			${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:U}}) \
+			${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}}) \
 			> ${LOCALBASE}/${FMTUTIL_CNF}
-	@${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:U}} | \
+	@${PRINTF} "%s\t\#$F\n" ${TEX_FORMAT_${F:tu}} | \
 		while read format dum; do \
 		${SETENV} PATH=${PATH}:${LOCALBASE}/bin \
 			TEXMFMAIN=${LOCALBASE}/${TEXMFDIR} \
@@ -224,14 +224,14 @@ do-fmtutil-$F:
 	@${ECHO_CMD} "@exec exec < ${LOCALBASE}/${FMTUTIL_CNF} && " \
 		"${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \
 		"(${GREP} -v \"\#$F\$$\"; ${PRINTF} \"%%s\t\#$F\n\" " \
-		"${TEX_FORMAT_${F:U}:S,",\\",g}) " \
+		"${TEX_FORMAT_${F:tu}:S,",\\",g}) " \
 		"> ${LOCALBASE}/${FMTUTIL_CNF}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec exec < ${LOCALBASE}/${FMTUTIL_CNF} && " \
 		"${RM} ${LOCALBASE}/${FMTUTIL_CNF} && " \
 		"${GREP} -v \"\#$F\$$\" " \
 		"> ${LOCALBASE}/${FMTUTIL_CNF}" >> ${TMPPLIST}
-_PLIST_FILES+=	${TEX_FORMAT_${F:U}_FILES}
-_PLIST_DIRSTRY+=${TEX_FORMAT_${F:U}_DIRS}
+_PLIST_FILES+=	${TEX_FORMAT_${F:tu}_FILES}
+_PLIST_DIRSTRY+=${TEX_FORMAT_${F:tu}_DIRS}
 . endfor
 post-install-script: do-fmtutil
 
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index 7e5cf664a133..f1af5961a13f 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -220,7 +220,7 @@ _WANT_WX=				yes
 
 .	for __WANT_WX in ${_WANT_WX}
 .		if defined(_WX_UC_AVAILABLE) && \
-		   (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${_WANT_WX:L} == "yes")
+		   (${_WX_VERS_UC_ALL:M${__WANT_WX}} != "" || ${_WANT_WX:tl} == "yes")
 _WX_WANT_UNICODE=		yes
 .		endif
 .	endfor
@@ -249,7 +249,7 @@ IGNORE?=				selected multiple values for WANT_WX: ${_WANT_WX}
 .		endif
 _HAVE_WX=				#
 # Check for all versions.
-.		if ${_WANT_WX:L} == "yes"
+.		if ${_WANT_WX:tl} == "yes"
 .			for comp in ${_WX_COMPS_ALL}
 .				for ver in ${_WX_VER_FINAL}
 _WX_COMP=				_WX_FILE_${comp}_${ver}
@@ -564,9 +564,9 @@ MAKE_ENV+=				WX_CONFIG=${WX_CONFIG}
 CONFIGURE_ENV+=			WX_CONFIG=${WX_CONFIG}
 
 .if defined(WX_CONF_ARGS)
-.	if ${WX_CONF_ARGS:L} == "absolute"
+.	if ${WX_CONF_ARGS:tl} == "absolute"
 CONFIGURE_ARGS+=		--with-wx-config=${WX_CONFIG}
-.	elif ${WX_CONF_ARGS:L} == "relative"
+.	elif ${WX_CONF_ARGS:tl} == "relative"
 CONFIGURE_ARGS+=		--with-wx=${LOCALBASE} \
 						--with-wx-config=${WX_CONFIG:T}
 .	else
diff --git a/arabic/ae_fonts_ttf/Makefile b/arabic/ae_fonts_ttf/Makefile
index c30ac1ef6376..4f51a55fa672 100644
--- a/arabic/ae_fonts_ttf/Makefile
+++ b/arabic/ae_fonts_ttf/Makefile
@@ -39,7 +39,7 @@ FONTS+=	${font}
 
 .for font in KASR SHMOOKH
 .  if ${PORT_OPTIONS:M${font}}
-FONTS+=	${font:C/(.).*/\1/}${font:L:C/.//}
+FONTS+=	${font:C/(.).*/\1/}${font:tl:C/.//}
 .  endif
 .endfor
 
diff --git a/archivers/pecl-lzf/Makefile b/archivers/pecl-lzf/Makefile
index 00d80b455b58..c1c9354aaf7a 100644
--- a/archivers/pecl-lzf/Makefile
+++ b/archivers/pecl-lzf/Makefile
@@ -16,7 +16,7 @@ USE_PHP=	yes
 USE_PHPEXT=	yes
 
 CONFIGURE_ARGS=	--enable-lzf
-WRKSRC=		${WRKDIR}/${DISTNAME:U}
+WRKSRC=		${WRKDIR}/${DISTNAME:tu}
 
 OPTIONS_DEFINE=		BETTER_COMPRESSION
 BETTER_COMPRESSION_DESC=	Better compression ratio
diff --git a/archivers/xarchiver/Makefile b/archivers/xarchiver/Makefile
index 75eb64d4cb77..e7944b14f457 100644
--- a/archivers/xarchiver/Makefile
+++ b/archivers/xarchiver/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xarchiver
 PORTVERSION=	0.5.3
 CATEGORIES=	archivers
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
+MASTER_SITE_SUBDIR=	${PORTNAME:tl}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop-agnostic GTK+2 frontend to various archiving tools
diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index 7aaf7392c58f..7e95696acd2d 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Maaate
 PORTVERSION=	0.3.1
 PORTREVISION=	5
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}.tar.gz
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	saper@saper.info
 COMMENT=	MPEG audio analysis toolkit
diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
index 2cbd8b756705..b0f40baf6494 100644
--- a/audio/baresip/Makefile
+++ b/audio/baresip/Makefile
@@ -58,7 +58,7 @@ X11_DESC=	X11 module [broken]
 
 .for o in ${OPTIONS_DEFINE}
 .  ifndef $o_DESC
-$o_DESC=	${o:C,^(.).*,\1,}${o:C,^.,,:L} module
+$o_DESC=	${o:C,^(.).*,\1,}${o:C,^.,,:tl} module
 .  endif
 .endfor
 
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile
index 1a2e46271bf5..0a7a20204d5b 100644
--- a/audio/boodler/Makefile
+++ b/audio/boodler/Makefile
@@ -33,7 +33,7 @@ pre-everything::
 	@${ECHO} "interfaces. The default is to use OSS."
 	@${ECHO} ""
 
-.if ${DRIVER:L} == "esd"
+.if ${DRIVER:tl} == "esd"
 LIB_DEPENDS+=	libesd.so:${PORTSDIR}/audio/esound
 .endif
 
@@ -49,7 +49,7 @@ post-patch:
 	@${RMDIR} ${WRKDIR}/boodler-snd/string
 
 do-build:
-	(cd ${WRKSRC} && ${PYTHON_CMD} configure.py --driver ${DRIVER:L} ${PIC} --include ${PREFIX}/include --lib ${PREFIX}/lib && make)
+	(cd ${WRKSRC} && ${PYTHON_CMD} configure.py --driver ${DRIVER:tl} ${PIC} --include ${PREFIX}/include --lib ${PREFIX}/lib && make)
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/effects ${WRKSRC}/boodle/
 
 do-install:
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index f65441c23aa0..41a5815e5ec3 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -82,10 +82,10 @@ post-patch::
 .include <bsd.port.options.mk>
 
 .for m in nas esd
-.	if ${PORT_OPTIONS:M${m:U}}
+.	if ${PORT_OPTIONS:M${m:tu}}
 LIB_DEPENDS+=	lib${m:nas=audio}.so:${PORTSDIR}/audio/${m:esd=esound}
 post-patch::
-	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:U}_AUDIO,INCLUDE_MODULES += ${m:U}_AUDIO,' \
+	${REINPLACE_CMD} -e 's,# INCLUDE_MODULES += ${m:tu}_AUDIO,INCLUDE_MODULES += ${m:tu}_AUDIO,' \
 		${WRKDIR}/*/config/config.in
 CONFIGURE_ARGS+=--enable-$m
 .	else
diff --git a/audio/flake/Makefile b/audio/flake/Makefile
index 89dd896d392a..4dd36423dd69 100644
--- a/audio/flake/Makefile
+++ b/audio/flake/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	flake
 PORTVERSION=	0.11
 CATEGORIES=	audio
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME:L}-enc/${PORTNAME:L}/${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME:tl}-enc/${PORTNAME:tl}/${PORTVERSION}
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	FLAC audio encoder
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index 580ee51c5c24..0fecca5985a8 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -54,7 +54,7 @@ PLIST_SUB+=	OMF="@comment "
 .endif
 
 .for plugin in flac gconf jack ladspa lame mp3 pulse vorbis
-. if ${PORT_OPTIONS:M${plugin:U}}
+. if ${PORT_OPTIONS:M${plugin:tu}}
 USE_GSTREAMER+=${plugin}
 . endif
 .endfor
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index fe289da936ae..6a762739845a 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	lame
 PORTVERSION=	3.99.5
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/3.99
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/3.99
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Fast MP3 encoder kit
diff --git a/audio/liquidsoap/Makefile b/audio/liquidsoap/Makefile
index de48696902d8..039539fe7835 100644
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@@ -165,7 +165,7 @@ CONFIGURE_ARGS+=	--disable-bjack
 .endif
 
 .for i in ${_ALL_PACKAGES}
-.if ${PORT_OPTIONS:M${i:U}}
+.if ${PORT_OPTIONS:M${i:tu}}
 .if defined(LIB_DEPENDS_${i})
 LIB_DEPENDS+=	${LIB_DEPENDS_${i}}
 .endif
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index 322a9b9cb3c8..09b583369b0c 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -34,8 +34,8 @@ RDEP=	AIFF:sox SHN:shorten FLAC APE:mac OFR:ofr:optimfrog LPAC WV:wavpack \
 .for o in ${PORT_OPTIONS}
 m=	${RDEP:M${o}*}
 .if ${m}
-b=	${m:C/^[A-Z]*://:C/:.*//:L}
-p=	${m:C/^[A-Z]*://:C/.*://:L}
+b=	${m:C/^[A-Z]*://:C/:.*//:tl}
+p=	${m:C/^[A-Z]*://:C/.*://:tl}
 RUN_DEPENDS+=	${b}:${PORTSDIR}/audio/${p}
 RUN_DEPENDS:=	${RUN_DEPENDS}
 .endif
diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile
index 3f88448d480c..7e5340c0e51f 100644
--- a/audio/tse3/Makefile
+++ b/audio/tse3/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	tse3
 PORTVERSION=	0.3.1
 PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:U}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME:tu}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIDI library
diff --git a/audio/umodplayer/Makefile b/audio/umodplayer/Makefile
index b9db8b27d7c8..f70f077e7104 100644
--- a/audio/umodplayer/Makefile
+++ b/audio/umodplayer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	umodplayer
-PORTVERSION=	0.${DISTVERSION:L}
+PORTVERSION=	0.${DISTVERSION:tl}
 DISTVERSION=	B5.1
 PORTREVISION=	3
 CATEGORIES=	audio
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 23fdeb5e023a..572054937a1f 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Self-scaling network benchmark
 PORTDOCS=	README netpipe_paper.ps
 PLIST_FILES=	bin/NPtcp bin/NPtcp6 man/man1/netpipe.1.gz
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:L}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
 
 do-build:
 	cd ${WRKSRC} \
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 3240f7029406..53289983ba17 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emboss
 PORTVERSION=	6.2.0
-RELEASE=	${PORTNAME:U}-${PORTVERSION}
+RELEASE=	${PORTNAME:tu}-${PORTVERSION}
 PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	ftp://emboss.open-bio.org/pub/EMBOSS/
@@ -30,8 +30,8 @@ USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX=${PREFIX} DATADIR=${DATADIR}
 
-DOCSDIR=	${PREFIX}/share/${PORTNAME:U}/doc
-DATADIR=	${PREFIX}/share/${PORTNAME:U}
+DOCSDIR=	${PREFIX}/share/${PORTNAME:tu}/doc
+DATADIR=	${PREFIX}/share/${PORTNAME:tu}
 
 CONFIGURE_ARGS+= --with-docroot=${DOCSDIR}
 
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index d951cb460177..22a2974fb207 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -151,7 +151,7 @@ WITH_ED=	vi
 .endif
 
 unamesm=	${OPSYS} ${ARCH}
-v_ifdef=	${OPSYS:U}
+v_ifdef=	${OPSYS:tu}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 
 .if !defined(PACKAGE_BUILDING)
diff --git a/cad/gdt/Makefile b/cad/gdt/Makefile
index 55571d303b2a..084e38ba52ba 100644
--- a/cad/gdt/Makefile
+++ b/cad/gdt/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	gdt
 PORTVERSION=	4.0
 CATEGORIES=	cad
 MASTER_SITES=	SF/gds2/gds2/
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	GDS2/GDT format translator
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 USES=	shebangfix perl5
 USE_PERL5=	run
 SHEBANG_FILES=	Examples/gdsinfo Examples/scalegds
-WRKSRC=		${WRKDIR}/${PORTNAME:U}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:tu}-${PORTVERSION}
 PLIST_FILES=	bin/gdsinfo bin/gds2gdt bin/gdt2gds bin/scalegds
 
 NO_STAGE=	yes
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 18d8afc26f9a..31a64d4e4497 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -45,7 +45,7 @@ LIB_DEPENDS+=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-ffmpeg
 .endif
 
-MACHINE=	${OPSYS:U}
+MACHINE=	${OPSYS:tu}
 
 SUB_LIST=	PREFIX=${PREFIX}
 SUB_FILES=	pkg-message
diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile
index b8e03520b87d..bb3bc01c8866 100644
--- a/chinese/miniChinput/Makefile
+++ b/chinese/miniChinput/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	miniChinput
 PORTVERSION=	0.1.9
 PORTREVISION=	3
 CATEGORIES=	chinese
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/0-1-9
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/0-1-9
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tiny version of Chinput
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 05fd3d42758a..585a0108aa86 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -69,7 +69,7 @@ NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 CFLAGS+=	-DAUTO_PPP
-.if defined(WITH_FIDO) && ${WITH_FIDO:L} != no
+.if defined(WITH_FIDO) && ${WITH_FIDO:tl} != no
 CFLAGS+=	-DFIDO
 .endif
 
diff --git a/databases/WWWdb/Makefile b/databases/WWWdb/Makefile
index b36f2b664851..641e51d18440 100644
--- a/databases/WWWdb/Makefile
+++ b/databases/WWWdb/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	WWWdb
 PORTVERSION=	0.8.3
 CATEGORIES=	databases perl5 www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Perl based generic WWW DB interface / frontend
diff --git a/databases/dbXML/Makefile b/databases/dbXML/Makefile
index ec429d331855..fbebddfae8e3 100644
--- a/databases/dbXML/Makefile
+++ b/databases/dbXML/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	dbXML
 PORTVERSION=	2.0
 CATEGORIES=	databases java
-MASTER_SITES=	SF/${PORTNAME:L}-core/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME:tl}-core/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
 DISTNAME=	dbXML-${PORTVERSION}
 
 MAINTAINER=	rws@procopia.com
@@ -20,11 +20,11 @@ SUB_FILES+=	pkg-message \
 		dbxmlctl
 SUB_LIST+=	DBXML_HOME=${DBXML_HOME} \
 		USER=${USERS} \
-		PORTNAME=${PORTNAME:L}
-USE_RC_SUBR=	${PORTNAME:L}
+		PORTNAME=${PORTNAME:tl}
+USE_RC_SUBR=	${PORTNAME:tl}
 
-USERS=		${PORTNAME:L}
-GROUPS=		${PORTNAME:L}
+USERS=		${PORTNAME:tl}
+GROUPS=		${PORTNAME:tl}
 SHAREMODE=	0644
 
 NO_STAGE=	yes
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index b8ca74c6e422..f1a368c9bf0d 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 
 GO_ACCOUNT=	mdb
 GO_PROJECT=	mdb
-GO_TAGNAME=	${PORTNAME:U}_${PORTVERSION}
+GO_TAGNAME=	${PORTNAME:tu}_${PORTVERSION}
 FETCH_ARGS?=	-o ${DISTDIR}/${DISTFILES}
 
 do-install:
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index d00389dffab8..2a81441f9fe0 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	phpMyAdmin
 DISTVERSION=	4.1.14
 CATEGORIES=	databases www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
 
 MAINTAINER=	matthew@FreeBSD.org
@@ -63,7 +63,7 @@ SHEBANG_FILES=	libraries/plugins/transformations/generator_main_class.sh \
 
 .for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect}
 .    if ${PORT_OPTIONS:M${opt}}
-USE_PHP+=	${opt:L}
+USE_PHP+=	${opt:tl}
 .    endif
 .endfor
 
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index a3324fa300bf..47a8f897d1b9 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -24,6 +24,6 @@ GH_ACCOUNT=	jmafc
 GH_COMMIT=	9b0e3d2
 GH_TAGNAME=	v${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTNAME}-${GH_COMMIT}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTNAME}-${GH_COMMIT}
 
 .include <bsd.port.mk>
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index b348165a57fc..39f309d7b067 100644
--- a/databases/py-htsql-mysql/Makefile
+++ b/databases/py-htsql-mysql/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Database Query Language (MySQL Backend for HTSQL)
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index e04dba716fae..d4daf76a27d3 100644
--- a/databases/py-htsql-pgsql/Makefile
+++ b/databases/py-htsql-pgsql/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Database Query Language (PostgreSQL Backend for HTSQL)
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index 2f471e3b1356..3d782ad1cce9 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Database Query Language (Core & SQLite Backend)
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index 78ebd32208ad..b481f263e403 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -47,7 +47,7 @@ RUN_DEPENDS+=	${ORACLE_HOME}/network/admin/tnsnames.ora:${PORTSDIR}/databases/or
 
 ORACLE_HOME?=	${LOCALBASE}/oracle8-client
 ORACLE_VER=	8i	# Client version
-CONFIGURE_ARGS+=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:U}
+CONFIGURE_ARGS+=	--with-oracle=${ORACLE_HOME} --with-oci-version=${ORACLE_VER:tu}
 .endif
 
 run-autotools:
diff --git a/deskutils/egroupware/Makefile b/deskutils/egroupware/Makefile
index 41deb0296965..8839cab1de73 100644
--- a/deskutils/egroupware/Makefile
+++ b/deskutils/egroupware/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	eGroupware
 PORTVERSION=	1.8.006.20140307
 CATEGORIES=	deskutils
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}-1.8/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-1.8/${PORTNAME}-${PORTVERSION}
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2 \
 		${PORTNAME}-egw-pear-${PORTVERSION}.tar.bz2
 
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index fb608c6bc213..95173f0d67b9 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	SpecTcl
 PORTVERSION=	1.2.2a
 CATEGORIES=	devel tk
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index 8a551d566bd1..30da33b31481 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	6.2.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://download.dre.vanderbilt.edu/previous_versions/ \
 		http://download.dre.vanderbilt.edu/previous_versions/
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adaptive Communication Environment for C++
@@ -68,9 +68,9 @@ post-patch:
 
 do-configure:
 	@cd ${WRKSRC}/ace \
-		&& ${ECHO_CMD} "#include <ace/config-${OPSYS:L}.h>" >> config.h
+		&& ${ECHO_CMD} "#include <ace/config-${OPSYS:tl}.h>" >> config.h
 	@cd ${WRKSRC}/include/makeinclude \
-		&& ${ECHO_CMD} "include \$$(ACE_ROOT)/include/makeinclude/platform_${OPSYS:L}.GNU" >> platform_macros.GNU \
+		&& ${ECHO_CMD} "include \$$(ACE_ROOT)/include/makeinclude/platform_${OPSYS:tl}.GNU" >> platform_macros.GNU \
 		&& ${ECHO_CMD} "CC=	${CC}" >> platform_macros.GNU \
 		&& ${ECHO_CMD} "CXX=	${CXX}" >> platform_macros.GNU \
 		&& ${ECHO_CMD} "CPPFLAGS=	${CPPFLAGS}" >> platform_macros.GNU \
diff --git a/devel/asdlgen/Makefile b/devel/asdlgen/Makefile
index 47ae980b2850..beca4e0b90ea 100644
--- a/devel/asdlgen/Makefile
+++ b/devel/asdlgen/Makefile
@@ -52,7 +52,7 @@ MAKE_ENV+=	SMLNJ_DEVEL=yes
 # http://java.sun.com/docs/books/tutorial/java/package/namingpkgs.html
 pre-patch:
 .for dir in StdPkl StdPrims StdTypes
-	cd ${WRKSRC}/src/java/asts && [ -d ${dir} ] && ${MV} ${dir} ${dir:L}
+	cd ${WRKSRC}/src/java/asts && [ -d ${dir} ] && ${MV} ${dir} ${dir:tl}
 .endfor
 
 post-build:
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index a208ee7bb772..afa6c0806606 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_ARCHS=	i386
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=	yes
-MAKE_ARGS=	OS=${OPSYS:U} KERNEL=${OSREL:S/.//g}
+MAKE_ARGS=	OS=${OPSYS:tu} KERNEL=${OSREL:S/.//g}
 
 # This will play merry hell with portlint(1)
 BINS=		bonus/asmutils basename cal cat chmod chown chroot cmp cp \
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index d23352e2c5f7..a01ec9473f9c 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ENV=	QTDIR="${QTDIR}"
 CONFIGURE_ARGS+=--with-doxywizard
 .endif # QT4
 
-.if ${MACHINE_ARCH:L} == alpha
+.if ${MACHINE_ARCH:tl} == alpha
 CONFIGURE_ARGS+=	--enable-langs no
 .endif
 
@@ -74,7 +74,7 @@ PLIST_FILES+=	bin/doxywizard
 
 pre-configure:
 	@cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \
-		${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done
+		${ECHO} "unix:tlIBS += ${ICONV_LIB}" >> $$pro; done
 	@${CHMOD} +x ${WRKSRC}/configure
 
 post-configure:
diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index 69f418169599..913b1c635f5d 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.40
 PORTREVISION=	11
 CATEGORIES=	devel elisp
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME:U}%20${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME:tu}%20${PORTVERSION}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER=	mva@FreeBSD.org
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index 1590c8e579b1..ef18eb0b3ce8 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -21,11 +21,11 @@ OPTIONS_DEFINE=	CON EVAS FILE IMF IMF_EVAS INPUT INPUT_EVAS IPC SDL X11
 OPTIONS_DEFAULT=CON EVAS FILE IMF IMF_EVAS INPUT INPUT_EVAS IPC X11
 
 .for NODE in ${OPTIONS_DEFINE}
-${NODE}_DESC=	Install ${NODE:L} module
+${NODE}_DESC=	Install ${NODE:tl} module
 .endfor
 
 .for NODE in ${OPTIONS_DEFINE}
-${NODE}_USE=	EFL_ECORE=${NODE:L}
+${NODE}_USE=	EFL_ECORE=${NODE:tl}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/eiffelstudio/Makefile b/devel/eiffelstudio/Makefile
index 72eae3f7cd07..d33b817dacf8 100644
--- a/devel/eiffelstudio/Makefile
+++ b/devel/eiffelstudio/Makefile
@@ -30,7 +30,7 @@ SUB_FILES=	${PORTNAME} pkg-message
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 
 NATIVE_ARCHS=	i386 amd64
-EIFFEL_HOST=	${OPSYS:L}-${EIFFEL_ARCH}
+EIFFEL_HOST=	${OPSYS:tl}-${EIFFEL_ARCH}
 PLIST_SUB+=	EIFFEL_HOST="${EIFFEL_HOST}"
 SUB_LIST+=	EIFFEL_HOST="${EIFFEL_HOST}"
 
@@ -49,9 +49,9 @@ EIFFEL_ARCH=		x86
 
 .for arch in ${NATIVE_ARCHS}
 . if ${EIFFEL_ARCH} == ${arch:S/i386/x86/:S/amd64/x86-64/}
-PLIST_SUB+=	${arch:U}=""
+PLIST_SUB+=	${arch:tu}=""
 . else
-PLIST_SUB+=	${arch:U}="@comment "
+PLIST_SUB+=	${arch:tu}="@comment "
 . endif
 .endfor
 
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 08347a273257..391c1ef8382b 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.0.3
 PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/ELFIO-sources/ELFIO-${PORTVERSION}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for reading and generating files in the ELF binary format
diff --git a/devel/fc++/Makefile b/devel/fc++/Makefile
index 38b0d4d952b8..16a885bf5f3c 100644
--- a/devel/fc++/Makefile
+++ b/devel/fc++/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	fc++
 PORTVERSION=	1.5
 CATEGORIES=	devel
 MASTER_SITES=	http://people.cs.umass.edu/~yannis/fc++/
-DISTNAME=	${PORTNAME:U}.${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Functional Programming in C++
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index a956c8dc7942..d41748193123 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Fnorb
 PORTVERSION=	1.3
 PORTREVISION=	2
 CATEGORIES=	devel python
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CORBA 2.0 ORB written in Python
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
index 691bb808c219..2a83a682cf9b 100644
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -9,7 +9,6 @@ DISTFILES=	# none
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Geany plugins (meta port)
 
-.MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
@@ -23,9 +22,9 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 NO_OPTIONS_SORT=	yes
 
 .for plugin in ${GEANY_PLUGINS_ALL}
-OPTIONS_DEFINE+=	${plugin:U}
-${plugin:U}_DESC=	${${plugin}_DESC}
-${plugin:U}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin}
+OPTIONS_DEFINE+=	${plugin:tu}
+${plugin:tu}_DESC=	${${plugin}_DESC}
+${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin}
 .endfor
 
 NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:${PORTSDIR}/devel/geany-plugins-l10n
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 8072ba891d1f..0dec970fdcc2 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -41,7 +41,7 @@ PYTHON_DESC=		Enable Python console
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
-CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 CONFIGURE_ARGS+=	--disable-shared --with-gmp=${PREFIX}
diff --git a/devel/jsap/Makefile b/devel/jsap/Makefile
index a2042495797a..d13bd4230894 100644
--- a/devel/jsap/Makefile
+++ b/devel/jsap/Makefile
@@ -6,7 +6,7 @@ DISTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	devel java
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME:U}-${DISTVERSION}
+DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java package to parse command-line arguments
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index fa923a511106..0afec2dbc9cf 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Judy
 PORTVERSION=	1.0.5
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose dynamic array
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	YES
 MAKE_JOBS_UNSAFE=	yes
 
-WRKSRC=	${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+WRKSRC=	${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 
 PORTDOCS=	COPYRIGHT README *.htm
 
diff --git a/devel/kBuild/Makefile b/devel/kBuild/Makefile
index a74927349319..d9bdfad339e8 100644
--- a/devel/kBuild/Makefile
+++ b/devel/kBuild/Makefile
@@ -29,7 +29,7 @@ KBUILD_ENV=	ACLOCAL=${ACLOCAL} \
 		AUTORECONF=${AUTORECONF} \
 		AUTOPOINT=true
 USE_GCC=	any
-KBUILD_TARGET=	${OPSYS:L}
+KBUILD_TARGET=	${OPSYS:tl}
 
 KBUILD_BINS=	kDepIDB kDepPre kObjCache kmk kmk_append kmk_ash kmk_cat \
 		kmk_chmod kmk_cmp kmk_cp kmk_echo kmk_expr kmk_gmake \
diff --git a/devel/lua-alien/Makefile b/devel/lua-alien/Makefile
index b5f71290b97a..2ba734803a59 100644
--- a/devel/lua-alien/Makefile
+++ b/devel/lua-alien/Makefile
@@ -36,8 +36,8 @@ CFLAGS+=	-fno-stack-protector
 
 # add lua prefix to directories
 .for p in data: docs:doc/ examples:examples/
-${p:C/:.*//:U}DIR_REL=	share/${p:C/.*://}${LUA_PKGNAMEPREFIX}${PORTNAME}
-${p:C/:.*//:U}DIR=	${PREFIX}/${${p:C/:.*//:U}DIR_REL}
+${p:C/:.*//:tu}DIR_REL=	share/${p:C/.*://}${LUA_PKGNAMEPREFIX}${PORTNAME}
+${p:C/:.*//:tu}DIR=	${PREFIX}/${${p:C/:.*//:tu}DIR_REL}
 .endfor
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/devel/ninja-ide/Makefile b/devel/ninja-ide/Makefile
index b5e381c70252..2d41e8ca4758 100644
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:${PORTSDIR}/devel/py
 		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:${PORTSDIR}/www/py-qt4-webkit
 
 #PYDISTUTILS_PKGNAME=	${PORTNAME:tu:S,-,_,}
-PYDISTUTILS_PKGNAME=	${PORTNAME:U:S,-,_,}
+PYDISTUTILS_PKGNAME=	${PORTNAME:tu:S,-,_,}
 #PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}_dev
 
 USE_GITHUB=	yes
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 6df7fe796142..8fa3c472e447 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	omniORB
 PORTVERSION=	4.1.6
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Robust high performance CORBA ORB for C++ and Python
 
diff --git a/devel/p4db/Makefile b/devel/p4db/Makefile
index 1241fdbd2a7b..2ecc6e6dcdf4 100644
--- a/devel/p4db/Makefile
+++ b/devel/p4db/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel www
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
-DISTNAME=	${PORTNAME:U}_${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web/Perforce Browser
diff --git a/devel/pecl-APCu/Makefile b/devel/pecl-APCu/Makefile
index 2544fccd6ae8..a3a1739c3aa3 100644
--- a/devel/pecl-APCu/Makefile
+++ b/devel/pecl-APCu/Makefile
@@ -21,7 +21,7 @@ USE_PHP=	yes
 USE_PHP_BUILD=	yes
 USE_PHPIZE=	yes
 USE_PHPEXT=	yes
-PHP_MODNAME=	${PORTNAME:L}
-WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+PHP_MODNAME=	${PORTNAME:tl}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/py-gyp-devel/Makefile b/devel/py-gyp-devel/Makefile
index 12655208594f..c46e29c22cec 100644
--- a/devel/py-gyp-devel/Makefile
+++ b/devel/py-gyp-devel/Makefile
@@ -18,7 +18,7 @@ PYDISTUTILS_AUTOPLIST=	yes
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${REINPLACE_CMD} -e 's/linux/${OPSYS:L}/;s|gcc|${CC}|;s|g++|${CXX}|' \
+	${REINPLACE_CMD} -e 's/linux/${OPSYS:tl}/;s|gcc|${CC}|;s|g++|${CXX}|' \
 	${WRKSRC}/pylib/gyp/generator/make.py
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-tables/Makefile b/devel/py-tables/Makefile
index adf7d19d8e84..a2cf37404b17 100644
--- a/devel/py-tables/Makefile
+++ b/devel/py-tables/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	tables
 PORTVERSION=	3.0.0
 PORTREVISION=	3
 CATEGORIES=	devel python
-MASTER_SITES=	SF/py${PORTNAME:L}/py${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/py${PORTNAME:tl}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	tables-${PORTVERSION}.tar.gz pytablesmanual-${PORTVERSION}.pdf
 EXTRACT_ONLY=	tables-${PORTVERSION}.tar.gz
diff --git a/devel/qt5/Makefile.sqldrivers b/devel/qt5/Makefile.sqldrivers
index 9fe31b3b88b2..fbaec5d565c8 100644
--- a/devel/qt5/Makefile.sqldrivers
+++ b/devel/qt5/Makefile.sqldrivers
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
-# tell bmake we use the old :L :U modifiers
-.MAKE.FreeBSD_UL= yes
-
-PORTNAME?=	${DB:L}
+PORTNAME?=	${DB:tl}
 DISTVERSION?=	${QT5_VERSION}
 CATEGORIES?=	databases
 PKGNAMEPREFIX?=	qt5-sqldrivers-
@@ -16,12 +13,12 @@ QT_DIST?=	base
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=-no-gui -no-xcb
 
-BUILD_WRKSRC?=	${WRKSRC}/src/plugins/sqldrivers/${DB:L}
+BUILD_WRKSRC?=	${WRKSRC}/src/plugins/sqldrivers/${DB:tl}
 INSTALL_WRKSRC?=${BUILD_WRKSRC}
 
 PLIST_FILES+=	${QT_LIBDIR_REL}/cmake/Qt5Sql/Qt5Sql_Q${DB}DriverPlugin.cmake \
-		${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:L:C/^sql//}.so \
-		%%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:L:C/^sql//}.so.debug
+		${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so \
+		%%DEBUG%%${QT_PLUGINDIR_REL}/sqldrivers/libqsql${DB:tl:C/^sql//}.so.debug
 PLIST_DIRSTRY+=	${QT_PLUGINDIR_REL}/sqldrivers \
 		${QT_PLUGINDIR_REL} \
 		${QT_ARCHDIR_REL} \
diff --git a/devel/rbtools/Makefile b/devel/rbtools/Makefile
index c3f30a2357ad..3c7b65523be2 100644
--- a/devel/rbtools/Makefile
+++ b/devel/rbtools/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${ORIGNAME:L}
+PORTNAME=	${ORIGNAME:tl}
 DISTVERSION=	0.5.7
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.reviewboard.org/releases/${ORIGNAME}/${DISTVERSION:R}/
diff --git a/devel/simpletest/Makefile b/devel/simpletest/Makefile
index 557f49a74d5a..1a80d0fd8bf4 100644
--- a/devel/simpletest/Makefile
+++ b/devel/simpletest/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	simpletest
 PORTVERSION=	1.1.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION:C/\.0//}
-DISTNAME=	${PORTNAME:L}_${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}_${PORTVERSION}
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Unit testing, mock objects, and web testing framework for PHP
@@ -17,7 +17,7 @@ USE_PHP_BUILD=	yes
 DEFAULT_VERSIONS=	php=5
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/devel/tclap/Makefile b/devel/tclap/Makefile
index 78796f2d921a..300bee82dcd2 100644
--- a/devel/tclap/Makefile
+++ b/devel/tclap/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=  ${PORTNAME:L}#
+MASTER_SITE_SUBDIR=  ${PORTNAME:tl}#
 
 MAINTAINER=	grog@FreeBSD.org
 COMMENT=	Verbose replacement for getopt
diff --git a/devel/udis86/Makefile b/devel/udis86/Makefile
index 626229a0d69c..ef6833ff43ff 100644
--- a/devel/udis86/Makefile
+++ b/devel/udis86/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.7.2
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION:R}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Minimalistic x86 and x86-64 disassembler library
diff --git a/dns/dnsmax-perl/Makefile b/dns/dnsmax-perl/Makefile
index 916f88a8c388..7997a28ca6bc 100644
--- a/dns/dnsmax-perl/Makefile
+++ b/dns/dnsmax-perl/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	dnsmax-perl
 PORTVERSION=	1.0.1
 CATEGORIES=	dns
 MASTER_SITES=	SF/dynamicdns/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
 
 MAINTAINER=	dan@algenta.com
 COMMENT=	DNSMax-perl is a perl DNS update client for the REST DNSMax protocol
diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile
index b61cec30a8b3..7dc1db5557d2 100644
--- a/editors/omegaT/Makefile
+++ b/editors/omegaT/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	omegaT
 DISTVERSION=	2.6.3_01
 PORTREVISION=	1
 CATEGORIES=	editors java x11
-MASTER_SITES=	SF/${PORTNAME:L}/OmegaT%20-%20Standard/OmegaT%202.6.3%20update%201/
+MASTER_SITES=	SF/${PORTNAME:tl}/OmegaT%20-%20Standard/OmegaT%202.6.3%20update%201/
 DISTNAME=	OmegaT_2.6.3_01_Source
 DIST_SUBDIR=	${PORTNAME}
 
diff --git a/editors/spe/Makefile b/editors/spe/Makefile
index f0b0cdbbf28b..ddf60d424c11 100644
--- a/editors/spe/Makefile
+++ b/editors/spe/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	6
 CATEGORIES=	editors devel python
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	python
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}-wx2.6.1.0
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}-wx2.6.1.0
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Stani's Python Editor
@@ -24,7 +24,7 @@ ENCRYPTED_DEBUG_DESC=	Enable encrypted debug in SPE
 
 REINPLACE_ARGS=	-i.bak -E -e "1s,^(\#!.* )python$$,\1 -S PYTHONPATH=${DATADIR} ${PYTHON_CMD},1"
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 SPEDOCS=	${DATADIR}/_spe/doc
 SPEXAMPLES=	${DATADIR}/_spe/examples
 SPESCRIPTS=	spe SPE.py SPE_DEBUG.py
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index c4fddf27538d..401d95dd3749 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-optimize="${CXXFLAGS}"
 MAKE_ARGS=	CP="${CP} -R -f"
-ALL_TARGET=	${PORTNAME:U}
+ALL_TARGET=	${PORTNAME:tu}
 INSTALL_ICONS=	yes
 
 DATADIR=	${PREFIX}/share/TeXmacs
diff --git a/emulators/m2000/Makefile b/emulators/m2000/Makefile
index 83ea076d7cff..d09f81e41c93 100644
--- a/emulators/m2000/Makefile
+++ b/emulators/m2000/Makefile
@@ -10,11 +10,11 @@ MASTER_SITES=	\
 		http://www.mavetju.org/download/adopted/:tapes \
 		ftp://ftp.komkon.org/pub/EMUL8/P2000/Tapes/:tapes \
 		http://www.mavetju.org/download/adopted/:code
-DISTFILES=	${PORTNAME:U}${EXTRACT_SUFX}:code \
+DISTFILES=	${PORTNAME:tu}${EXTRACT_SUFX}:code \
 		tapeconv.zip:code \
 		${M2000TAPES:S/$/.gz:tapes/}
 DIST_SUBDIR=	m2000
-EXTRACT_ONLY=	${PORTNAME:U}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${PORTNAME:tu}${EXTRACT_SUFX}
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	A portable emulator for the Philips P2000 home computer
diff --git a/emulators/ucon64/Makefile b/emulators/ucon64/Makefile
index 8a9539761bf6..4205c35da2ba 100644
--- a/emulators/ucon64/Makefile
+++ b/emulators/ucon64/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ucon64
 PORTVERSION=	2.0.0
 CATEGORIES=	emulators
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME:L}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME:tl}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	root@cooltrainer.org
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index 4067edda8cb0..4933990dbb05 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${UPPORTNAME:L}
+PORTNAME=	${UPPORTNAME:tl}
 PORTVERSION=	10.00
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/OTS_${TAXYEAR}/v${PORTVERSION}
diff --git a/french/homard/Makefile b/french/homard/Makefile
index 8d4764679d27..7bbd2141a28d 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -32,8 +32,8 @@ HOMARDDIR=	${PREFIX}/${LHOMARDDIR}
 AHPY=		aster_homard_py
 HOMARDSCRIPT=	${PORTNAME}_base ASTER_HOMARD/aster_homard_py/aster_homard_3.py
 # This name is requested to run aster's make test
-HOMARDPG=	${PORTNAME:U}_V${PORTVERSION:R}.out
-HOMARDWDIR=	${PORTNAME:U}
+HOMARDPG=	${PORTNAME:tu}_V${PORTVERSION:R}.out
+HOMARDWDIR=	${PORTNAME:tu}
 
 DOCS=		A_Lire.txt Readme.txt
 
diff --git a/games/ftjava/Makefile b/games/ftjava/Makefile
index b090f057704c..5d358334871b 100644
--- a/games/ftjava/Makefile
+++ b/games/ftjava/Makefile
@@ -44,7 +44,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} ";"
 	cd ${WRKSRC} && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} ";"
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME:L}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME:tl}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${doc} ${STAGEDIR}${DOCSDIR}
diff --git a/games/ioquake3/Makefile b/games/ioquake3/Makefile
index 86faf15096a0..d147fd051973 100644
--- a/games/ioquake3/Makefile
+++ b/games/ioquake3/Makefile
@@ -62,7 +62,7 @@ ALL_TARGET=	release
 
 LIBDIR=		lib/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	share/doc/${PORTNAME}${PKGNAMESUFFIX}
-BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${IOQ3ARCH}
+BUILDDIR=	${WRKSRC}/build/${ALL_TARGET}-${OPSYS:tl}-${IOQ3ARCH}
 BINSUFFIX?=
 HOMEPATH?=	/.${PORTNAME}
 Q3CLIENT?=	ioquake3
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index f10cb4470023..b7126d0e62a6 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -105,7 +105,7 @@ do-extract:
 # Original CD
 .elif defined(ORIGINAL)
 .for dir in ${CDDIRS:NSystem:NMaps/UPak:NSounds/int} Manuals
-	@${LN} -sf ${CDROM_MOUNT}/${dir:U} ${WRKDIR}/source/${dir}
+	@${LN} -sf ${CDROM_MOUNT}/${dir:tu} ${WRKDIR}/source/${dir}
 .endfor
 .for _file in UDSDemo.u UPak.u
 	@${CP} ${CDROM_MOUNT}/SYSTEM/${_file} ${WRKDIR}/source/System
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index d4412e6bc9e8..b38e9271116f 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	lwjgl
 DISTVERSION=	2.9.1
 CATEGORIES=	games java
-MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:U}%20${PORTVERSION}/
+MASTER_SITES=	SF/java-game-lib/Official%20Releases/${PORTNAME:tu}%20${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${PORTNAME}-source-${DISTVERSION}${EXTRACT_SUFX}
 
diff --git a/games/mtaserver/Makefile b/games/mtaserver/Makefile
index 14dd9ea08d28..dd8412759bc7 100644
--- a/games/mtaserver/Makefile
+++ b/games/mtaserver/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
 
-PORTNAME=	${MTANAME:L}
+PORTNAME=	${MTANAME:tl}
 PORTVERSION=	0.5
 PORTREVISION=	2
 CATEGORIES=	games linux
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 79f14362aaa1..213c2ff93164 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -55,7 +55,7 @@ X11_ARGS+=	CFLAGS+="-DXWINGRAPHX" \
 
 do-build:
 .for f in ${TARGETS}
-	@(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_ARGS} ${${f:U}_ARGS} \
+	@(cd ${BUILD_WRKSRC}; ${MAKE} ${MAKE_ARGS} ${${f:tu}_ARGS} \
 		${ALL_TARGET} clean)
 	@(cd ${BUILD_WRKSRC}; ${MV} ${PORTNAME} ${PORTNAME}-${f})
 .endfor
diff --git a/games/q2p/Makefile b/games/q2p/Makefile
index 0521d1b8a705..5e55fed72c7b 100644
--- a/games/q2p/Makefile
+++ b/games/q2p/Makefile
@@ -82,7 +82,7 @@ PLIST_SUB+=	GAME="@comment "
 .  if ${PORT_OPTIONS:M${opt}}
 MAKE_ENV+=	BUILD_${opt}=YES
 PLIST_SUB+=	${opt}=""
-Q2REF+=		${opt:L:S/glx/gl/:S/sdlgl/sdl/}
+Q2REF+=		${opt:tl:S/glx/gl/:S/sdlgl/sdl/}
 .  else
 PLIST_SUB+=	${opt}="@comment "
 .  endif
diff --git a/games/quake-reaper/Makefile b/games/quake-reaper/Makefile
index 14c05bb5f9df..5456c5368e98 100644
--- a/games/quake-reaper/Makefile
+++ b/games/quake-reaper/Makefile
@@ -24,11 +24,11 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in Autoexec.cfg PROGS.DAT
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/${f:L}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/${f:tl}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in B08chg.txt Dedserv.txt Reaprb80.txt Skinspec.txt
-	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f:L}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/${f:tl}
 .endfor
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
diff --git a/games/quake2-3zb2/Makefile b/games/quake2-3zb2/Makefile
index 9a67616dff4a..2c3b42d5cef0 100644
--- a/games/quake2-3zb2/Makefile
+++ b/games/quake2-3zb2/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.angelfire.com/mt2/quakebots/:prog \
 		http://ponpoko.tri6.net/3zb2/routes/:routes
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}
+DISTNAME=	${PORTNAME:tu}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:prog \
 		${PORTNAME}src${PORTVERSION:S/0.//}${EXTRACT_SUFX}:prog
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile
index 0ea9ce2b92d7..94b0d4460093 100644
--- a/games/quake2-source/Makefile
+++ b/games/quake2-source/Makefile
@@ -57,12 +57,12 @@ PLIST_SUB+=	XATRIX="@comment "
 
 post-extract:
 .for f in rogue xatrix
-.   if ${PORT_OPTIONS:M${f:U}}
+.   if ${PORT_OPTIONS:M${f:tu}}
 	@${MKDIR} ${WRKSRC}/src/${f}
 	@(cd ${WRKSRC}/src/${f} && ${GUNZIP_CMD} -c \
 		${DISTDIR}/${DIST_SUBDIR}/${f}src320.shar.Z > \
 		${f}src320.shar && \
-		${TAIL} +${${f:U}_OFF} ${f}src320.shar | ${SH})
+		${TAIL} +${${f:tu}_OFF} ${f}src320.shar | ${SH})
 .   endif
 .endfor
 
@@ -76,7 +76,7 @@ do-install:
 	${CP} -R ${WRKSRC}/src/game ${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/Makefile.game ${DATADIR}/game/Makefile
 .for f in ctf rogue xatrix
-.   if ${PORT_OPTIONS:M${f:U}}
+.   if ${PORT_OPTIONS:M${f:tu}}
 	${CP} -R ${WRKSRC}/src/${f} ${DATADIR}
 	${INSTALL_DATA} ${FILESDIR}/Makefile.${f} ${DATADIR}/${f}/Makefile
 .   endif
diff --git a/games/qudos/Makefile b/games/qudos/Makefile
index d11ae7eca1f2..fad594fda879 100644
--- a/games/qudos/Makefile
+++ b/games/qudos/Makefile
@@ -114,7 +114,7 @@ MAKE_ENV+=	WITH_GAME_MOD=NO
 .  if ${PORT_OPTIONS:M${opt}}
 MAKE_ENV+=	BUILD_${opt}=YES
 PLIST_SUB+=	${opt}=""
-Q2REF+=		${opt:L}
+Q2REF+=		${opt:tl}
 .  else
 MAKE_ENV+=	BUILD_${opt}=NO
 PLIST_SUB+=	${opt}="@comment "
@@ -199,8 +199,8 @@ do-install:
 .if ${PORT_OPTIONS:MGAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake2/baseq2/game.so ${LIBDIR}/baseq2
 .endif
-.for mod in ${MOD_LIST:L}
-.if ${PORT_OPTIONS:M${mod:U}}
+.for mod in ${MOD_LIST:tl}
+.if ${PORT_OPTIONS:M${mod:tu}}
 	@${MKDIR} ${LIBDIR}/${mod}
 	${INSTALL_PROGRAM} ${WRKSRC}/quake2/${mod}/game.so ${LIBDIR}/${mod}
 .endif
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index e6c5e513a4dc..4e3936fab8b5 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Ri-li
 PORTVERSION=	2.0.1
 PORTREVISION=	5
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}%20Linux_Unix/${PORTNAME}%20V${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}%20Linux_Unix/${PORTNAME}%20V${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Drive a toy wood train in many levels - snake-like arcade game
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 49aad9ad89be..eac78168b4e9 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.0.8
 DISTVERSIONSUFFIX=	-Ext
 PORTREVISION=	10
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}-1.0.x/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}-1.0.x/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Robot programming game for UNIX
@@ -27,7 +27,7 @@ CONFIGURE_ARGS=	--with-rtb-dir=${PREFIX}/lib/${PORTNAME}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-DESKTOP_ENTRIES="${PORTNAME}" "" "" "${PORTNAME:L}" "" ""
+DESKTOP_ENTRIES="${PORTNAME}" "" "" "${PORTNAME:tl}" "" ""
 
 post-patch:
 .for i in configure
diff --git a/games/searchandrescue/Makefile b/games/searchandrescue/Makefile
index f6e4c94c1a98..a8e58f40688b 100644
--- a/games/searchandrescue/Makefile
+++ b/games/searchandrescue/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	SearchAndRescue
 PORTVERSION=	1.4.0
 PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME:L}/Program/
+MASTER_SITES=	SF/${PORTNAME:tl}/Program/
 
 MAINTAINER=	jessefrgsmith@yahoo.ca
 COMMENT=	A flight simulator in which the player rescues people
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/searchandrescue/human.ini:${PORTSDIR}/games/sear
 USE_SDL=	mixer
 USE_XORG=	x11 xau xdmcp xext xmu xpm xxf86vm
 USE_GL=		glu
-WRKSRC=		${WRKDIR}/${PORTNAME:L}_${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}_${PORTVERSION}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${DESKTOPDIR:S,${PREFIX}/,,}/${PORTNAME}.desktop \
diff --git a/games/slashem-tty/Makefile b/games/slashem-tty/Makefile
index 7bc403d95466..f786b673cf51 100644
--- a/games/slashem-tty/Makefile
+++ b/games/slashem-tty/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.0.7E.7F.3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/0.0.7E7F3
 PKGNAMESUFFIX=	-tty
-DISTNAME=	se${PORTVERSION:S/.//g:L}
+DISTNAME=	se${PORTVERSION:S/.//g:tl}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	A dungeon explorin', slashin', hackin' game
diff --git a/games/tuxpaint-fonts/Makefile b/games/tuxpaint-fonts/Makefile
index a08d0ef51d00..4a448d85cf93 100644
--- a/games/tuxpaint-fonts/Makefile
+++ b/games/tuxpaint-fonts/Makefile
@@ -29,19 +29,16 @@ CHINESE_SIMPLIFIED_CODE=	zh_cn
 KOREAN_CODE=			ko
 VIETNAMESE_CODE=		vi
 
-#Bmake compatibility
-.MAKE.FreeBSD_UL= yes
-
 # Generate options menu.
 .for l in ${LANGS}
-OPTIONS_DEFINE+=	${l:U}
-OPTIONS_DEFAULT+=	${l:U}
-${l:U}_DESC=	${l:S/_/ /} fonts
+OPTIONS_DEFINE+=	${l:tu}
+OPTIONS_DEFAULT+=	${l:tu}
+${l:tu}_DESC=	${l:S/_/ /} fonts
 .endfor
 
 # Set MASTER_SITES
 .for l in ${LANGS}
-MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-fonts/${${l:U}_DISTNAME}:${l:U}
+MASTER_SITES+=	SF/${PORTNAME}/${PORTNAME}-fonts/${${l:tu}_DISTNAME}:${l:tu}
 .endfor
 
 # Do not use the same OPTIONS directory as "games/tuxpaint".
@@ -51,12 +48,12 @@ LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
 # Set DISTFILES and PLIST_FILES according to OPTIONS.
 .for l in ${LANGS}
-.	if ${PORT_OPTIONS:M${l:U}}
-DISTFILES+=	${PORTNAME}-ttf-${${l:U}_DISTNAME}${EXTRACT_SUFX}:${l:U}
-PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}.ttf
-PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs/COPYING.txt
-PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs/README.txt
-PLIST_DIRS+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs
+.	if ${PORT_OPTIONS:M${l:tu}}
+DISTFILES+=	${PORTNAME}-ttf-${${l:tu}_DISTNAME}${EXTRACT_SUFX}:${l:tu}
+PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:tu}_CODE}.ttf
+PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:tu}_CODE}_docs/COPYING.txt
+PLIST_FILES+=	%%DATADIR%%/fonts/locale/${${l:tu}_CODE}_docs/README.txt
+PLIST_DIRS+=	%%DATADIR%%/fonts/locale/${${l:tu}_CODE}_docs
 .	endif
 .endfor
 
@@ -64,14 +61,14 @@ PLIST_DIRS+=	%%DATADIR%%/fonts/locale/${${l:U}_CODE}_docs
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/fonts/locale
 .for l in ${LANGS}
-.	if ${PORT_OPTIONS:M${l:U}}
+.	if ${PORT_OPTIONS:M${l:tu}}
 		${INSTALL_DATA} \
-			${WRKSRC}/${PORTNAME}-ttf-${${l:U}_DISTNAME}/${${l:U}_CODE}.ttf \
+			${WRKSRC}/${PORTNAME}-ttf-${${l:tu}_DISTNAME}/${${l:tu}_CODE}.ttf \
 			${STAGEDIR}${DATADIR}/fonts/locale
-		@${MKDIR} ${STAGEDIR}${DATADIR}/fonts/locale/${${l:U}_CODE}_docs
+		@${MKDIR} ${STAGEDIR}${DATADIR}/fonts/locale/${${l:tu}_CODE}_docs
 		${INSTALL_DATA} \
-			${WRKSRC}/${PORTNAME}-ttf-${${l:U}_DISTNAME}/*.txt \
-			${STAGEDIR}${DATADIR}/fonts/locale/${${l:U}_CODE}_docs
+			${WRKSRC}/${PORTNAME}-ttf-${${l:tu}_DISTNAME}/*.txt \
+			${STAGEDIR}${DATADIR}/fonts/locale/${${l:tu}_CODE}_docs
 .	endif
 .endfor
 
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 3bb74cb7b247..a71f643c6db1 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -23,7 +23,7 @@ USE_XORG=	xpm
 DOS2UNIX_GLOB=	*.cpp *.h config.mk makefile
 MAKEFILE=	makefile
 MAKE_ARGS=	DEPTH="${WRKSRC}"
-ALL_TARGET=	${OPSYS:L}
+ALL_TARGET=	${OPSYS:tl}
 
 PORTDOCS=	*
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index 25b60b2d7e19..fbd65110819b 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	BBBike
 PORTVERSION=	3.18
 PORTREVISION=	1
 CATEGORIES=	german
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	slaven@rezic.de
 COMMENT=	A route-finder for cyclists in Berlin and Brandenburg
diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile
index 867a65902c36..da1e29e6066d 100644
--- a/graphics/Cgraph/Makefile
+++ b/graphics/Cgraph/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A PostScript plotting library in C
 
 WRKSRC=		${WRKDIR}/Cgraph/source
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:L}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:L}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:tl}
 
 USE_LDCONFIG=	yes
 
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 776ef87902ab..b329e9eeebee 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
-MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
 PKGNAMESUFFIX=	13
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index 4d3171e14078..c78cc20899f2 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -19,7 +19,7 @@ MAKE_ENV=	EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
 USE_LDCONFIG=	yes
 
 INCLUDES=	SciPlot.h SciPlotP.h SciPlotUtil.h
-LIBNAME=	lib${PORTNAME:L}	# Remove :L for libSciPlot
+LIBNAME=	lib${PORTNAME:tl}	# Remove :tl for libSciPlot
 PLIST_SUB=	LIBNAME=${LIBNAME}
 
 PORTDOCS=	README SciPlot.html SciPlotDemo.html SciPlotProg.html
diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile
index 92a102a0895a..b9516a64aed3 100644
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--enable-ILU \
 USE_LDCONFIG=	yes
 USE_GCC=	any
 
-WRKSRC=		${WRKDIR}/${DISTNAME:L}
+WRKSRC=		${WRKDIR}/${DISTNAME:tl}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 026b79a023dd..098adbefacd8 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -86,7 +86,7 @@ PLIST_SUB+=	${_d}_DRIVER="@comment "
 .if !(${ARCH} == amd64 || ${ARCH} == i386)
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
-CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
+CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
 
 .if defined(WITH_NEW_XORG) && !defined(WITH_GALLIUM) \
 	&& (${ARCH} == i386 || ${ARCH} == amd64)
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 8ea31e059d67..0c5593e8aca7 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	electrix
 PORTVERSION=	0.2.0
 PORTREVISION=	2
 CATEGORIES=	graphics print
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION}
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Application to view PDF files
diff --git a/graphics/evas-loader-generic/Makefile b/graphics/evas-loader-generic/Makefile
index ce1130a901b9..00ede3123bfb 100644
--- a/graphics/evas-loader-generic/Makefile
+++ b/graphics/evas-loader-generic/Makefile
@@ -16,13 +16,10 @@ LICENSE=	BSD
 
 EVAS_GENERIC_LOADERS=	gst pdf ps raw svg xcf
 
-#bmake compatibility
-.MAKE.FreeBSD_UL= yes
-
 .for NODE in ${EVAS_GENERIC_LOADERS}
-OPTIONS_DEFINE+=	${NODE:U}
-OPTIONS_DEFAULT+=	${NODE:U}
-${NODE:U}_DESC=	Install ${NODE} evas generic loader
+OPTIONS_DEFINE+=	${NODE:tu}
+OPTIONS_DEFAULT+=	${NODE:tu}
+${NODE:tu}_DESC=	Install ${NODE} evas generic loader
 .endfor
 
 DIST_SUBDIR=	e17
@@ -40,7 +37,7 @@ CONFIGURE_ARGS+=	--enable-image-loader-generic
 .include <bsd.port.options.mk>
 
 .for NODE in ${EVAS_GENERIC_LOADERS}
-. if ${PORT_OPTIONS:M${NODE:U}}
+. if ${PORT_OPTIONS:M${NODE:tu}}
 RUN_DEPENDS+=	${LOCALBASE}/lib/evas/utils/evas_image_loader.${NODE}:${PORTSDIR}/graphics/evas_generic_loaders-${NODE}
 . endif
 .endfor
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 5259ff3beb2c..0ea9691c658c 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -24,24 +24,24 @@ OPTIONS_DEFAULT=BUFFER OPENGL X11 \
 		PNG PMAPS PSD TGA TIFF WBMP XPM
 
 .for NODE in ${OPTIONS_MULTI_ENGINES}
-${NODE}_DESC=	Install ${NODE:L} engine
+${NODE}_DESC=	Install ${NODE:tl} engine
 .endfor
 
 .for NODE in ${OPTIONS_DEFINE}
-${NODE}_DESC=	Install ${NODE:L} loader
+${NODE}_DESC=	Install ${NODE:tl} loader
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for NODE in ${OPTIONS_MULTI_ENGINES}
 .  if ${PORT_OPTIONS:M${NODE}}
-USE_EFL_EVAS_ENGINES+=	${NODE:L}
+USE_EFL_EVAS_ENGINES+=	${NODE:tl}
 .  endif
 .endfor
 
 .for NODE in ${OPTIONS_DEFINE}
 .  if ${PORT_OPTIONS:M${NODE}}
-USE_EFL_EVAS_LOADERS+=	${NODE:L}
+USE_EFL_EVAS_LOADERS+=	${NODE:tl}
 .  endif
 .endfor
 
diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile
index bdf28110fe18..30520ffc6a8f 100644
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@@ -53,7 +53,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${STAGEDIR}${EXAMPLESDIR}
 .for prog in ${BINS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:tl} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
diff --git a/graphics/gimp-help/Makefile b/graphics/gimp-help/Makefile
index 76390a6ac70d..cdf2423a7636 100644
--- a/graphics/gimp-help/Makefile
+++ b/graphics/gimp-help/Makefile
@@ -12,8 +12,6 @@ COMMENT=	The meta port for GIMP User Manual
 
 LICENSE=	GFDL
 
-.MAKE.FreeBSD_UL=	yes
-
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
@@ -49,7 +47,7 @@ sl_NAME=	Slovenian
 sv_NAME=	Swedish
 zh_CN_NAME=	Chinese Simplified
 
-OPTIONS_DEFINE=	ALL ${LANG_ALL_HTML:U}
+OPTIONS_DEFINE=	ALL ${LANG_ALL_HTML:tu}
 OPTIONS_DEFAULT=	ALL
 ALL_DESC=	All translations
 
@@ -57,8 +55,8 @@ ALL_DESC=	All translations
 ${lang}_DETECT?=	${LOCALBASE}/share/gimp/help/${lang}/index.html
 ${lang}_PORT?=		misc/gimp-help-${lang}
 ${lang}_NAME?=		${lang}
-${lang:U}_DESC=		${${lang}_NAME}
-${lang:U}_RUN_DEPENDS=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
+${lang:tu}_DESC=		${${lang}_NAME}
+${lang:tu}_RUN_DEPENDS=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
 ALL_RUN_DEPENDS+=	${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
 .endfor
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 71a095cb0a85..b857c2bec492 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.48.4
 PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
+MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Full featured open source SVG editor
diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile
index 15d3707ff34b..e76329881734 100644
--- a/graphics/ivtools/Makefile
+++ b/graphics/ivtools/Makefile
@@ -19,7 +19,7 @@ USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--with-tiff=${PREFIX}
 CONFIGURE_ENV=	IMAKECPP=${CPP}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-MAKE_ARGS=	ARCH="${OPSYS:U}" MAKE="${MAKE_CMD}"
+MAKE_ARGS=	ARCH="${OPSYS:tu}" MAKE="${MAKE_CMD}"
 USE_XORG=	x11 xaw ice xext
 
 MANCOMPRESSED=	no
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 445e629af38f..814aafb2852d 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -10,8 +10,6 @@ DISTFILES=	#
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 kipi graphics plugins (meta port)
 
-.MAKE.FreeBSD_UL=	yes
-
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
@@ -25,9 +23,9 @@ OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 NO_OPTIONS_SORT=	yes
 
 .for plugin in ${KIPI_PLUGINS_ALL}
-OPTIONS_DEFINE+=	${plugin:U}
-${plugin:U}_DESC=	${${plugin}_DESC}
-${plugin:U}_RUN_DEPENDS=	kipi-plugin-${plugin}>=${DIGIKAM_VER}:${PORTSDIR}/graphics/kipi-plugin-${plugin}
+OPTIONS_DEFINE+=	${plugin:tu}
+${plugin:tu}_DESC=	${${plugin}_DESC}
+${plugin:tu}_RUN_DEPENDS=	kipi-plugin-${plugin}>=${DIGIKAM_VER}:${PORTSDIR}/graphics/kipi-plugin-${plugin}
 .endfor
 
 NLS_DEP=	digikam-l10n>=${DIGIKAM_VER}:${PORTSDIR}/graphics/digikam-kde4-l10n
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 1a87e02bcfc2..4d8a7beabc26 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -11,8 +11,6 @@
 #
 # $FreeBSD$
 
-.MAKE.FreeBSD_UL=	yes
-
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
@@ -86,7 +84,7 @@ DESCR=			${.CURDIR}/pkg-descr
 PLIST=			${.CURDIR}/pkg-plist
 WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
 
-COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
+COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
 
 .if ${COMPONENT:Mglesv2} == ""
 CONFIGURE_ARGS+=	--disable-gles2
diff --git a/graphics/libprojectm/Makefile b/graphics/libprojectm/Makefile
index 54d4b61776df..8796a2a10ff7 100644
--- a/graphics/libprojectm/Makefile
+++ b/graphics/libprojectm/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	libprojectM
 PORTVERSION=	2.0.1
 PORTREVISION=	2
 CATEGORIES=	graphics audio
-MASTER_SITES=	SF/${PORTNAME:L:S/lib//}/${PORTVERSION}/
+MASTER_SITES=	SF/${PORTNAME:tl:S/lib//}/${PORTVERSION}/
 DISTNAME=	${PORTNAME:S/lib//}-${DISTVERSION}-Source
 
 MAINTAINER=	crees@FreeBSD.org
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 4306b35e73fd..12d91624e9a3 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -22,11 +22,11 @@ USE_GL=		yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	ARCH="${OPSYS:L}"
+CONFIGURE_ENV=	ARCH="${OPSYS:tl}"
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 NO_MTREE=	yes
-PLIST_SUB=	ARCH=${OPSYS:L}
+PLIST_SUB=	ARCH=${OPSYS:tl}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .if defined(WITH_HDF) && !defined(WITHOUT_NETCDF)
diff --git a/graphics/projectm-libvisual/Makefile b/graphics/projectm-libvisual/Makefile
index edb044087a4b..60887fd30f40 100644
--- a/graphics/projectm-libvisual/Makefile
+++ b/graphics/projectm-libvisual/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	projectM-libvisual
 PORTVERSION=	2.0.1
 CATEGORIES=	graphics audio
-MASTER_SITES=	SF/${PORTNAME:L:S/-libvisual//}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl:S/-libvisual//}/${PORTVERSION}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}-Source
 
 MAINTAINER=	crees@FreeBSD.org
diff --git a/graphics/py-pyggel/Makefile b/graphics/py-pyggel/Makefile
index fe7441f3e743..a6b86ca38741 100644
--- a/graphics/py-pyggel/Makefile
+++ b/graphics/py-pyggel/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.08
 DISTVERSIONSUFFIX=	-alpha4c
 CATEGORIES=	graphics python
 MASTER_SITES=	GOOGLE_CODE
-DISTNAME=	${PORTNAME:U}-V${DISTVERSION}${DISTVERSIONSUFFIX}
+DISTNAME=	${PORTNAME:tu}-V${DISTVERSION}${DISTVERSIONSUFFIX}
 DIST_SUBDIR=	python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index 33c341767c64..a153b015174c 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -22,7 +22,7 @@ NEED_ROOT=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
-RUBY_MODNAME=	${PORTNAME:L}
+RUBY_MODNAME=	${PORTNAME:tl}
 
 CONFIGURE_ARGS=	--with-gd-lib="${LOCALBASE}/lib" \
 		--with-jpeg \
diff --git a/graphics/svgfig/Makefile b/graphics/svgfig/Makefile
index a358179f0e71..31fb91079427 100644
--- a/graphics/svgfig/Makefile
+++ b/graphics/svgfig/Makefile
@@ -6,13 +6,13 @@ PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Draw mathematical figures in SVG using Python
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/graphics/uDrawGraph/Makefile b/graphics/uDrawGraph/Makefile
index e9464dacb101..de68333e0510 100644
--- a/graphics/uDrawGraph/Makefile
+++ b/graphics/uDrawGraph/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.1.1
 #PORTREVISION=	0
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.informatik.uni-bremen.de/uDrawGraph/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${PKGNUM}-${OPSYS:L}-${ARCH}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${PKGNUM}-${OPSYS:tl}-${ARCH}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A graph drawing/visualization system
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index fcebc24af3ed..017300ed3ddb 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -19,7 +19,7 @@ CONFLICTS_INSTALL=	charybdis-[0-9]* ircd-hybrid-[0-9]* Nefarious-[0-9]* \
 USE_RC_SUBR=	ircd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd
-BUILD_WRKSRC=	${WRKSRC}/${MACHINE_ARCH}-unknown-${OPSYS:L}${OSREL}
+BUILD_WRKSRC=	${WRKSRC}/${MACHINE_ARCH}-unknown-${OPSYS:tl}${OSREL}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 OPTIONS_DEFINE=	IPV6
diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile
index 35dd6ab378c5..94b6e6913b08 100644
--- a/japanese/onew/Makefile
+++ b/japanese/onew/Makefile
@@ -46,9 +46,9 @@ RK_DIR.WNN7=		${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7
 
 .for I in ${OPTIONS_DEFINE:NDOCS}
 .if ${PORT_OPTIONS:M${I}}
-INPUT_METHOD+=	${I:S/_/+/g:L}
-SUB_FILES+=	ONEW_CONF-for-${I:S/_/+/g:L}
-PLIST_FILES+=	lib/libonew-${I:S/_/+/g:L}.a
+INPUT_METHOD+=	${I:S/_/+/g:tl}
+SUB_FILES+=	ONEW_CONF-for-${I:S/_/+/g:tl}
+PLIST_FILES+=	lib/libonew-${I:S/_/+/g:tl}.a
 RK_DIR+=	${RK_DIR.${I}}
 .endif
 .endfor
diff --git a/japanese/p5-MeCab/Makefile b/japanese/p5-MeCab/Makefile
index d2b5e55f0d51..1e56865beec5 100644
--- a/japanese/p5-MeCab/Makefile
+++ b/japanese/p5-MeCab/Makefile
@@ -5,8 +5,8 @@ PORTNAME=	MeCab
 PORTVERSION=	0.996
 CATEGORIES=	japanese textproc perl5
 MASTER_SITES=	GOOGLE_CODE
-PROJECTHOST=	${PORTNAME:L}
-DISTNAME=	${PORTNAME:L}-perl-${PORTVERSION}
+PROJECTHOST=	${PORTNAME:tl}
+DISTNAME=	${PORTNAME:tl}-perl-${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MeCab library module for Perl5
diff --git a/java/eclipse-RDT/Makefile b/java/eclipse-RDT/Makefile
index 37876cdbffeb..5c579560e1d1 100644
--- a/java/eclipse-RDT/Makefile
+++ b/java/eclipse-RDT/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	RDT
 PORTVERSION=	0.9.1
 PORTREVISION=	3
 CATEGORIES=	java editors devel
-MASTER_SITES=	SF/rubyeclipse/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/rubyeclipse/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
 PKGNAMEPREFIX=	eclipse-
 DISTNAME=	${RDT}-${RDTVERSION}
 
diff --git a/korean/nanumfonts-otf/Makefile b/korean/nanumfonts-otf/Makefile
index 33644ff1158f..f8d98a0d7b08 100644
--- a/korean/nanumfonts-otf/Makefile
+++ b/korean/nanumfonts-otf/Makefile
@@ -7,10 +7,10 @@ MASTER_SITES=	http://cdn.naver.com/naver/NanumFont/fontfiles/ \
 		LOCAL
 MASTER_SITE_SUBDIR=	jkim
 PKGNAMESUFFIX=	-${FONTTYPE}
-DISTFILES=	NanumFont_${FONTTYPE:U}_ALL${EXTRACT_SUFX} \
-		NanumFontSetup_${FONTTYPE:U}_GOTHICECO${EXTRACT_SUFX} \
-		NanumFontSetup_${FONTTYPE:U}_GOTHICLIGHT${EXTRACT_SUFX} \
-		NanumFontSetup_${FONTTYPE:U}_MYUNGJOECO${EXTRACT_SUFX}
+DISTFILES=	NanumFont_${FONTTYPE:tu}_ALL${EXTRACT_SUFX} \
+		NanumFontSetup_${FONTTYPE:tu}_GOTHICECO${EXTRACT_SUFX} \
+		NanumFontSetup_${FONTTYPE:tu}_GOTHICLIGHT${EXTRACT_SUFX} \
+		NanumFontSetup_${FONTTYPE:tu}_MYUNGJOECO${EXTRACT_SUFX}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Nanum family Hangul fonts (${FONTFORMAT})
diff --git a/korean/uniksc/Makefile b/korean/uniksc/Makefile
index 32f86a18bec7..c8d2a86cedd2 100644
--- a/korean/uniksc/Makefile
+++ b/korean/uniksc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Converts data between Korean KSC-5601 and Unicode 3.0 UTF-16
 USE_LDCONFIG=	YES
 PLIST_FILES=	bin/uniksc include/uniksc.h lib/libuniksc.so.0
 
-.if ${MACHINE_ARCH:L} == "amd64"
+.if ${MACHINE_ARCH:tl} == "amd64"
 CFLAGS+=	"-fPIC"
 .endif
 
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index d31fe3c60266..4174cfba95f7 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -45,7 +45,7 @@ DTRACE_DESC=	Enable DTrace support (experimental)
 
 OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE
 
-ERL_RELEASE=	R${PORTVERSION:S/.//g:U:S/1$/-1/}
+ERL_RELEASE=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index 17b32a05a396..af3d7eb91650 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -44,7 +44,7 @@ DTRACE_DESC=	Enable DTrace support (experimental)
 
 OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE
 
-ERL_RELEASE=	R${PORTVERSION:S/.//g:U:S/1$/-1/}
+ERL_RELEASE=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
 
 USES=		gmake perl5
 GNU_CONFIGURE=	yes
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 7c7941b0908d..7d0220794d33 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -48,7 +48,7 @@ DTRACE_DESC=	Enable DTrace support (experimental)
 
 OPTIONS_DEFAULT=SMP OPENSSL THREADS SCTP KQUEUE
 
-ERL_RELEASE=	R${PORTVERSION:S/.//g:U:S/1$/-1/}
+ERL_RELEASE=	R${PORTVERSION:S/.//g:tu:S/1$/-1/}
 
 USES=		gmake perl5
 USE_RC_SUBR=	epmd
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 5e92f64ae0be..7dd510642160 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -122,7 +122,7 @@ OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC
 UNITS_SELECTED=		#
 .for OPT in ${OPTIONS_DEFINE}
 .	if ${PORT_OPTIONS:M${OPT}}
-UNITS_SELECTED+=	${OPT:L}
+UNITS_SELECTED+=	${OPT:tl}
 .	endif
 .endfor
 USE_FPC=	${UNITS_SELECTED}
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 6a4de3216cf2..3099acbd815c 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -52,9 +52,9 @@ SUB_FILES=	pkg-message
 BUILDNAME=	${FPC_ARCH}-freebsd
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
-DISTFILES+=	${PPNAME}-${PORTVERSION}-${OPSYS:L}${EXTRACT_SUFX}:bootstrap \
+DISTFILES+=	${PPNAME}-${PORTVERSION}-${OPSYS:tl}${EXTRACT_SUFX}:bootstrap \
 		${DISTNAME:S/$/.man/}${EXTRACT_SUFX}:man
-MAKE_ARGS+=	PP=${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L} \
+MAKE_ARGS+=	PP=${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:tl} \
 		FPCMAKE=${WRKDIR}/${FPCSRCDIR}/utils/fpcm/fpcmake \
 		FPCTARGET=${BUILDNAME} \
 		ARCH=${FPC_ARCH} \
@@ -65,8 +65,8 @@ MAKE_ARGS+=	PP=${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L} \
 do-extract:
 # unpack binary distribution
 	@${MKDIR} ${WRKDIR}
-	@${TAR} xfz ${_DISTDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L}${EXTRACT_SUFX} --directory \
-		${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:L}
+	@${TAR} xfz ${_DISTDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:tl}${EXTRACT_SUFX} --directory \
+		${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${PPNAME}-${PORTVERSION}-${OPSYS:tl}
 # unpack man files
 	@${TAR} xfz ${_DISTDIR}/${DISTNAME:S/$/.man/}${EXTRACT_SUFX} --directory \
 		${WRKDIR}
diff --git a/lang/gcc-aux/Makefile b/lang/gcc-aux/Makefile
index b954404234c5..71cbeb5d1a1f 100644
--- a/lang/gcc-aux/Makefile
+++ b/lang/gcc-aux/Makefile
@@ -22,8 +22,8 @@ LANGS=			c c++ ada
 APPLY_DIFFS=		core cxx ada
 INTENDED_COMPILER=	NATIVE
 GARCH=			${ARCH:S/amd64/x86_64/}
-BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:L}.tar.bz2
-BLD_TARGET=		${GARCH}-aux-${OPSYS:L}${OSREL}
+BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
+BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
 FULL_GNATGCC=		NOT_SET
 OS_LABEL4VERS=		[${OPSYS}${GARCH:M*64:S/amd_//:S/x86_//}]
 NO_MTREE=		yes
@@ -72,7 +72,7 @@ REVFILE=		${WRKSRC}/gcc/REVISION
 BOOTSTRAP_PREFIX=	${WRKDIR}/bootstrap
 PKG_PREFIX=		${PREFIX}/${PORTNAME}
 MANPREFIX=		${PREFIX}/${PORTNAME}/share
-BSFILENAME=		ada-bootstrap.${GARCH}.${OPSYS:L}.${OSREL:S/.//}.tar.bz2
+BSFILENAME=		ada-bootstrap.${GARCH}.${OPSYS:tl}.${OSREL:S/.//}.tar.bz2
 
 # If we find gnatmake and friends in a standard location, then we'll use this
 # compiler instead of downloading the bootstrap.
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 5e3defce855d..1a7eea6b4ce6 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -50,9 +50,9 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64
diff --git a/lang/gcc410/Makefile b/lang/gcc410/Makefile
index 6452d0534982..ab21d693e713 100644
--- a/lang/gcc410/Makefile
+++ b/lang/gcc410/Makefile
@@ -51,9 +51,9 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 8126fae493bc..1a8d90a05370 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -50,9 +50,9 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 LANGUAGES:=	c,c++,objc,fortran
diff --git a/lang/gcc47-aux/Makefile b/lang/gcc47-aux/Makefile
index 08b25ad0bacd..0294c6748b54 100644
--- a/lang/gcc47-aux/Makefile
+++ b/lang/gcc47-aux/Makefile
@@ -64,8 +64,8 @@ BOOTSTRAP_TRIPLET=	x86_64-bootstrap-dragonfly2.8/4.6.0
 BOOTSTRAP_TRIPLET=	i386-bootstrap-dragonfly2.8/4.6.0
 .  endif
 .endif
-BLD_TARGET=		${GARCH}-aux-${OPSYS:L}${OSREL}
-BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:L}.tar.bz2
+BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
+BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
 
 WRKSRC=			${WRKDIR}/gcc-${GCC_VERSION}
 BUILDDIR=		${WRKDIR}/build
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index bd1dfa8d78a1..15a653ef26e6 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -53,9 +53,9 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 709c28377fad..0951cfa93b17 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -51,9 +51,9 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index 493c590191b3..1735a4a698fb 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -51,9 +51,9 @@ BOOTSTRAP_DESC=		Build using a full bootstrap
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
 .else
-CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:L}${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
 .endif
 
 .if ${ARCH} == powerpc64
diff --git a/lang/gnat-aux/Makefile b/lang/gnat-aux/Makefile
index dae7853fb0fc..577005313574 100644
--- a/lang/gnat-aux/Makefile
+++ b/lang/gnat-aux/Makefile
@@ -54,8 +54,8 @@ BOOTSTRAP_TRIPLET=	i386-bootstrap-freebsd8.0/4.6.0
 .if ${OPSYS} == DragonFly
 BOOTSTRAP_TRIPLET=	${GARCH}-bootstrap-dragonfly2.8/4.6.0
 .endif
-BLD_TARGET=		${GARCH}-aux-${OPSYS:L}${OSREL}
-BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:L}.tar.bz2
+BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
+BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
 
 WRKSRC=			${WRKDIR}/gcc-${GCC_VERSION}
 BUILDDIR=		${WRKDIR}/build
diff --git a/lang/go/Makefile b/lang/go/Makefile
index 22b075d28154..74ff6f0f69a4 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -50,7 +50,7 @@ do-build:
 	cd ${WRKSRC}/src && \
 		CC=${CC} \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \
-		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:L} \
+		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
 		${SH} make.bash
 
 do-install:
diff --git a/lang/groovy/Makefile b/lang/groovy/Makefile
index eac2dbbf8bf4..147172b1ad66 100644
--- a/lang/groovy/Makefile
+++ b/lang/groovy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Agile dynamic language for the JVM
 
 LICENSE=	APACHE20
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:U}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:tu}
 
 USES=		zip
 USE_JAVA=	yes
@@ -34,7 +34,7 @@ SUB_FILES=	set-groovy_home.sed
 
 do-install:
 	@${ECHO_MSG} -n ">> Staging JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
-	@${INSTALL_DATA} ${WRKSRC}/embeddable/${PORTNAME}-all-${DISTVERSION:U}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	@${INSTALL_DATA} ${WRKSRC}/embeddable/${PORTNAME}-all-${DISTVERSION:tu}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Staging data files in ${DATADIR}..."
 	@cd ${WRKSRC} \
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index cb1c457d23ae..1db7f517ae13 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -44,7 +44,7 @@ PLIST_SUB+=	X11="@comment "
 
 MAN1=		hugs.1
 
-.if ${MACHINE_ARCH:L} == "amd64"
+.if ${MACHINE_ARCH:tl} == "amd64"
 CFLAGS+=	"-fPIC"
 .endif
 
diff --git a/lang/libhx/Makefile b/lang/libhx/Makefile
index c4da2744e140..28e592da03f4 100644
--- a/lang/libhx/Makefile
+++ b/lang/libhx/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	libHX
 PORTVERSION=	3.14.1
 CATEGORIES=	lang
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	C/C++ library with common data structures and functions
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:L}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:tl}
 .endif
 
 post-patch:
diff --git a/lang/modula3/Makefile b/lang/modula3/Makefile
index f33e22aab0ff..088be2fea8ca 100644
--- a/lang/modula3/Makefile
+++ b/lang/modula3/Makefile
@@ -69,8 +69,8 @@ BOOTDIST=	${DST2}
 MARCH=		x86_64
 . endif
 
-NEWBOOTNAME=	m3-bootstrap.${MARCH}.${OPSYS:U}.${OSREL:S/.//}.tar.bz2
-M3TARGET=	${MARCH}_${OPSYS:U}
+NEWBOOTNAME=	m3-bootstrap.${MARCH}.${OPSYS:tu}.${OSREL:S/.//}.tar.bz2
+M3TARGET=	${MARCH}_${OPSYS:tu}
 .endif
 
 do-extract:
diff --git a/lang/php5-extensions/Makefile b/lang/php5-extensions/Makefile
index bc2269194916..9aa6595679ca 100644
--- a/lang/php5-extensions/Makefile
+++ b/lang/php5-extensions/Makefile
@@ -117,7 +117,7 @@ OPTIONS_DEFAULT=	CTYPE \
 
 .for opt in ${OPTIONS_DEFINE}
 .	if ${PORT_OPTIONS:M${opt}}
-USE_PHP+=	${opt:L}
+USE_PHP+=	${opt:tl}
 .	endif
 .endfor
 
diff --git a/lang/php53-extensions/Makefile b/lang/php53-extensions/Makefile
index b8eec39ebb96..9f6487a8623b 100644
--- a/lang/php53-extensions/Makefile
+++ b/lang/php53-extensions/Makefile
@@ -116,7 +116,7 @@ ZLIB_DESC=		ZLIB support
 
 .for opt in ${OPTIONS_DEFINE}
 .	if ${PORT_OPTIONS:M${opt}}
-USE_PHP+=	${opt:L}
+USE_PHP+=	${opt:tl}
 .	endif
 .endfor
 
diff --git a/lang/php55-extensions/Makefile b/lang/php55-extensions/Makefile
index cf839bc97588..6b28432e2091 100644
--- a/lang/php55-extensions/Makefile
+++ b/lang/php55-extensions/Makefile
@@ -119,7 +119,7 @@ OPTIONS_DEFAULT=	CTYPE \
 
 .for opt in ${OPTIONS_DEFINE}
 .	if ${PORT_OPTIONS:M${opt}}
-USE_PHP+=	${opt:L}
+USE_PHP+=	${opt:tl}
 .	endif
 .endfor
 
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index e3e24a3e57b7..3e7ec642e8ba 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB+=	FREEBSD_DIR=${FREEBSD_DIR}
 # Hack to prevent rbx from creating $HOME/.rbx during compilation of gems
 MAKE_ENV+=	HOME=${WRKSRC}
 
-F_OS=		${OPSYS:L}
+F_OS=		${OPSYS:tl}
 F_MAJOR=	${OSREL:C/\..*$//}
 FREEBSD_DIR=	${F_ARCH}-${F_OS}-${F_MAJOR}
 
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 67b0a5280725..971485ce4a77 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -30,8 +30,8 @@ USE_XORG=	xft xpm xt
 USES=		pkgconfig pathfix gmake shebangfix
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ARCH=${ARCH}-${OPSYS:L}
-CONFIGURE_TARGET=	${ARCH}-${OPSYS:L}
+CONFIGURE_ENV=	ARCH=${ARCH}-${OPSYS:tl}
+CONFIGURE_TARGET=	${ARCH}-${OPSYS:tl}
 CONFIGURE_ARGS=	--with-world --without-jpl --enable-shared
 MAKE_ARGS=	DISABLE_PKGS=jpl \
 		ac_cv_lib_ossp_uuid_uuid_create=no ac_cv_lib_uuid_uuid_create=no
@@ -42,7 +42,7 @@ swipl_CMD=	${LOCALBASE}/bin/swipl
 SHEBANG_FILES=	library/dialect/sicstus/swipl-lfr.pl \
 		packages/http/examples/demo_inetd
 
-PLIST_SUB=	DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:L} \
+PLIST_SUB=	DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:tl} \
 		VER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile
index f7f184dee265..eaf1af787860 100644
--- a/lang/tcl-wrapper/Makefile
+++ b/lang/tcl-wrapper/Makefile
@@ -51,7 +51,7 @@ TX_VER=${TCL_VER}
 
 SUB_LIST+=	ECHO_CMD="${ECHO_CMD}" GREP="${GREP}" LS="${LS}" \
 		CP="${CP}" RM="${RM}" MD5="${MD5} -q" \
-		TX_SHELL="${TX_SHELL}" TX_SHELL_U="${TX_SHELL:U}" \
+		TX_SHELL="${TX_SHELL}" TX_SHELL_U="${TX_SHELL:tu}" \
 		TX_PORT="${TX_PORT}" TX_PORT_U="${TX_PORT_U}" \
 		TX_CAT="${TX_CAT}" TX_VER="${TX_VER}" TX_CONF="${TX_CONF}" \
 		TX_CONF_FULL="${TX_CONF_FULL:S/${STAGEDIR}//}"
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 7a82be1162e2..3a932bd88391 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	tclX
 PORTVERSION=	8.4
 PORTREVISION=	3
 CATEGORIES=	lang tcl devel
-MASTER_SITES=	SF/${PORTNAME:L}/TclX/${PORTVERSION}.0
+MASTER_SITES=	SF/${PORTNAME:tl}/TclX/${PORTVERSION}.0
 DISTNAME=	tclx${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 7d9c940eadbf..d8231fc66010 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.9.9.13257
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
-DISTNAME=	${PORTNAME:U}_${PORTVERSION}_Install
+DISTNAME=	${PORTNAME:tu}_${PORTVERSION}_Install
 
 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Anti-Spam SMTP Proxy
@@ -53,7 +53,7 @@ IPV6_DESC=	IPv6 sockets support
 
 OPTIONS_DEFAULT=	EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_13227_install/${PORTNAME:U}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_13227_install/${PORTNAME:tu}
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 8be8b61c6919..9d474bd8f3cb 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -55,8 +55,8 @@ PLIST_SUB=	SO_REV="${SO_REV}" \
 		LIB_DIR="${LIB_DIR:S,^${PREFIX}/,,}" \
 		SHLIB_DIR="${SHLIB_DIR:S,^${PREFIX}/,,}" \
 		ELM_SHLIBS="${ELM_SHLIBS}" \
-		${ELM_SHLIBS:U:S/^/ELM_/:S/$/=""/} \
-		${ELM_UNSHLIBS:U:S/^/ELM_/:S/$/="@comment "/}
+		${ELM_SHLIBS:tu:S/^/ELM_/:S/$/=""/} \
+		${ELM_UNSHLIBS:tu:S/^/ELM_/:S/$/="@comment "/}
 
 MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmbindata.1 \
 		elmcharset.1 elmlibregister.1 elmmimetypes.1 \
@@ -97,7 +97,7 @@ USES+=	iconv
 .endif
 
 .for shlib in iconv smtp tls
-.if ${PORT_OPTIONS:M${shlib:U}}
+.if ${PORT_OPTIONS:M${shlib:tu}}
 ELM_SHLIBS+=	${shlib}
 .else
 ELM_UNSHLIBS+=	${shlib}
@@ -122,7 +122,7 @@ ELM_RC=		elm.rc
 LOCAL_CONF_FILES=	${MIME_TYPES} ${MIME_CSETS} ${TERM_INFO} ${ELM_RC}
 DOC_FILES=	MIME.txt README.ME+
 .for shlib in ${ELM_SHLIBS}
-DOC_FILES+=	shared_libs/${shlib:L}/README.${shlib:U}
+DOC_FILES+=	shared_libs/${shlib:tl}/README.${shlib:tu}
 .endfor
 
 .include <bsd.port.pre.mk>
@@ -168,18 +168,18 @@ TEE?=	tee
 configure-shlibs:
 	@${CP} /dev/null ${CONFIG_PATH}
 .for shlib in ${ELM_SYSTEM_SHLIBS}
-	@${ECHO_CMD} "\#  Support for ${shlib:U}" \
-		> ${WRKSRC}/shared_libs/${shlib:L}/config.res
+	@${ECHO_CMD} "\#  Support for ${shlib:tu}" \
+		> ${WRKSRC}/shared_libs/${shlib:tl}/config.res
 .endfor
 .for shlib in ${ELM_SHLIBS}
-	@${ECHO_CMD} "${shlib:L}_ok='define'" \
+	@${ECHO_CMD} "${shlib:tl}_ok='define'" \
 		| ${TEE} -a ${CONFIG_PATH} \
-		>> ${WRKSRC}/shared_libs/${shlib:L}/config.res
+		>> ${WRKSRC}/shared_libs/${shlib:tl}/config.res
 .endfor
 .for shlib in ${ELM_UNSHLIBS}
-	@${ECHO_CMD} "${shlib:L}_ok='undef'" \
+	@${ECHO_CMD} "${shlib:tl}_ok='undef'" \
 		| ${TEE} -a ${CONFIG_PATH} \
-		>> ${WRKSRC}/shared_libs/${shlib:L}/config.res
+		>> ${WRKSRC}/shared_libs/${shlib:tl}/config.res
 .endfor
 
 # Post-configure
@@ -189,9 +189,9 @@ post-configure: rename-readmes
 
 rename-readmes:
 .for shlib in ${ELM_SHLIBS}
-	@if [ -f ${WRKSRC}/shared_libs/${shlib:L}/README.ME+ ]; then \
-		${MV} ${WRKSRC}/shared_libs/${shlib:L}/README.ME+ \
-		       ${WRKSRC}/shared_libs/${shlib:L}/README.${shlib:U}; \
+	@if [ -f ${WRKSRC}/shared_libs/${shlib:tl}/README.ME+ ]; then \
+		${MV} ${WRKSRC}/shared_libs/${shlib:tl}/README.ME+ \
+		       ${WRKSRC}/shared_libs/${shlib:tl}/README.${shlib:tu}; \
 	fi
 .endfor
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 7ac2a4ac25a3..bb25905fdb0f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -249,7 +249,7 @@ SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,,'
 BROKEN=		deprecated LDAP option defined, use WITH_OPENLDAP or WITH_OPENLDAP_VER
 .endif
 
-.if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:L} != "auto"
+.if ${PORT_OPTIONS:MOPENLDAP_VER} && ${WITH_OPENLDAP_VER:tl} != "auto"
 WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 
@@ -289,7 +289,7 @@ SEDLIST+=	-e 's,XX_DB_LIBS_XX,${DB_LIBS:S/,/\\,/g},' \
 		-e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES:S/,/\\,/g},'
 
 .if ${PORT_OPTIONS:MMYSQL}
-.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER:L} == "auto"
+.if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER:tl} == "auto"
 IGNORE=		WITH_MYSQL_VER set to "${WITH_MYSQL_VER}" is no longer supported.
 IGNORE+=	Just don't set WITH_MYSQL_VER if you want to use system-default version
 .else
@@ -339,11 +339,11 @@ SEDLIST+=	-e 's,^\# (AUTH_CYRUS_SASL=),\1,' \
 
 .if ${PORT_OPTIONS:MAUTH_RADIUS}
 WITH_RADIUS_TYPE?=	RADLIB
-.if ${WITH_RADIUS_TYPE:L} == radlib
+.if ${WITH_RADIUS_TYPE:tl} == radlib
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-lradius,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1/etc/radius.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADLIB,'
-.elif ${WITH_RADIUS_TYPE:L} == radiusclient
+.elif ${WITH_RADIUS_TYPE:tl} == radiusclient
 LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -lradiusclient-ng,' \
 		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE:S/,/\\,/g}/etc/radiusclient-ng/radiusclient.conf,' \
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 6c44571eb639..3d0e1528d110 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -283,7 +283,7 @@ do-install:
 	cd ${WRKDIR} && \
 		${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
 	${LN} -sf ${PREFIX}/man/man8/${PORTNAME}.8 \
-		${STAGEDIR}${PREFIX}/man/man8/${PORTNAME:L}.8
+		${STAGEDIR}${PREFIX}/man/man8/${PORTNAME:tl}.8
 	@${ECHO_MSG} " [DONE]"
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 84fbe041f5bb..df4b5e910823 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	roundcube
 DISTVERSION=	1.0.0
 PORTEPOCH=	1
 CATEGORIES?=	mail www
-MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:U}
+MASTER_SITES=	SF/${PORTNAME}mail/${PORTNAME}mail/${DISTVERSION:tu}
 DISTNAME=	${PORTNAME}mail-${DISTVERSION}
 
 MAINTAINER?=	ale@FreeBSD.org
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index d1382f397f67..2c32e7a8fdd9 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=--bindir=${PREFIX}/libexec/${PORTNAME}	\
 CONFIGURE_ENV+=	lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
 MAKE_ENV?=	PERL_EXTUTILS_AUTOINSTALL=--skip
 SUB_FILES=	pkg-install pkg-message
-SUB_LIST=	DB_TYPE=${DB_TYPE:L}
+SUB_LIST=	DB_TYPE=${DB_TYPE:tl}
 PORTEXAMPLES=	*
 
 USE_RC_SUBR=	sympa
@@ -78,7 +78,7 @@ OPTIONS_RADIO_DATABASE=	ORACLE PGSQL SYBASE MYSQL
 SYBASE_DESC=	Sybase database
 
 .ifdef DB_TYPE
-DB_TYPE:=	${DB_TYPE:U}
+DB_TYPE:=	${DB_TYPE:tu}
 .  for option in ${OPTIONS_RADIO_DATABASE}
 .    if ${DB_TYPE} == ${option:S,PGSQL,PG,}
 OPTIONS_SET+=	${option}
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index da038530def1..c70d8b0cf5b0 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -90,7 +90,7 @@ DISTFILES+=	${EM_DISTFILE}:enigmail
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 EM_DISTNAME=	enigmail-${EM_VERSION}
 EM_DISTFILE=	${EM_DISTNAME}.tar.gz
-EM_XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-${OPSYS:L}-${ARCH:S/amd64/x86_64/}.xpi
+EM_XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/bin/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/}.xpi
 EM_ORIG_ID=	{847b3a00-7ab1-11d4-8f02-006008948af5}
 EM_ID=		${PORTNAME}@mozilla-enigmail.org
 EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/install.rdf \
@@ -102,7 +102,7 @@ EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/install.rdf \
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning@thunderbird.mozilla.org
 .else
diff --git a/math/GiNaC/Makefile b/math/GiNaC/Makefile
index 4bcc2ae3d06a..2aaa5b2a4145 100644
--- a/math/GiNaC/Makefile
+++ b/math/GiNaC/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.6.2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ \
 		http://www.ginac.de/
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	C++ library for symbolic mathematical calculations
diff --git a/math/R/Makefile b/math/R/Makefile
index c899d221ce40..554c189d2cd9 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -369,7 +369,7 @@ check-all: build
 post-install:
 .for L in R Rblas Rlapack
 	@(cd ${STAGEDIR}${PREFIX}/lib/R/lib; if [ -f lib${L}.so ] ; then \
-	${LN} -sf lib${L}.so lib${L}.so.${${L:U}_SOVERSION} ; fi)
+	${LN} -sf lib${L}.so lib${L}.so.${${L:tu}_SOVERSION} ; fi)
 .endfor
 .if ${PORT_OPTIONS:MINFO_MANUALS} && ${PORT_OPTIONS:MDOCS}
 	@(cd ${WRKSRC}/doc/manual; \
diff --git a/math/atlas/Makefile b/math/atlas/Makefile
index b5ba211c8c51..f60b501d8590 100644
--- a/math/atlas/Makefile
+++ b/math/atlas/Makefile
@@ -150,13 +150,13 @@ post-configure:
 
 do-build:
 .for opt in shared static
-.  if ${PORT_OPTIONS:M${opt:U}}
+.  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Building the LAPACK archives with ${opt} ATLAS flags:"
 	F77FLAGS="`${MAKE} -f ${WRKSRC}/saved_flags -V F77FLAGS` ${EXTRA_FFLAGS}" ; \
-	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:U}_LAPACK_WRKSRC}` ; \
-	${MAKE} -C ${PORTSDIR}/math/lapack WITH_${opt:U}=yes \
+	LW=`${MAKE} -C ${PORTSDIR}/math/lapack -V ${${opt:tu}_LAPACK_WRKSRC}` ; \
+	${MAKE} -C ${PORTSDIR}/math/lapack WITH_${opt:tu}=yes \
 		clean patch ; \
-	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:U}_FLAGS}" \
+	cd $${LW} ; ${SETENV} ${MAKE_ENV:NFFLAGS=*} EXTRAFLAGS="${${opt:tu}_FLAGS}" \
 		FFLAGS="-pipe $${F77FLAGS}" ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 		ARCH="${AR}" lapacklib ; \
 	TIMEFLAG=`${MAKE} -f ${WRKSRC}/saved_flags -V TIMEFLAG` ; \
@@ -168,7 +168,7 @@ do-build:
 		--with-netlib-lapack="${WRKSRC}/${opt}/liblapack_${opt}.a" \
 		--prefix="${PREFIX}" -v 2 $${TIMEFLAG} ${ARCHDEFFLAG} \
 		-Ss f77lib " " -Ss pmake "${MAKE} ${_MAKE_JOBS}" \
-		-Fa alg "${${opt:U}_FLAGS} " -b ${POINTER} ; \
+		-Fa alg "${${opt:tu}_FLAGS} " -b ${POINTER} ; \
 	if [ "x${WITH_ARCHDEF}" != "x" ] ; then \
 		if [ "x${ARCHDEF}" != "xNONE" ] ; then \
 			if [ -f ${ARCHDEF} ] ; then \
@@ -194,7 +194,7 @@ L2=	-Wl,--no-whole-archive -Wl,--as-needed ${PTHREAD_LIBS}
 
 post-build:
 .for opt in shared static
-.  if ${PORT_OPTIONS:M${opt:U}}
+.  if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Timing ${opt} ATLAS:"
 	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} time ; \
 	cd ARCHS ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ArchNew tarfile
@@ -218,9 +218,9 @@ SHARED_BLAS=	-L${LOCALBASE}/lib -lblas
 
 check regression-test test: build
 .  for opt in shared static
-.    if ${PORT_OPTIONS:M${opt:U}}
+.    if ${PORT_OPTIONS:M${opt:tu}}
 	@${ECHO_CMD} "Testing ${opt} ATLAS:"
-	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:U}_BLAS}" \
+	@cd ${WRKSRC}/${opt} ; ${SETENV} ${MAKE_ENV} BLAS="${${opt:tu}_BLAS}" \
 	${MAKE} ${MAKE_ARGS} check ptcheck error_report
 .    endif
 .  endfor
@@ -240,7 +240,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/cblas.h   ${PREFIX}/include
 	@${INSTALL_DATA} ${WRKSRC}/include/clapack.h ${PREFIX}/include
 .for opt in shared static
-.  if ${PORT_OPTIONS:M${opt:U}}
+.  if ${PORT_OPTIONS:M${opt:tu}}
 	@${MKDIR} ${PREFIX}/include/atlas/${opt}
 	@${INSTALL_DATA} ${WRKSRC}/${opt}/include/* ${PREFIX}/include/atlas/${opt}
 	@cd ${PREFIX} ; \
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index c155b7905c84..8b4a250f5e32 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -83,9 +83,9 @@ post-patch:
 do-build: build-profile build-shared build-static
 
 .for o in PROFILE SHARED STATIC
-build-${o:L}: patch
+build-${o:tl}: patch
 .if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\nBuilding ${o:L} libraries:\n\n\n"
+	@${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n"
 	@cd ${WRKSRC_${o}}/src; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all
 
@@ -107,9 +107,9 @@ MAKE_ENV+=		BLLIB="${BLAS}"
 check regression-test test: ${TESTS}
 
 .for o in PROFILE SHARED STATIC
-test-${o:L}: build-${o:L}
+test-${o:tl}: build-${o:tl}
 .if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\nTesting ${o:L} libraries:\n\n\n"
+	@${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n"
 	@cd ${WRKSRC_${o}}/testing; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all run
 	@${CAT} ${WRKSRC_${o}}/testing/*.out
diff --git a/math/jsmath/Makefile b/math/jsmath/Makefile
index 7498d7a54079..f760437fa380 100644
--- a/math/jsmath/Makefile
+++ b/math/jsmath/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	jsMath
 DISTVERSION=	3.6e
 CATEGORIES=	math www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	JavaScript tool for including mathematics in web pages
diff --git a/math/jts/Makefile b/math/jts/Makefile
index b8835257488a..0387ce90add4 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -18,7 +18,7 @@ NO_BUILD=	yes
 USE_JAVA=	yes
 NO_WRKSUBDIR=	yes
 
-VER=		${PORTVERSION:L}
+VER=		${PORTVERSION:tl}
 JARFILES=	JTS_Test acme jts-${VER}
 
 NO_STAGE=	yes
diff --git a/math/kash3/Makefile b/math/kash3/Makefile
index c957c6d4ff98..d455933361cb 100644
--- a/math/kash3/Makefile
+++ b/math/kash3/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2008.07.31
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.math.tu-berlin.de/pub/algebra/Kant/Kash_3/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
-DISTFILES=	${PORTNAME:U}-${ELFTYPE}-i686-${PORTVERSION:S|.|-|g}.tar.bz2
+DISTFILES=	${PORTNAME:tu}-${ELFTYPE}-i686-${PORTVERSION:S|.|-|g}.tar.bz2
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A computer algebra system for computing in algebraic number fields
@@ -26,7 +26,7 @@ USE_BZIP2=	yes
 USE_LINUX=	yes
 
 SUB_FILES=	${PORTNAME}
-WRKSRC=	${WRKDIR}/${PORTNAME:U}-${ELFTYPE}-i686-${PORTVERSION:S|.|-|g}
+WRKSRC=	${WRKDIR}/${PORTNAME:tu}-${ELFTYPE}-i686-${PORTVERSION:S|.|-|g}
 
 
 FIND_DATA=	-type f -mindepth 1 -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
@@ -44,7 +44,7 @@ LN_OPTS=	-sf
 ELFTYPE=	Linux
 
 .if ${PORT_OPTIONS:MOPTLIB}
-DISTFILES+=	${PORTNAME:U}-lib-archindep-${PORTVERSION:S|.|-|g}.tar.bz2
+DISTFILES+=	${PORTNAME:tu}-lib-archindep-${PORTVERSION:S|.|-|g}.tar.bz2
 OPTLIB=
 .else
 OPTLIB=	"@comment "
@@ -53,7 +53,7 @@ OPTLIB=	"@comment "
 do-install:
 	${MKDIR} ${DATADIR};
 .if ${PORT_OPTIONS:MOPTLIB}
-	cd ${WRKDIR}/${PORTNAME:U}-lib-archindep-${PORTVERSION:S|.|-|g}; \
+	cd ${WRKDIR}/${PORTNAME:tu}-lib-archindep-${PORTVERSION:S|.|-|g}; \
 	${COPYTREE_SHARE} . ${DATADIR}
 .endif
 	cd ${WRKSRC}; \
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 23755a8d4f88..3fa3e1b2c87f 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -117,9 +117,9 @@ post-patch:
 do-build: ${MAN_TARGET} build-profile build-shared build-static
 
 .for o in PROFILE SHARED STATIC
-build-${o:L}: patch
+build-${o:tl}: patch
 .if ${PORT_OPTIONS:M${o}}
-	${PRINTF} "\n\nBuilding ${o:L} libraries:\n\n\n"
+	${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n"
 	cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${ALL_TARGET}
 
@@ -153,9 +153,9 @@ TESTS ?=	test-profile
 check regression-test test: ${TESTS}
 
 .for o in PROFILE SHARED STATIC
-test-${o:L}: build-${o:L}
+test-${o:tl}: build-${o:tl}
 .if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\nTesting ${o:L} libraries:\n\n\n"
+	@${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n"
 	@cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${TEST_TARGET}
 .if defined(BLAS_SLAVEPORT)
diff --git a/math/libflame/Makefile b/math/libflame/Makefile
index 3bcbfe988305..e2f374398940 100644
--- a/math/libflame/Makefile
+++ b/math/libflame/Makefile
@@ -86,7 +86,7 @@ WITH_BLAS=	gotoblas
 CONFIGURE_ARGS+=	--disable-goto-interfaces
 .for b in M K N
 .if defined(${b}_BLOCKSIZE)
-CONFIGURE_ARGS+=	--enable-default-${b:L}-blocksize=${${b}_BLOCKSIZE}
+CONFIGURE_ARGS+=	--enable-default-${b:tl}-blocksize=${${b}_BLOCKSIZE}
 .endif
 .endfor
 .endif
@@ -295,7 +295,7 @@ post-configure:
 do-build:
 .for o in SHARED STATIC
 .if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\n\n===> Building ${o:L} library:\n\n\n\n"
+	@${PRINTF} "\n\n\n===> Building ${o:tl} library:\n\n\n\n"
 	@cd ${WRKSRC}${o:S|^|_|:M*STATIC}; ${SETENV} ${MAKE_ENV} ${GMAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} libs
 .endif
@@ -331,7 +331,7 @@ check regression-test test: build
 	install-headers
 .for o in SHARED STATIC
 .if ${PORT_OPTIONS:M${o}}
-	@${PRINTF} "\n\n\n===> Testing ${o:L} library:\n\n\n\n"
+	@${PRINTF} "\n\n\n===> Testing ${o:tl} library:\n\n\n\n"
 	@cd ${WRKSRC}${o:S|^|_|:M*STATIC}/test;  ${SETENV} ${MAKE_ENV} \
 	${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} \
 	LIBBLAS="-L${LOCALBASE}/lib ${BLAS} -lm" \
diff --git a/math/libmissing/Makefile b/math/libmissing/Makefile
index 93f88bfeb187..fe248f712f18 100644
--- a/math/libmissing/Makefile
+++ b/math/libmissing/Makefile
@@ -75,7 +75,7 @@ check regression-test test: build
 	LD_LIBRARY_PATH="/lib:/usr/lib:${LOCALBASE}/lib:${WRKSRC}" \
 	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all3
 .for t in d q s
-	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:U}. PRECISION TEST RESULTS:"
+	@${PRINTF} "\n\n\n\t\t%s\n\n\n" "REPORT OF ${t:tu}. PRECISION TEST RESULTS:"
 	@${CAT} ${WRKSRC}/c/${t}p/tall${t}p.lst-xxx
 .endfor
 
diff --git a/math/ogdf/Makefile b/math/ogdf/Makefile
index bed7b88dfecf..5bedc363feb9 100644
--- a/math/ogdf/Makefile
+++ b/math/ogdf/Makefile
@@ -22,7 +22,7 @@ USES=		zip
 USE_LDCONFIG=	yes
 USE_PYTHON=	build
 
-WRKSRC=		${WRKDIR}/${PORTNAME:U}
+WRKSRC=		${WRKDIR}/${PORTNAME:tu}
 
 .include <bsd.port.options.mk>
 
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index a51ce3630107..7acc7085a20b 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Package for parallel (mpi) unstructured graph partitioning
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index c60dce2d99f6..aa982c8634af 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--with-x-include=${LOCALBASE}/include	\
 USES=		fortran
 FFLAGS+=	-O2
 PFX=		${PORTNAME}
-TARGET=		${OPSYS:L}
+TARGET=		${OPSYS:tl}
 PLIST_SUB=	PFX=${PFX} TARGET=${TARGET}
 
 .if !defined(WITHOUT_UMFPACK)
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 96f320422def..88fedd033385 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -29,8 +29,8 @@ USES=		fortran
 ARCH2FIX=	PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \
 		REDIST/SRC SRC TOOLS TOOLS/LAPACK
 
-DATADIR=	${PREFIX}/share/${PORTNAME:U}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:U}
+DATADIR=	${PREFIX}/share/${PORTNAME:tu}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:tu}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile
index a7b5ab2291ba..23b3b4805eaa 100644
--- a/math/vtk6/Makefile
+++ b/math/vtk6/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	6
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	The Visualization Toolkit
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index fbd854ef1109..fbd6c586ad8d 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -57,7 +57,7 @@ PLIST_SUB+=	X86="@comment "
 .endif
 
 .for _f in ${FIRMWARES}
-${_f}_NAME?=	dahdi-fw-${_f:L:S/_/-/g}
+${_f}_NAME?=	dahdi-fw-${_f:tl:S/_/-/g}
 ${_f}_DIR?=	${${_f}_NAME}.bin
 ${_f}_DISTFILE=	${${_f}_NAME}-${${_f}_VERSION}.tar.gz
 DISTFILES+=	${${_f}_DISTFILE}:firmware
diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile
index d35cfe8f66fe..de8f2345a2c6 100644
--- a/misc/dahdi-kmod26/Makefile
+++ b/misc/dahdi-kmod26/Makefile
@@ -59,7 +59,7 @@ PLIST_SUB+=	X86="@comment "
 .endif
 
 .for _f in ${FIRMWARES}
-${_f}_NAME?=	dahdi-fw-${_f:L:S/_/-/g}
+${_f}_NAME?=	dahdi-fw-${_f:tl:S/_/-/g}
 ${_f}_DIR?=	${${_f}_NAME}.bin
 ${_f}_DISTFILE=	${${_f}_NAME}-${${_f}_VERSION}.tar.gz
 DISTFILES+=	${${_f}_DISTFILE}:firmware
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 5326e3d3aeae..c797f367d746 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -50,8 +50,8 @@ OPTIONS_SET+=	${AVAILABLEFORMATS}
 
 .for O in ${AVAILABLEFORMATS}
 .if ${PORT_OPTIONS:M${O}}
-DOCFORMAT+=	${O:L:S,_,-,}
-PLIST_FORMATS+=	${O:L:S,_,-,}
+DOCFORMAT+=	${O:tl:S,_,-,}
+PLIST_FORMATS+=	${O:tl:S,_,-,}
 .endif
 .endfor
 
diff --git a/misc/gnome2-reference/Makefile b/misc/gnome2-reference/Makefile
index c4884d2dedc9..aec4b2dd84dd 100644
--- a/misc/gnome2-reference/Makefile
+++ b/misc/gnome2-reference/Makefile
@@ -53,21 +53,19 @@ NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
 
-.MAKE.FreeBSD_UL= yes
-
 REF_LIST_INC=	${.CURDIR}/Makefile.inc
 .include "${REF_LIST_INC}"
 
 .for ref in ${_PORT_REF_LIST:C/^([^:]+).*/\1/}
-OPTIONS_DEFINE+=	${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U}
-OPTIONS_DEFAULT+=	${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U}
-${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U}_DESC=	Install ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//} programing reference
+OPTIONS_DEFINE+=	${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:tu}
+OPTIONS_DEFAULT+=	${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:tu}
+${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:tu}_DESC=	Install ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//} programing reference
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for ref in ${_PORT_REF_LIST}
-.if ${PORT_OPTIONS:M${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U:C/^([^:]+).*/\1/}}
+.if ${PORT_OPTIONS:M${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:tu:C/^([^:]+).*/\1/}}
 RUN_DEPENDS+=	${ref:C|^[^:]+:([^:]+).*|\1|:C|^[^/]+/([^/]+).*|\1|}>0:${PORTSDIR}/${ref:C/^([^:]+).*/\1/}
 .endif
 .endfor
diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index 72d5f6e8e635..b966cd108936 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -38,8 +38,8 @@ MISSING=	ax bl bq cw gg im je me mf rs ss sx
 
 .ifndef NOMISSING
 .for M in ${MISSING}
-HAS_${M:U}!=	${GREP} -c ^${M:U} /usr/share/misc/iso3166 || ${TRUE}
-.if ${HAS_${M:U}} == "0"
+HAS_${M:tu}!=	${GREP} -c ^${M:tu} /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_${M:tu}} == "0"
 EXTRA_PATCHES+=	${FILESDIR}/patchremove-${M}
 .endif
 .endfor
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index fcc41a2d18b4..946b7387c8e4 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	AtomicParsley
 PORTVERSION=	0.9.0
 PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20v${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20v${PORTVERSION}
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index 300df0ddddd3..58dbcc34c8af 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -13,7 +13,6 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Meta-port of all gstreamer plugins with options
 
-.MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
@@ -22,9 +21,9 @@ USE_GSTREAMER=	yes
 .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
 
 .for all in ${_GSTREAMER_PLUGINS}
-OPTIONS_DEFINE+=	${all:U}
-${all:U}_DESC=	${all} plugin
-OPTIONS_DEFAULT+=	${all:U}
+OPTIONS_DEFINE+=	${all:tu}
+${all:tu}_DESC=	${all} plugin
+OPTIONS_DEFAULT+=	${all:tu}
 .endfor
 
 .include <bsd.port.pre.mk>
@@ -42,8 +41,8 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NSPC} # i386 only
 .endif
 
 .for f in ${OPTIONS_DEFINE}
-.if ${PORT_OPTIONS:M${f:U}}
-USE_GSTREAMER+=	${f:L}
+.if ${PORT_OPTIONS:M${f:tu}}
+USE_GSTREAMER+=	${f:tl}
 .endif
 .endfor
 
diff --git a/multimedia/gstreamer1-plugins-all/Makefile b/multimedia/gstreamer1-plugins-all/Makefile
index 777b20f4a01f..724112c2e1b4 100644
--- a/multimedia/gstreamer1-plugins-all/Makefile
+++ b/multimedia/gstreamer1-plugins-all/Makefile
@@ -12,7 +12,6 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Meta-port of all gstreamer 1.x plugins with options
 
-.MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 USE_GSTREAMER1=	yes
@@ -20,9 +19,9 @@ USE_GSTREAMER1=	yes
 .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
 
 .for all in ${_GSTREAMER_PLUGINS}
-OPTIONS_DEFINE+=	${all:U}
-${all:U}_DESC=	${all} plugin
-OPTIONS_DEFAULT+=	${all:U}
+OPTIONS_DEFINE+=	${all:tu}
+${all:tu}_DESC=	${all} plugin
+OPTIONS_DEFAULT+=	${all:tu}
 .endfor
 
 .include <bsd.port.options.mk>
@@ -37,8 +36,8 @@ PORT_OPTIONS:=	${PORT_OPTIONS:NVDPAU} # Needs to be build agains running kernel
 OPTIONS_DEFINE_i386=	SPC
 
 .for f in ${OPTIONS_DEFINE}
-.if ${PORT_OPTIONS:M${f:U}}
-USE_GSTREAMER1+=${f:L}
+.if ${PORT_OPTIONS:M${f:tu}}
+USE_GSTREAMER1+=${f:tl}
 .endif
 .endfor
 
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 3ac2e0bc0d5e..44aeb480d3b7 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -31,7 +31,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's| -O3|| ; s|<termio|&s|' \
 		${WRKSRC}/configure
 # AMD64 prefers position independent code
-.if ${ARCH:L} == "amd64"
+.if ${ARCH:tl} == "amd64"
 	@${REINPLACE_CMD} -e '/CFLAGS/s| -prefer-non-pic||' \
 		${WRKSRC}/configure
 .endif
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index e205cc539034..62609d105a00 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -40,7 +40,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
 		x264:${PORTSDIR}/multimedia/x264 \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-WRKSRC=		${WRKDIR}/${DISTNAME:L}
+WRKSRC=		${WRKDIR}/${DISTNAME:tl}
 
 USES=		libtool pathfix perl5 pkgconfig shebangfix tar:bzip2 
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi \
diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 4cfdff0890a0..ca1eab0794fb 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -36,8 +36,8 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/MediaInfo/Project/GNU/CLI/.libs/mediainfo ${PREFIX}/bin/
 .for library in MediaInfo Zen
-	${INSTALL_LIB} ${WRKSRC}/${library}Lib/Project/GNU/Library/.libs/lib${library:L}.so.0 ${PREFIX}/lib/
-	${LN} -fs lib${library:L}.so.0 ${PREFIX}/lib/lib${library:L}.so
+	${INSTALL_LIB} ${WRKSRC}/${library}Lib/Project/GNU/Library/.libs/lib${library:tl}.so.0 ${PREFIX}/lib/
+	${LN} -fs lib${library:tl}.so.0 ${PREFIX}/lib/lib${library:tl}.so
 .endfor
 
 .include <bsd.port.mk>
diff --git a/multimedia/oqtencoder/Makefile b/multimedia/oqtencoder/Makefile
index 26e4b016cd0b..685d6e3efd03 100644
--- a/multimedia/oqtencoder/Makefile
+++ b/multimedia/oqtencoder/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.1
 PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/openquicktime/OpenQuicktime%20v1/1.0b
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}-src
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -31,7 +31,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gcc -g|${CC}|g' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:L} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:tl} ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/multimedia/oqtplayer/Makefile b/multimedia/oqtplayer/Makefile
index 23fc7c0d833a..bf2d0d06933a 100644
--- a/multimedia/oqtplayer/Makefile
+++ b/multimedia/oqtplayer/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.5
 PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/openquicktime/OpenQuicktime%20v1/1.0b
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}-src
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/multimedia/subtools/Makefile b/multimedia/subtools/Makefile
index c4d83fb09f40..ddd085b1dc5b 100644
--- a/multimedia/subtools/Makefile
+++ b/multimedia/subtools/Makefile
@@ -25,7 +25,7 @@ post-patch:
 
 do-build:
 .for f in srtshift srtrate
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -D${f:U} -o ${f} ${PORTNAME}.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -D${f:tu} -o ${f} ${PORTNAME}.c
 .endfor
 
 do-install:
diff --git a/net-im/mercury/Makefile b/net-im/mercury/Makefile
index a72fef48199c..837af3fab61f 100644
--- a/net-im/mercury/Makefile
+++ b/net-im/mercury/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercury
-DISTVERSION=	2.0${RCVER:U}
+DISTVERSION=	2.0${RCVER:tu}
 PORTREVISION=	1
 PORTEPOCH=	8
 CATEGORIES=	net-im java
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 4fa7855e52ea..f19afc5c0ae9 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -225,7 +225,7 @@ post-configure:
 		${XARGS} ${REINPLACE_CMD} -E -e '/^INSTALL[ 	]+=/s|$$| -m 755|'
 .for hdr in sys/mbuf.h netinet/in_pcb.h netinet/in_var.h netinet/ip6.h
 	@${REINPLACE_CMD} -E -e '\
-		s!^.*#undef.*(HAVE_${hdr:U:S/./_/g:S/\//_/g}).*$$!#define \1 1!g' \
+		s!^.*#undef.*(HAVE_${hdr:tu:S/./_/g:S/\//_/g}).*$$!#define \1 1!g' \
 			${WRKSRC}/include/net-snmp/net-snmp-config.h
 .endfor
 .if ${PORT_OPTIONS:MPYTHON}
diff --git a/net-mgmt/snmp4nagios/Makefile b/net-mgmt/snmp4nagios/Makefile
index 1e7d9b7d7f62..5380fc120d7b 100644
--- a/net-mgmt/snmp4nagios/Makefile
+++ b/net-mgmt/snmp4nagios/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	SNMP4Nagios
 PORTVERSION=	0.4
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Vendor specific SNMP plugins for Nagios
diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile
index ba9dd916bce7..45871c6c0322 100644
--- a/net-p2p/frost/Makefile
+++ b/net-p2p/frost/Makefile
@@ -91,6 +91,6 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 # wrapper
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
+	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:tl}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 81d2aaeba011..ef4e42ff5d4b 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -54,7 +54,7 @@ DEBUG_CONFIGURE_ENABLE=	debug
 
 .include <bsd.port.options.mk>
 
-.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "yes" && defined(USE_PYTHON)
+.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON)
 CONFIGURE_ARGS+=	--enable-python-binding \
 			--with-boost-python=boost_python
 .else
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 60cba43c5e2e..bc7206f59ed2 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -46,7 +46,7 @@ USE_QT4+=	dbus
 .endif
 
 do-configure:
-.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "no"
+.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"
 	@cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \
 		./configure --prefix=${PREFIX}
 .else
@@ -60,7 +60,7 @@ post-install:
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
-.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "no"
+.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
diff --git a/net-p2p/xnap/Makefile b/net-p2p/xnap/Makefile
index 63d74ebc96ec..dfc815818afd 100644
--- a/net-p2p/xnap/Makefile
+++ b/net-p2p/xnap/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	XNap
 DISTVERSION=	2.5r3
 PORTREVISION=	3
 CATEGORIES=	net-p2p audio java
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/2.5r3
-#DISTNAME=	${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
-DISTNAME=	${PORTNAME:L}-${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/2.5r3
+#DISTNAME=	${PORTNAME:tl}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
+DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
 
 MAINTAINER=	conrads@cox.net
 COMMENT=	Pure Java napster client; also, supports OpenNap & giFT (FastTrack)
@@ -23,8 +23,8 @@ DOC_FILES=	AUTHORS COPYING COPYING.LIB NEWS README \
 PORTDOCS=	${DOC_FILES}
 
 PLIST_FILES=	\
-		bin/${PORTNAME:L} \
-		%%JAVAJARDIR%%/${PORTNAME:L}.jar
+		bin/${PORTNAME:tl} \
+		%%JAVAJARDIR%%/${PORTNAME:tl}.jar
 
 NO_STAGE=	yes
 post-patch:
@@ -36,8 +36,8 @@ post-patch:
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/xnap.jar \
-		${JAVAJARDIR}/${PORTNAME:L}.jar
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
+		${JAVAJARDIR}/${PORTNAME:tl}.jar
+	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:tl}
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOC_FILES}
diff --git a/net/liveMedia/Makefile b/net/liveMedia/Makefile
index 16a16d78d2da..a485d5c5051f 100644
--- a/net/liveMedia/Makefile
+++ b/net/liveMedia/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/live
 HAS_CONFIGURE=	yes
 
 CONFIGURE_SCRIPT=	genMakefiles
-CONFIGURE_ARGS=		fixed-${OPSYS:L}
+CONFIGURE_ARGS=		fixed-${OPSYS:tl}
 
 USES=		gmake
 USE_LDCONFIG=	yes
@@ -39,6 +39,6 @@ BROKEN=		Does not compile
 .endif
 
 post-extract:
-	${CP} ${FILESDIR}/config.fixed-${OPSYS:L} ${WRKSRC}/
+	${CP} ${FILESDIR}/config.fixed-${OPSYS:tl} ${WRKSRC}/
 
 .include <bsd.port.post.mk>
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 9866c37bae63..85fdb76076a3 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -44,11 +44,11 @@ CONFIGURE_ARGS=	--with-hwloc-prefix=${LOCALBASE} ac_cv_path_BASH_SHELL=""
 .for pm in ${OPTIONS_GROUP_PM}
 . if ${PORT_OPTIONS:M${pm}}
 .  if empty(PMLIST)
-PMLIST=		${pm:L}
+PMLIST=		${pm:tl}
 .  elif ${PORT_OPTIONS:MD${pm}}
-PMLIST:=	${pm:L},${PMLIST}
+PMLIST:=	${pm:tl},${PMLIST}
 .  else
-PMLIST:=	${PMLIST},${pm:L}
+PMLIST:=	${PMLIST},${pm:tl}
 .  endif
 . endif
 .endfor
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index a4886a4780a3..643dcf904297 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -25,7 +25,7 @@ GAPING_DESC=	Enable GAPING_SECURITY_HOLE support
 
 NO_WRKSUBDIR=	yes
 
-CFLAGS+=	-D${OPSYS:U}
+CFLAGS+=	-D${OPSYS:tu}
 LDFLAGS+=	-static
 
 PORTDOCS=	README
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 5dbe9f524913..15f4ad051253 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -429,9 +429,9 @@ CONFIGURE_ARGS+=	--enable-spasswd
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
 WITH_ODBC_TYPE?=	iODBC
-.if ${WITH_ODBC_TYPE:L} == iodbc
+.if ${WITH_ODBC_TYPE:tl} == iodbc
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-.elif ${WITH_ODBC_TYPE:L} == unixodbc
+.elif ${WITH_ODBC_TYPE:tl} == unixodbc
 LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
 .else
 BROKEN=			choose either iODBC or unixODBC for WITH_ODBC_TYPE
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 915bfaa4daf9..d20c65fee171 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -8,7 +8,7 @@ PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	SF/pywebsvcs/ZSI/ZSI-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Python module that provides an implementation of SOAP 1.1
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index c0a329f178bd..ce0cc2f3a8a6 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -362,7 +362,7 @@ CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\
 # XXX
 .for m in ${SAMBA4_MODULES}
 PLIST_REINPLACE+=	${m}
-PLIST_REINPLACE_${m:U}=	s|^@comment ${m} ||g
+PLIST_REINPLACE_${m:tu}=	s|^@comment ${m} ||g
 .endfor
 ##############################################################################
 # !SAMBA4_SUBPORT
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 79d5f55a1585..a8e0beea0629 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -357,7 +357,7 @@ CONFIGURE_ARGS+=	--bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\
 # XXX
 .for m in ${SAMBA4_MODULES}
 PLIST_REINPLACE+=	${m}
-PLIST_REINPLACE_${m:U}=	s|^@comment ${m} ||g
+PLIST_REINPLACE_${m:tu}=	s|^@comment ${m} ||g
 .endfor
 ##############################################################################
 # !SAMBA4_SUBPORT
diff --git a/net/seda/Makefile b/net/seda/Makefile
index 117d6430fea6..673d25bbe013 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -36,7 +36,7 @@ PORTDOCS=	${DOC_FILES} \
 		javadoc
 
 PLIST_FILES=	\
-		%%JAVAJARDIR%%/${PORTNAME:L}.jar
+		%%JAVAJARDIR%%/${PORTNAME:tl}.jar
 
 NO_STAGE=	yes
 pre-build:
@@ -46,7 +46,7 @@ pre-build:
 do-install:
 # jar
 	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:L}.jar \
+	@${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:tl}.jar \
 		${JAVAJARDIR}/
 # docs
 .ifndef(NOPORTDOCS)
diff --git a/net/udt/files/BSDmakefile b/net/udt/files/BSDmakefile
index 1ebebc00aa70..c0d5c5111ca5 100644
--- a/net/udt/files/BSDmakefile
+++ b/net/udt/files/BSDmakefile
@@ -11,7 +11,7 @@ LDADD=	-lmd -lpthread
 SRCS=	common.cpp window.cpp list.cpp buffer.cpp packet.cpp channel.cpp \
 	queue.cpp ccc.cpp cache.cpp core.cpp epoll.cpp api.cpp
 
-CXXFLAGS+=	-D${MACHINE_ARCH:U:S/I386/IA32/:S/SPARC64/SPARC/} -DBSD
+CXXFLAGS+=	-D${MACHINE_ARCH:tu:S/I386/IA32/:S/SPARC64/SPARC/} -DBSD
 CXXFLAGS+=	-Wno-system-headers -Wall -W	\
 	-Wpointer-arith -Wreturn-type	\
 	-Wwrite-strings -Wswitch -Wno-cast-align	\
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 997e504b901d..d34136bdc988 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -42,12 +42,12 @@ WIRESHARK_LIBS=
 .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
     reordercap
 .if defined(LITE)
-PLIST_SUB+=		${x:U}="@comment $x not installed" \
-    			${x:U}_MAN="@comment $x not installed "
+PLIST_SUB+=		${x:tu}="@comment $x not installed" \
+    			${x:tu}_MAN="@comment $x not installed "
 CONFIGURE_ARGS+=	--enable-$x=no
 .else
-PLIST_SUB+=		${x:U}=bin/$x \
-    			${x:U}_MAN=""
+PLIST_SUB+=		${x:tu}=bin/$x \
+    			${x:tu}_MAN=""
 .endif
 .endfor
 
diff --git a/news/inn/Makefile.layout b/news/inn/Makefile.layout
index b0961dd46d48..c9e09176590a 100644
--- a/news/inn/Makefile.layout
+++ b/news/inn/Makefile.layout
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
-# tell bmake we use the old :L :U modifiers
-.MAKE.FreeBSD_UL= yes
-
 INN_LAYOUT?=		old
 
-.if !empty(INN_LAYOUT:L:Mnew)
+.if !empty(INN_LAYOUT:tl:Mnew)
 #-----------------------------------------------------------------------
 # New-style layout. Keep database, spool, and other transient data under
 # /var, where it should be.
@@ -18,7 +15,7 @@ INN_LOGDIR=		${VARBASE}/log/news
 INN_DBDIR=		${VARBASE}/news/db
 INN_TMPDIR=		${VARBASE}/news/tmp
 INN_NEWSSPOOL=		${VARBASE}/news
-.elif !empty(INN_LAYOUT:L:Mhier)
+.elif !empty(INN_LAYOUT:tl:Mhier)
 #-----------------------------------------------------------------------
 # hier(7)-ish layout. As above, but try to use standard directories
 # under /var.
diff --git a/ports-mgmt/kpackagekit/Makefile b/ports-mgmt/kpackagekit/Makefile
index bcedf94d100f..909c002e6acc 100644
--- a/ports-mgmt/kpackagekit/Makefile
+++ b/ports-mgmt/kpackagekit/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	0.6.3.3
 PORTREVISION=	3
 CATEGORIES=	ports-mgmt sysutils kde
 MASTER_SITES=	http://opendesktop.org/CONTENT/content-files/
-DISTNAME=	84745-${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	84745-${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE interface for PackageKit
@@ -22,6 +22,6 @@ USES=		cmake gettext pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/pkg_add_it/Makefile b/ports-mgmt/pkg_add_it/Makefile
index 60e1ab79f151..646b23f179d3 100644
--- a/ports-mgmt/pkg_add_it/Makefile
+++ b/ports-mgmt/pkg_add_it/Makefile
@@ -20,7 +20,7 @@ PKG_RELEASE!=	${UNAME} -r | ${CUT} -d '-' -f 1,2 | ${SED} -e 's|\.[0-9]*.*|-STAB
 
 post-patch:
 	${REINPLACE_CMD} -e 's|@PKG_ARCH@|${ARCH}|' \
-		-e 's|@PKG_RELEASE@|${PKG_RELEASE:L}|' ${WRKSRC}/pkg_add_it.conf
+		-e 's|@PKG_RELEASE@|${PKG_RELEASE:tl}|' ${WRKSRC}/pkg_add_it.conf
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/pkg_add_it.conf ${PREFIX}/etc/
diff --git a/portuguese/irpf-pt_BR/Makefile b/portuguese/irpf-pt_BR/Makefile
index 3afef58c58b0..0531b1c1782e 100644
--- a/portuguese/irpf-pt_BR/Makefile
+++ b/portuguese/irpf-pt_BR/Makefile
@@ -20,7 +20,7 @@ LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 BROKEN=		Unfetchable
 
 USES=		zip
-WRKSRC=		${WRKDIR}/${PORTNAME:U}2014
+WRKSRC=		${WRKDIR}/${PORTNAME:tu}2014
 
 USE_JAVA=	yes
 JAVA_RUN=	yes
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index be0d010d7ef7..999894284ce7 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--with-medium=libpaper --sharedstatedir=${PREFIX}/share \
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
 PAPERSIZE?=
-.if ${PAPERSIZE:L} == a4
+.if ${PAPERSIZE:tl} == a4
 RUN_DEPENDS+=	${LOCALBASE}/etc/papersize:${PORTSDIR}/print/papersize-default-a4
 .endif
 
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index e9f843d33df9..9c75abf75d02 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	acroread8
 PORTVERSION=	8.1.7
 PORTREVISION=	4
 CATEGORIES?=	print linux
-MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:L}/ \
-		ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:L}/
-DISTNAME=	AdobeReader_${ADOBE_LANG:L}-${PORTVERSION}-1.i486
+MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:tl}/ \
+		ftp://ftp.adobe.com/pub/adobe/reader/unix/8.x/${PORTVERSION}/${ADOBE_LANG:tl}/
+DISTNAME=	AdobeReader_${ADOBE_LANG:tl}-${PORTVERSION}-1.i486
 DIST_SUBDIR=	acroread
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -32,10 +32,10 @@ PLIST_SUB=	ACRODIR=${ACRODIR} \
 		ACROBASE=${ACROBASE} \
 		ADOBEBASE=${ADOBEBASE} \
 		PLUGINDIR=${PLUGINDIR} \
-		ADOBE_LANG=${ADOBE_LANG:U} \
+		ADOBE_LANG=${ADOBE_LANG:tu} \
 		LOCALE_NAME=${LOCALE_NAME}
 SUB_FILES=	ln mv rm pkg-message pkg-deinstall
-SUB_LIST=	ADOBE_LANG=${ADOBE_LANG:U} \
+SUB_LIST=	ADOBE_LANG=${ADOBE_LANG:tu} \
 		ACROBASE=${ACROBASE}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -45,14 +45,13 @@ LANGCODE=	chs:zh_CN cht:zh_TW dan:da_DK deu:de_DE enu:en_US \
 		esp:es_ES fra:fr_FR ita:it_IT jpn:ja_JP kor:ko_KR \
 		nld:nl_NL nor:nb_NO ptb:pt_BR suo:fi_FI sve:sv_SE
 
-.MAKE.FreeBSD_UL=	yes
 ADOBE_LANG?=	ENU
-.for L in ${ADOBE_LANG:L}
+.for L in ${ADOBE_LANG:tl}
 LOCALE_NAME=	${LANGCODE:M${L}\:*:C/.*\://}
-LANG_${L:U}=	""
-LANG_NON${L:U}=	"@comment "
+LANG_${L:tu}=	""
+LANG_NON${L:tu}=	"@comment "
 .endfor
-.for L in ${LANGCODE:C/\:.*//:U}
+.for L in ${LANGCODE:C/\:.*//:tu}
 LANG_${L}?=	"@comment "
 LANG_NON${L}?=	""
 PLIST_SUB+=	LANG_${L}=${LANG_${L}}
@@ -61,7 +60,7 @@ PLIST_SUB+=	LANG_NON${L}=${LANG_NON${L}}
 
 ADOBEBASE=	Adobe
 ACROBASE=	${ADOBEBASE}/Reader8
-ACRODIR=	${ACROBASE}/${ADOBE_LANG:U}
+ACRODIR=	${ACROBASE}/${ADOBE_LANG:tu}
 PLUGINDIR=	lib/browser_linux_plugins
 INSTALLDIR=	${PREFIX}/${ACRODIR}
 INSTALLEXEC=	${SETENV} UNAME_s=Linux \
@@ -81,7 +80,7 @@ do-install:
 	@${MKDIR} ${INSTALLDIR}
 	@cd ${WRKSRC} && ${SETENV} PATH=${WRKDIR}/bin:${PATH} ${INSTALLEXEC} > /dev/null
 
-.if ${ADOBE_LANG:U} != ENU
+.if ${ADOBE_LANG:tu} != ENU
 post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile
index 535374666b10..a8977b6bc23f 100644
--- a/print/acroread9/Makefile
+++ b/print/acroread9/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	acroread9
 PORTVERSION?=	9.5.5
 PORTREVISION=	1
 CATEGORIES?=	print linux
-MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:L}/ \
-		ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:L}/
-DISTNAME=	AdbeRdr${PORTVERSION:S,.0$,,}-1_i486linux_${ADOBE_LANG:L}
+MASTER_SITES?=	http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:tl}/ \
+		ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/${PORTVERSION}/${ADOBE_LANG:tl}/
+DISTNAME=	AdbeRdr${PORTVERSION:S,.0$,,}-1_i486linux_${ADOBE_LANG:tl}
 DIST_SUBDIR=	acroread
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -32,11 +32,11 @@ PLIST_SUB=	ACRODIR=${ACRODIR} \
 		ACROBASE=${ACROBASE} \
 		ADOBEBASE=${ADOBEBASE} \
 		PLUGINDIR=${PLUGINDIR} \
-		ADOBE_LANG=${ADOBE_LANG:U} \
+		ADOBE_LANG=${ADOBE_LANG:tu} \
 		LOCALE_NAME=${LOCALE_NAME} \
 		MANINSTALLDIR=${MANINSTALLDIR}
 SUB_FILES=	ln mv rm pkg-message pkg-deinstall
-SUB_LIST=	ADOBE_LANG=${ADOBE_LANG:U} \
+SUB_LIST=	ADOBE_LANG=${ADOBE_LANG:tu} \
 		ACROBASE=${ACROBASE}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -46,15 +46,14 @@ LANGCODE=	chs:zh_CN cht:zh_TW dan:da_DK deu:de_DE enu:en_US \
 		esp:es_ES fra:fr_FR ita:it_IT jpn:ja_JP kor:ko_KR \
 		nld:nl_NL nor:nb_NO ptb:pt_BR suo:fi_FI sve:sv_SE
 
-.MAKE.FreeBSD_UL=	yes
 ADOBE_LANG?=	ENU
-.for L in ${ADOBE_LANG:L}
+.for L in ${ADOBE_LANG:tl}
 LOCALE_NAME=	${LANGCODE:M${L}\:*:C/.*\://}
 MANLANG=	${LOCALE_NAME:C/_.*//:C/en/""/}
-LANG_${L:U}=	""
-LANG_NON${L:U}=	"@comment "
+LANG_${L:tu}=	""
+LANG_NON${L:tu}=	"@comment "
 .endfor
-.for L in ${LANGCODE:C/\:.*//:U}
+.for L in ${LANGCODE:C/\:.*//:tu}
 LANG_${L}?=	"@comment "
 LANG_NON${L}?=	""
 PLIST_SUB+=	LANG_${L}=${LANG_${L}}
@@ -63,7 +62,7 @@ PLIST_SUB+=	LANG_NON${L}=${LANG_NON${L}}
 
 ADOBEBASE=	Adobe
 ACROBASE=	${ADOBEBASE}/Reader9
-ACRODIR=	${ACROBASE}/${ADOBE_LANG:U}
+ACRODIR=	${ACROBASE}/${ADOBE_LANG:tu}
 PLUGINDIR=	lib/browser_linux_plugins
 INSTALLDIR=	${PREFIX}/${ACRODIR}
 INSTALLEXEC=	${SETENV} UNAME_s=Linux \
diff --git a/print/acroreadwrapper/Makefile b/print/acroreadwrapper/Makefile
index fb7782fe6b37..70a16a30af05 100644
--- a/print/acroreadwrapper/Makefile
+++ b/print/acroreadwrapper/Makefile
@@ -23,7 +23,7 @@ PLIST_DIRS=	${RELKMODDIR}
 SUB_FILES=	acroread
 SUB_LIST=	ACROBASE8=${ACROBASE8} \
 		ACROBASE9=${ACROBASE9} \
-		ADOBE_LANG=${ADOBE_LANG:U} \
+		ADOBE_LANG=${ADOBE_LANG:tu} \
 		INSTALLDIR=${INSTALLDIR} \
 		LINUXBASE=${LINUXBASE} \
 		LINUXSH=${LINUXBASE}/bin/sh \
diff --git a/print/ghostscript7-commfont/files/Makefile.in b/print/ghostscript7-commfont/files/Makefile.in
index ce29d45b3341..620d3c4b61e1 100644
--- a/print/ghostscript7-commfont/files/Makefile.in
+++ b/print/ghostscript7-commfont/files/Makefile.in
@@ -72,14 +72,14 @@ KO.SANSSERIF=	HYGoThic-Medium
 all:
 	@${MKDIR} CIDFont Font
 .for T in ${TEMPLATES_TTF}
-	@for F in ${${T:U}}; do \
+	@for F in ${${T:tu}}; do \
 		echo "Generating CIDFont/$${F}"; \
 		sed -e "s,%%FONTNAME%%,$$F,g" \
 		    -e "s,%%GS_FONTDIR%%,${GS_FONTDIR}," \
-		    -e "s,%%GENERICFONTNAME%%,${${T:U}.GENERIC}," \
-		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:U}.GENERIC_SUBST}," \
+		    -e "s,%%GENERICFONTNAME%%,${${T:tu}.GENERIC}," \
+		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:tu}.GENERIC_SUBST}," \
 		    < template.ttcidfont > CIDFont/$${F}; \
-		for D in ${${T:U:C/\.[^.]*$//}.CMAPS}; do \
+		for D in ${${T:tu:C/\.[^.]*$//}.CMAPS}; do \
 			if [ -d ${CMAPDIR}/$${D}/CMap ]; then \
 			CMAPS=`cd ${CMAPDIR}/$${D}/CMap; echo *`; \
 			elif [ -r ${CMAPDIR}/$${D} ]; then \
@@ -92,22 +92,22 @@ all:
 				sed -e "s,%%FONTNAME%%,$$F,g" \
 				    -e "s,%%GS_FONTDIR%%,${GS_FONTDIR}," \
 				    -e "s,%%CMAPNAME%%,$${C}," \
-				    -e "s,%%GENERICFONTNAME%%,${${T:U}.GENERIC}," \
-		    		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:U}.GENERIC_SUBST}," \
+				    -e "s,%%GENERICFONTNAME%%,${${T:tu}.GENERIC}," \
+		    		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:tu}.GENERIC_SUBST}," \
 				    < template.font > Font/$${F}-$${C}; \
 			done; \
 		done; \
 	done | awk "${PROGRESS}"
 .endfor
 .for T in ${TEMPLATES_CID}
-	@for F in ${${T:U}}; do \
+	@for F in ${${T:tu}}; do \
 		echo "Generating CIDFont/$${F}"; \
 		sed -e "s,%%FONTNAME%%,$$F,g" \
 		    -e "s,%%GS_FONTDIR%%,${GS_FONTDIR}," \
-		    -e "s,%%GENERICFONTNAME%%,${${T:U}.GENERIC}," \
-		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:U}.GENERIC_SUBST}," \
+		    -e "s,%%GENERICFONTNAME%%,${${T:tu}.GENERIC}," \
+		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:tu}.GENERIC_SUBST}," \
 		    < template.cidfont > CIDFont/$${F}; \
-		for D in ${${T:U:C/\.[^.]*$//}.CMAPS}; do \
+		for D in ${${T:tu:C/\.[^.]*$//}.CMAPS}; do \
 			if [ -d ${CMAPDIR}/$${D}/CMap ]; then \
 			CMAPS=`cd ${CMAPDIR}/$${D}/CMap; echo *`; \
 			elif [ -r ${CMAPDIR}/$${D} ]; then \
@@ -120,8 +120,8 @@ all:
 				sed -e "s,%%FONTNAME%%,$$F,g" \
 				    -e "s,%%GS_FONTDIR%%,${GS_FONTDIR}," \
 				    -e "s,%%CMAPNAME%%,$${C}," \
-				    -e "s,%%GENERICFONTNAME%%,${${T:U}.GENERIC}," \
-		    		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:U}.GENERIC_SUBST}," \
+				    -e "s,%%GENERICFONTNAME%%,${${T:tu}.GENERIC}," \
+		    		    -e "s,%%GENERICFONTNAME_SUBST%%,${${T:tu}.GENERIC_SUBST}," \
 				    < template.font > Font/$${F}-$${C}; \
 			done; \
 		done; \
@@ -137,5 +137,5 @@ install:
 	${MKDIR} ${GS_RESCMAPDIR}
 	cd ${GS_RESCMAPDIR} && ${LN} -s -f `${FIND} ${CMAPDIR} -type f` .
 .for T in ${TEMPLATES_CID}
-	cd ${GS_RESCIDFONTDIR} && ${LN} -s -f ${CIDFONTDIR}/${${T:U}.GENERIC_SUBST} ${${T:U}.GENERIC_SUBST}
+	cd ${GS_RESCIDFONTDIR} && ${LN} -s -f ${CIDFONTDIR}/${${T:tu}.GENERIC_SUBST} ${${T:tu}.GENERIC_SUBST}
 .endfor
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index db144fa9c250..2f5aa326df4e 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Hyperlatex
 DISTVERSION=	2.9a
 PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/2.9a
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/2.9a
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce HTML and printed documents from LaTeX source
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index cd479075b06c..0e9d7f0903cd 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -20,7 +20,7 @@ MLINKS=		mp.1 digestp.1	- filep.1	- filofaxp.1 \
 		- timemanp.1	- timesysp.1
 
 PAPERSIZE?=	letter
-.if ${PAPERSIZE:L} == a4
+.if ${PAPERSIZE:tl} == a4
 INSTALL_TARGET=	install-a4
 .endif
 
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 1470263459de..70407cffad99 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -63,7 +63,7 @@ post-patch:
 			${WRKSRC}/doc/manual/*/manual-*/*.html
 	@${REINPLACE_CMD} -e '/\.css/d' ${WRKSRC}/doc/manual/*/Makefile
 .if ${PAPERSIZE}==a4
-	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE:U}|' \
+	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE:tu}|' \
 		${WRKSRC}/muttprint
 .else
 	@${REINPLACE_CMD} 's|%%PAPERSIZE%%|${PAPERSIZE}|' \
diff --git a/print/papersize-default-a4/Makefile b/print/papersize-default-a4/Makefile
index 8dc540136a0c..03bddcd9f9f2 100644
--- a/print/papersize-default-a4/Makefile
+++ b/print/papersize-default-a4/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	papersize-default
 PORTVERSION=	0.0.20120302
 CATEGORIES=	print
 MASTER_SITES=	# none
-PKGNAMESUFFIX=	-${DEFAULTPAPERSIZE:L}
+PKGNAMESUFFIX=	-${DEFAULTPAPERSIZE:tl}
 DISTFILES=	# none
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 
 DEFAULTPAPERSIZE?=	a4
 .for P in a4 letter
-.if ${DEFAULTPAPERSIZE:L:M${P}} != ${P}
+.if ${DEFAULTPAPERSIZE:tl:M${P}} != ${P}
 CONFLICTS_INSTALL+=	papersize-default-${P}-[0-9]*
 .endif
 .endfor
@@ -25,7 +25,7 @@ CONFLICTS_INSTALL+=	papersize-default-${P}-[0-9]*
 PLIST_FILES=	etc/papersize
 
 do-install:
-	${LN} -s -f papersize.${DEFAULTPAPERSIZE:L} \
+	${LN} -s -f papersize.${DEFAULTPAPERSIZE:tl} \
 		${STAGEDIR}${PREFIX}/etc/papersize
 
 .include <bsd.port.mk>
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 0ef89ba4d87b..55e70359b6c4 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Device independent view of the CDF data model
 
-MAKE_FLAGS=	INSTALLDIR=${STAGEDIR}${PREFIX} OS=${OPSYS:L} ENV=gnu      \
+MAKE_FLAGS=	INSTALLDIR=${STAGEDIR}${PREFIX} OS=${OPSYS:tl} ENV=gnu      \
 		FORTRAN=yes FC_freebsd=${F77}
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/science/clhep/Makefile b/science/clhep/Makefile
index 018c9876f7c7..07f100f4415e 100644
--- a/science/clhep/Makefile
+++ b/science/clhep/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Object-oriented toolkit for particle physics applications by CERN
 
-WRKSRC=		${WRKDIR}/${PORTVERSION}/${PORTNAME:U}
+WRKSRC=		${WRKDIR}/${PORTVERSION}/${PORTNAME:tu}
 
 USES=		gmake perl5
 USE_PERL5=	build
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index 08b89a3fd49f..fbab29160381 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF/releases/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME:U}${PORTVERSION}/src/
+MASTER_SITE_SUBDIR=	${PORTNAME:tu}${PORTVERSION}/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hierarchical Data Format library (from NCSA)
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index b56eb903a786..769ebe6004ef 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.3
 CATEGORIES=	science python
 MASTER_SITES=	SF/${PORTNAME}-toolkit/${PORTNAME}-toolkit/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME:U}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Modular toolkit for Data Processing
diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile
index 3a07cb3dc637..77e5a454a113 100644
--- a/security/axTLS/Makefile
+++ b/security/axTLS/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	axTLS
 PORTVERSION=	1.4.9
 CATEGORIES=	security devel net
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTVERSION}
 
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	SSL/TLS client/server library implementation
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 948339154d2d..0284f84b277b 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--disable-openmp
 # Help it here:
 .for o in sse3 sse2 sse mmx
 .if ${MACHINE_CPU:M$o} != ""
-CPPFLAGS+=	-DOPTIMIZE_${o:U}
+CPPFLAGS+=	-DOPTIMIZE_${o:tu}
 .endif
 .endfor
 
diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile
index c4a7957b797e..57ec20045115 100644
--- a/security/ca_root_nss/Makefile
+++ b/security/ca_root_nss/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
 CATEGORIES=	security
-MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
+MASTER_SITES=	MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=	gecko@FreeBSD.org
diff --git a/security/dradis/Makefile b/security/dradis/Makefile
index 8278cd1aa041..42e3f2abc69f 100644
--- a/security/dradis/Makefile
+++ b/security/dradis/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	dradis
 DISTVERSION=	2.6.1
 CATEGORIES=	security
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/v${PORTVERSION}
+MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/v${PORTVERSION}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	semprix@gmx.com
diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index cd1d7a70d31d..07fbfc88dacb 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -30,7 +30,7 @@ GORILLAARCH=	bogus
 WITHOUTSO=	"@comment "
 .endif
 
-PLIST_SUB+=	GORILLAARCH=${GORILLAARCH:L} WITHOUTSO=${WITHOUTSO}
+PLIST_SUB+=	GORILLAARCH=${GORILLAARCH:tl} WITHOUTSO=${WITHOUTSO}
 
 WRKSRC=		${WRKDIR}/zdia-${PORTNAME}-${DISTVERSIONSUFFIX}
 USES=		tk:85+,run
@@ -54,7 +54,7 @@ post-patch:
 do-build:
 .if !defined(WITHOUTSO)
 	${MV} ${WRKDIR}/${PORTNAME}-sha256/sha256/${GORILLAARCH}/ \
-		${WRKSRC}/sources/tcllib/sha256c/${GORILLAARCH:L}
+		${WRKSRC}/sources/tcllib/sha256c/${GORILLAARCH:tl}
 .endif
 
 
diff --git a/security/i2p/Makefile b/security/i2p/Makefile
index ec665ce5b49d..f8e81d511993 100644
--- a/security/i2p/Makefile
+++ b/security/i2p/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	i2p
 PORTVERSION=	0.9.11
 CATEGORIES=	security java net-p2p
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTVERSION} \
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION} \
 		http://download.i2p2.no/releases/${PORTVERSION}/ \
 		http://download2.geti2p.com/${PORTVERSION}/ \
 		http://download.geti2p.com/${PORTVERSION}/ \
diff --git a/security/john/Makefile b/security/john/Makefile
index d5e59c98abf3..1bdd10649af6 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -27,7 +27,7 @@ BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 #
 PORTSCOUT=	limit:.*-jumbo
 
-OSNAME=		${OPSYS:L}
+OSNAME=		${OPSYS:tl}
 CFLAGS+=	-DJOHN_SYSTEMWIDE=1 \
 		-DJOHN_SYSTEMWIDE_HOME=\\"${DATADIR}\\" \
 		-DCFG_FULL_NAME=\\"${PREFIX}/etc/${PORTNAME}.conf\\"
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 103ab100a931..b175c4dd1f3a 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -5,14 +5,14 @@ PORTNAME=	KeePassX
 PORTVERSION=	0.4.3
 PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	SF/${PORTNAME:L}/KeePassX/${PORTVERSION}/
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/KeePassX/${PORTVERSION}/
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Cross Platform Password Manager
 
-DATADIR=	${PREFIX}/share/${PORTNAME:L}
-WRKSRC=		${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+DATADIR=	${PREFIX}/share/${PORTNAME:tl}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 
 USES=		qmake shared-mime-info
 USE_QT4=	moc_build uic_build qt3support_build rcc_build \
diff --git a/security/keepassx2/Makefile b/security/keepassx2/Makefile
index 0fed9811aff1..207db072ccbb 100644
--- a/security/keepassx2/Makefile
+++ b/security/keepassx2/Makefile
@@ -6,7 +6,7 @@ DISTVERSION=	2.0
 CATEGORIES=	security
 MASTER_SITES=	https://www.keepassx.org/dev/attachments/download/69/
 PKGNAMESUFFIX=	-alpha
-DISTNAME=	${PORTNAME:L}-${DISTVERSION}${PKGNAMESUFFIX}6
+DISTNAME=	${PORTNAME:tl}-${DISTVERSION}${PKGNAMESUFFIX}6
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Cross Platform Password Manager
@@ -15,8 +15,8 @@ LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
 
 CONFLICTS_INSTALL=	keepassx-0.*
 
-DATADIR=	${PREFIX}/share/${PORTNAME:L}
-WRKSRC=		${WRKDIR}/${DISTNAME:L}
+DATADIR=	${PREFIX}/share/${PORTNAME:tl}
+WRKSRC=		${WRKDIR}/${DISTNAME:tl}
 
 USES=		cmake
 USE_LDCONFIG=	yes
diff --git a/security/nss/Makefile b/security/nss/Makefile
index f936f604e927..d739f7dfd5f5 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	nss
 PORTVERSION=	3.16
 #DISTVERSIONSUFFIX=	.with.ckbi.1.93
 CATEGORIES=	security
-MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
+MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
diff --git a/security/py-PF/Makefile b/security/py-PF/Makefile
index f37831c59109..fa7ea76e4443 100644
--- a/security/py-PF/Makefile
+++ b/security/py-PF/Makefile
@@ -17,7 +17,7 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 
 GH_ACCOUNT=	dotpy
-GH_PROJECT=	py-${PORTNAME:L}
+GH_PROJECT=	py-${PORTNAME:tl}
 GH_TAGNAME=	${PORTVERSION}
 GH_COMMIT=	4edf8ee
 
diff --git a/security/shttpscanner/Makefile b/security/shttpscanner/Makefile
index b60efd5543a8..ac3852995a02 100644
--- a/security/shttpscanner/Makefile
+++ b/security/shttpscanner/Makefile
@@ -17,10 +17,10 @@ PLIST_FILES=	bin/${PORTNAME} %%DATADIR%%/requests.txt %%DATADIR%%/subdomains.txt
 PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-	@${REINPLACE_CMD} -E '/^#define/s!([a-z]*\.txt)!${DATADIR}/\1!' ${WRKSRC}/${DISTNAME:L}.c
+	@${REINPLACE_CMD} -E '/^#define/s!([a-z]*\.txt)!${DATADIR}/\1!' ${WRKSRC}/${DISTNAME:tl}.c
 
 do-build:
-	@cd ${WRKSRC} && ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} -o ${PORTNAME} ${DISTNAME:L}.c ${PTHREAD_LIBS}
+	@cd ${WRKSRC} && ${CC} ${CFLAGS} ${PTHREAD_CFLAGS} -o ${PORTNAME} ${DISTNAME:tl}.c ${PTHREAD_LIBS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/security/spike-proxy/Makefile b/security/spike-proxy/Makefile
index 6d30b5a6170e..3a76af2c59fd 100644
--- a/security/spike-proxy/Makefile
+++ b/security/spike-proxy/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	spike-proxy
 PORTVERSION=	1.4.8
 CATEGORIES=	security
 MASTER_SITES=	http://www.immunitysec.com/downloads/
-DISTNAME=	SP${PORTVERSION:L:C/\.//g}
+DISTNAME=	SP${PORTVERSION:tl:C/\.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	onatan@gmail.com
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 8d92fab89c4b..77e7dc88f9a9 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+=	--without-bash-malloc \
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:L} != "no")
+.if ${PORT_OPTIONS:MSTATIC} || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ${NOSHARED:tl} != "no")
 CONFIGURE_ARGS+=	--enable-static-link
 PKGNAMESUFFIX=		-static
 CONFLICTS+=		bash-[0-9]*
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 1dd66c302629..8acc8384810c 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	cups-base-1.[2-9]*
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-USE_RC_SUBR=	${PORTNAME:L}
+USE_RC_SUBR=	${PORTNAME:tl}
 
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST=	SYSCONFDIR="${SYSCONFDIR}"
diff --git a/sysutils/evtviewer/Makefile b/sysutils/evtviewer/Makefile
index 10828a5ca39b..919193fcd689 100644
--- a/sysutils/evtviewer/Makefile
+++ b/sysutils/evtviewer/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	evtViewer
 PORTVERSION=	0.5
 PORTREVISION=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION} \
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION} \
 		http://contribs.martymac.org/evtViewer/
 EXTRACT_SUFX=	.tgz
 
diff --git a/sysutils/heirloom/Makefile b/sysutils/heirloom/Makefile
index a137b909f6e2..0c62a61d9184 100644
--- a/sysutils/heirloom/Makefile
+++ b/sysutils/heirloom/Makefile
@@ -69,12 +69,12 @@ _M1LINKS=	df.1	dfspace.1 \
 MANEXT=		.gz
 .endif
 
-.for sect in ${_MSECS:U}
+.for sect in ${_MSECS:tu}
 . if defined(_MAN${sect})
-_MANPAGES+=	${_MAN${sect}:S%^%${_MANPREFIX}/man${sect:L}/%}
+_MANPAGES+=	${_MAN${sect}:S%^%${_MANPREFIX}/man${sect:tl}/%}
 . endif
 . if defined(_M${sect}LINKS)
-_MLINKS_PREPEND+=${_M${sect}LINKS:S%^%${_MANPREFIX}/man${sect:L}/%:S%$%${MANEXT}%}
+_MLINKS_PREPEND+=${_M${sect}LINKS:S%^%${_MANPREFIX}/man${sect:tl}/%:S%$%${MANEXT}%}
 . endif
 .endfor
 
diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile
index 6f96c3d90ba2..a20ff88295d5 100644
--- a/sysutils/screenfetch/Makefile
+++ b/sysutils/screenfetch/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	screenFetch
 PORTVERSION=	3.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	LOCAL/jgh/sysutils/${PORTNAME:L}/ \
+MASTER_SITES=	LOCAL/jgh/sysutils/${PORTNAME:tl}/ \
 		GH
 
 MAINTAINER=	jgh@FreeBSD.org
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/screenFetch bin/screenfetch
 PORTDOCS=	CHANGELOG README.mkdn TODO
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME:L}-dev ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME:tl}-dev ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${LN} -fs ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/screenfetch
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
diff --git a/textproc/aspell/Makefile.inc b/textproc/aspell/Makefile.inc
index a375bb8d1371..b3d9d6ea45b8 100644
--- a/textproc/aspell/Makefile.inc
+++ b/textproc/aspell/Makefile.inc
@@ -4,7 +4,7 @@
 MASTER_SITES?=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR?=	aspell/dict/${DICT}
 DISTNAME?=	aspell${DISTVERSION}
-PORTVERSION?=	${DISTVERSION:L:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
+PORTVERSION?=	${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
 
 LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
 
diff --git a/textproc/dtd2relax/Makefile b/textproc/dtd2relax/Makefile
index 6169d7c6eeb8..ffb095df8fb5 100644
--- a/textproc/dtd2relax/Makefile
+++ b/textproc/dtd2relax/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.1.1
 PORTREVISION=	2
 CATEGORIES=	textproc java
 MASTER_SITES=	http://www.horobi.com/Projects/RELAX/Archive/
-DISTNAME=	${PORTNAME:U}_${PORTVERSION:S/./_/g}
+DISTNAME=	${PORTNAME:tu}_${PORTVERSION:S/./_/g}
 DISTFILES=	${JARFILE} ${DISTNAME}-src${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX}
 
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 670b72801daa..9c90f5f69b5c 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-awk=/usr/bin/awk
 
 # Canonicalize to A4 if set.
-.if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:U} == "A4")
+.if defined(A4) || (defined(PAPERSIZE) && ${PAPERSIZE:tu} == "A4")
 PAPERSIZE=A4
 .endif
 .if defined(PAPERSIZE)
diff --git a/textproc/nunnimcax/Makefile b/textproc/nunnimcax/Makefile
index 523601c4e1d4..226ad32102f1 100644
--- a/textproc/nunnimcax/Makefile
+++ b/textproc/nunnimcax/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	NunniMCAX
 PORTVERSION=	1.4.1
 CATEGORIES=	textproc
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C, non validating XML parser with SAX-like API
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index d4ef9d75c149..f6b874ee2a6a 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	OpenSP
 PORTVERSION=	1.5.2
 PORTREVISION=	2
 CATEGORIES=	textproc
-MASTER_SITES=	SF/openjade/${PORTNAME:L}/${PORTVERSION}
+MASTER_SITES=	SF/openjade/${PORTNAME:tl}/${PORTVERSION}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	This package is a collection of SGML/XML tools called OpenSP
diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile
index 1a9ea7d3e938..018aa826d995 100644
--- a/textproc/py-genshi/Makefile
+++ b/textproc/py-genshi/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.7
 PORTREVISION=	1
 #PORTEPOCH=	0
 CATEGORIES=	textproc www python
-MASTER_SITES=	http://ftp.edgewall.com/pub/${PORTNAME:L}/
+MASTER_SITES=	http://ftp.edgewall.com/pub/${PORTNAME:tl}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
diff --git a/textproc/py-tvgrab/Makefile b/textproc/py-tvgrab/Makefile
index d9e192c1452d..c98f559efbae 100644
--- a/textproc/py-tvgrab/Makefile
+++ b/textproc/py-tvgrab/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	TVGrab
 PORTVERSION=	0.5.1
 PORTREVISION=	3
 CATEGORIES=	textproc python
-MASTER_SITES=	SF/py${PORTNAME:L}/lib/${PORTVERSION}
+MASTER_SITES=	SF/py${PORTNAME:tl}/lib/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pytvgrab-lib-${PORTVERSION}
 
diff --git a/textproc/stardict-dictd_mova/Makefile b/textproc/stardict-dictd_mova/Makefile
index c33998293a66..404a12e883c2 100644
--- a/textproc/stardict-dictd_mova/Makefile
+++ b/textproc/stardict-dictd_mova/Makefile
@@ -11,7 +11,6 @@ DIST_SUBDIR=	stardict
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionaries from www.mova.org for StarDict
 
-.MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 USE_BZIP2=	yes
 
@@ -36,15 +35,15 @@ OPTIONS_DEFINE=	ALL
 OPTIONS_DEFAULT=	ALL
 ALL_DESC=	All dictionaries
 .for dict in ${DICTIONARIES}
-OPTIONS_DEFINE+=	${dict:U:S|-|_|g}
-${dict:U:S|-|_|g}_DESC=	${dict} dictionary
+OPTIONS_DEFINE+=	${dict:tu:S|-|_|g}
+${dict:tu:S|-|_|g}_DESC=	${dict} dictionary
 ${dict}_DISTNAME=	stardict-dictd_www.mova.org_${dict}-${PORTVERSION}
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for dict in ${DICTIONARIES}
-.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:U:S|-|_|g}}
+.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:tu:S|-|_|g}}
 INSTALL_DICTIONARIES+=	${dict}
 DISTFILES+=	${${dict}_DISTNAME}${EXTRACT_SUFX}
 .endif
diff --git a/textproc/stardict-quick/Makefile b/textproc/stardict-quick/Makefile
index 6b46590c00c4..26a9cd4eb7b2 100644
--- a/textproc/stardict-quick/Makefile
+++ b/textproc/stardict-quick/Makefile
@@ -11,7 +11,6 @@ DIST_SUBDIR=	stardict
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionaries from Quick for StarDict
 
-.MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
 USE_BZIP2=	yes
 
@@ -41,15 +40,15 @@ OPTIONS_DEFINE=	ALL
 OPTIONS_DEFAULT=	ALL
 ALL_DESC=	All dictionaries
 .for dict in ${DICTIONARIES}
-OPTIONS_DEFINE+=	${dict:U:S|-|_|g}
-${dict:U:S|-|_|g}_DESC=	${dict} dictionary
+OPTIONS_DEFINE+=	${dict:tu:S|-|_|g}
+${dict:tu:S|-|_|g}_DESC=	${dict} dictionary
 ${dict}_DISTNAME=	${PORTNAME}_${dict}-${PORTVERSION}
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for dict in ${DICTIONARIES}
-.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:U:S|-|_|g}}
+.if ${PORT_OPTIONS:MALL} || ${PORT_OPTIONS:M${dict:tu:S|-|_|g}}
 INSTALL_DICTIONARIES+=	${dict}
 DISTFILES+=	${${dict}_DISTNAME}${EXTRACT_SUFX}
 .endif
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index 54dc245181e6..50ba4a36da5e 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	xsv
 PORTVERSION=	3.1
 CATEGORIES=	textproc python
 MASTER_SITES=	ftp://ftp.cogsci.ed.ac.uk/pub/XSV/
-DISTNAME=	${PORTNAME:U}-${DISTVERSION}
+DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	XML Schema Validator
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 6c072eaa1a8e..6e9755597bc2 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.03p24
 DISTVERSION=	2.03pre24
 PORTEPOCH=	1
 CATEGORIES=	www graphics
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}-beta/${DISTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
diff --git a/www/autoindex2/Makefile b/www/autoindex2/Makefile
index cd0b89cdebda..6dd930169c10 100644
--- a/www/autoindex2/Makefile
+++ b/www/autoindex2/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	AutoIndex
 PORTVERSION=	2.2.4
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}%20PHP%20Script%202.x/${PORTNAME}%20PHP%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}%20PHP%20Script%202.x/${PORTNAME}%20PHP%20${PORTVERSION}
 
 MAINTAINER=	danger@FreeBSD.org
 COMMENT=	PHP 5.x script that makes a table that lists the files in a directory
diff --git a/www/bblog/Makefile b/www/bblog/Makefile
index 3c74eecabb1e..93caa7c21ec9 100644
--- a/www/bblog/Makefile
+++ b/www/bblog/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	bBlog
 PORTVERSION=	0.7.6
 PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A elegant personal publishing system with Smarty
@@ -14,9 +14,9 @@ USE_PHP=	mysql pcre session
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}
 WWWDOCROOT?=	www
-BBLOGURL?=	${PORTNAME:L}
+BBLOGURL?=	${PORTNAME:tl}
 BBLOGDIR?=	${WWWDOCROOT}/${BBLOGURL}
 
 SUB_FILES=	pkg-message
@@ -44,18 +44,18 @@ pre-patch:
 .endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/${BBLOGDIR}/${PORTNAME:L}
+	@${MKDIR} ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${BBLOGDIR}
 	@${CHGRP} -R ${WWWGRP} ${PREFIX}/${BBLOGDIR}
 	@${CHMOD} 755 ${PREFIX}/${BBLOGDIR}
 .for f in archives.php documentation.txt htaccess-cleanurls index.php item rss.php search.php section
 	${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/${BBLOGDIR}
 .endfor
-	@${CP} -Rv ${WRKSRC}/* ${PREFIX}/${BBLOGDIR}/${PORTNAME:L}
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:L}/compiled_templates/
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:L}/cache/
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:L}/cache/favorites.xml
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:L}/config.php
+	@${CP} -Rv ${WRKSRC}/* ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/compiled_templates/
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/cache/favorites.xml
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/${PORTNAME:tl}/config.php
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/eyeos-themes/Makefile b/www/eyeos-themes/Makefile
index d513cc4a3cd3..f4b06bb7af9b 100644
--- a/www/eyeos-themes/Makefile
+++ b/www/eyeos-themes/Makefile
@@ -44,11 +44,11 @@ NO_STAGE=	yes
 .for theme in ${OPTIONS_DEFINE:M*_THEME:S/_THEME//}
 .if ${PORT_OPTIONS:M${theme}_THEME}
 EYETHEMES+=	${theme}
-PLIST_SUB+=	${theme:U}=${THEMESDIR:S,^${PREFIX}/,,}/${theme}
-PLIST_SUB+=	D${theme:U}="@dirrm ${THEMESDIR:S,^${PREFIX}/,,}/${theme}"
+PLIST_SUB+=	${theme:tu}=${THEMESDIR:S,^${PREFIX}/,,}/${theme}
+PLIST_SUB+=	D${theme:tu}="@dirrm ${THEMESDIR:S,^${PREFIX}/,,}/${theme}"
 .else
-PLIST_SUB+=	${theme:U}="@comment "
-PLIST_SUB+=	D${theme:U}="@comment "
+PLIST_SUB+=	${theme:tu}="@comment "
+PLIST_SUB+=	D${theme:tu}="@comment "
 .endif
 .endfor
 
@@ -70,11 +70,11 @@ create-plist: build
 	:>${PLIST}
 .for theme in ${OPTIONS:M*_THEME:S/_THEME//:O}
 	${FIND} -s ${WRKSRC}/${theme} -type f -or -type l | \
-		${SED} -e 's#^${WRKSRC}/${theme}#%%${theme:U}%%#' >> ${PLIST}
+		${SED} -e 's#^${WRKSRC}/${theme}#%%${theme:tu}%%#' >> ${PLIST}
 .endfor
 .for theme in ${OPTIONS:M*_THEME:S/_THEME//:O}
 	${FIND} -ds ${WRKSRC}/${theme} -type d | \
-		${SED} -e 's#^${WRKSRC}/${theme}#%%D${theme:U}%%#' >> ${PLIST}
+		${SED} -e 's#^${WRKSRC}/${theme}#%%D${theme:tu}%%#' >> ${PLIST}
 .endfor
 	${ECHO_CMD} @dirrmtry %%EYEDIR%%/system/themes >> ${PLIST}
 	${ECHO_CMD} @dirrmtry %%EYEDIR%%/system >> ${PLIST}
diff --git a/www/eyeos/Makefile b/www/eyeos/Makefile
index 58b69c27adac..d65d61acee37 100644
--- a/www/eyeos/Makefile
+++ b/www/eyeos/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	eyeOS
 DISTVERSION=	0.9.3-5
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/0.9.3-5
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/0.9.3-5
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Web Based Desktop System
diff --git a/www/grails/Makefile b/www/grails/Makefile
index 4a1ef416e908..59c450ff7ba4 100644
--- a/www/grails/Makefile
+++ b/www/grails/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://dist.codehaus.org/grails/ \
 MAINTAINER=	mjs@bur.st
 COMMENT=	Web framework built on Groovy
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:U}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:tu}
 
 USES=		zip
 USE_JAVA=	yes
diff --git a/www/mysar/Makefile b/www/mysar/Makefile
index 547b577a46dc..75366906d98f 100644
--- a/www/mysar/Makefile
+++ b/www/mysar/Makefile
@@ -6,14 +6,14 @@ PORTVERSION=	2.1.4
 PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	MySQL Squid Access Report
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-WRKROOT=	${WRKDIR}/${PORTNAME:L}
+WRKROOT=	${WRKDIR}/${PORTNAME:tl}
 WRKSRC=		${WRKROOT}/bin/mysar-binary-importer/
 GNU_CONFIGURE=	yes
 USE_MYSQL=	yes
diff --git a/www/p5-ClearSilver/Makefile b/www/p5-ClearSilver/Makefile
index bdddde4d6298..0ecca91f0c79 100644
--- a/www/p5-ClearSilver/Makefile
+++ b/www/p5-ClearSilver/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.clearsilver.net/downloads/
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings for fast and powerful template system
diff --git a/www/p5-Gantry/Makefile b/www/p5-Gantry/Makefile
index 7ea99e693021..2bf231327d26 100644
--- a/www/p5-Gantry/Makefile
+++ b/www/p5-Gantry/Makefile
@@ -35,7 +35,7 @@ USE_PERL5=	modbuild
 CONFIGURE_ARGS=	</dev/null
 PLIST_SUB+=	WWWDIR=${WWWDIR}
 
-WWWDIR=		${PREFIX}/www/${PORTNAME:L}
+WWWDIR=		${PREFIX}/www/${PORTNAME:tl}
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/home/httpd/html/gantry,${WWWDIR},g' \
diff --git a/www/phpgedview/Makefile b/www/phpgedview/Makefile
index 8d51fb7b0c87..91c1aec0e0f9 100644
--- a/www/phpgedview/Makefile
+++ b/www/phpgedview/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	phpGedView
 PORTVERSION=	4.2.3
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME:L}/1%20PhpGedView/PhpGedView%20v${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/1%20PhpGedView/PhpGedView%20v${PORTVERSION}
 DISTNAME=	${PORTNAME:S/p/P/}-basic-${PORTVERSION}
 
 MAINTAINER=	fbsd@opal.com
diff --git a/www/phpsysinfo-dev/Makefile b/www/phpsysinfo-dev/Makefile
index 7f03424e9581..ffd1133f8c0a 100644
--- a/www/phpsysinfo-dev/Makefile
+++ b/www/phpsysinfo-dev/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	phpSysInfo
 DISTVERSION=	3.0-RC9
 PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/3.0-RC9
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/3.0-RC9
 
 MAINTAINER=	walt@relnor.com
 COMMENT=	A PHP script for displaying system information
@@ -16,7 +16,7 @@ WANT_PHP_WEB=	yes
 CONFLICTS=	phpsysinfo-2.[0-9]*
 IGNORE=		please use www/phpsysinfo
 
-WRKSRC=		${WRKDIR}/${PORTNAME:L}
+WRKSRC=		${WRKDIR}/${PORTNAME:tl}
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 259158ac3612..bec1514eb40a 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -122,7 +122,7 @@ DISTFILES+=	${EM_DISTFILE}:enigmail
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
 EM_DISTNAME=	enigmail-${EM_VERSION}
 EM_DISTFILE=	${EM_DISTNAME}.tar.xz
-EM_XPI_FILE=	${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:L}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi
+EM_XPI_FILE=	${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi
 EM_ORIG_ID=	{847b3a00-7ab1-11d4-8f02-006008948af5}
 EM_ID=		${PORTNAME}@mozilla-enigmail.org
 EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/install.rdf \
@@ -140,7 +140,7 @@ MOZ_OPTIONS+=	--disable-composer
 MOZ_OPTIONS+=	--enable-calendar
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=calendar
 LIGHTNING_DIR=	share/lightning
-XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
+XPI_FILE=	${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
 XPI_ORIG_ID=	{e2fda1a4-762b-4020-b5ad-a41df1933103}
 XPI_ID=		lightning@seamonkey.mozilla.org
 .else
diff --git a/www/trac-discussion/Makefile b/www/trac-discussion/Makefile
index 4355d0e1e0c0..f6b138dd063f 100644
--- a/www/trac-discussion/Makefile
+++ b/www/trac-discussion/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.7
 PORTREVISION=	1
 CATEGORIES=	www devel python
diff --git a/www/trac-downloads/Makefile b/www/trac-downloads/Makefile
index bc5eaa1c3da3..8a25244aeec7 100644
--- a/www/trac-downloads/Makefile
+++ b/www/trac-downloads/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;:tl}
 PORTVERSION=	${TRAC_VERSION}.${PLUGIN_VERSION}.${SVN_REV}
 PORTREVISION=	1
 CATEGORIES=	www devel python
diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile
index dc6016638d43..c62db0483f3e 100644
--- a/www/trac-fivestarvote/Makefile
+++ b/www/trac-fivestarvote/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	www devel python
diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index e32a1147eb9f..a1a154fec89c 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.1.1
 PORTREVISION=	1
 CATEGORIES=	www devel python
diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile
index 8eb2301eadbc..14169072aba7 100644
--- a/www/trac-fullblognotification/Makefile
+++ b/www/trac-fullblognotification/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.2.1
 PORTREVISION=	1
 CATEGORIES=	www devel python
diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile
index e02489291bb9..e046e675490e 100644
--- a/www/trac-graphviz/Makefile
+++ b/www/trac-graphviz/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.7.4
 PORTREVISION=	6
 CATEGORIES=	www devel graphics python
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index 7b2ae65fdd13..0730c60cf75a 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.1
 PORTREVISION=	6
 CATEGORIES=	www math python
diff --git a/www/trac-navadd/Makefile b/www/trac-navadd/Makefile
index d6edb37f1115..e782ecee3812 100644
--- a/www/trac-navadd/Makefile
+++ b/www/trac-navadd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;:tl}
 PORTVERSION=	0.1
 PORTREVISION=	3
 CATEGORIES=	www devel python
diff --git a/www/trac-pydotorgtheme/Makefile b/www/trac-pydotorgtheme/Makefile
index e08f171a4050..d7ec32768586 100644
--- a/www/trac-pydotorgtheme/Makefile
+++ b/www/trac-pydotorgtheme/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;:tl}
 PORTVERSION=	2.0
 PORTREVISION=	3
 CATEGORIES=	www devel python
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index e8fb9016717b..f774f3e3758a 100644
--- a/www/trac-ticketimport/Makefile
+++ b/www/trac-ticketimport/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.7c
 PORTREVISION=	2
 CATEGORIES=	www devel python
diff --git a/www/trac-vote/Makefile b/www/trac-vote/Makefile
index 00ad7dd3966d..5db8e32c6b06 100644
--- a/www/trac-vote/Makefile
+++ b/www/trac-vote/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.1.2
 PORTREVISION=	2
 CATEGORIES=	www devel python
diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile
index c426211308ee..8ad1eb29644f 100644
--- a/www/trac-wikitopdf/Makefile
+++ b/www/trac-wikitopdf/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:L}
+PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	2.2.2
 PORTREVISION=	5
 CATEGORIES=	www devel python
diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi
index 07923bd81f28..d774d15af835 100644
--- a/www/xpi-adblock/Makefile.xpi
+++ b/www/xpi-adblock/Makefile.xpi
@@ -119,7 +119,7 @@ WITH_XPI_APPS?=	${WITH_XPI_NTUPLES}
 USE_XPI=	${WITH_XPI_APPS}
 .endif
 
-.if !defined(USE_XPI) || ${USE_XPI:U} == "YES" || ${USE_XPI} == "*"
+.if !defined(USE_XPI) || ${USE_XPI:tu} == "YES" || ${USE_XPI} == "*"
 USE_XPI=	${XPI_APPS_ALL_WC}
 .endif
 
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 47c291072612..be7537191b95 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -10,8 +10,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org drivers meta-port
 
-.MAKE.FreeBSD_UL=	yes
-
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
 
@@ -69,9 +67,9 @@ OPTIONS_DEFAULT=	MOUSE \
 			VESA
 
 .for type in input video
-. for a in ${${type:U}_DRIVERS}
-OPTIONS_DEFINE+=	${a:U}
-${a:U}_DESC=	Install ${a} ${type} driver
+. for a in ${${type:tu}_DRIVERS}
+OPTIONS_DEFINE+=	${a:tu}
+${a:tu}_DESC=	Install ${a} ${type} driver
 . endfor
 .endfor
 
@@ -106,12 +104,12 @@ VIDEO_DRIVERS+=	sunffb
 .endif
 
 .for type in input video
-. for i in ${${type:U}_DRIVERS}
-.  if ${PORT_OPTIONS:M${i:U}} != ""
+. for i in ${${type:tu}_DRIVERS}
+.  if ${PORT_OPTIONS:M${i:tu}} != ""
 .   if ${QUIRKS:M${i}\:*:C/.*://} != ""
-RUN_DEPENDS+=	${${type:U}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+RUN_DEPENDS+=	${${type:tu}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
 .   else
-RUN_DEPENDS+=	${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+RUN_DEPENDS+=	${${type:tu}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
 .   endif
 .  endif
 . endfor
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index aaa5ee9c5cc9..38e289c1499a 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.6.3
 PORTREVISION=	1
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:L}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:tl}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 12c157df6838..d25f6e62290f 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.171
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry/${DIST_SUBDIR}
-DISTFILES=	${PORTNAME:U}${EXTRACT_SUFX:U}
+DISTFILES=	${PORTNAME:tu}${EXTRACT_SUFX:tu}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 65c77d21e86d..24349fe75e03 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	terminus-font
 PORTVERSION=	4.38
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:L}/${PORTNAME}-${PORTVERSION}|}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}|}
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	Terminus Font - a clean fixed width font
diff --git a/x11-themes/cursor-chameleon-white/files/Makefile.common b/x11-themes/cursor-chameleon-white/files/Makefile.common
index 070b6b0f4ddd..69e9bb0a9bd2 100644
--- a/x11-themes/cursor-chameleon-white/files/Makefile.common
+++ b/x11-themes/cursor-chameleon-white/files/Makefile.common
@@ -4,11 +4,11 @@ PKGMESSAGE?=	${.CURDIR}/../../x11-themes/cursor-chameleon-white/pkg-message
 
 do-install:
 .for i in Large Regular Small
-	${MKDIR} ${PREFIX}/lib/X11/icons/${PORTNAME}${PKGNAMESUFFIX}-${i:L}
+	${MKDIR} ${PREFIX}/lib/X11/icons/${PORTNAME}${PKGNAMESUFFIX}-${i:tl}
 	cd ${WRKDIR}/Chameleon-${THEME}-${i}-${PORTVERSION} && \
 		${RM} -f build.info COPYRIGHT LICENSE && \
 		${COPYTREE_SHARE} \* \
-		${PREFIX}/lib/X11/icons/${PORTNAME}${PKGNAMESUFFIX}-${i:L}
+		${PREFIX}/lib/X11/icons/${PORTNAME}${PKGNAMESUFFIX}-${i:tl}
 .endfor
 
 post-install:
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
index 577a90dc1529..2ea3bb8ccc80 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Port of Mac OS X theme Aluminum Alloy (${FLAVOR} flavor)
 TYPE?=		gtk
 FLAVOR?=	volcanic
 
-THEME_NAME=	AluminumAlloy-${FLAVOR:U:C/^(.).*$/\1/g}${FLAVOR:C/^(.)//}
+THEME_NAME=	AluminumAlloy-${FLAVOR:tu:C/^(.).*$/\1/g}${FLAVOR:C/^(.)//}
 WRKSRC=		${WRKDIR}/${THEME_NAME}
 
 USE_BZIP2=	yes
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 235f3591582d..5a4117545543 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	Pmw
 PORTVERSION=	1.3.2
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
-MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}.${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}.${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index 9ae166d5f819..27b98f65f514 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	XmHTML
 PORTVERSION=	1.1.9
 CATEGORIES=	x11-toolkits www
-MASTER_SITES=	SF/${PORTNAME:L}
+MASTER_SITES=	SF/${PORTNAME:tl}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/x11-wm/e17-modules/Makefile b/x11-wm/e17-modules/Makefile
index 7aebd3fb7cb3..a2512aca9b37 100644
--- a/x11-wm/e17-modules/Makefile
+++ b/x11-wm/e17-modules/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Meta-port for e17 modules
 
 NO_BUILD=	yes
 WANT_EFL=	yes
-E17_ARCH=	${OPSYS:L}${OSREL}-${ARCH}
+E17_ARCH=	${OPSYS:tl}${OSREL}-${ARCH}
 
 MODULES=	alarm comp-scale cpu deskshow diskio eektool elfe empris engage eooorg \
 		everything-aspell everything-mpris everything-pidgin everything-places \
@@ -28,19 +28,19 @@ EVERYTHING_SHOTGUN_PATH=	evry-shotgun
 EVERYTHING_WEBSEARCH_PATH=	evry-websearch
 
 .for M in ${MODULES}
-OPTIONS_DEFINE+=	${M:U:S,-,_,g}
-OPTIONS_DEFAULT+=	${M:U:S,-,_,g}
-${M:U:S,-,_,g}_DESC=	Install ${M} module
+OPTIONS_DEFINE+=	${M:tu:S,-,_,g}
+OPTIONS_DEFAULT+=	${M:tu:S,-,_,g}
+${M:tu:S,-,_,g}_DESC=	Install ${M} module
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for M in ${MODULES}
-. if !defined(${M:U:S,-,_,g}_PATH)
-${M:U:S,-,_,g}_PATH=	${M}
+. if !defined(${M:tu:S,-,_,g}_PATH)
+${M:tu:S,-,_,g}_PATH=	${M}
 . endif
-. if ${PORT_OPTIONS:M${M:U:S,-,_,g}}
-RUN_DEPENDS+=	${LOCALBASE}/lib/enlightenment/modules/${${M:U:S,-,_,g}_PATH}/${E17_ARCH}/module.so:${PORTSDIR}/x11-wm/e17-module-${M}
+. if ${PORT_OPTIONS:M${M:tu:S,-,_,g}}
+RUN_DEPENDS+=	${LOCALBASE}/lib/enlightenment/modules/${${M:tu:S,-,_,g}_PATH}/${E17_ARCH}/module.so:${PORTSDIR}/x11-wm/e17-module-${M}
 . endif
 .endfor
 
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index b0710c24e8c2..2146800c2609 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -10,8 +10,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org apps meta-port
 
-.MAKE.FreeBSD_UL=	yes
-
 COMPONENTS=	appres bitmap xf86dga:dga iceauth luit \
 		x11-fonts/mkfontdir:mkfontdir \
 		x11-fonts/mkfontscale:mkfontscale sessreg \
@@ -32,15 +30,15 @@ do-install:
 		${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/apps
 
 .for comp in ${COMPONENTS}
-OPTIONS_DEFINE+=	${comp:C/:.*//:C/.*\///:U}
-OPTIONS_DEFAULT+=	${comp:C/:.*//:C/.*\///:U}
-${comp:C/:.*//:C/.*\///:U}_DESC=	Install ${comp:C/:.*//:C/.*\///} application
+OPTIONS_DEFINE+=	${comp:C/:.*//:C/.*\///:tu}
+OPTIONS_DEFAULT+=	${comp:C/:.*//:C/.*\///:tu}
+${comp:C/:.*//:C/.*\///:tu}_DESC=	Install ${comp:C/:.*//:C/.*\///} application
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for comp in ${COMPONENTS}
-. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
+. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:tu}}
 .  if ${comp:M*\:*}==""
 port=${comp}
 check=${comp:C/.*\///} # doesn't work