www/ap2-chroot was removed on Jun 26. Fix www/Makefile to match.
note fix to www/Makefile
Merge branch 'pkgsrc_2014Q2' into joyent/feature/miscfix/2014Q2

Conflicts:
	doc/CHANGES-pkgsrc-2014Q2
Merge branch 'joyent/feature/miscfix/2014Q2' into joyent/release/2014Q2