Upgrade category Makefiles to r364081
Upgrade category Makefiles to r364081 pt.2
Remove killed ports