From owner-svn-ports-all@FreeBSD.ORG Mon May 5 09:45:46 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53B31592; Mon, 5 May 2014 09:45:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3DDDE161C; Mon, 5 May 2014 09:45:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s459jks3000844; Mon, 5 May 2014 09:45:46 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s459jbaD000791; Mon, 5 May 2014 09:45:37 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405050945.s459jbaD000791@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 5 May 2014 09:45:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352986 - in head: . Mk Mk/Uses arabic/ae_fonts_ttf archivers/pecl-lzf archivers/xarchiver audio/Maaate audio/baresip audio/boodler audio/festival audio/flake audio/jokosher audio/lame ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2014 09:45:46 -0000 Author: bapt Date: Mon May 5 09:45:36 2014 New Revision: 352986 URL: http://svnweb.freebsd.org/changeset/ports/352986 QAT: https://qat.redports.org/buildarchive/r352986/ Log: Convert all :U to :tu and :L to :tl Since FreeBSD 8.4 and FreeBSD 9.1 make(1) do support :tu and :tl as a replacement for :U and :L (which has been marked as deprecated) bmake which is the default on FreeBSD 10+ only support by default :tu/:tl a hack has been added at the time to support :U and :L to ease migration. This hack is now not necessary anymore Note that this makes the ports tree incompatible with make(1) from FreeBSD 8.3 or earlier With hat: portmgr Modified: head/CHANGES head/Mk/Uses/cmake.mk head/Mk/Uses/qmail.mk head/Mk/Uses/scons.mk head/Mk/bsd.apache.mk head/Mk/bsd.autotools.mk head/Mk/bsd.database.mk head/Mk/bsd.default-versions.mk head/Mk/bsd.efl.mk head/Mk/bsd.fpc.mk head/Mk/bsd.gecko.mk head/Mk/bsd.java.mk head/Mk/bsd.linux-rpm.mk head/Mk/bsd.lua.mk head/Mk/bsd.options.mk head/Mk/bsd.php.mk head/Mk/bsd.port.mk head/Mk/bsd.python.mk head/Mk/bsd.ruby.mk head/Mk/bsd.sites.mk head/Mk/bsd.tex.mk head/Mk/bsd.wx.mk head/arabic/ae_fonts_ttf/Makefile head/archivers/pecl-lzf/Makefile head/archivers/xarchiver/Makefile head/audio/Maaate/Makefile head/audio/baresip/Makefile head/audio/boodler/Makefile head/audio/festival/Makefile head/audio/flake/Makefile head/audio/jokosher/Makefile head/audio/lame/Makefile head/audio/liquidsoap/Makefile head/audio/shntool/Makefile head/audio/tse3/Makefile head/audio/umodplayer/Makefile head/benchmarks/netpipe/Makefile head/biology/emboss/Makefile head/cad/astk-serveur/Makefile head/cad/gdt/Makefile head/cad/netgen/Makefile head/chinese/miniChinput/Makefile head/comms/mgetty+sendfax/Makefile head/databases/WWWdb/Makefile head/databases/dbXML/Makefile head/databases/lmdb/Makefile head/databases/phpmyadmin/Makefile head/databases/py-Pyrseas/Makefile head/databases/py-htsql-mysql/Makefile head/databases/py-htsql-pgsql/Makefile head/databases/py-htsql/Makefile head/databases/tora/Makefile head/deskutils/egroupware/Makefile head/devel/SpecTcl/Makefile head/devel/ace/Makefile head/devel/asdlgen/Makefile head/devel/asmutils/Makefile head/devel/doxygen/Makefile head/devel/ecb/Makefile head/devel/ecore/Makefile head/devel/eiffelstudio/Makefile head/devel/elfio/Makefile head/devel/fc++/Makefile head/devel/fnorb/Makefile head/devel/geany-plugins/Makefile head/devel/gps/Makefile head/devel/jsap/Makefile head/devel/judy/Makefile head/devel/kBuild/Makefile head/devel/lua-alien/Makefile head/devel/ninja-ide/Makefile head/devel/omniORB/Makefile head/devel/p4db/Makefile head/devel/pecl-APCu/Makefile head/devel/py-gyp-devel/Makefile head/devel/py-tables/Makefile head/devel/qt5/Makefile.sqldrivers head/devel/rbtools/Makefile head/devel/simpletest/Makefile head/devel/tclap/Makefile head/devel/udis86/Makefile head/dns/dnsmax-perl/Makefile head/editors/omegaT/Makefile head/editors/spe/Makefile head/editors/texmacs/Makefile head/emulators/m2000/Makefile head/emulators/ucon64/Makefile head/finance/opentaxsolver/Makefile head/french/homard/Makefile head/games/ftjava/Makefile head/games/ioquake3/Makefile head/games/linux-unrealgold/Makefile head/games/lwjgl/Makefile head/games/mtaserver/Makefile head/games/pmars/Makefile head/games/q2p/Makefile head/games/quake-reaper/Makefile head/games/quake2-3zb2/Makefile head/games/quake2-source/Makefile head/games/qudos/Makefile head/games/ri-li/Makefile head/games/rtb/Makefile head/games/searchandrescue/Makefile head/games/slashem-tty/Makefile head/games/tuxpaint-fonts/Makefile head/games/xevil/Makefile head/german/BBBike/Makefile head/graphics/Cgraph/Makefile head/graphics/GraphicsMagick13/Makefile head/graphics/SciPlot/Makefile head/graphics/devil/Makefile head/graphics/dri/Makefile head/graphics/electrix/Makefile head/graphics/evas-loader-generic/Makefile head/graphics/evas/Makefile head/graphics/freeglut/Makefile head/graphics/gimp-help/Makefile head/graphics/inkscape/Makefile head/graphics/ivtools/Makefile head/graphics/kipi-plugins-kde4/Makefile head/graphics/libGL/bsd.mesalib.mk head/graphics/libprojectm/Makefile head/graphics/opendx/Makefile head/graphics/projectm-libvisual/Makefile head/graphics/py-pyggel/Makefile head/graphics/ruby-gd/Makefile head/graphics/svgfig/Makefile head/graphics/uDrawGraph/Makefile head/irc/irc/Makefile head/japanese/onew/Makefile head/japanese/p5-MeCab/Makefile head/java/eclipse-RDT/Makefile head/korean/nanumfonts-otf/Makefile head/korean/uniksc/Makefile head/lang/erlang-runtime15/Makefile head/lang/erlang-runtime16/Makefile head/lang/erlang/Makefile head/lang/fpc-units/Makefile head/lang/fpc/Makefile head/lang/gcc-aux/Makefile head/lang/gcc/Makefile head/lang/gcc410/Makefile head/lang/gcc46/Makefile head/lang/gcc47-aux/Makefile head/lang/gcc47/Makefile head/lang/gcc48/Makefile head/lang/gcc49/Makefile head/lang/gnat-aux/Makefile head/lang/go/Makefile head/lang/groovy/Makefile head/lang/hugs/Makefile head/lang/libhx/Makefile head/lang/modula3/Makefile head/lang/php5-extensions/Makefile head/lang/php53-extensions/Makefile head/lang/php55-extensions/Makefile head/lang/rubinius/Makefile head/lang/swi-pl/Makefile head/lang/tcl-wrapper/Makefile head/lang/tclX/Makefile head/mail/assp/Makefile head/mail/elm+ME/Makefile head/mail/exim/Makefile head/mail/mailscanner/Makefile head/mail/roundcube/Makefile head/mail/sympa/Makefile head/mail/thunderbird/Makefile head/math/GiNaC/Makefile head/math/R/Makefile head/math/atlas/Makefile head/math/cblas/Makefile head/math/jsmath/Makefile head/math/jts/Makefile head/math/kash3/Makefile head/math/lapack/Makefile head/math/libflame/Makefile head/math/libmissing/Makefile head/math/ogdf/Makefile head/math/parmetis/Makefile head/math/petsc/Makefile head/math/scalapack/Makefile head/math/vtk6/Makefile head/misc/dahdi-kmod/Makefile head/misc/dahdi-kmod26/Makefile head/misc/freebsd-doc-en/Makefile head/misc/gnome2-reference/Makefile head/misc/zoneinfo/Makefile head/multimedia/atomicparsley/Makefile head/multimedia/gstreamer-plugins-all/Makefile head/multimedia/gstreamer1-plugins-all/Makefile head/multimedia/libmpeg2/Makefile head/multimedia/lives/Makefile head/multimedia/mediainfo/Makefile head/multimedia/oqtencoder/Makefile head/multimedia/oqtplayer/Makefile head/multimedia/subtools/Makefile head/net-im/mercury/Makefile head/net-mgmt/net-snmp/Makefile head/net-mgmt/snmp4nagios/Makefile head/net-p2p/frost/Makefile head/net-p2p/libtorrent-rasterbar/Makefile head/net-p2p/qbittorrent/Makefile head/net-p2p/xnap/Makefile head/net/liveMedia/Makefile head/net/mpich/Makefile head/net/netcat/Makefile head/net/openldap24-server/Makefile head/net/py-zsi/Makefile head/net/samba4/Makefile head/net/samba41/Makefile head/net/seda/Makefile head/net/udt/files/BSDmakefile head/net/wireshark/Makefile head/news/inn/Makefile.layout head/ports-mgmt/kpackagekit/Makefile head/ports-mgmt/pkg_add_it/Makefile head/portuguese/irpf-pt_BR/Makefile head/print/a2ps/Makefile head/print/acroread8/Makefile head/print/acroread9/Makefile head/print/acroreadwrapper/Makefile head/print/ghostscript7-commfont/files/Makefile.in head/print/hyperlatex/Makefile head/print/mp-letter/Makefile head/print/muttprint/Makefile head/print/papersize-default-a4/Makefile head/science/cdf/Makefile head/science/clhep/Makefile head/science/hdf/Makefile head/science/py-mdp/Makefile head/security/axTLS/Makefile head/security/beecrypt/Makefile head/security/ca_root_nss/Makefile head/security/dradis/Makefile head/security/gorilla/Makefile head/security/i2p/Makefile head/security/john/Makefile head/security/keepassx/Makefile head/security/keepassx2/Makefile head/security/nss/Makefile head/security/py-PF/Makefile head/security/shttpscanner/Makefile head/security/spike-proxy/Makefile head/shells/bash/Makefile head/sysutils/LPRng/Makefile head/sysutils/evtviewer/Makefile head/sysutils/heirloom/Makefile head/sysutils/screenfetch/Makefile head/textproc/aspell/Makefile.inc head/textproc/dtd2relax/Makefile head/textproc/groff/Makefile head/textproc/nunnimcax/Makefile head/textproc/opensp/Makefile head/textproc/py-genshi/Makefile head/textproc/py-tvgrab/Makefile head/textproc/stardict-dictd_mova/Makefile head/textproc/stardict-quick/Makefile head/textproc/xsv/Makefile head/www/WebMagick/Makefile head/www/autoindex2/Makefile head/www/bblog/Makefile head/www/eyeos-themes/Makefile head/www/eyeos/Makefile head/www/grails/Makefile head/www/mysar/Makefile head/www/p5-ClearSilver/Makefile head/www/p5-Gantry/Makefile head/www/phpgedview/Makefile head/www/phpsysinfo-dev/Makefile head/www/seamonkey/Makefile head/www/trac-discussion/Makefile head/www/trac-downloads/Makefile head/www/trac-fivestarvote/Makefile head/www/trac-fullblog/Makefile head/www/trac-fullblognotification/Makefile head/www/trac-graphviz/Makefile head/www/trac-math/Makefile head/www/trac-navadd/Makefile head/www/trac-pydotorgtheme/Makefile head/www/trac-ticketimport/Makefile head/www/trac-vote/Makefile head/www/trac-wikitopdf/Makefile head/www/xpi-adblock/Makefile.xpi head/x11-drivers/xorg-drivers/Makefile head/x11-fm/thunar/Makefile head/x11-fonts/code2000/Makefile head/x11-fonts/terminus-font/Makefile head/x11-themes/cursor-chameleon-white/files/Makefile.common head/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile head/x11-toolkits/py-Pmw/Makefile head/x11-toolkits/xmhtml/Makefile head/x11-wm/e17-modules/Makefile head/x11/xorg-apps/Makefile Modified: head/CHANGES ============================================================================== --- head/CHANGES Mon May 5 09:36:33 2014 (r352985) +++ head/CHANGES Mon May 5 09:45:36 2014 (r352986) @@ -10,6 +10,15 @@ in the release notes and/or placed into 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 Modified: head/Mk/Uses/cmake.mk ============================================================================== --- head/Mk/Uses/cmake.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/Uses/cmake.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/Mk/Uses/qmail.mk ============================================================================== --- head/Mk/Uses/qmail.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/Uses/qmail.mk Mon May 5 09:45:36 2014 (r352986) @@ -42,7 +42,7 @@ _QMAIL_VALID_SLAVEPORTS= ldap mysql spam . 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. O . 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 Modified: head/Mk/Uses/scons.mk ============================================================================== --- head/Mk/Uses/scons.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/Uses/scons.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.apache.mk Mon May 5 09:45:36 2014 (r352986) @@ -147,7 +147,7 @@ IGNORE= lowercase 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 # ==================================== Modified: head/Mk/bsd.autotools.mk ============================================================================== --- head/Mk/bsd.autotools.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.autotools.mk Mon May 5 09:45:36 2014 (r352986) @@ -320,7 +320,7 @@ AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTO .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 Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.database.mk Mon May 5 09:45:36 2014 (r352986) @@ -331,8 +331,8 @@ _DB_6P= 6 # Override the global WITH_BDB_VER with the # port specific _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 USE_FIREBIRD= ${WITH_FIREBIRD_VER} .endif -.if ${USE_FIREBIRD:L} == "yes" +.if ${USE_FIREBIRD:tl} == "yes" FIREBIRD_VER= 25 .else FIREBIRD_VER= ${USE_FIREBIRD} Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.default-versions.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/Mk/bsd.efl.mk ============================================================================== --- head/Mk/bsd.efl.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.efl.mk Mon May 5 09:45:36 2014 (r352986) @@ -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) # Modified: head/Mk/bsd.fpc.mk ============================================================================== --- head/Mk/bsd.fpc.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.fpc.mk Mon May 5 09:45:36 2014 (r352986) @@ -75,7 +75,7 @@ _FPC_ALL_UNITS= a52 aspell bfd bzip2 cai _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" .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} Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.gecko.mk Mon May 5 09:45:36 2014 (r352986) @@ -452,7 +452,7 @@ MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAG 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 Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.java.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.linux-rpm.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/Mk/bsd.lua.mk ============================================================================== --- head/Mk/bsd.lua.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.lua.mk Mon May 5 09:45:36 2014 (r352986) @@ -243,7 +243,7 @@ IGNORE?= selected multiple values for . 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_par 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 Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.options.mk Mon May 5 09:45:36 2014 (r352986) @@ -434,7 +434,7 @@ SUB_LIST:= ${SUB_LIST} ${opt}="@comment . 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) Modified: head/Mk/bsd.php.mk ============================================================================== --- head/Mk/bsd.php.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.php.mk Mon May 5 09:45:36 2014 (r352986) @@ -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} Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.port.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 .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 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:${PORTSD _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%^ma # 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-algorithm 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-algorithm _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 \ Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.python.mk Mon May 5 09:45:36 2014 (r352986) @@ -187,7 +187,7 @@ Python_Include_MAINTAINER= python@FreeBS # # 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}/includ 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=${PYEASYINSTA .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 Modified: head/Mk/bsd.ruby.mk ============================================================================== --- head/Mk/bsd.ruby.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.ruby.mk Mon May 5 09:45:36 2014 (r352986) @@ -243,9 +243,9 @@ RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir= --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 Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.sites.mk Mon May 5 09:45:36 2014 (r352986) @@ -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:${P 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*\:/*} Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.tex.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/Mk/bsd.wx.mk ============================================================================== --- head/Mk/bsd.wx.mk Mon May 5 09:36:33 2014 (r352985) +++ head/Mk/bsd.wx.mk Mon May 5 09:45:36 2014 (r352986) @@ -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 . 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 Modified: head/arabic/ae_fonts_ttf/Makefile ============================================================================== --- head/arabic/ae_fonts_ttf/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/arabic/ae_fonts_ttf/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/archivers/pecl-lzf/Makefile ============================================================================== --- head/archivers/pecl-lzf/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/archivers/pecl-lzf/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/archivers/xarchiver/Makefile ============================================================================== --- head/archivers/xarchiver/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/archivers/xarchiver/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/Maaate/Makefile ============================================================================== --- head/audio/Maaate/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/Maaate/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/baresip/Makefile ============================================================================== --- head/audio/baresip/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/baresip/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/boodler/Makefile ============================================================================== --- head/audio/boodler/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/boodler/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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: Modified: head/audio/festival/Makefile ============================================================================== --- head/audio/festival/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/festival/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -82,10 +82,10 @@ post-patch:: .include .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 Modified: head/audio/flake/Makefile ============================================================================== --- head/audio/flake/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/flake/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/jokosher/Makefile ============================================================================== --- head/audio/jokosher/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/jokosher/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/lame/Makefile ============================================================================== --- head/audio/lame/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/lame/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/liquidsoap/Makefile ============================================================================== --- head/audio/liquidsoap/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/liquidsoap/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/shntool/Makefile ============================================================================== --- head/audio/shntool/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/shntool/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -34,8 +34,8 @@ RDEP= AIFF:sox SHN:shorten FLAC APE:mac .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 Modified: head/audio/tse3/Makefile ============================================================================== --- head/audio/tse3/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/tse3/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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 Modified: head/audio/umodplayer/Makefile ============================================================================== --- head/audio/umodplayer/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/audio/umodplayer/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= umodplayer -PORTVERSION= 0.${DISTVERSION:L} +PORTVERSION= 0.${DISTVERSION:tl} DISTVERSION= B5.1 PORTREVISION= 3 CATEGORIES= audio Modified: head/benchmarks/netpipe/Makefile ============================================================================== --- head/benchmarks/netpipe/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/benchmarks/netpipe/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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} \ Modified: head/biology/emboss/Makefile ============================================================================== --- head/biology/emboss/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/biology/emboss/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -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} Modified: head/cad/astk-serveur/Makefile ============================================================================== --- head/cad/astk-serveur/Makefile Mon May 5 09:36:33 2014 (r352985) +++ head/cad/astk-serveur/Makefile Mon May 5 09:45:36 2014 (r352986) @@ -151,7 +151,7 @@ WITH_ED= vi *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***