All,
Looks like they have moved the pickup spot. It is in the P2 parking area. There are supposedly new signs to guide you.
I tried to cut and paste the information I found on the Portugal Travel FB page, but it is beyond meager social media skills. Perhaps someone else can complete the task
Dennis