Simon ‘corecode’ Schubert would like to get rid of ipfw, slowly.  This means it wouldn’t be gone until release 1.7.   While pf doesn’t have all needed functionality to work as a replacement, Gary Allan pointed out that ipfw2 is a suitable replacement as it has similar features but is less of a mess.  (And look – he’s on it!)