Date: Sun, 18 Jul 2021 22:07:40 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a53e6655e337 - main - print/texinfo: Update to 6.8 Message-ID: <202107182207.16IM7eGI074103@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a53e6655e337191bd7f92fa070ab979025132063 commit a53e6655e337191bd7f92fa070ab979025132063 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2021-07-18 21:43:56 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2021-07-18 22:07:02 +0000 print/texinfo: Update to 6.8 Changes: https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS https://lists.gnu.org/archive/html/bug-texinfo/2021-07/msg00011.html PR: 257026 Exp-run by: antoine --- devel/autoconf/files/patch-texinfo | 12 ++++++++++++ misc/latex-mk/files/patch-texinfo | 10 ++++++++++ print/texinfo/Makefile | 3 +-- print/texinfo/distinfo | 6 +++--- .../files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm | 17 ----------------- print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c | 4 ++-- .../files/patch-tp-Texinfo-XS-parsetexi-errors.c | 12 ------------ print/texinfo/pkg-plist | 5 +++++ textproc/iksemel/files/patch-texinfo | 10 ++++++++++ 9 files changed, 43 insertions(+), 36 deletions(-) diff --git a/devel/autoconf/files/patch-texinfo b/devel/autoconf/files/patch-texinfo new file mode 100644 index 000000000000..45cdf9f0f74c --- /dev/null +++ b/devel/autoconf/files/patch-texinfo @@ -0,0 +1,12 @@ +--- doc/autoconf.texi.orig 2012-04-25 02:14:19 UTC ++++ doc/autoconf.texi +@@ -5,9 +5,6 @@ + @include version.texi + @settitle Autoconf + @setchapternewpage odd +-@ifnothtml +-@setcontentsaftertitlepage +-@end ifnothtml + @finalout + + @c @ovar(ARG) diff --git a/misc/latex-mk/files/patch-texinfo b/misc/latex-mk/files/patch-texinfo new file mode 100644 index 000000000000..625ce2a94fd2 --- /dev/null +++ b/misc/latex-mk/files/patch-texinfo @@ -0,0 +1,10 @@ +--- doc/latex-mk.texi.orig 2010-12-28 21:50:27 UTC ++++ doc/latex-mk.texi +@@ -3,7 +3,6 @@ + @c %**start of header + @setfilename latex-mk.info + @settitle LaTeX-Mk +-@setcontentsaftertitlepage + @c %**end of header + + @include version.texi diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile index b7c5c7a39ff2..1cbd3ddd71b4 100644 --- a/print/texinfo/Makefile +++ b/print/texinfo/Makefile @@ -1,8 +1,7 @@ # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> PORTNAME= texinfo -PORTVERSION= 6.7 -PORTREVISION= 6 +PORTVERSION= 6.8 PORTEPOCH= 1 CATEGORIES= print MASTER_SITES= GNU \ diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo index 070fe401131b..fe0bf161be29 100644 --- a/print/texinfo/distinfo +++ b/print/texinfo/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1625585436 -SHA256 (texinfo/texinfo-6.7.tar.xz) = 988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa -SIZE (texinfo/texinfo-6.7.tar.xz) = 4337984 +TIMESTAMP = 1625599050 +SHA256 (texinfo/texinfo-6.8.tar.xz) = 8eb753ed28bca21f8f56c1a180362aed789229bd62fff58bf8368e9beb59fec4 +SIZE (texinfo/texinfo-6.8.tar.xz) = 4961528 SHA256 (texinfo/htmlxref.cnf-20201020) = eb8f4a17a4890030d8db2b728deec11d86a9343f696a50fc65f7e4a048520c90 SIZE (texinfo/htmlxref.cnf-20201020) = 20246 SHA256 (texinfo/texi2dvi-20210703) = 6fbc3a9a4f1166e8f0b4fd68ee29b22ba4465f03a7aac77d619d7a991c531f70 diff --git a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm b/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm deleted file mode 100644 index 8b3f9be6219f..000000000000 --- a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm +++ /dev/null @@ -1,17 +0,0 @@ ---- tp/Texinfo/XS/parsetexi/Parser-5556.pm.orig 2019-02-16 17:11:56 UTC -+++ tp/Texinfo/XS/parsetexi/Parser-5556.pm -@@ -5438,12 +5438,12 @@ 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 - unless(_ignore_global_commands($self)); - $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/files/patch-tp-Texinfo-XS-parsetexi-api.c b/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c index b433f95c1ce2..5a96d391bec7 100644 --- a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c +++ b/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-api.c @@ -1,10 +1,10 @@ ---- tp/Texinfo/XS/parsetexi/api.c.orig 2019-08-25 17:11:45 UTC +--- 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 -+#if defined(HAVE_LIBINTL_H) ++#ifdef ENABLE_NLS #include <libintl.h> +#endif diff --git a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-errors.c b/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-errors.c deleted file mode 100644 index 6ba02010067d..000000000000 --- a/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-errors.c +++ /dev/null @@ -1,12 +0,0 @@ ---- tp/Texinfo/XS/parsetexi/errors.c.orig 2019-08-25 17:11:45 UTC -+++ tp/Texinfo/XS/parsetexi/errors.c -@@ -14,7 +14,9 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - - #include <config.h> -+#if defined(HAVE_LIBINTL_H) - #include <libintl.h> -+#endif - - #include <stdlib.h> - #include <stdarg.h> diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist index 497d4688e68f..bb1146c9a9e3 100644 --- a/print/texinfo/pkg-plist +++ b/print/texinfo/pkg-plist @@ -106,9 +106,13 @@ man/man5/texinfo.5.gz %%DATADIR%%/htmlxref.cnf %%DATADIR%%/init/book.pm %%DATADIR%%/init/chm.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 %%DATADIR%%/texindex.awk %%DATADIR%%/texinfo.dtd %%TEXMFDIR%%/tex/generic/epsf/epsf.tex @@ -119,6 +123,7 @@ man/man5/texinfo.5.gz %%TEXMFDIR%%/tex/texinfo/txi-de.tex %%TEXMFDIR%%/tex/texinfo/txi-en.tex %%TEXMFDIR%%/tex/texinfo/txi-es.tex +%%TEXMFDIR%%/tex/texinfo/txi-fi.tex %%TEXMFDIR%%/tex/texinfo/txi-fr.tex %%TEXMFDIR%%/tex/texinfo/txi-hu.tex %%TEXMFDIR%%/tex/texinfo/txi-is.tex diff --git a/textproc/iksemel/files/patch-texinfo b/textproc/iksemel/files/patch-texinfo new file mode 100644 index 000000000000..b486f47f75f2 --- /dev/null +++ b/textproc/iksemel/files/patch-texinfo @@ -0,0 +1,10 @@ +--- doc/iksemel.texi.orig 2011-10-18 20:25:37 UTC ++++ doc/iksemel.texi +@@ -1,7 +1,6 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header + @setfilename iksemel +-@setcontentsaftertitlepage + @settitle Iksemel Programmers Manual + @set VERSION 1.2 + @c %**end of header
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107182207.16IM7eGI074103>