Date: Sat, 25 Jul 2015 16:13:55 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392891 - head/Mk Message-ID: <201507251613.t6PGDtPJ016597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Jul 25 16:13:54 2015 New Revision: 392891 URL: https://svnweb.freebsd.org/changeset/ports/392891 Log: - Fix a bug which prevented both a package version number and arguments at the same time in USE_TEX from working. - Enforce to use a package version number for dependency on base and texmf. Modified: head/Mk/bsd.tex.mk Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Sat Jul 25 16:01:14 2015 (r392890) +++ head/Mk/bsd.tex.mk Sat Jul 25 16:13:54 2015 (r392891) @@ -157,7 +157,16 @@ USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX .for _UU in ${USE_TEX:tu} _U:= ${_UU} # ugly but necessary in for loop _VOP:= -. if !empty(_U:tu:MKPATHSEA) || !empty(_U:tu:MPTEXENC) || !empty(_U:tu:MTEXLUA) || !empty(_U:tu:MTEXLUAJIT) +. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXMF) && empty(_U:M*[<>=]*) +_U:= ${_U}>=20150523 +. endif +. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MBASE) && empty(_U:M*[<>=]*) +_U:= ${_U}>=20150521 +. endif +. if !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MKPATHSEA) || \ + !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MPTEXENC) || \ + !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUA) || \ + !empty(_U:tu:C/[<>=][^\:]*//:C/\:.*$//:MTEXLUAJIT) _U:= ${_U}:lib . endif . if !empty(_U:M*[<>=]*) @@ -166,8 +175,9 @@ _VOP:= ${_U:C/^[^<>=]*//:C/\:.*$//} . if empty(_U:M*\:*) _C:= BUILD RUN . else -_C:= ${_U:C/.*://:S/,/ /g} +_C:= ${_U:C/.*://:S/,/ /g:C/[<>=][^\:]*//g} . endif +#. warning DEBUG: ${_U}: _VOP=${_VOP}, _C=${_C} . for _CC in ${_C:tu} _V:=${_UU:C/[<>=][^\:]*//:C/\:.*$//} . if defined(_USE_TEX_${_V}_PORT)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507251613.t6PGDtPJ016597>