FreeBSD Fixes in make package_X in Makefile
Merge branch 'master' of github.com:nitrogen/nitrogen