On Thu, 4 Dec 2025 20:12:49 +0800
Chris Billington <cbillington@emulti.net> wrote:

> Sorry, forgot to include the PLIST, which needs updating.
> Is there a standard procedure for making diffs to send to the list? I
> couldn't find one in the handbook. Should it be based in /usr/ports,
> one per file, or a single diff for all changes?
> 
> --- /usr/ports/print/texinfo/pkg/PLIST  Mon Sep 23 23:34:41 2024
> +++ pkg/PLIST   Thu Dec  4 19:12:33 2025
> @@ -7,13 +7,13 @@
>  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-stnd.info
> +info/texi2any_api.info
> +info/texi2any_internals.info
> +info/texinfo.info
> +info/texinfo.info-1
> +info/texinfo.info-2
> +info/texinfo.info-3
>  lib/texinfo/
>  @comment lib/texinfo/MiscXS.la
>  @so lib/texinfo/MiscXS.so
> 
> On Thu, 4 Dec 2025 20:05:19 +0800
> Chris Billington <cbillington@emulti.net> wrote:
> 
> > --- Makefile.orig       Thu Dec  4 20:03:03 2025
> > +++ Makefile    Thu Dec  4 19:59:32 2025
> > @@ -1,7 +1,7 @@
> >  COMMENT =              official documentation format of the GNU
> > project 
> >  DISTNAME =             texinfo-7.1
> > -REVISION =             1
> > +REVISION =             2
> >  
> >  CATEGORIES =           print
> >  
> > @@ -32,7 +32,6 @@
> >  
> >  # gtexindex is a shell script which hardcodes texindex.awk
> >  post-install:
> > -       cd ${PREFIX}/info && for i in *.info*; do mv $$i g$$i; done
> >         cd ${PREFIX}/share/texinfo && mv gtexindex.awk texindex.awk
> >  
> >  .include <bsd.port.mk>
> > 
> > 
> > On Thu, 04 Dec 2025 11:57:41 +0000
> > Stuart Henderson <stu@spacehopper.org> wrote:
> >   
> > > I think I understand what you're saying, but to make it clear,
> > > please send a diff.
> > > 
> > > -- 
> > >   Sent from a phone, apologies for poor formatting.
> > > 
> > > On 4 December 2025 11:29:28 Chris Billington
> > > <cbillington@emulti.net> wrote:
> > >     
> > > > I noticed that the print/texinfo port (7.1) renames the
> > > > executables to 'gtexinfo', 'gtexi2any' and so on, to avoid
> > > > conflict with the older version 4.2 of texinfo in Base.
> > > >
> > > > A post-install target is also used to prefix the .info files
> > > > installed in /usr/local/info with 'g':
> > > >
> > > >   cd ${PREFIX}/info && for i in *.info*; do mv $$i g$$i; done
> > > >
> > > > However, after this renaming, 'info gtexinfo' and 'ginfo
> > > > gtexinfo' (etc...) do not work, because the metadata in the
> > > > source .texi files still refers to the original executable
> > > > names. This metadata is put into /usr/local/info/dir, and the
> > > > renamed files are not found.
> > > >
> > > > Removing the Makefile post-install line to rename the .info
> > > > files restores expected operation, that is:
> > > >
> > > > 'info texinfo' gives the info file for Texinfo 4.2 in base
> > > > 'info gtexinfo' gives the info file for Texinfo 7.1 from ports.
> > > > 'info 'gtexi2any' gives a manpage, but there is an up-to-date
> > > > section in 'info gtexinfo' that covers it, which is how I think
> > > > it's supposed to be.
> > > > 'info ginfo-stnd' works OK.
> > > >
> > > > I have tested the tweak on 7.8 Release/amd64.
> > > >
> > > > --
> > > > Chris Billington    
> > >     
> > 
> > 
> > -- 
> > Chris Billington  
> 
> 
> -- 
> Chris Billington

Hopefully, this is the correct way to make the diff. Sorry for the
noise.

cvs diff -uNp > texinfo.diff

? texinfo.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/texinfo/Makefile,v
diff -u -p -u -p -r1.20 Makefile
--- Makefile    21 Jul 2025 15:44:28 -0000      1.20
+++ Makefile    4 Dec 2025 12:27:51 -0000
@@ -1,7 +1,7 @@
 COMMENT =              official documentation format of the GNU project
 
 DISTNAME =             texinfo-7.1
-REVISION =             1
+REVISION =             2
 
 CATEGORIES =           print
 
@@ -32,7 +32,6 @@ INSTALL_TARGET =      install install-tex
 
 # gtexindex is a shell script which hardcodes texindex.awk
 post-install:
-       cd ${PREFIX}/info && for i in *.info*; do mv $$i g$$i; done
        cd ${PREFIX}/share/texinfo && mv gtexindex.awk texindex.awk
 
 .include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/texinfo/pkg/PLIST,v
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST   3 May 2024 13:41:08 -0000       1.9
+++ pkg/PLIST   4 Dec 2025 12:27:51 -0000
@@ -7,13 +7,13 @@ 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-stnd.info
+info/texi2any_api.info
+info/texi2any_internals.info
+info/texinfo.info
+info/texinfo.info-1
+info/texinfo.info-2
+info/texinfo.info-3
 lib/texinfo/
 @comment lib/texinfo/MiscXS.la
 @so lib/texinfo/MiscXS.so


-- 
Chris Billington