Undid most of 3ef341abe440ece07f8deed59fb026ab020e805 because FreeBSD needs the HAVE_...
[mmh] / DATE
1  3 January 2012