Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 lat temu
..
files 2d7666cde2 simplify add_rcconf 11 lat temu
patches 4f157056c3 more Darwin compat fixes, add java as build dependency check for xbmc 11 lat temu
Makefile f14c1fc551 resolve merge conflict 11 lat temu