pkg breakage after updating ports tree

[Will Parsons]

After doing "portsnap fetch update" on a 9.3-RELEASE system, I find that
updating ports is broken because of dependencies on pkg.  The attempt
to update pkg-1.3.8_3 to pkg-1.4.0 results in:

========================================================================
...
cc1: warnings being treated as errors
set.c: In function 'exec_set':
set.c:103: warning: 'depfield' may be used uninitialized in this function
set.c:103: warning: 'field' may be used uninitialized in this function
*** [pkg-set.o] Error code 1

Stop in /usr/ports/ports-mgmt/pkg/work/pkg-1.4.0/src.
*** [all-recursive] Error code 1

Stop in /usr/ports/ports-mgmt/pkg/work/pkg-1.4.0.
*** [all] Error code 1

Stop in /usr/ports/ports-mgmt/pkg/work/pkg-1.4.0.
*** [do-build] Error code 1

Stop in /usr/ports/ports-mgmt/pkg.
*** [/usr/ports/ports-mgmt/pkg/work/.build_done.pkg._usr_local] Error code 1

Stop in /usr/ports/ports-mgmt/pkg.

===>>> make build failed for ports-mgmt/pkg
===>>> Aborting update

===>>> Update for pkg-1.3.8_3 failed
===>>> Aborting update

========================================================================

This is using portmaster, but running make from the ports directory is
similar.

(As a side question, "which pkg" shows /usr/sbin/pkg.  Why are there
dependencies on the version of pkg in ports?)

What can I do to fix this?

-- 
Will