Update Makefile

* Reflected changes on FreeBSD SVN Ports up to r314325
Merge branch 'dev'