net/samba-2.2.9_* and editors/emacs-21.3_* no longer build on recent -CURRENT

There seem to have been some changes in -CURRENT, or in the recent
patches to these ports, that cause the to no longer build on my
-CURRENT.

In net/samba, I get an undefined NULL in lib/snprintf.c.

In editors/emacs, the build blows up in lib-src/movemail.c complaining
about conflicting types for sys_errlist.

jmc