Remove reference to deprecated config file
Merge branch 'joyent/feature/smf/2013Q3' of github.com:joyent/pkgsrc into joyent/feature/smf/2013Q3
Merge branch 'joyent/feature/smf/2013Q3' into joyent/release/2013Q3