All patches or equivalent are upstreamed so remove them all.
getopt_long is now doing argument permutation so remove the
BSD replacement. Also fixes multiple bugs. ref #3692, ref #3693