- 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.
This commit is contained in:
Hiroki Sato 2015-07-25 16:13:54 +00:00
parent 1a3e636c60
commit cc4a6b7ab5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=392891

View file

@ -157,7 +157,16 @@ USE_TEX:= ${USE_TEX:tu:NFULL} ${_USE_TEX_FULLLIST:tu}
.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)