Try and rebase the bsd.lib.mk changes after ^/head@r322824 was merged in

Unfortunately the snippet's now broken -- need to get the matching expressions to
work properly.