Update the conflicts lines in all the llvm and clang ports to conflict with 3.x as well as 2.x and generally simplify the conflict definitions following the example of llvm-etoile.
