Account for added ports and category Makefiles