From 79546b3e2b3ee5c17aa3b49fb99d3d3fc7a68d28 Mon Sep 17 00:00:00 2001 From: Po-Chuan Hsieh Date: Wed, 5 Nov 2025 18:18:13 +0800 Subject: [PATCH] print/texinfo: Update to 7.2 Changes: https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS https://lists.gnu.org/archive/html/bug-texinfo/2024-09/msg00041.html https://lists.gnu.org/archive/html/bug-texinfo/2024-12/msg00043.html PR: 290581 Exp-run by: antoine --- print/texinfo/Makefile | 11 +- print/texinfo/distinfo | 4 +- .../files/patch-tp-Texinfo-XS-Makefile.in | 13 -- .../files/patch-tp-Texinfo-XS-parsetexi-api.c | 12 -- print/texinfo/pkg-plist | 137 +++++++++++------- 5 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in delete mode 100644 print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile index cfd09e9f538a..bf26207beaef 100644 --- a/print/texinfo/Makefile +++ b/print/texinfo/Makefile @@ -1,6 +1,5 @@ PORTNAME= texinfo -PORTVERSION= 7.1 -PORTREVISION= 12 +PORTVERSION= 7.2 PORTEPOCH= 1 CATEGORIES= print MASTER_SITES= GNU \ @@ -28,7 +27,10 @@ RUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \ USES= charsetfix cpe gmake iconv:wchar_t libtool ncurses perl5 tar:xz tex -CONFIGURE_ARGS= --with-external-libintl-perl \ +CONFIGURE_ARGS= --enable-perl-api-texi-build \ + --enable-perl-xs \ + --enable-xs-perl-libintl \ + --with-external-libintl-perl \ --with-external-Text-Unidecode \ --with-external-Unicode-EastAsianWidth CONFIGURE_ENV= PERL_EXT_CC="${CC}" @@ -59,7 +61,4 @@ post-patch: @${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi-${TEXI2DVI_RELDATE} ${WRKSRC}/util/texi2dvi @${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2pdf-${TEXI2PDF_RELDATE} ${WRKSRC}/util/texi2pdf -post-install: - ${INSTALL_DATA} ${WRKSRC}/util/htmlxref.cnf ${STAGEDIR}${DATADIR} - .include diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo index dc49e49bed47..543c2eb3b70f 100644 --- a/print/texinfo/distinfo +++ b/print/texinfo/distinfo @@ -1,6 +1,6 @@ TIMESTAMP = 1753796018 -SHA256 (texinfo/texinfo-7.1.tar.xz) = deeec9f19f159e046fdf8ad22231981806dac332cc372f1c763504ad82b30953 -SIZE (texinfo/texinfo-7.1.tar.xz) = 5545720 +SHA256 (texinfo/texinfo-7.2.tar.xz) = 0329d7788fbef113fa82cb80889ca197a344ce0df7646fe000974c5d714363a6 +SIZE (texinfo/texinfo-7.2.tar.xz) = 6408432 SHA256 (texinfo/htmlxref.cnf-20250626) = 3ffecc1d8941daabd2eec93697a3ced02d68d84425dba6a2e693dffd67cb5cb8 SIZE (texinfo/htmlxref.cnf-20250626) = 769 SHA256 (texinfo/texi2dvi-20241223) = cb8a5fed2801350c093aa5ccb082aa9c315717ec3e818ef5ec70c367d7232b9e diff --git a/print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in b/print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in deleted file mode 100644 index 80b652fb2558..000000000000 --- a/print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -% sed -i .orig '/rm -f $$(DESTDIR)/ s|$| $(DESTDIR)$(xsdir)/XSParagraph.*|' tp/Texinfo/XS/Makefile.in - ---- tp/Texinfo/XS/Makefile.in.orig 2022-11-30 17:07:57 UTC -+++ tp/Texinfo/XS/Makefile.in -@@ -2326,7 +2326,7 @@ uninstall-am: uninstall-dist_modulesDATA uninstall-xsL - # otherwise dynamic libraries aren't built (a libtool bug). Work around - # this by deleting it after it's installed. - install-data-hook: -- rm -f $(DESTDIR)$(xsdir)/TestXS* -+ rm -f $(DESTDIR)$(xsdir)/TestXS* $(DESTDIR)$(xsdir)/XSParagraph.* - @HOST_NEEDS_NO_UNDEFINED_TRUE@ # The -no-undefined flag is for MS-Windows. See info node - @HOST_NEEDS_NO_UNDEFINED_TRUE@ # `(gnulib)Libtool and Windows'. The -L and -l options after it show - @HOST_NEEDS_NO_UNDEFINED_TRUE@ # where to find the undefined symbols. diff --git a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c b/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c deleted file mode 100644 index 5a96d391bec7..000000000000 --- a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c +++ /dev/null @@ -1,12 +0,0 @@ ---- tp/Texinfo/XS/parsetexi/api.c.orig 2021-03-12 20:48:49 UTC -+++ tp/Texinfo/XS/parsetexi/api.c -@@ -25,7 +25,9 @@ - - #undef context - -+#ifdef ENABLE_NLS - #include -+#endif - - #include - #include diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist index e2b1c2ac4004..fd2280690c46 100644 --- a/print/texinfo/pkg-plist +++ b/print/texinfo/pkg-plist @@ -7,15 +7,30 @@ bin/texi2any bin/texi2dvi bin/texi2pdf bin/texindex -lib/texinfo/MiscXS.so -lib/texinfo/Parsetexi.so -%%NLS%%share/locale/ca.us-ascii/LC_MESSAGES/texinfo_document.mo +lib/texi2any/ConvertXS.so +lib/texi2any/DocumentXS.so +lib/texi2any/IndicesXS.so +lib/texi2any/MiscXS.so +lib/texi2any/Parsetexi.so +lib/texi2any/StructuringTransfoXS.so +lib/texi2any/XSParagraph.so +lib/texi2any/libtexinfo-convert.so +lib/texi2any/libtexinfo-convert.so.0 +lib/texi2any/libtexinfo-convert.so.0.0.0 +lib/texi2any/libtexinfo-convertxs.so +lib/texi2any/libtexinfo-convertxs.so.0 +lib/texi2any/libtexinfo-convertxs.so.0.0.0 +lib/texi2any/libtexinfo.so +lib/texi2any/libtexinfo.so.0 +lib/texi2any/libtexinfo.so.0.0.0 +lib/texi2any/libtexinfoxs.so +lib/texi2any/libtexinfoxs.so.0 +lib/texi2any/libtexinfoxs.so.0.0.0 %%NLS%%share/locale/ca/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/ca/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/cs/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/cs/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/da/LC_MESSAGES/texinfo.mo -%%NLS%%share/locale/de.us-ascii/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/de/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/de/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/el/LC_MESSAGES/texinfo.mo @@ -37,17 +52,15 @@ lib/texinfo/Parsetexi.so %%NLS%%share/locale/it/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/ja/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/ka/LC_MESSAGES/texinfo.mo +%%NLS%%share/locale/ka/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/nb/LC_MESSAGES/texinfo.mo +%%NLS%%share/locale/nb/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/nl/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/nl/LC_MESSAGES/texinfo_document.mo -%%NLS%%share/locale/no.us-ascii/LC_MESSAGES/texinfo_document.mo -%%NLS%%share/locale/pl.iso-8859-2/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/pl/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/pl/LC_MESSAGES/texinfo_document.mo -%%NLS%%share/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/pt/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/pt/LC_MESSAGES/texinfo_document.mo -%%NLS%%share/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/ro/LC_MESSAGES/texinfo.mo @@ -78,55 +91,67 @@ share/man/man1/texi2pdf.1.gz share/man/man1/texindex.1.gz share/man/man5/info.5.gz share/man/man5/texinfo.5.gz -%%DATADIR%%/DebugTexinfo/DebugTree.pm -%%DATADIR%%/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm -%%DATADIR%%/Texinfo/Commands.pm -%%DATADIR%%/Texinfo/Commands.pod -%%DATADIR%%/Texinfo/Common.pm -%%DATADIR%%/Texinfo/Config.pm -%%DATADIR%%/Texinfo/Convert/Converter.pm -%%DATADIR%%/Texinfo/Convert/DocBook.pm -%%DATADIR%%/Texinfo/Convert/HTML.pm -%%DATADIR%%/Texinfo/Convert/IXIN.pm -%%DATADIR%%/Texinfo/Convert/IXINSXML.pm -%%DATADIR%%/Texinfo/Convert/Info.pm -%%DATADIR%%/Texinfo/Convert/LaTeX.pm -%%DATADIR%%/Texinfo/Convert/NodeNameNormalization.pm -%%DATADIR%%/Texinfo/Convert/Paragraph.pm -%%DATADIR%%/Texinfo/Convert/ParagraphNonXS.pm -%%DATADIR%%/Texinfo/Convert/PlainTexinfo.pm -%%DATADIR%%/Texinfo/Convert/Plaintext.pm -%%DATADIR%%/Texinfo/Convert/Texinfo.pm -%%DATADIR%%/Texinfo/Convert/TexinfoMarkup.pm -%%DATADIR%%/Texinfo/Convert/TexinfoSXML.pm -%%DATADIR%%/Texinfo/Convert/TexinfoXML.pm -%%DATADIR%%/Texinfo/Convert/Text.pm -%%DATADIR%%/Texinfo/Convert/TextContent.pm -%%DATADIR%%/Texinfo/Convert/Unicode.pm -%%DATADIR%%/Texinfo/Convert/Utils.pm -%%DATADIR%%/Texinfo/Documentlanguages.pm -%%DATADIR%%/Texinfo/MiscXS.pm -%%DATADIR%%/Texinfo/ModulePath.pm -%%DATADIR%%/Texinfo/Parser.pm -%%DATADIR%%/Texinfo/ParserNonXS.pm -%%DATADIR%%/Texinfo/Report.pm -%%DATADIR%%/Texinfo/Structuring.pm -%%DATADIR%%/Texinfo/Transformations.pm -%%DATADIR%%/Texinfo/Translations.pm -%%DATADIR%%/Texinfo/XS/parsetexi/Parsetexi.pm -%%DATADIR%%/Texinfo/XSLoader.pm -%%DATADIR%%/ext/epub3.pm -%%DATADIR%%/ext/highlight_syntax.pm -%%DATADIR%%/ext/latex2html.pm -%%DATADIR%%/ext/tex4ht.pm +share/texi2any/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm +share/texi2any/Texinfo/Commands.pm +share/texi2any/Texinfo/Commands.pod +share/texi2any/Texinfo/Common.pm +share/texi2any/Texinfo/Config.pm +share/texi2any/Texinfo/Convert/ConvertXS.pm +share/texi2any/Texinfo/Convert/Converter.pm +share/texi2any/Texinfo/Convert/DocBook.pm +share/texi2any/Texinfo/Convert/HTML.pm +share/texi2any/Texinfo/Convert/IXIN.pm +share/texi2any/Texinfo/Convert/IXINSXML.pm +share/texi2any/Texinfo/Convert/Info.pm +share/texi2any/Texinfo/Convert/LaTeX.pm +share/texi2any/Texinfo/Convert/NodeNameNormalization.pm +share/texi2any/Texinfo/Convert/Paragraph.pm +share/texi2any/Texinfo/Convert/ParagraphNonXS.pm +share/texi2any/Texinfo/Convert/PlainTexinfo.pm +share/texi2any/Texinfo/Convert/Plaintext.pm +share/texi2any/Texinfo/Convert/Texinfo.pm +share/texi2any/Texinfo/Convert/TexinfoMarkup.pm +share/texi2any/Texinfo/Convert/TexinfoSXML.pm +share/texi2any/Texinfo/Convert/TexinfoXML.pm +share/texi2any/Texinfo/Convert/Text.pm +share/texi2any/Texinfo/Convert/TextContent.pm +share/texi2any/Texinfo/Convert/Unicode.pm +share/texi2any/Texinfo/Convert/Utils.pm +share/texi2any/Texinfo/DebugTree.pm +share/texi2any/Texinfo/Document.pm +share/texi2any/Texinfo/DocumentXS.pm +share/texi2any/Texinfo/Documentlanguages.pm +share/texi2any/Texinfo/HTMLData.pm +share/texi2any/Texinfo/Indices.pm +share/texi2any/Texinfo/IndicesXS.pm +share/texi2any/Texinfo/ManipulateTree.pm +share/texi2any/Texinfo/MiscXS.pm +share/texi2any/Texinfo/ModulePath.pm +share/texi2any/Texinfo/Options.pm +share/texi2any/Texinfo/OutputUnits.pm +share/texi2any/Texinfo/Parser.pm +share/texi2any/Texinfo/ParserNonXS.pm +share/texi2any/Texinfo/Report.pm +share/texi2any/Texinfo/StructTransfXS.pm +share/texi2any/Texinfo/Structuring.pm +share/texi2any/Texinfo/Tests.pm +share/texi2any/Texinfo/Transformations.pm +share/texi2any/Texinfo/Translations.pm +share/texi2any/Texinfo/XS/parsetexi/Parsetexi.pm +share/texi2any/Texinfo/XSLoader.pm +share/texi2any/ext/epub3.pm +share/texi2any/ext/highlight_syntax.pm +share/texi2any/ext/latex2html.pm +share/texi2any/ext/tex4ht.pm +share/texi2any/init/book.pm +share/texi2any/init/chm.pm +share/texi2any/init/documentation_examples.pm +share/texi2any/init/html32.pm +share/texi2any/init/sc_formatting_with_css.pm +share/texi2any/js/info.css +share/texi2any/js/info.js +share/texi2any/js/modernizr.js %%DATADIR%%/htmlxref.cnf -%%DATADIR%%/init/book.pm -%%DATADIR%%/init/chm.pm -%%DATADIR%%/init/documentation_examples.pm -%%DATADIR%%/init/html32.pm -%%DATADIR%%/js/info.css -%%DATADIR%%/js/info.js -%%DATADIR%%/js/modernizr.js %%DATADIR%%/texindex.awk %%DATADIR%%/texinfo.dtd %%TEXMFDIR%%/tex/generic/epsf/epsf.tex