Dear all, A straightforward update; it appears that the patch has been merged upstream (with a subsequent refactoring - one can find patched lines, in a different file).
Only worked with gmake for me (thus it's used now). REVISION - I commented it out - correct? Patch attached. Dima
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile index eded47a982b..3b46f4504a2 100644 --- a/print/texinfo/Makefile +++ b/print/texinfo/Makefile @@ -1,12 +1,14 @@ COMMENT = official documentation format of the GNU project -DISTNAME = texinfo-6.5 -REVISION = 4 +DISTNAME = texinfo-7.1 +# REVISION = 1 CATEGORIES = print HOMEPAGE = https://www.gnu.org/software/texinfo/ +USE_GMAKE = Yes + # GPLv3 PERMIT_PACKAGE = Yes diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo index 99686ad2554..c469544cfc6 100644 --- a/print/texinfo/distinfo +++ b/print/texinfo/distinfo @@ -1,2 +1,2 @@ -SHA256 (texinfo-6.5.tar.gz) = 00Jy5AQsRhht3NZr1dmAwMoU/3NERGhsz4Ex9uyLFCc= -SIZE (texinfo-6.5.tar.gz) = 9311787 +SHA256 (texinfo-7.1.tar.gz) = dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0 +SIZE (texinfo-7.1.tar.gz) = 12118819 diff --git a/print/texinfo/patches/patch-tp_Texinfo_Parser_pm b/print/texinfo/patches/patch-tp_Texinfo_Parser_pm deleted file mode 100644 index 05359026d5a..00000000000 --- a/print/texinfo/patches/patch-tp_Texinfo_Parser_pm +++ /dev/null @@ -1,17 +0,0 @@ -Index: tp/Texinfo/Parser.pm ---- tp/Texinfo/Parser.pm.orig -+++ tp/Texinfo/Parser.pm -@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$) - } - } elsif ($command eq 'clickstyle') { - # REMACRO -- if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) { -+ if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) { - $args = ['@'.$1]; - $self->{'clickstyle'} = $1; - $remaining = $line; -- $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//; -+ $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//; - $has_comment = 1 if (defined($4)); - } else { - $self->line_error (sprintf($self->__( diff --git a/print/texinfo/pkg/PLIST b/print/texinfo/pkg/PLIST index 95bacf5ccdb..1998136ad9c 100644 --- a/print/texinfo/pkg/PLIST +++ b/print/texinfo/pkg/PLIST @@ -8,15 +8,14 @@ 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 -lib/texinfo/ @comment lib/texinfo/MiscXS.la -lib/texinfo/MiscXS.so @comment lib/texinfo/XSParagraph.la -lib/texinfo/XSParagraph.so @man man/man1/ginfo.1 @man man/man1/ginstall-info.1 @man man/man1/gmakeinfo.1 @@ -36,21 +35,18 @@ share/locale/ca/LC_MESSAGES/texinfo_document.mo share/locale/cs/LC_MESSAGES/texinfo.mo share/locale/cs/LC_MESSAGES/texinfo_document.mo share/locale/da/LC_MESSAGES/texinfo.mo -share/locale/da/LC_MESSAGES/texinfo_document.mo share/locale/de.us-ascii/ share/locale/de.us-ascii/LC_MESSAGES/ share/locale/de.us-ascii/LC_MESSAGES/texinfo_document.mo share/locale/de/LC_MESSAGES/texinfo.mo share/locale/de/LC_MESSAGES/texinfo_document.mo -share/locale/de_AT/ -share/locale/de_AT/LC_MESSAGES/ -share/locale/de_AT/LC_MESSAGES/texinfo.mo share/locale/el/LC_MESSAGES/texinfo.mo -share/locale/el/LC_MESSAGES/texinfo_document.mo share/locale/eo/LC_MESSAGES/texinfo.mo share/locale/eo/LC_MESSAGES/texinfo_document.mo share/locale/es/LC_MESSAGES/texinfo.mo share/locale/es/LC_MESSAGES/texinfo_document.mo +share/locale/fi/LC_MESSAGES/texinfo.mo +share/locale/fi/LC_MESSAGES/texinfo_document.mo share/locale/fr/LC_MESSAGES/texinfo.mo share/locale/fr/LC_MESSAGES/texinfo_document.mo share/locale/he/LC_MESSAGES/texinfo.mo @@ -62,17 +58,22 @@ share/locale/id/LC_MESSAGES/texinfo.mo share/locale/it/LC_MESSAGES/texinfo.mo share/locale/it/LC_MESSAGES/texinfo_document.mo share/locale/ja/LC_MESSAGES/texinfo.mo +share/locale/ka/LC_MESSAGES/texinfo.mo share/locale/nb/LC_MESSAGES/texinfo.mo share/locale/nl/LC_MESSAGES/texinfo.mo share/locale/nl/LC_MESSAGES/texinfo_document.mo share/locale/no.us-ascii/ share/locale/no.us-ascii/LC_MESSAGES/ share/locale/no.us-ascii/LC_MESSAGES/texinfo_document.mo +share/locale/pl.iso-8859-2/ +share/locale/pl.iso-8859-2/LC_MESSAGES/ +share/locale/pl.iso-8859-2/LC_MESSAGES/texinfo_document.mo share/locale/pl/LC_MESSAGES/texinfo.mo share/locale/pl/LC_MESSAGES/texinfo_document.mo share/locale/pt.us-ascii/ share/locale/pt.us-ascii/LC_MESSAGES/ share/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo +share/locale/pt/LC_MESSAGES/texinfo.mo share/locale/pt/LC_MESSAGES/texinfo_document.mo share/locale/pt_BR.us-ascii/ share/locale/pt_BR.us-ascii/LC_MESSAGES/ @@ -80,10 +81,16 @@ share/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo share/locale/pt_BR/LC_MESSAGES/texinfo.mo share/locale/pt_BR/LC_MESSAGES/texinfo_document.mo share/locale/ro/LC_MESSAGES/texinfo.mo +share/locale/ro/LC_MESSAGES/texinfo_document.mo share/locale/ru/LC_MESSAGES/texinfo.mo share/locale/rw/LC_MESSAGES/texinfo.mo +share/locale/sk/LC_MESSAGES/texinfo.mo +share/locale/sk/LC_MESSAGES/texinfo_document.mo share/locale/sl/LC_MESSAGES/texinfo.mo +share/locale/sr/LC_MESSAGES/texinfo.mo +share/locale/sr/LC_MESSAGES/texinfo_document.mo share/locale/sv/LC_MESSAGES/texinfo.mo +share/locale/sv/LC_MESSAGES/texinfo_document.mo share/locale/tr/LC_MESSAGES/texinfo.mo share/locale/uk/LC_MESSAGES/texinfo.mo share/locale/uk/LC_MESSAGES/texinfo_document.mo @@ -98,7 +105,10 @@ share/texinfo/Pod-Simple-Texinfo/Pod/ share/texinfo/Pod-Simple-Texinfo/Pod/Simple/ share/texinfo/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm share/texinfo/Texinfo/ +share/texinfo/Texinfo/Commands.pm +share/texinfo/Texinfo/Commands.pod share/texinfo/Texinfo/Common.pm +share/texinfo/Texinfo/Config.pm share/texinfo/Texinfo/Convert/ share/texinfo/Texinfo/Convert/Converter.pm share/texinfo/Texinfo/Convert/DocBook.pm @@ -106,37 +116,45 @@ share/texinfo/Texinfo/Convert/HTML.pm share/texinfo/Texinfo/Convert/IXIN.pm share/texinfo/Texinfo/Convert/IXINSXML.pm share/texinfo/Texinfo/Convert/Info.pm -share/texinfo/Texinfo/Convert/Line.pm +share/texinfo/Texinfo/Convert/LaTeX.pm share/texinfo/Texinfo/Convert/NodeNameNormalization.pm share/texinfo/Texinfo/Convert/Paragraph.pm share/texinfo/Texinfo/Convert/ParagraphNonXS.pm share/texinfo/Texinfo/Convert/PlainTexinfo.pm share/texinfo/Texinfo/Convert/Plaintext.pm share/texinfo/Texinfo/Convert/Texinfo.pm +share/texinfo/Texinfo/Convert/TexinfoMarkup.pm share/texinfo/Texinfo/Convert/TexinfoSXML.pm share/texinfo/Texinfo/Convert/TexinfoXML.pm share/texinfo/Texinfo/Convert/Text.pm share/texinfo/Texinfo/Convert/TextContent.pm -share/texinfo/Texinfo/Convert/UnFilled.pm share/texinfo/Texinfo/Convert/Unicode.pm -share/texinfo/Texinfo/Convert/XSParagraph/ -share/texinfo/Texinfo/Convert/XSParagraph/TestXS.pm +share/texinfo/Texinfo/Convert/Utils.pm share/texinfo/Texinfo/Documentlanguages.pm -share/texinfo/Texinfo/Encoding.pm share/texinfo/Texinfo/MiscXS.pm share/texinfo/Texinfo/ModulePath.pm share/texinfo/Texinfo/Parser.pm +share/texinfo/Texinfo/ParserNonXS.pm share/texinfo/Texinfo/Report.pm share/texinfo/Texinfo/Structuring.pm share/texinfo/Texinfo/Transformations.pm +share/texinfo/Texinfo/Translations.pm share/texinfo/Texinfo/XSLoader.pm +share/texinfo/ext/ +share/texinfo/ext/epub3.pm +share/texinfo/ext/highlight_syntax.pm +share/texinfo/ext/latex2html.pm +share/texinfo/ext/tex4ht.pm share/texinfo/htmlxref.cnf share/texinfo/init/ share/texinfo/init/book.pm share/texinfo/init/chm.pm +share/texinfo/init/documentation_examples.pm share/texinfo/init/html32.pm -share/texinfo/init/latex2html.pm -share/texinfo/init/tex4ht.pm +share/texinfo/js/ +share/texinfo/js/info.css +share/texinfo/js/info.js +share/texinfo/js/modernizr.js share/texinfo/lib/ share/texinfo/lib/Text-Unidecode/ share/texinfo/lib/Text-Unidecode/lib/ @@ -151,6 +169,7 @@ share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x04.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x05.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x06.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x07.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x08.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x09.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0a.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0b.pm @@ -167,6 +186,11 @@ share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x15.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x16.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x17.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x18.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x19.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1a.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1b.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1c.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1d.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1e.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1f.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x20.pm @@ -178,12 +202,42 @@ share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x25.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x26.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x27.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x28.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x29.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2a.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2b.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2c.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2d.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2e.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2f.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x30.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x31.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x32.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x33.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x34.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x35.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x36.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x37.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x38.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x39.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3a.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3b.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3c.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3d.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3e.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x3f.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x40.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x41.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x42.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x43.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x44.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x45.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x46.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x47.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x48.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x49.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4a.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4b.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4c.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4d.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4e.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4f.pm @@ -272,6 +326,13 @@ share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa1.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa2.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa3.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa4.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa5.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa6.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa7.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa8.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa9.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xaa.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xab.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xac.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xad.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xae.pm @@ -316,6 +377,39 @@ share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd4.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd5.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd6.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd7.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd8.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd9.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xda.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdb.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdc.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdd.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xde.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xdf.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe0.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe1.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe2.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe3.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe4.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe5.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe6.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe7.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe8.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xe9.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xea.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xeb.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xec.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xed.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xee.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xef.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf0.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf1.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf2.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf3.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf4.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf5.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf6.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf7.pm +share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf8.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf9.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfa.pm share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfb.pm @@ -477,6 +571,7 @@ share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/VISCII.pm share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/_Encode.pm share/texinfo/lib/libintl-perl/lib/Locale/TextDomain.pm share/texinfo/lib/libintl-perl/lib/Locale/Util.pm +share/texinfo/lib/libintl-perl/lib/Locale/gettext_dumb.pm share/texinfo/lib/libintl-perl/lib/Locale/gettext_pp.pm share/texinfo/texindex.awk share/texinfo/texinfo.dtd @@ -485,12 +580,14 @@ share/texmf-local/tex/generic/ share/texmf-local/tex/generic/epsf/ share/texmf-local/tex/generic/epsf/epsf.tex share/texmf-local/tex/texinfo/ +share/texmf-local/tex/texinfo/texinfo-ja.tex share/texmf-local/tex/texinfo/texinfo.tex share/texmf-local/tex/texinfo/txi-ca.tex share/texmf-local/tex/texinfo/txi-cs.tex share/texmf-local/tex/texinfo/txi-de.tex share/texmf-local/tex/texinfo/txi-en.tex share/texmf-local/tex/texinfo/txi-es.tex +share/texmf-local/tex/texinfo/txi-fi.tex share/texmf-local/tex/texinfo/txi-fr.tex share/texmf-local/tex/texinfo/txi-hu.tex share/texmf-local/tex/texinfo/txi-is.tex @@ -506,3 +603,4 @@ share/texmf-local/tex/texinfo/txi-sr.tex share/texmf-local/tex/texinfo/txi-tr.tex share/texmf-local/tex/texinfo/txi-uk.tex @tag mktexlsr-local +share/texmf-local/tex/texinfo/txi-zh.tex
signature.asc
Description: PGP signature
