Fix mergering errors

Special note: libusb was removed.  Add this now DragonFly-only feature to
Makefile.DragonFly where possible and Makefile.diff as a last resort.

Many of these errors were results of moving dports fixes to FreeBSD.