Merge our chagnes with FreeBSD's latest changes. We should now

Merge our chagnes with FreeBSD's latest changes.  We should now
have identical bsd.port.mk files again.  This file has successfully
compiled many of the archivers, gnu make, and emacs (althought the emacs
deltas have not been merged back into the FreeBSD tree yet since I don't
have it working yet).

The FreeBSD Id line may be slightly off since I generated it by hand to match
the commit I just made there.