Spanish version: Te esperaré or Voy a esperarte (or a ti). I think we should use the future tense, because the action of waiting for you itself refers to the future. I am a Spanish major, and I am a Portuguese friend.

Portuguese version: Eu estou esperando por você