Could someone please look at this Athens bug report?

About a month ago, I upgraded devel/athens, and discovered that it 
always fails immediately at startup. I figured out that the 
/usr/local/etc/rc.d script had been broken, and it sure looks to me like 
it would always immediately fail at startup for everyone. I made a local 
fix for it on my machine and submitted a bug report 
<https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=296971>.

Earlier this week, with the port not yet fixed, another user added a 
patch to the bug report, which is essentially the same change as I had 
made locally.

A new release of the port was made, yesterday or so. I upgraded . Athens 
started always immediately failing again. Looking into it, the change 
for the new release was part of a big "bumping Go version" change for 
many ports. This overwrote the local fix I had made, thus causing the 
problem again.

It's easy enough for me to make the local change again. But maybe it's 
not easy for everyone, and like I say, I think this problem will happen 
for everyone who uses the (unmodified) port. And to be honest I'm not 
really looking forward to noticing and refixing this every time a new 
version of Go is used. Could someone please take a look at the bug 
report, and submit the patch? Thanks in advance.