To build the sysutils/upsmon port, I needed the attached patches. They correct problems associated with include file changes for -CURRENT, type changes, and that gcc apparently implicitly meant g++ previously (?). With these changes, upsd and upsstat appear to work well for me.
State Changed From-To: open->closed Committed, thanks!