> I am trying to apply this, but seem to have difficulty on CVS patches.
> I don't have a current ports tree checked out, but it appears that the
> version is the same for the ports from 7.7 that I have.

This works on stable and current:

$ patch -d /usr/ports/mail/aerc < /path/to/patch

or apply from /usr/ports/mail/aerc as 'patch < /path/to/patch'