Old trunk (2.7.1) was branched to be stabilized.
The stabilized branch is branches/fixes_3_0 and will become FPC 3.0 in time (currently holding version 3.0.1, but that is normal for fixes branches).
The current trunk is 3.1.1.
All these versions (a recent 2.7.1), 3.0.1 and 3.1.1 are currently still very close together, and barely differ beyond versions.
The future of fpcup is still being discussed, and FPC team (Florian and Me) is thinking about picking it up. But first we need to get the 3.x show on the road.