Index: head/print/texinfo/Makefile =================================================================== --- head/print/texinfo/Makefile (revision 495369) +++ head/print/texinfo/Makefile (revision 495370) @@ -1,60 +1,59 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= texinfo -PORTVERSION= 6.5 -PORTREVISION= 5 +PORTVERSION= 6.6 PORTEPOCH= 1 CATEGORIES= print MASTER_SITES= GNU \ LOCAL/sunpoet/${DIST_SUBDIR}:DEFAULT,local DISTFILES= ${DISTNAME}${EXTRACT_SUFX} htmlxref.cnf:local texi2dvi:local texinfo.tex:local DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Typeset documentation system with multiple format output LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= help2man:misc/help2man \ ${RUN_DEPENDS} RUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \ p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \ p5-Unicode-EastAsianWidth>=0:textproc/p5-Unicode-EastAsianWidth OPTIONS_DEFINE= NLS OPTIONS_SUB= yes USES= charsetfix cpe gmake iconv libtool ncurses perl5 tar:xz CONFIGURE_ARGS= --with-external-libintl-perl \ --with-external-Text-Unidecode \ --with-external-Unicode-EastAsianWidth GNU_CONFIGURE= yes INSTALL_TARGET= install-strip install-tex MAKE_ARGS= PERL=${PERL} TEXMF=${LOCALBASE}/${TEXMFDIR} PKGDEINSTALL= ${PKGINSTALL} USE_TEX= yes INFO= info-stnd texinfo CPE_VENDOR= gnu CPE_VERSION= ${PORTVERSION:R} NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext post-patch: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex ${WRKSRC}/doc/ @${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} .include Index: head/print/texinfo/distinfo =================================================================== --- head/print/texinfo/distinfo (revision 495369) +++ head/print/texinfo/distinfo (revision 495370) @@ -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 Index: head/print/texinfo/files/patch-tp-Texinfo-Parser.pm =================================================================== --- head/print/texinfo/files/patch-tp-Texinfo-Parser.pm (revision 495369) +++ head/print/texinfo/files/patch-tp-Texinfo-Parser.pm (nonexistent) @@ -1,16 +0,0 @@ ---- 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->__( Property changes on: head/print/texinfo/files/patch-tp-Texinfo-Parser.pm ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm =================================================================== --- head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm (nonexistent) +++ head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm (revision 495370) @@ -0,0 +1,17 @@ +--- 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->__( Property changes on: head/print/texinfo/files/patch-tp-Texinfo-XS-parsetexi-Parser-5556.pm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/print/texinfo/pkg-plist =================================================================== --- head/print/texinfo/pkg-plist (revision 495369) +++ head/print/texinfo/pkg-plist (revision 495370) @@ -1,133 +1,136 @@ bin/info bin/install-info bin/makeinfo bin/pdftexi2dvi bin/pod2texi 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 man/man1/pdftexi2dvi.1.gz man/man1/pod2texi.1.gz man/man1/texi2any.1.gz man/man1/texi2dvi.1.gz man/man1/texi2pdf.1.gz man/man1/texindex.1.gz man/man5/info.5.gz man/man5/texinfo.5.gz %%NLS%%share/locale/ca.us-ascii/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/ca/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/ca/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/cs/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/cs/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/da/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/da/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/de.us-ascii/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/de/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/de/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/de_AT/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/el/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/el/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/eo/LC_MESSAGES/texinfo.mo %%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 %%NLS%%share/locale/hr/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/hr/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/hu/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/hu/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/id/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/it/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/it/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/ja/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/nb/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/nl/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/nl/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/no.us-ascii/LC_MESSAGES/texinfo_document.mo %%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 %%NLS%%share/locale/pt_BR/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/ro/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/ru/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/rw/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/sl/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/sv/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/tr/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/uk/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/uk/LC_MESSAGES/texinfo_document.mo %%NLS%%share/locale/vi/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/texinfo.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/texinfo.mo %%DATADIR%%/DebugTexinfo/DebugTree.pm %%DATADIR%%/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm %%DATADIR%%/Texinfo/Common.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/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/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/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 %%DATADIR%%/init/chm.pm %%DATADIR%%/init/html32.pm %%DATADIR%%/init/latex2html.pm %%DATADIR%%/init/tex4ht.pm %%DATADIR%%/texindex.awk %%DATADIR%%/texinfo.dtd %%TEXMFDIR%%/tex/generic/epsf/epsf.tex %%TEXMFDIR%%/tex/texinfo/texinfo.tex %%TEXMFDIR%%/tex/texinfo/txi-ca.tex %%TEXMFDIR%%/tex/texinfo/txi-cs.tex %%TEXMFDIR%%/tex/texinfo/txi-de.tex %%TEXMFDIR%%/tex/texinfo/txi-en.tex %%TEXMFDIR%%/tex/texinfo/txi-es.tex %%TEXMFDIR%%/tex/texinfo/txi-fr.tex %%TEXMFDIR%%/tex/texinfo/txi-hu.tex %%TEXMFDIR%%/tex/texinfo/txi-is.tex %%TEXMFDIR%%/tex/texinfo/txi-it.tex %%TEXMFDIR%%/tex/texinfo/txi-ja.tex %%TEXMFDIR%%/tex/texinfo/txi-nb.tex %%TEXMFDIR%%/tex/texinfo/txi-nl.tex %%TEXMFDIR%%/tex/texinfo/txi-nn.tex %%TEXMFDIR%%/tex/texinfo/txi-pl.tex %%TEXMFDIR%%/tex/texinfo/txi-pt.tex %%TEXMFDIR%%/tex/texinfo/txi-ru.tex %%TEXMFDIR%%/tex/texinfo/txi-sr.tex %%TEXMFDIR%%/tex/texinfo/txi-tr.tex %%TEXMFDIR%%/tex/texinfo/txi-uk.tex