Tweak devel/git version 1.8.4
Update sysutils/upower to version 0.9.7_2