Hi ports@,

When trying to update net/miniflux, I came up with an error on
modgo-gen-modules.  It leaves a line like this `toolchain go1.21` which
makes our ports infra try to download go 1.21

sthen@ already tried to fix this issue here I think:
https://cvsweb.openbsd.org/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm?rev=1.11&content-type=text/x-cvsweb-markup
https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/infrastructure/lib/OpenBSD/PortGen/Port/Go.pm.diff?r1=1.10&r2=1.11

But it seems there are more cases that end up in this scenario.  This
diff takes care of the one I found.

Ok to commit ?

diff /usr/ports
commit - 38d0232339070be591bb46e7219eccf1706a4293
path + /usr/ports
blob - 5fbe54d2dcf1ed5a7913e590e602ac7bd7006708
file + infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
--- infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
+++ infrastructure/lib/OpenBSD/PortGen/Port/Go.pm
@@ -167,7 +167,7 @@ sub _go_mod_info
                foreach my $m (split(/ /, $mod)) {
                        $m =~ s/@/ /;
                        next if $m eq $json->{Module};
-                       next if $m =~ /^go /;
+                       next if $m =~ /^(go|toolchain) /;
                        $m = $self->_go_mod_normalize($m);
                        if (! defined $all_deps->{$m}) {
                                push @mods, $m;

-- 
Paco Esteban.
0x5818130B8A6DBC03

Reply via email to