extras/contrib/src: clean up Makefile & packages.mak