As for the real fix -- I attempted to fix it as the xorgproto fallout but it ended up seeming worse so I quickly reverted it. https://mail-index.netbsd.org/pkgsrc-changes/2018/03/31/msg173442.html