Can't build "apcupsd" with "cgi" option disabled

["John D. Baker" <jdbaker%consolidated.net@localhost>]

Recently, changes were made to cause packages requiring X11 to fail if
X11_TYPE=native but the "xbase" set was not installed.

As such, I can no-longer build "sysutils/apcupsd" with

  PKG_OPTIONS.apcupsd+=-cgi

With the option disabled, it does not require X11, but is being failed
anyway:

$ pwd ; make show-options ; make
/x/pkgsrc/sysutils/apcupsd
Any of the following general options may be selected:
        cgi      Enable CGI support.

These options are enabled by default:
        cgi

These options are currently enabled:


You can select which build options to use by setting PKG_DEFAULT_OPTIONS
or PKG_OPTIONS.apcupsd.
ERROR: This package has set PKG_FAIL_REASON:
ERROR: /usr/X11R7: X11_TYPE=native but xbase set is not installed (missing: makedepend).  Either set X11_TYPE to modular or install xbase.
*** Error code 1

Stop.
make: stopped in /x/pkgsrc/sysutils/apcupsd


Please arrange that when options requiring X11 are _dis_abled, the package
as a whole will not require X11.

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]consolidated[flyspeck]net  OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645