svn commit: r495370 - in head/print/texinfo: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Mon Mar 11 18:07:08 UTC 2019
Author: sunpoet
Date: Mon Mar 11 18:07:06 2019
New Revision: 495370
URL: https://svnweb.freebsd.org/changeset/ports/495370
Log:
Update to 6.6
Changes: https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS
https://lists.gnu.org/archive/html/bug-texinfo/2019-02/msg00021.html
PR: 236158
Exp-run by: antoine
Added:
head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm
- copied, changed from r495369, head/print/texinfo/files/patch-tp-Texinfo-Parser.pm
Deleted:
head/print/texinfo/files/patch-tp-Texinfo-Parser.pm
Modified:
head/print/texinfo/Makefile
head/print/texinfo/distinfo
head/print/texinfo/pkg-plist
Modified: head/print/texinfo/Makefile
==============================================================================
--- head/print/texinfo/Makefile Mon Mar 11 17:47:10 2019 (r495369)
+++ head/print/texinfo/Makefile Mon Mar 11 18:07:06 2019 (r495370)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= texinfo
-PORTVERSION= 6.5
-PORTREVISION= 5
+PORTVERSION= 6.6
PORTEPOCH= 1
CATEGORIES= print
MASTER_SITES= GNU \
@@ -51,8 +50,8 @@ post-patch:
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/htmlxref.cnf ${WRKSRC}/util/
@${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi ${WRKSRC}/util/
@${REINPLACE_CMD} -e '/rm -f $$(DESTDIR)/ s|$$| $$(DESTDIR)$$(xsdir)/XSParagraph.*|' \
- ${WRKSRC}/tp/Texinfo/Convert/XSParagraph/Makefile.in
- @${REINPLACE_CMD} -e 's|free (.*)|Safe&|' ${WRKSRC}/tp/Texinfo/MiscXS/misc.c
+ ${WRKSRC}/tp/Texinfo/XS/Makefile.in
+ @${REINPLACE_CMD} -e 's|free (.*)|Safe&|' ${WRKSRC}/tp/Texinfo/XS/misc.c
post-install:
${INSTALL_DATA} ${WRKSRC}/util/htmlxref.cnf ${STAGEDIR}${DATADIR}
Modified: head/print/texinfo/distinfo
==============================================================================
--- head/print/texinfo/distinfo Mon Mar 11 17:47:10 2019 (r495369)
+++ head/print/texinfo/distinfo Mon Mar 11 18:07:06 2019 (r495370)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1551354964
-SHA256 (texinfo/6.5/texinfo-6.5.tar.xz) = 77774b3f4a06c20705cc2ef1c804864422e3cf95235e965b1f00a46df7da5f62
-SIZE (texinfo/6.5/texinfo-6.5.tar.xz) = 4503048
-SHA256 (texinfo/6.5/htmlxref.cnf) = 214988e088251b52c5b9c80c05120858777fee4c8cec384be2f33dd716374d2d
-SIZE (texinfo/6.5/htmlxref.cnf) = 20076
-SHA256 (texinfo/6.5/texi2dvi) = 9c608884b81a43a9b0802e7294788b336b2a9db8a64ca775e9e6bdae396a0c24
-SIZE (texinfo/6.5/texi2dvi) = 61195
-SHA256 (texinfo/6.5/texinfo.tex) = b19a421624076a9d1335d1a17c33329a26d02a0a3430b43c2a3cbd51708f1cdf
-SIZE (texinfo/6.5/texinfo.tex) = 380503
+TIMESTAMP = 1551424865
+SHA256 (texinfo/6.6/texinfo-6.6.tar.xz) = 9bb9ca00da53f26a7e5725eee49689cd4a1e18d25d5b061ac8b2053018d93d66
+SIZE (texinfo/6.6/texinfo-6.6.tar.xz) = 4946900
+SHA256 (texinfo/6.6/htmlxref.cnf) = 214988e088251b52c5b9c80c05120858777fee4c8cec384be2f33dd716374d2d
+SIZE (texinfo/6.6/htmlxref.cnf) = 20076
+SHA256 (texinfo/6.6/texi2dvi) = 9c608884b81a43a9b0802e7294788b336b2a9db8a64ca775e9e6bdae396a0c24
+SIZE (texinfo/6.6/texi2dvi) = 61195
+SHA256 (texinfo/6.6/texinfo.tex) = b19a421624076a9d1335d1a17c33329a26d02a0a3430b43c2a3cbd51708f1cdf
+SIZE (texinfo/6.6/texinfo.tex) = 380503
Copied and modified: head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm (from r495369, head/print/texinfo/files/patch-tp-Texinfo-Parser.pm)
==============================================================================
--- head/print/texinfo/files/patch-tp-Texinfo-Parser.pm Mon Mar 11 17:47:10 2019 (r495369, copy source)
+++ head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm Mon Mar 11 18:07:06 2019 (r495370)
@@ -1,16 +1,17 @@
---- tp/Texinfo/Parser.pm.orig 2017-09-12 18:49:03 UTC
-+++ 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->__(
+--- 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->__(
Modified: head/print/texinfo/pkg-plist
==============================================================================
--- head/print/texinfo/pkg-plist Mon Mar 11 17:47:10 2019 (r495369)
+++ head/print/texinfo/pkg-plist Mon Mar 11 18:07:06 2019 (r495370)
@@ -7,8 +7,8 @@ bin/texi2any
bin/texi2dvi
bin/texi2pdf
bin/texindex
-lib/texinfo/MiscXS.a
lib/texinfo/MiscXS.so
+lib/texinfo/Parsetexi.so
man/man1/info.1.gz
man/man1/install-info.1.gz
man/man1/makeinfo.1.gz
@@ -37,6 +37,7 @@ man/man5/texinfo.5.gz
%%NLS%%share/locale/eo/LC_MESSAGES/texinfo_document.mo
%%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/fr/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/fr/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/he/LC_MESSAGES/texinfo.mo
@@ -55,6 +56,7 @@ man/man5/texinfo.5.gz
%%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
@@ -92,15 +94,16 @@ man/man5/texinfo.5.gz
%%DATADIR%%/Texinfo/Convert/TextContent.pm
%%DATADIR%%/Texinfo/Convert/UnFilled.pm
%%DATADIR%%/Texinfo/Convert/Unicode.pm
-%%DATADIR%%/Texinfo/Convert/XSParagraph/TestXS.pm
%%DATADIR%%/Texinfo/Documentlanguages.pm
%%DATADIR%%/Texinfo/Encoding.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/XS/parsetexi/Parsetexi.pm
%%DATADIR%%/Texinfo/XSLoader.pm
%%DATADIR%%/htmlxref.cnf
%%DATADIR%%/init/book.pm
More information about the svn-ports-all
mailing list