Update to 6.7
Changelog: 6.7 (23 September 2019) * Language: . support of index subentries and sub-subentries with @subentry . new commands @seeentry and @seealso in index entries . no need to wrap Top node in @ifnottex - omitted automatically when processed with TeX . UTF-8 is the default input encoding * texi2any . for HTML output, mark index nodes in menus and tables of contents with the 'rel' attribute of the 'a' tag. . TOP_NODE_UP is now only used in HTML if TOP_NODE_UP_URL is set. Also TOP_NODE_UP should now be formatted in the output format. In HTML TOP_NODE_UP should be suitable for inclusion in HTML element attributes, so for instance should not contain elements. . support of noderename.cnf files has been removed . INPUT_PERL_ENCODING, INPUT_ENCODING_NAME, NODE_FILE_EXTENSION, NODE_FILENAMES, SHORTEXTN and TOP_NODE_FILE removed as customization variables. . TOP_NODE_FILE_TARGET now contains the extension. . error messages translated when the XS parser module is in use * texi2dvi . unconditionally run in --batch mode, i.e. without stopping if there is a TeX error . keep on going after a TeX error if the index files changed . with --tidy (or --build-dir), avoid reading index files from previous runs where --tidy was not used * info . for a tree search (with M-/), '}' and '{' work as well as 'M-}' and 'M-{' to go through the results * Distribution: . Several obsolete portability checks removed . gettext 0.20.1, automake 1.16.1 6.6 (16 February 2019) * Language: . new commands @&, @ampchar{} . @cropmarks command removed . @ctrl is no longer recognised (it was a way to insert literal control characters in Info files, but deprecated since the time of Texinfo version 2) . \usebracesinindexestrue is no longer recommended for using braces in index entries, and has been a no-op for some time * texi2any . extension modules fixed to work with the "thread-safe locales" of Perl 5.28 and newer . some code changed to stop warnings being given by newer versions of Perl . for HTML output, use `id' to define link targets instead of the `name' attribute on <a> . A native-code implementation of the Texinfo parser has been included on an experimental basis, which makes texi2any a lot faster. Set the `TEXINFO_XS_PARSER' environment variable to 1 to use. . changes to HTML output: . omit colon after node name in menus by default (use `MENU_ENTRY_COLON' to add it back) . no special CSS for commands like @smallexample . new customization variable `SECTION_NAME_IN_TITLE' to use the section name as the document <title> . use section names instead of node names in generated menus . pass on flags set with -D to TeX . useless static libraries are not installed . the newline after an @insertcopying is not output . warning given for @multitable prototypes not in braces . @indent and @noindent are not allowed inside the arguments to commands where they are not meaningful . @quote-arg and @allow-recursion are not recognised (these two used to be recognised by makeinfo in macro definitions but were never implemented in texinfo.tex) . `FIX_TEXINFO' removed as a customization variable . do not recognise or warn about obsolete customization variables * info . debugging output with -x is not diverted to a separate infodebug file * Development: . switch from Subversion to git - https://savannah.gnu.org/git/?group=texinfo . automake 1.16
This commit is contained in:
parent
a2a4b9a6e6
commit
a79ce94790
12 changed files with 28 additions and 151 deletions
|
@ -1,8 +1,7 @@
|
|||
# $NetBSD: Makefile,v 1.103 2019/10/06 08:58:22 rillig Exp $
|
||||
# $NetBSD: Makefile,v 1.104 2019/10/08 14:30:09 ryoon Exp $
|
||||
|
||||
DISTNAME= texinfo-6.5
|
||||
DISTNAME= texinfo-6.7
|
||||
PKGNAME= g${DISTNAME}
|
||||
PKGREVISION= 4
|
||||
CATEGORIES= devel sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/}
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.22 2017/09/28 12:53:59 ryoon Exp $
|
||||
@comment $NetBSD: PLIST,v 1.23 2019/10/08 14:30:09 ryoon Exp $
|
||||
bin/info
|
||||
bin/install-info
|
||||
bin/makeinfo
|
||||
|
@ -11,6 +11,7 @@ bin/texindex
|
|||
info/info-stnd.info
|
||||
info/texinfo.info
|
||||
lib/texinfo/MiscXS.la
|
||||
lib/texinfo/Parsetexi.la
|
||||
lib/texinfo/XSParagraph.la
|
||||
man/man1/info.1
|
||||
man/man1/install-info.1
|
||||
|
@ -45,15 +46,16 @@ 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/TestXS.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/XS/parsetexi/Parsetexi.pm
|
||||
share/texinfo/Texinfo/XSLoader.pm
|
||||
share/texinfo/htmlxref.cnf
|
||||
share/texinfo/init/book.pm
|
||||
|
|
|
@ -1,21 +1,19 @@
|
|||
@comment $NetBSD: PLIST.locale,v 1.10 2017/09/28 12:53:59 ryoon Exp $
|
||||
@comment $NetBSD: PLIST.locale,v 1.11 2019/10/08 14:30:09 ryoon Exp $
|
||||
share/locale/ca.us-ascii/LC_MESSAGES/texinfo_document.mo
|
||||
share/locale/ca/LC_MESSAGES/texinfo.mo
|
||||
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/LC_MESSAGES/texinfo_document.mo
|
||||
share/locale/de/LC_MESSAGES/texinfo.mo
|
||||
share/locale/de/LC_MESSAGES/texinfo_document.mo
|
||||
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/fr/LC_MESSAGES/texinfo.mo
|
||||
share/locale/fr/LC_MESSAGES/texinfo_document.mo
|
||||
share/locale/he/LC_MESSAGES/texinfo.mo
|
||||
|
@ -34,6 +32,7 @@ share/locale/no.us-ascii/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/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/LC_MESSAGES/texinfo_document.mo
|
||||
share/locale/pt_BR/LC_MESSAGES/texinfo.mo
|
||||
|
@ -42,6 +41,7 @@ share/locale/ro/LC_MESSAGES/texinfo.mo
|
|||
share/locale/ru/LC_MESSAGES/texinfo.mo
|
||||
share/locale/rw/LC_MESSAGES/texinfo.mo
|
||||
share/locale/sl/LC_MESSAGES/texinfo.mo
|
||||
share/locale/sv/LC_MESSAGES/texinfo_document.mo
|
||||
share/locale/sv/LC_MESSAGES/texinfo.mo
|
||||
share/locale/tr/LC_MESSAGES/texinfo.mo
|
||||
share/locale/uk/LC_MESSAGES/texinfo.mo
|
||||
|
|
|
@ -1,17 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.54 2018/08/30 11:27:48 tnn Exp $
|
||||
$NetBSD: distinfo,v 1.55 2019/10/08 14:30:09 ryoon Exp $
|
||||
|
||||
SHA1 (texinfo-6.5.tar.gz) = 0f8e69781e28ec102b6a9487b093c440f5bb8545
|
||||
RMD160 (texinfo-6.5.tar.gz) = cfa624ad3572c21d201bb4c734aae19cd8785e88
|
||||
SHA512 (texinfo-6.5.tar.gz) = 0a8b435f3133781a88b5fa1977cc4777ef98928470586e822213cd72ea74993056fa0cab96e29bb9a34db2a1a58aeb713d488447743a09930ae119ea9ea2e7e5
|
||||
Size (texinfo-6.5.tar.gz) = 9311787 bytes
|
||||
SHA1 (patch-ab) = 1191eb02e87c51b62f45b8d92ffd124a4d5eda05
|
||||
SHA1 (texinfo-6.7.tar.gz) = 3eb87fe3f4241ba4305255f8a47d867dbc4f96fc
|
||||
RMD160 (texinfo-6.7.tar.gz) = 7fe5cfe888c2aa250a7eb8f22c3ad4aeacc0fa8d
|
||||
SHA512 (texinfo-6.7.tar.gz) = a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
|
||||
Size (texinfo-6.7.tar.gz) = 9027808 bytes
|
||||
SHA1 (patch-ab) = c27f30eefc28f021835f118543e872089b1c3c52
|
||||
SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148
|
||||
SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd
|
||||
SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4
|
||||
SHA1 (patch-texindex_texindex.awk) = 1f022f1495c951337997036ef1cd758ef9c116a7
|
||||
SHA1 (patch-tp_Texinfo_Convert_XSParagraph_Makefile.in) = cdb6c78c2c15d3f8ee5755625694c11ecd9004e9
|
||||
SHA1 (patch-tp_Texinfo_Convert_XSParagraph_configure) = d4557bae4417cd42297bceaa76478b00b3875df3
|
||||
SHA1 (patch-tp_Texinfo_Convert_XSParagraph_xspara.c) = ba679fcd739382ad20babe2241c6504e45b69273
|
||||
SHA1 (patch-tp_Texinfo_MiscXS_Makefile.in) = fdf3a4d6f81bdeb03cbf156b77a1510e2f6baf9e
|
||||
SHA1 (patch-tp_Texinfo_Parser.pm) = d3e4ed3ab0fca4a9d017ee65608ea66ee85b28ac
|
||||
SHA1 (patch-util_texi2dvi) = c894eb109ef3faa7ed1cb544556ca6a97af439e9
|
||||
SHA1 (patch-util_texi2dvi) = 72be61e607a393edf0cbd67747f7e0b360441466
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ab,v 1.15 2016/02/13 07:02:08 ryoon Exp $
|
||||
$NetBSD: patch-ab,v 1.16 2019/10/08 14:30:09 ryoon Exp $
|
||||
|
||||
--- info/Makefile.in.orig 2016-02-06 12:24:05.000000000 +0000
|
||||
--- info/Makefile.in.orig 2019-09-23 18:32:12.000000000 +0000
|
||||
+++ info/Makefile.in
|
||||
@@ -1262,7 +1262,8 @@ AM_CPPFLAGS = \
|
||||
@@ -1323,7 +1323,8 @@ AM_CPPFLAGS = \
|
||||
-I$(top_builddir)/gnulib/lib \
|
||||
-DLOCALEDIR=\"$(datadir)/locale\" \
|
||||
-DINFODIR=\"$(infodir)\" \
|
||||
|
@ -10,5 +10,5 @@ $NetBSD: patch-ab,v 1.15 2016/02/13 07:02:08 ryoon Exp $
|
|||
+ -DINFODIR2=\"$(datadir)/info\" \
|
||||
+ -DPKGSRC_INFOPATH=\"$(PKGSRC_INFOPATH)\"
|
||||
|
||||
LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS) $(LIBINTL) $(LIBICONV)
|
||||
LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS) $(LIBINTL) $(LIBICONV) $(LIBTHREAD)
|
||||
EXTRA_DIST = pcterm.c $(TESTS) $(XFAIL_TESTS) t/README t/infodir \
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-texindex_texindex.awk,v 1.2 2015/08/13 20:17:03 joerg Exp $
|
||||
|
||||
--- texindex/texindex.awk.orig 2015-06-18 20:04:07.000000000 +0000
|
||||
+++ texindex/texindex.awk
|
||||
@@ -332,7 +332,9 @@ function field_split( \
|
||||
function print_initial(initial)
|
||||
{
|
||||
if (Do_initials) {
|
||||
- if (index(Special_chars, initial) != 0)
|
||||
+ if (initial == Command_char)
|
||||
+ initial = "$\backslash$"
|
||||
+ else if (index(Special_chars, initial) != 0)
|
||||
initial = Command_char initial
|
||||
printf("%cinitial {%s}\n",
|
||||
Command_char, initial) > Output_file
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_Makefile.in,v 1.1 2017/07/12 11:04:59 wiz Exp $
|
||||
|
||||
Honor LDFLAGS for RELRO builds.
|
||||
|
||||
--- tp/Texinfo/Convert/XSParagraph/Makefile.in.orig 2017-07-12 10:57:18.518824283 +0000
|
||||
+++ tp/Texinfo/Convert/XSParagraph/Makefile.in
|
||||
@@ -573,7 +573,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LD = @LD@
|
||||
-LDFLAGS = $(PERL_EXT_LDFLAGS)
|
||||
+LDFLAGS = $(PERL_EXT_LDFLAGS) @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_configure,v 1.1 2016/03/17 05:35:47 richard Exp $
|
||||
force use of pkgsrc libtool instead of bundled to get over rm issue.
|
||||
--- tp/Texinfo/Convert/XSParagraph/configure.orig 2016-01-30 18:04:16.000000000 +0000
|
||||
+++ tp/Texinfo/Convert/XSParagraph/configure
|
||||
@@ -14592,7 +14592,7 @@ esac
|
||||
LIBTOOL_DEPS=$ltmain
|
||||
|
||||
# Always use our own libtool.
|
||||
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
+#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
|
||||
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_xspara.c,v 1.3 2018/08/30 11:27:48 tnn Exp $
|
||||
|
||||
>From 9031aefb7f180f718db83aec5e2782079455a32f Mon Sep 17 00:00:00 2001
|
||||
From: Niko Tyni <address@hidden>
|
||||
Date: Sat, 30 Jun 2018 16:51:13 +0100
|
||||
Subject: [PATCH] Update locale handling for Perl 5.28
|
||||
|
||||
Perl 5.28 introduced thread-safe locales, where setlocale()
|
||||
only affects the locale of the current thread. External code
|
||||
like mbrtowc(3) isn't aware of this thread specific locale,
|
||||
so we need to explicitly modify the global one instead.
|
||||
|
||||
Without this we could enter a busy loop in xspara__add_next()
|
||||
(Texinfo::Convert::XSParagraph) for UTF-8 documents when mbrtowc(3)
|
||||
returned -1.
|
||||
---
|
||||
tp/Texinfo/Convert/XSParagraph/xspara.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
--- tp/Texinfo/Convert/XSParagraph/xspara.c.orig 2017-06-18 15:38:01.000000000 +0000
|
||||
+++ tp/Texinfo/Convert/XSParagraph/xspara.c
|
||||
@@ -248,6 +248,11 @@ xspara_init (void)
|
||||
|
||||
dTHX;
|
||||
|
||||
+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
|
||||
+ /* needed due to thread-safe locale handling in newer perls */
|
||||
+ switch_to_global_locale();
|
||||
+#endif
|
||||
+
|
||||
if (setlocale (LC_CTYPE, "en_US.UTF-8")
|
||||
|| setlocale (LC_CTYPE, "en_US.utf8"))
|
||||
goto success;
|
||||
@@ -320,6 +325,10 @@ failure:
|
||||
{
|
||||
success: ;
|
||||
free (utf8_locale);
|
||||
+#if PERL_VERSION > 27 || (PERL_VERSION == 27 && PERL_SUBVERSION > 8)
|
||||
+ /* needed due to thread-safe locale handling in newer perls */
|
||||
+ sync_locale();
|
||||
+#endif
|
||||
/*
|
||||
fprintf (stderr, "tried to set LC_CTYPE to UTF-8.\n");
|
||||
fprintf (stderr, "character encoding is: %s\n",
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-tp_Texinfo_MiscXS_Makefile.in,v 1.1 2017/09/29 21:03:45 wiz Exp $
|
||||
|
||||
Pass LDFLAGS to module.
|
||||
|
||||
--- tp/Texinfo/MiscXS/Makefile.in.orig 2017-09-29 20:47:20.485704820 +0000
|
||||
+++ tp/Texinfo/MiscXS/Makefile.in
|
||||
@@ -263,7 +263,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
LD = @LD@
|
||||
-LDFLAGS = $(PERL_EXT_LDFLAGS)
|
||||
+LDFLAGS = $(PERL_EXT_LDFLAGS) @LDFLAGS@
|
||||
LIBOBJS = @LIBOBJS@
|
||||
LIBS = @LIBS@
|
||||
LIBTOOL = @LIBTOOL@
|
|
@ -1,20 +0,0 @@
|
|||
$NetBSD: patch-tp_Texinfo_Parser.pm,v 1.1 2018/08/30 11:03:35 tnn Exp $
|
||||
|
||||
Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.32)
|
||||
|
||||
--- tp/Texinfo/Parser.pm.orig 2017-09-12 18:49:03.000000000 +0000
|
||||
+++ 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->__(
|
|
@ -1,12 +1,14 @@
|
|||
$NetBSD: patch-util_texi2dvi,v 1.6 2017/07/12 11:04:59 wiz Exp $
|
||||
$NetBSD: patch-util_texi2dvi,v 1.7 2019/10/08 14:30:09 ryoon Exp $
|
||||
|
||||
As indicated in pkg/48075, pdksh doesn't support double-parens
|
||||
if not containing an arithmetic expression of a particular form.
|
||||
Older bash and ast-ksh apparently also had problems with this.
|
||||
|
||||
--- util/texi2dvi.orig 2016-09-10 19:25:16.000000000 +0000
|
||||
--- util/texi2dvi.orig 2019-09-23 18:28:10.000000000 +0000
|
||||
+++ util/texi2dvi
|
||||
@@ -27,6 +27,6 @@
|
||||
@@ -22,10 +22,10 @@
|
||||
# If possible, please send a copy of the output of the script called with
|
||||
# the `--debug' option when making a bug report.
|
||||
|
||||
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
|
||||
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
|
||||
|
@ -17,3 +19,5 @@ Older bash and ast-ksh apparently also had problems with this.
|
|||
+# && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
|
||||
+#unset RUNNING_KSH
|
||||
|
||||
# No failure shall remain unpunished.
|
||||
set -e
|
||||
|
|
Loading…
Reference in a new issue