git: 65d3b64a2987 - main - print/texinfo: Update to 7.0.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Apr 2023 21:49:30 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=65d3b64a298777d5e3cfd2b997552bb336f686b5
commit 65d3b64a298777d5e3cfd2b997552bb336f686b5
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-04-18 21:37:45 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-04-18 21:37:45 +0000
print/texinfo: Update to 7.0.3
- Update texinfo.tex to 20230327
Changes: https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS
https://lists.gnu.org/archive/html/bug-texinfo/2022-11/msg00036.html
https://lists.gnu.org/archive/html/bug-texinfo/2022-11/msg00237.html
https://git.savannah.gnu.org/cgit/texinfo.git/log/doc/texinfo.tex
PR: 270721
Exp-run by: antoine
---
print/texinfo/Makefile | 14 +++++--------
print/texinfo/distinfo | 18 ++++++++---------
print/texinfo/files/patch-configure | 11 +++++++++++
.../texinfo/files/patch-tp-Texinfo-ParserNonXS.pm | 11 +++++++++++
.../texinfo/files/patch-tp-Texinfo-XS-Makefile.in | 13 ++++++++++++
print/texinfo/files/patch-tp-Texinfo-XS-misc.c | 22 +++++++++++++++++++++
print/texinfo/pkg-plist | 23 +++++++++++++++++-----
7 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 01cb7f28a985..a32fd5213008 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -1,6 +1,5 @@
PORTNAME= texinfo
-PORTVERSION= 6.8
-PORTREVISION= 3
+PORTVERSION= 7.0.3
PORTEPOCH= 1
CATEGORIES= print
MASTER_SITES= GNU \
@@ -39,12 +38,12 @@ INSTALL_TARGET= install-strip install-tex
MAKE_ARGS= PERL=${PERL} TEXMF=${LOCALBASE}/${TEXMFDIR}
PKGDEINSTALL= ${PKGINSTALL}
-INFO= info-stnd texinfo
+INFO= info-stnd texi2any_api texi2any_internals texinfo
# Use the date on https://ftp.gnu.org/gnu/texinfo/
-HTMLXREF_CNF_RELDATE= 20220110
-TEXI2DVI_RELDATE= 20220408
-TEXINFO_TEX_RELDATE= 20220409
+HTMLXREF_CNF_RELDATE= 20221130
+TEXI2DVI_RELDATE= 20221130
+TEXINFO_TEX_RELDATE= 20230327
CPE_VENDOR= gnu
CPE_VERSION= ${PORTVERSION:R}
@@ -56,9 +55,6 @@ post-patch:
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex-${TEXINFO_TEX_RELDATE} ${WRKSRC}/doc/texinfo.tex
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/htmlxref.cnf-${HTMLXREF_CNF_RELDATE} ${WRKSRC}/util/htmlxref.cnf
@${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi-${TEXI2DVI_RELDATE} ${WRKSRC}/util/texi2dvi
- @${REINPLACE_CMD} -e '/rm -f $$(DESTDIR)/ s|$$| $$(DESTDIR)$$(xsdir)/XSParagraph.*|' ${WRKSRC}/tp/Texinfo/XS/Makefile.in
- @${REINPLACE_CMD} -e 's|free (.*)|Safe&|' ${WRKSRC}/tp/Texinfo/XS/misc.c
- @${REINPLACE_CMD} -e 's/tinfo/tinfow/g' ${WRKSRC}/configure
post-install:
${INSTALL_DATA} ${WRKSRC}/util/htmlxref.cnf ${STAGEDIR}${DATADIR}
diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo
index 4898d2a810ea..ed4badf5c73b 100644
--- a/print/texinfo/distinfo
+++ b/print/texinfo/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1652548170
-SHA256 (texinfo/texinfo-6.8.tar.xz) = 8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4
-SIZE (texinfo/texinfo-6.8.tar.xz) = 4961528
-SHA256 (texinfo/htmlxref.cnf-20220110) = 6c9153878f2abe2f19468b442376ce5784fc030ab6ba5628d46d342596a99c74
-SIZE (texinfo/htmlxref.cnf-20220110) = 22769
-SHA256 (texinfo/texi2dvi-20220408) = 11d5d6aec5eb7de4bb8aa8aed15a17ce226dbf08c6b0bfc53e5a0254e76655b9
-SIZE (texinfo/texi2dvi-20220408) = 58497
-SHA256 (texinfo/texinfo.tex-20220409) = de57dfd9dc2c42466d08adec2717a434cf4cd0d2a517f9eb392f01cb75671e46
-SIZE (texinfo/texinfo.tex-20220409) = 373782
+TIMESTAMP = 1681843834
+SHA256 (texinfo/texinfo-7.0.3.tar.xz) = 74b420d09d7f528e84f97aa330f0dd69a98a6053e7a4e01767eed115038807bf
+SIZE (texinfo/texinfo-7.0.3.tar.xz) = 4886668
+SHA256 (texinfo/htmlxref.cnf-20221130) = ef2e21ec0f84c5529ae74c9b9755d7c9e78f20e1e6aabf6c6f2bd6c282518655
+SIZE (texinfo/htmlxref.cnf-20221130) = 24512
+SHA256 (texinfo/texi2dvi-20221130) = 4ed3d7db702036054dda61268937e4211169a47619ba0afb5e72064e3bc2de76
+SIZE (texinfo/texi2dvi-20221130) = 58633
+SHA256 (texinfo/texinfo.tex-20230327) = a73bd67dd7d63410c8acaa234263f795d257200dc01e0fb5d09e14074c5cbf02
+SIZE (texinfo/texinfo.tex-20230327) = 380239
diff --git a/print/texinfo/files/patch-configure b/print/texinfo/files/patch-configure
new file mode 100644
index 000000000000..90349db507b0
--- /dev/null
+++ b/print/texinfo/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2022-11-30 17:07:45 UTC
++++ configure
+@@ -31429,7 +31429,7 @@ fi
+ # rather ncurses. So we check for it.
+ TERMLIBS=
+ # Check for termlib before termcap because Solaris termcap needs libucb.
+-TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo"
++TERMLIB_VARIANTS="tinfow ncurses curses termlib termcap terminfo"
+ for termlib in ${TERMLIB_VARIANTS}; do
+ as_ac_Lib=`printf "%s\n" "ac_cv_lib_${termlib}""_tgetent" | $as_tr_sh`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
diff --git a/print/texinfo/files/patch-tp-Texinfo-ParserNonXS.pm b/print/texinfo/files/patch-tp-Texinfo-ParserNonXS.pm
new file mode 100644
index 000000000000..720674e98b94
--- /dev/null
+++ b/print/texinfo/files/patch-tp-Texinfo-ParserNonXS.pm
@@ -0,0 +1,11 @@
+--- tp/Texinfo/ParserNonXS.pm.orig 2023-01-22 10:42:42 UTC
++++ tp/Texinfo/ParserNonXS.pm
+@@ -4357,7 +4357,7 @@ sub _process_remaining_on_line($$$$)
+ and ($current->{'parent'}->{'type'} eq 'menu_comment'
+ or $current->{'parent'}->{'type'} eq 'menu_entry_description')
+ and $asterisk
+- and @{$current->{'contents'}}
++ and $current->{'contents'}
+ and $current->{'contents'}->[-1]->{'type'}
+ and $current->{'contents'}->[-1]->{'type'} eq 'empty_line'
+ and $current->{'contents'}->[-1]->{'text'} eq '') {
diff --git a/print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in b/print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in
new file mode 100644
index 000000000000..6d8ccd08a595
--- /dev/null
+++ b/print/texinfo/files/patch-tp-Texinfo-XS-Makefile.in
@@ -0,0 +1,13 @@
+% sed '/rm -f $$(DESTDIR)/ s|$| $(DESTDIR)$(xsdir)/XSParagraph.*|' -i .orig 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-misc.c b/print/texinfo/files/patch-tp-Texinfo-XS-misc.c
new file mode 100644
index 000000000000..ef98e0dba937
--- /dev/null
+++ b/print/texinfo/files/patch-tp-Texinfo-XS-misc.c
@@ -0,0 +1,22 @@
+% sed -e 's|free (.*)|Safe&|' -i .orig tp/Texinfo/XS/misc.c
+
+--- tp/Texinfo/XS/misc.c.orig 2022-11-30 17:06:28 UTC
++++ tp/Texinfo/XS/misc.c
+@@ -67,7 +67,7 @@ xs_abort_empty_line (HV *self, HV *current, SV *additi
+ additional_spaces = SvPV (additional_spaces_in, len);
+ if (!SvUTF8 (additional_spaces_in))
+ {
+- free (new_string);
++ Safefree (new_string);
+ new_string = bytes_to_utf8 (additional_spaces, &len);
+ additional_spaces = new_string;
+ }
+@@ -248,7 +248,7 @@ xs_merge_text (HV *self, HV *current, SV *text_in)
+ text = SvPV (text_in, len);
+ if (!SvUTF8 (text_in))
+ {
+- free (new_string);
++ Safefree (new_string);
+ new_string = bytes_to_utf8 (text, &len);
+ text = new_string;
+ }
diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist
index bb1146c9a9e3..aaf51eba8cf6 100644
--- a/print/texinfo/pkg-plist
+++ b/print/texinfo/pkg-plist
@@ -35,6 +35,7 @@ man/man5/texinfo.5.gz
%%NLS%%share/locale/es/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/es/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/fi/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/fr/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/fr/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/he/LC_MESSAGES/texinfo.mo
@@ -59,9 +60,14 @@ man/man5/texinfo.5.gz
%%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
+%%NLS%%share/locale/ro/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/ru/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/rw/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/sl/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/texinfo.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/sv/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/sv/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/tr/LC_MESSAGES/texinfo.mo
@@ -72,28 +78,31 @@ man/man5/texinfo.5.gz
%%NLS%%share/locale/zh_TW/LC_MESSAGES/texinfo.mo
%%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/Line.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/UnFilled.pm
%%DATADIR%%/Texinfo/Convert/Unicode.pm
+%%DATADIR%%/Texinfo/Convert/Utils.pm
%%DATADIR%%/Texinfo/Documentlanguages.pm
-%%DATADIR%%/Texinfo/Encoding.pm
%%DATADIR%%/Texinfo/MiscXS.pm
%%DATADIR%%/Texinfo/ModulePath.pm
%%DATADIR%%/Texinfo/Parser.pm
@@ -101,15 +110,18 @@ man/man5/texinfo.5.gz
%%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/latex2html.pm
+%%DATADIR%%/ext/tex4ht.pm
%%DATADIR%%/htmlxref.cnf
%%DATADIR%%/init/book.pm
%%DATADIR%%/init/chm.pm
+%%DATADIR%%/init/documentation_examples.pm
%%DATADIR%%/init/highlight_syntax.pm
%%DATADIR%%/init/html32.pm
-%%DATADIR%%/init/latex2html.pm
-%%DATADIR%%/init/tex4ht.pm
%%DATADIR%%/js/info.css
%%DATADIR%%/js/info.js
%%DATADIR%%/js/modernizr.js
@@ -138,3 +150,4 @@ man/man5/texinfo.5.gz
%%TEXMFDIR%%/tex/texinfo/txi-sr.tex
%%TEXMFDIR%%/tex/texinfo/txi-tr.tex
%%TEXMFDIR%%/tex/texinfo/txi-uk.tex
+%%TEXMFDIR%%/tex/texinfo/txi-zh.tex