Upgrade deps, -r1 version on intermediate tarballs.
Fix build of miniupnpc-1.9 on OSX 10.6