Firefox 54.0 (pkgsrc-HEAD) vs. gtk2

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

"www/firefox" retains options "gtk2" and "gtk3", but firefox-54.0 can't
cope with having "gtk2" selected.

  PKG_DEFAULT_OPTIONS+=gtk2 -gtk3

(among other things).

[...]
platform netbsd8 is not supported

Error processing command. Ignoring because optional. (optional:setup.py:python/psutil:build_ext:--inplace)
Reexecuting in the virtualenv
checking for a shell... /d0/build/pkgsrc/www/firefox/work/.tools/bin/sh
checking for host system type... x86_64-unknown-netbsd8.0
checking for target system type... x86_64-unknown-netbsd8.0
checking for a shell... /d0/build/pkgsrc/www/firefox/work/.tools/bin/sh
checking for host system type... x86_64-unknown-netbsd8.0
checking for target system type... x86_64-unknown-netbsd8.0
checking whether cross compiling... no
checking for the target C compiler... /d0/build/pkgsrc/www/firefox/work/.cwrapper/bin/gcc
checking whether the target C compiler can be used... yes
checking for llvm-config... not found
Traceback (most recent call last):
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/configure.py", line 124, in <module>
    sys.exit(main(sys.argv))
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/configure.py", line 29, in main
    sandbox.run(os.path.join(os.path.dirname(__file__), 'moz.configure'))
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/python/mozbuild/mozbuild/configure/__init__.py", line 362, in run
    self._value_for(option)
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/python/mozbuild/mozbuild/configure/__init__.py", line 430, in _value_for
    return self._value_for_option(obj)
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/python/mozbuild/mozbuild/util.py", line 925, in method_call
    cache[args] = self.func(instance, *args)
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/python/mozbuild/mozbuild/configure/__init__.py", line 473, in _value_for_option
    value, option_string = self._helper.handle(option)
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/python/mozbuild/mozbuild/configure/options.py", line 466, in handle
    ret = option.get_value(arg, origin)
  File "/d0/build/pkgsrc/www/firefox/work/firefox-54.0/python/mozbuild/mozbuild/configure/options.py", line 366, in get_value
    % (val, ', '.join("'%s'" % c for c in self.choices)))
mozbuild.configure.options.InvalidOptionError: 'cairo-gtk2' is not one of 'cairo-windows', 'cairo-gtk3', 'cairo-cocoa', 'cairo-uikit', 'cairo-android', 'cairo-gonk'
[...]

As I'd like to avoid gtk3 as much as possible, is this just a matter of
patching, or is firefox-54.0 going to force the use of gtk3?

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com    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