[Midnightbsd-cvs] mports [17494] trunk/Mk/bsd.mport.mk: switch to tu and tl from :U and : L modifiers
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Sep 26 07:20:53 EDT 2014
Revision: 17494
http://svnweb.midnightbsd.org/mports/?rev=17494
Author: laffer1
Date: 2014-09-26 07:20:52 -0400 (Fri, 26 Sep 2014)
Log Message:
-----------
switch to tu and tl from :U and :L modifiers
Modified Paths:
--------------
trunk/Mk/bsd.mport.mk
Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk 2014-09-26 02:17:08 UTC (rev 17493)
+++ trunk/Mk/bsd.mport.mk 2014-09-26 11:20:52 UTC (rev 17494)
@@ -277,7 +277,7 @@
. 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
@@ -325,11 +325,11 @@
_LOAD_APACHE_EXT= yes
.endif
-.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.if (defined(USE_QT_VER) && ${USE_QT_VER:tl} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
_LOAD_KDE_EXT= yes
.endif
-.if (defined (USE_QT_VER) && ${USE_QT_VER:L} == 4) || defined(USE_QT4)
+.if (defined (USE_QT_VER) && ${USE_QT_VER:tl} == 4) || defined(USE_QT4)
_LOAD_QT_EXT= yes
.endif
@@ -346,7 +346,7 @@
.endif
.for EXT in ${EXTENSIONS}
-_LOAD_${EXT:U}_EXT= yes
+_LOAD_${EXT:tu}_EXT= yes
.endfor
# This is the order that we used before the extensions where refactored.
@@ -362,9 +362,9 @@
pgsql php python java qt ruby scons sdl sqlite \
tar tcl wx xfce zip
-.for EXT in ${_ALL_EXT:U}
+.for EXT in ${_ALL_EXT:tu}
. if defined(USE_${EXT}) || defined(USE_${EXT}_RUN) || defined(USE_${EXT}_BUILD) || defined(WANT_${EXT}) || defined(_LOAD_${EXT}_EXT)
-. include "${MPORTEXTENSIONS}/${EXT:L}.mk"
+. include "${MPORTEXTENSIONS}/${EXT:tl}.mk"
. endif
.endfor
@@ -372,7 +372,7 @@
# Loading features - USES directive
.for f in ${USES}
_f=${f:C/\:.*//g}
-USE_${_f:U}= yes
+USE_${_f:tu}= yes
.if ${_f} != ${f}
${_f}_ARGS:= ${f:C/^[^\:]*\://g}
USE_${_f}= ${_f}_ARGS
@@ -626,7 +626,7 @@
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
@@ -674,8 +674,8 @@
.endif
.endif
-.if defined(FAM_SYSTEM_${FAM_SYSTEM:U})
-LIB_DEPENDS+= ${FAM_SYSTEM_${FAM_SYSTEM:U}}
+.if defined(FAM_SYSTEM_${FAM_SYSTEM:tu})
+LIB_DEPENDS+= ${FAM_SYSTEM_${FAM_SYSTEM:tu}}
.else
IGNORE= cannot be built with unknown FAM system: ${FAM_SYSTEM}
.endif
@@ -685,7 +685,7 @@
.if defined(USE_RC_SUBR) || defined(USE_RCORDER)
RC_SUBR= /etc/rc.subr
SUB_LIST+= RC_SUBR=${RC_SUBR}
-.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
.if defined(USE_RCORDER)
@@ -693,11 +693,11 @@
.endif
.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
@@ -722,7 +722,7 @@
# 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
@@ -733,7 +733,7 @@
. 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"
. if (${OSVERSION} > 4003)
LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10
. else
@@ -817,7 +817,7 @@
_GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
.if defined(USE_GL)
-. if ${USE_GL:L} == "yes"
+. if ${USE_GL:tl} == "yes"
USE_GL= glu
. endif
. for _component in ${USE_GL}
@@ -836,9 +836,9 @@
#
# Here we include again XXX
#
-.for EXT in ${_ALL_EXT:U}
+.for EXT in ${_ALL_EXT:tu}
. if defined(USE_${EXT}) || defined(USE_${EXT}_RUN) || defined(USE_${EXT}_BUILD) || defined(WANT_${EXT}) || defined(_LOAD_${EXT}_EXT)
-. include "${PORTSDIR}/Mk/extensions/${EXT:L}.mk"
+. include "${PORTSDIR}/Mk/extensions/${EXT:tl}.mk"
. endif
.endfor
@@ -2686,39 +2686,39 @@
.for target in extract patch configure build fake package install update
.if !target(${target}) && defined(_OPTIONS_OK)
-${target}: ${${target:U}_COOKIE}
+${target}: ${${target:tu}_COOKIE}
.elif !target(${target})
${target}: config
- @cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
+ @cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:tu}_COOKIE}
.elif target(${target}) && defined(IGNORE)
.endif
-.if !exists(${${target:U}_COOKIE})
+.if !exists(${${target:tu}_COOKIE})
-.if ${UID} != 0 && defined(_${target:U}_SUSEQ) && !defined(INSTALL_AS_USER)
+.if ${UID} != 0 && defined(_${target:tu}_SUSEQ) && !defined(INSTALL_AS_USER)
.if defined(USE_SUBMAKE)
-${${target:U}_COOKIE}: ${_${target:U}_DEP}
- @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
+ @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} ${_${target:tu}_SEQ}
.else
-${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_SEQ}
.endif
@${ECHO_MSG} "===> Switching to root credentials for '${target}' target"
@cd ${.CURDIR} && \
- ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SUSEQ}"
+ ${SU_CMD} "${MAKE} ${__softMAKEFLAGS} ${_${target:tu}_SUSEQ}"
@${ECHO_MSG} "===> Returning to user credentials"
@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
.elif defined(USE_SUBMAKE)
-${${target:U}_COOKIE}: ${_${target:U}_DEP}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP}
@cd ${.CURDIR} && \
- ${MAKE} ${__softMAKEFLAGS} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ}
+ ${MAKE} ${__softMAKEFLAGS} ${_${target:tu}_SEQ} ${_${target:tu}_SUSEQ}
@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
.else
-${${target:U}_COOKIE}: ${_${target:U}_DEP} ${_${target:U}_SEQ} ${_${target:U}_SUSEQ}
+${${target:tu}_COOKIE}: ${_${target:tu}_DEP} ${_${target:tu}_SEQ} ${_${target:tu}_SUSEQ}
@${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
.endif
.else
-${${target:U}_COOKIE}::
+${${target:tu}_COOKIE}::
@if [ -e ${.TARGET} ]; then \
${DO_NADA}; \
else \
@@ -3019,7 +3019,7 @@
@ \
${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."; \
@@ -3042,7 +3042,7 @@
${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 \
@@ -3055,7 +3055,7 @@
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" >> ${HASH_FILE}; \
done; \
done
@@ -3073,7 +3073,7 @@
pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \
\
ignored="true"; \
- for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+ for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
ignore="false"; \
eval alg_executable=\$$$$alg; \
\
@@ -3128,7 +3128,7 @@
\
ignored="true"; \
alreadymatched="false"; \
- for alg in ${CHECKSUM_ALGORITHMS:U}; do \
+ for alg in ${CHECKSUM_ALGORITHMS:tu}; do \
ignore="false"; \
eval alg_executable=\$$$$alg; \
\
@@ -3257,8 +3257,8 @@
fi;
.for deptype in EXTRACT PATCH FETCH BUILD RUN
-.if !target(${deptype:L}-depends)
-${deptype:L}-depends:
+.if !target(${deptype:tl}-depends)
+${deptype:tl}-depends:
.if defined(${deptype}_DEPENDS)
.if !defined(NO_DEPENDS)
@for i in `${ECHO_CMD} "${${deptype}_DEPENDS}"`; do \
@@ -3730,7 +3730,7 @@
.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
@@ -3773,8 +3773,8 @@
${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \
fi
. 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
@@ -3874,7 +3874,7 @@
.if !target(install-rc-script)
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"
. if defined(USE_RCORDER)
@${ECHO_MSG} "===> Installing early rc.d startup script(s)"
@${ECHO_CMD} "@cwd /" >> ${TMPPLIST}
@@ -3885,7 +3885,7 @@
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} "===> Installing rc.d startup script(s)"
@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
@for i in ${USE_RC_SUBR}; do \
@@ -4032,10 +4032,10 @@
.if !target(compress-man)
compress-man:
. if defined(_FAKEMAN) || defined(_MLINKS)
-. if ${MANCOMPRESSED:L} == yes && defined(NOMANCOMPRESS)
+. if ${MANCOMPRESSED:tl} == yes && defined(NOMANCOMPRESS)
@${ECHO_MSG} "===> Uncompressing manual pages for ${PKGNAME}"
@_manpages='${_FAKEMAN:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GUNZIP_CMD} $${_manpages} ) || ${TRUE}
-. elif ${MANCOMPRESSED:L} == no && !defined(NOMANCOMPRESS)
+. elif ${MANCOMPRESSED:tl} == no && !defined(NOMANCOMPRESS)
@${ECHO_MSG} "===> Compressing manual pages for ${PKGNAME}"
@_manpages='${_FAKEMAN:S/'/'\''/g}' && [ "$${_manpages}" != "" ] && ( eval ${GZIP_CMD} $${_manpages} ) || ${TRUE}
. endif
More information about the Midnightbsd-cvs
mailing list