From: Marc Espie <marc.espie.openbsd@gmail.com>
Subject: Fix for update-plist was: Re: print/texinfo renames info files[...]
To: ports@openbsd.org
Cc: sthen@openbsd.org
Date: Thu, 4 Dec 2025 14:59:35 +0100

This discussion made me figure out texinfo is stupid, not surprisingly
for a FSF originated program.

The file produced will have a different header line depending on whether
it was generated by makeinfo or texi2any, even though the documentation
says this is the exact same program, thus breaking the recognizer in
update-plist.

Here's a fix... the plist for texinfo gets adjusted accordingly

(I did it independently of the other changes to give you an idea)

This may also help info find its stuff, specifically as the @info
stuff will get inserted into the correct dir with a bit of luck.

Even though apparently only texinfo does things that way, if anybody
uses texi2any, the result will be as hilariously stupid.

Index: infrastructure/lib/OpenBSD/FS2.pm
===================================================================
RCS file: /vide/cvs/ports/infrastructure/lib/OpenBSD/FS2.pm,v
diff -u -p -r1.42 FS2.pm
--- infrastructure/lib/OpenBSD/FS2.pm	5 Jul 2023 15:07:54 -0000	1.42
+++ infrastructure/lib/OpenBSD/FS2.pm	4 Dec 2025 13:48:08 -0000
@@ -350,8 +350,9 @@ sub recognize($class, $filename, $fs, $)
 	my $tag2 = <$fh>;
 	$tag .= $tag2 if defined $tag2;
 	close $fh;
-	if ($tag =~ /^This\sis\s.*,\sproduced\sby\sg?[Mm]akeinfo(?:\sversion\s|\-)?.*[\d\s]from/s ||
-	    $tag =~ /^Dies\sist\s.*,\shergestellt\svon\sg?[Mm]akeinfo(?:\sVersion\s|\-)?.*[\d\s]aus/s) {
+	my $prog = qr{(?:g?[Mm]akeinfo|texi2any)};
+	if ($tag =~ /^This\sis\s.*,\sproduced\sby\s$prog(?:\sversion\s|\-)?.*[\d\s]from/s ||
+	    $tag =~ /^Dies\sist\s.*,\shergestellt\svon\s$prog(?:\sVersion\s|\-)?.*[\d\s]aus/s) {
 		return 1;
 	} else {
 		return 0;
Index: print/texinfo/Makefile
===================================================================
RCS file: /vide/cvs/ports/print/texinfo/Makefile,v
diff -u -p -r1.20 Makefile
--- print/texinfo/Makefile	21 Jul 2025 15:44:28 -0000	1.20
+++ print/texinfo/Makefile	4 Dec 2025 13:37:53 -0000
@@ -1,7 +1,7 @@
 COMMENT =		official documentation format of the GNU project
 
 DISTNAME =		texinfo-7.1
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		print
 
Index: print/texinfo/pkg/PLIST
===================================================================
RCS file: /vide/cvs/ports/print/texinfo/pkg/PLIST,v
diff -u -p -r1.9 PLIST
--- print/texinfo/pkg/PLIST	3 May 2024 13:41:08 -0000	1.9
+++ print/texinfo/pkg/PLIST	4 Dec 2025 13:54:49 -0000
@@ -7,13 +7,10 @@ bin/gtexi2any
 bin/gtexi2dvi
 bin/gtexi2pdf
 bin/gtexindex
-info/ginfo-stnd.info
-info/gtexi2any_api.info
-info/gtexi2any_internals.info
-info/gtexinfo.info
-info/gtexinfo.info-1
-info/gtexinfo.info-2
-info/gtexinfo.info-3
+@info info/ginfo-stnd.info
+@info info/gtexi2any_api.info
+@info info/gtexi2any_internals.info
+@info info/gtexinfo.info
 lib/texinfo/
 @comment lib/texinfo/MiscXS.la
 @so lib/texinfo/MiscXS.so