Need ideas for updating devd.c patch for xserver 1.19

[David Shao]

xserver 1.19 switched from select(2) to epoll / poll.  One can read
the thread for
example starting from here:

https://lists.freedesktop.org/archives/xorg-devel/2016-May/049874.html

I have experimented with updating the xserver patch adding devd.c to
use SetNotifyFd and RemoveNotifyFd and eliminate the use of fd_set since
it is no longer part of the API, but the server no longer starts up.

I don't even know where to begin.  Is it for example possible that for
FreeBSD and DragonFly at least a third kqueue option should have been
added to the epoll versus poll choice in xserver 1.19's new ospoll.c?
Should poll as used by xserver 1.19 work for Unix domain sockets?