Errors in deluge port with python > 3.8

Hi,

Deluge as packages is version 2.0.3 from about 2 years ago. Since
switching to python 3.8 there are a number of errors popping up when
running deluge-web:

fatboy$ deluge-web

Unable to initialize gettext/locale!
'ngettext'
Traceback (most recent call last):
File "/usr/local/lib/python3.8/site-packages/deluge/i18n/util.py",
line 118, in setup_translation
builtins.__dict__['_n'] = builtins.__dict__['ngettext']
KeyError: 'ngettext'

And one related to findCaller usage in log.py. Both of these have been
solved for some time now in the develop branch
(https://git.deluge-torrent.org/deluge/log/?h=develop). How would one go
about updating the port in order to include this in the package (at the
moment I'm manually updating after every pkg_add -u).
Would one need to cherry pick the commits and add them as patches to
the port?
Or would it be easier/possible to pick a time in the
develop branch to create a tarball to be stored somewhere and used in an
updated port?

BR/Rob