Portuguese forward is back at Celtic Park on long-term deal