Fix #1129 -- correct SQL code resulting from bad merge.
Merge branch 'master' of github.com:freebsd/pkg