aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile49
-rw-r--r--textproc/R-cran-rmarkdown/Makefile10
-rw-r--r--textproc/R-cran-rmarkdown/distinfo6
-rw-r--r--textproc/R-cran-yaml/Makefile4
-rw-r--r--textproc/R-cran-yaml/distinfo5
-rw-r--r--textproc/UCD/distinfo4
-rw-r--r--textproc/aft/Makefile1
-rw-r--r--textproc/agrep/files/patch-agrep.h6
-rw-r--r--textproc/agrep/files/patch-asearch.c8
-rw-r--r--textproc/agrep/files/patch-asearch1.c6
-rw-r--r--textproc/agrep/files/patch-bitap.c8
-rw-r--r--textproc/agrep/files/patch-checkfile.c6
-rw-r--r--textproc/agrep/files/patch-compat.c4
-rw-r--r--textproc/agrep/files/patch-follow.c4
-rw-r--r--textproc/agrep/files/patch-main.c28
-rw-r--r--textproc/agrep/files/patch-maskgen.c4
-rw-r--r--textproc/agrep/files/patch-mgrep.c18
-rw-r--r--textproc/agrep/files/patch-parse.c4
-rw-r--r--textproc/agrep/files/patch-preprocess.c6
-rw-r--r--textproc/agrep/files/patch-sgrep.c38
-rw-r--r--textproc/agrep/files/patch-utilities.c4
-rw-r--r--textproc/aiksaurus-gtk/Makefile21
-rw-r--r--textproc/aiksaurus-gtk/pkg-descr4
-rw-r--r--textproc/aiksaurus-gtk/pkg-plist7
-rw-r--r--textproc/aiksaurus/Makefile8
-rw-r--r--textproc/ansifilter/Makefile4
-rw-r--r--textproc/ansifilter/distinfo5
-rw-r--r--textproc/antiword/Makefile4
-rw-r--r--textproc/apache-solr/Makefile13
-rw-r--r--textproc/apache-solr/distinfo6
-rw-r--r--textproc/apache-solr/files/patch-bind-localhost.patch18
-rw-r--r--textproc/apache-solr/pkg-plist593
-rw-r--r--textproc/artha/Makefile2
-rw-r--r--textproc/aspell/Makefile2
-rw-r--r--textproc/augeas/Makefile2
-rw-r--r--textproc/augeas/distinfo5
-rw-r--r--textproc/augeas/files/patch-lenses_pg__hba.aug10
-rw-r--r--textproc/augeas/files/patch-lenses_postgresql.aug10
-rw-r--r--textproc/augeas/pkg-plist26
-rw-r--r--textproc/bbe/pkg-descr2
-rw-r--r--textproc/bibtool/Makefile2
-rw-r--r--textproc/bibtool/distinfo6
-rw-r--r--textproc/bibtool/pkg-plist2
-rw-r--r--textproc/catdoc/pkg-descr2
-rw-r--r--textproc/cdif/Makefile2
-rw-r--r--textproc/clucene/Makefile2
-rw-r--r--textproc/clucene/pkg-descr2
-rw-r--r--textproc/codespell/Makefile13
-rw-r--r--textproc/dictem/pkg-descr2
-rw-r--r--textproc/dictionary/Makefile16
-rw-r--r--textproc/diffstat/Makefile5
-rw-r--r--textproc/dixit/pkg-descr2
-rw-r--r--textproc/docbook2X/Makefile2
-rw-r--r--textproc/docbook2mdoc/Makefile1
-rw-r--r--textproc/docdiff/Makefile37
-rw-r--r--textproc/docdiff/distinfo2
-rw-r--r--textproc/docdiff/pkg-plist18
-rw-r--r--textproc/domc/Makefile2
-rw-r--r--textproc/dsssl-docbook-modular/pkg-descr2
-rw-r--r--textproc/dtdparse/pkg-descr2
-rw-r--r--textproc/duncan/Makefile3
-rw-r--r--textproc/duncan/distinfo5
-rw-r--r--textproc/ebook-tools/pkg-descr2
-rw-r--r--textproc/elasticsearch-plugin-migration/Makefile2
-rw-r--r--textproc/elasticsearch-plugin-migration/distinfo5
-rw-r--r--textproc/elasticsearch/Makefile12
-rw-r--r--textproc/elasticsearch2-plugin-migration/Makefile2
-rw-r--r--textproc/elasticsearch2-plugin-migration/distinfo6
-rw-r--r--textproc/elasticsearch2-plugin-sql/Makefile4
-rw-r--r--textproc/elasticsearch2-plugin-sql/distinfo6
-rw-r--r--textproc/elixir-earmark/Makefile2
-rw-r--r--textproc/elixir-earmark/distinfo6
-rw-r--r--textproc/elixir-earmark/pkg-plist10
-rw-r--r--textproc/en-hunspell/Makefile2
-rw-r--r--textproc/en-hunspell/distinfo30
-rw-r--r--textproc/enchant/Makefile4
-rw-r--r--textproc/erlang-fast_xml/Makefile2
-rw-r--r--textproc/erlang-fast_xml/distinfo6
-rw-r--r--textproc/exempi/Makefile1
-rw-r--r--textproc/expat2/Makefile4
-rw-r--r--textproc/expat2/pkg-descr2
-rw-r--r--textproc/expat2/pkg-plist1
-rw-r--r--textproc/extract_url/Makefile27
-rw-r--r--textproc/extract_url/distinfo5
-rw-r--r--textproc/extract_url/files/extract_urlview31
-rw-r--r--textproc/extract_url/files/pkg-message.in2
-rw-r--r--textproc/fcitx-qt5/Makefile3
-rw-r--r--textproc/fzf/Makefile5
-rw-r--r--textproc/fzf/distinfo8
-rw-r--r--textproc/gdome2/Makefile2
-rw-r--r--textproc/gnome-spell/Makefile2
-rw-r--r--textproc/gnugrep/Makefile2
-rw-r--r--textproc/gnugrep/distinfo6
-rw-r--r--textproc/goldendict/Makefile4
-rw-r--r--textproc/groonga/Makefile1
-rw-r--r--textproc/gsed/Makefile1
-rw-r--r--textproc/gtkspell/Makefile2
-rw-r--r--textproc/gu-aspell/pkg-descr2
-rw-r--r--textproc/highlight/Makefile2
-rw-r--r--textproc/hs-regex-base/pkg-descr2
-rw-r--r--textproc/hs-regex-compat/pkg-descr2
-rw-r--r--textproc/hs-regex-posix/pkg-descr2
-rw-r--r--textproc/html-xml-utils/Makefile7
-rw-r--r--textproc/htmldoc/Makefile2
-rw-r--r--textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx11
-rw-r--r--textproc/htmltolatex/Makefile3
-rw-r--r--textproc/hunspell/Makefile17
-rw-r--r--textproc/hunspell/distinfo6
-rw-r--r--textproc/hunspell/files/patch-add-const22
-rw-r--r--textproc/ibus-kmfl/Makefile2
-rw-r--r--textproc/icdiff/Makefile2
-rw-r--r--textproc/icdiff/distinfo6
-rw-r--r--textproc/irstlm/Makefile1
-rw-r--r--textproc/jid/Makefile41
-rw-r--r--textproc/jid/distinfo11
-rw-r--r--textproc/jid/pkg-descr4
-rw-r--r--textproc/kenlm/Makefile7
-rw-r--r--textproc/kf5-kcodecs/distinfo6
-rw-r--r--textproc/kf5-sonnet/Makefile3
-rw-r--r--textproc/kf5-sonnet/distinfo6
-rw-r--r--textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake11
-rw-r--r--textproc/kf5-syntax-highlighting/Makefile16
-rw-r--r--textproc/kf5-syntax-highlighting/distinfo3
-rw-r--r--textproc/kf5-syntax-highlighting/files/patch-src_cli_kate-syntax-highlighter.cpp14
-rw-r--r--textproc/kf5-syntax-highlighting/pkg-descr3
-rw-r--r--textproc/kf5-syntax-highlighting/pkg-plist112
-rw-r--r--textproc/kmflcomp/Makefile2
-rw-r--r--textproc/ku-aspell/pkg-descr2
-rw-r--r--textproc/lasem/Makefile2
-rw-r--r--textproc/latex2html/Makefile2
-rw-r--r--textproc/libabw/Makefile2
-rw-r--r--textproc/libabw/files/patch-libabw.pc.in8
-rw-r--r--textproc/libcsv/Makefile20
-rw-r--r--textproc/libcsv/files/patch-csv.3127
-rw-r--r--textproc/libcsv/files/patch-csv.h10
-rw-r--r--textproc/libcsv/files/patch-libcsv.c18
-rw-r--r--textproc/libcsv/pkg-descr2
-rw-r--r--textproc/libcsv/pkg-plist4
-rw-r--r--textproc/libe-book/Makefile3
-rw-r--r--textproc/libe-book/files/patch-libe-book.pc.in8
-rw-r--r--textproc/libe-book/pkg-descr2
-rw-r--r--textproc/libextractor/Makefile2
-rw-r--r--textproc/libfo/Makefile2
-rw-r--r--textproc/libkolabxml/Makefile2
-rw-r--r--textproc/liblrdf/pkg-descr2
-rw-r--r--textproc/libmrss/Makefile2
-rw-r--r--textproc/libmwaw03/Makefile2
-rw-r--r--textproc/libmwaw03/distinfo6
-rw-r--r--textproc/libmwaw03/pkg-plist2
-rw-r--r--textproc/libnxml/Makefile2
-rw-r--r--textproc/libodfgen01/Makefile2
-rw-r--r--textproc/libparsifal/Makefile2
-rw-r--r--textproc/librevenge/Makefile2
-rw-r--r--textproc/libtre/Makefile2
-rw-r--r--textproc/libvisio01/Makefile5
-rw-r--r--textproc/libwps/Makefile3
-rw-r--r--textproc/libwps/distinfo6
-rw-r--r--textproc/libwps/pkg-plist2
-rw-r--r--textproc/libwps03/Makefile2
-rw-r--r--textproc/libxml++26/Makefile2
-rw-r--r--textproc/libxml++26/files/patch-c++1146
-rw-r--r--textproc/libxode/Makefile2
-rw-r--r--textproc/libxslt/Makefile8
-rw-r--r--textproc/libxslt/pkg-plist2
-rw-r--r--textproc/linux-c6-aspell/Makefile6
-rw-r--r--textproc/linux-c6-aspell/distinfo7
-rw-r--r--textproc/linux-c6-aspell/distinfo.i3865
-rw-r--r--textproc/linux-c6-aspell/distinfo.x86_647
-rw-r--r--textproc/linux-c6-aspell/pkg-plist.amd64 (renamed from textproc/linux-c6-aspell/pkg-plist.x86_64)58
-rw-r--r--textproc/linux-c6-aspell/pkg-plist.i38658
-rw-r--r--textproc/linux-c6-expat/Makefile12
-rw-r--r--textproc/linux-c6-expat/distinfo7
-rw-r--r--textproc/linux-c6-expat/distinfo.i3865
-rw-r--r--textproc/linux-c6-expat/distinfo.x86_647
-rw-r--r--textproc/linux-c6-expat/pkg-plist.amd648
-rw-r--r--textproc/linux-c6-expat/pkg-plist.i3866
-rw-r--r--textproc/linux-c6-expat/pkg-plist.x86_646
-rw-r--r--textproc/linux-c6-libxml2/Makefile14
-rw-r--r--textproc/linux-c6-libxml2/distinfo7
-rw-r--r--textproc/linux-c6-libxml2/distinfo.i3865
-rw-r--r--textproc/linux-c6-libxml2/distinfo.x86_647
-rw-r--r--textproc/linux-c6-libxml2/pkg-plist.amd64 (renamed from textproc/linux-c6-libxml2/pkg-plist.x86_64)6
-rw-r--r--textproc/linux-c6-libxml2/pkg-plist.i3866
-rw-r--r--textproc/linux-c7-aspell/Makefile7
-rw-r--r--textproc/linux-c7-aspell/distinfo7
-rw-r--r--textproc/linux-c7-aspell/distinfo.i3865
-rw-r--r--textproc/linux-c7-aspell/distinfo.x86_647
-rw-r--r--textproc/linux-c7-aspell/pkg-plist.amd64 (renamed from textproc/linux-c7-aspell/pkg-plist.x86_64)60
-rw-r--r--textproc/linux-c7-aspell/pkg-plist.i38660
-rw-r--r--textproc/linux-c7-expat/Makefile12
-rw-r--r--textproc/linux-c7-expat/distinfo7
-rw-r--r--textproc/linux-c7-expat/distinfo.i3863
-rw-r--r--textproc/linux-c7-expat/distinfo.x86_645
-rw-r--r--textproc/linux-c7-expat/pkg-plist.amd64 (renamed from textproc/linux-c7-expat/pkg-plist.x86_64)2
-rw-r--r--textproc/linux-c7-expat/pkg-plist.i3862
-rw-r--r--textproc/linux-c7-libxml2/Makefile9
-rw-r--r--textproc/linux-c7-libxml2/distinfo7
-rw-r--r--textproc/linux-c7-libxml2/distinfo.i3865
-rw-r--r--textproc/linux-c7-libxml2/distinfo.x86_647
-rw-r--r--textproc/linux-c7-libxml2/pkg-plist.amd64 (renamed from textproc/linux-c7-libxml2/pkg-plist.x86_64)5
-rw-r--r--textproc/linux-c7-libxml2/pkg-plist.i3865
-rw-r--r--textproc/linux-f10-aspell/Makefile22
-rw-r--r--textproc/linux-f10-aspell/distinfo.i3864
-rw-r--r--textproc/linux-f10-aspell/pkg-plist127
-rw-r--r--textproc/linux-f10-expat/Makefile25
-rw-r--r--textproc/linux-f10-expat/distinfo.i3864
-rw-r--r--textproc/linux-f10-libxml2/Makefile27
-rw-r--r--textproc/linux-f10-libxml2/distinfo.i3864
-rw-r--r--textproc/linux-f10-scim-gtk/Makefile22
-rw-r--r--textproc/linux-f10-scim-gtk/distinfo.i3864
-rw-r--r--textproc/linux-f10-scim-gtk/pkg-descr5
-rw-r--r--textproc/linux-f10-scim-gtk/pkg-plist3
-rw-r--r--textproc/linux-f10-scim-libs/Makefile24
-rw-r--r--textproc/linux-f10-scim-libs/distinfo.i3864
-rw-r--r--textproc/linux-f10-scim-libs/pkg-descr5
-rw-r--r--textproc/linux-f10-scim-libs/pkg-plist12
-rw-r--r--textproc/linuxdoc-tools/Makefile1
-rw-r--r--textproc/linuxdoc/Makefile2
-rw-r--r--textproc/lowdown/Makefile18
-rw-r--r--textproc/lowdown/distinfo3
-rw-r--r--textproc/lowdown/files/patch-Makefile19
-rw-r--r--textproc/lowdown/files/patch-xmalloc.c20
-rw-r--r--textproc/lowdown/pkg-descr7
-rw-r--r--textproc/luaexpat/Makefile1
-rw-r--r--textproc/luceneplusplus/Makefile2
-rw-r--r--textproc/miller/Makefile18
-rw-r--r--textproc/minixmlto/Makefile1
-rw-r--r--textproc/modlogan/pkg-descr2
-rw-r--r--textproc/msort/Makefile3
-rw-r--r--textproc/multimarkdown/Makefile15
-rw-r--r--textproc/mythes/Makefile4
-rw-r--r--textproc/nunnimcax/pkg-descr2
-rw-r--r--textproc/ocaml-pxp/Makefile4
-rw-r--r--textproc/ocaml-text/Makefile2
-rw-r--r--textproc/opengrm-ngram/Makefile2
-rw-r--r--textproc/openjade/Makefile2
-rw-r--r--textproc/opensp/Makefile2
-rw-r--r--textproc/p5-Algorithm-CheckDigits/Makefile1
-rw-r--r--textproc/p5-BibTeX-Parser/Makefile10
-rw-r--r--textproc/p5-BibTeX-Parser/distinfo5
-rw-r--r--textproc/p5-BibTeX-Parser/pkg-plist6
-rw-r--r--textproc/p5-CSS-Croco/Makefile2
-rw-r--r--textproc/p5-Data-Report/Makefile4
-rw-r--r--textproc/p5-EBook-Tools/Makefile1
-rw-r--r--textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile6
-rw-r--r--textproc/p5-HTML-FormatText-WithLinks-AndTables/distinfo5
-rw-r--r--textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-descr8
-rw-r--r--textproc/p5-LaTeX-Table/Makefile2
-rw-r--r--textproc/p5-Lingua-EN-Infinitive/Makefile12
-rw-r--r--textproc/p5-Lingua-EN-Infinitive/distinfo5
-rw-r--r--textproc/p5-Lingua-EN-Infinitive/pkg-plist2
-rw-r--r--textproc/p5-Lingua-EN-MatchNames/Makefile9
-rw-r--r--textproc/p5-Lingua-EN-Tagger/Makefile3
-rw-r--r--textproc/p5-Lingua-EN-Tagger/distinfo5
-rw-r--r--textproc/p5-Lingua-EN-Tagger/files/patch-Makefile.PL20
-rw-r--r--textproc/p5-Lingua-Identify-CLD/Makefile2
-rw-r--r--textproc/p5-Marpa-HTML/Makefile2
-rw-r--r--textproc/p5-PDF-API2/Makefile5
-rw-r--r--textproc/p5-PDF-API2/distinfo6
-rw-r--r--textproc/p5-PDF-API2/pkg-plist1
-rw-r--r--textproc/p5-Perl-Critic/Makefile1
-rw-r--r--textproc/p5-Perl-Lint/Makefile13
-rw-r--r--textproc/p5-Pod-Autopod/Makefile2
-rw-r--r--textproc/p5-Pod-Autopod/distinfo6
-rw-r--r--textproc/p5-Pod-Autopod/pkg-plist2
-rw-r--r--textproc/p5-Pod-Elemental/Makefile9
-rw-r--r--textproc/p5-Pod-Tree/Makefile8
-rw-r--r--textproc/p5-RDF-Core/Makefile1
-rw-r--r--textproc/p5-RDF-Trine/Makefile9
-rw-r--r--textproc/p5-SGMLSpm/Makefile2
-rw-r--r--textproc/p5-SVG/Makefile1
-rw-r--r--textproc/p5-Search-Saryer/Makefile2
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/Makefile1
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/Makefile3
-rw-r--r--textproc/p5-String-LCSS/Makefile16
-rw-r--r--textproc/p5-String-LCSS/distinfo3
-rw-r--r--textproc/p5-String-LCSS/pkg-descr8
-rw-r--r--textproc/p5-String-LCSS/pkg-plist2
-rw-r--r--textproc/p5-TOML-Parser/Makefile26
-rw-r--r--textproc/p5-TOML-Parser/distinfo3
-rw-r--r--textproc/p5-TOML-Parser/pkg-descr6
-rw-r--r--textproc/p5-TOML-Parser/pkg-plist8
-rw-r--r--textproc/p5-TOML/Makefile14
-rw-r--r--textproc/p5-TOML/distinfo5
-rw-r--r--textproc/p5-Text-BibTeX/Makefile3
-rw-r--r--textproc/p5-Text-BibTeX/distinfo6
-rw-r--r--textproc/p5-Text-Colorizer/Makefile1
-rw-r--r--textproc/p5-Text-HikiDoc/Makefile2
-rw-r--r--textproc/p5-Text-HikiDoc/distinfo6
-rw-r--r--textproc/p5-Text-Lorem/Makefile2
-rw-r--r--textproc/p5-Text-RecordParser/Makefile2
-rw-r--r--textproc/p5-Text-Reflow/Makefile2
-rw-r--r--textproc/p5-Text-Reflow/distinfo6
-rw-r--r--textproc/p5-Text-Reflow/files/patch-Reflow.pm4
-rw-r--r--textproc/p5-Text-Sass/Makefile2
-rw-r--r--textproc/p5-UML-Class-Simple/Makefile3
-rw-r--r--textproc/p5-UML-Class-Simple/distinfo5
-rw-r--r--textproc/p5-UML-Class-Simple/pkg-plist2
-rw-r--r--textproc/p5-URI-Find/Makefile1
-rw-r--r--textproc/p5-Unicode-LineBreak/Makefile5
-rw-r--r--textproc/p5-Unicode-LineBreak/distinfo5
-rw-r--r--textproc/p5-Unicode-Unihan/Makefile2
-rw-r--r--textproc/p5-Validator-Custom/Makefile3
-rw-r--r--textproc/p5-Validator-Custom/distinfo5
-rw-r--r--textproc/p5-XML-GDOME/Makefile2
-rw-r--r--textproc/p5-XML-MyXML/Makefile2
-rw-r--r--textproc/p5-XML-MyXML/distinfo6
-rw-r--r--textproc/p5-XML-RSS-Parser/Makefile2
-rw-r--r--textproc/p5-XML-Rules/Makefile2
-rw-r--r--textproc/p5-XML-SAX-ExpatXS/Makefile2
-rw-r--r--textproc/p5-XML-SAX-Machines/Makefile1
-rw-r--r--textproc/p5-XML-STX/Makefile3
-rw-r--r--textproc/pcrs/Makefile2
-rw-r--r--textproc/pdfgrep/Makefile2
-rw-r--r--textproc/pdftohtml/pkg-descr2
-rw-r--r--textproc/pear-File_Fortune/pkg-descr2
-rw-r--r--textproc/pear-File_MARC/Makefile2
-rw-r--r--textproc/pear-File_MARC/distinfo6
-rw-r--r--textproc/pear-File_MARC/pkg-descr2
-rw-r--r--textproc/pear-Horde_CssMinify/Makefile2
-rw-r--r--textproc/pear-Horde_CssMinify/distinfo5
-rw-r--r--textproc/pear-Numbers_Roman/pkg-descr2
-rw-r--r--textproc/pear-Numbers_Words/pkg-descr2
-rw-r--r--textproc/pear-Spreadsheet_Excel_Writer/pkg-descr2
-rw-r--r--textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile1
-rw-r--r--textproc/pear-Structures_DataGrid_DataSource_RSS/pkg-descr2
-rw-r--r--textproc/pear-Structures_DataGrid_DataSource_XML/Makefile1
-rw-r--r--textproc/pear-Structures_DataGrid_DataSource_XML/pkg-descr2
-rw-r--r--textproc/pear-Structures_DataGrid_Renderer_CSV/pkg-descr2
-rw-r--r--textproc/pear-Structures_DataGrid_Renderer_XLS/pkg-descr2
-rw-r--r--textproc/pear-Structures_DataGrid_Renderer_XML/pkg-descr2
-rw-r--r--textproc/pear-Symfony_Component_Yaml/Makefile4
-rw-r--r--textproc/pear-Symfony_Component_Yaml/distinfo5
-rw-r--r--textproc/pear-Text_Highlighter/pkg-descr2
-rw-r--r--textproc/pear-Validate_ISPN/pkg-descr2
-rw-r--r--textproc/pear-XML_Beautifier/pkg-descr2
-rw-r--r--textproc/pear-XML_DTD/pkg-descr2
-rw-r--r--textproc/pear-XML_Feed_Parser/pkg-descr2
-rw-r--r--textproc/pear-XML_HTMLSax/pkg-descr2
-rw-r--r--textproc/pear-XML_Wddx/pkg-descr2
-rw-r--r--textproc/pecl-cld/pkg-descr2
-rw-r--r--textproc/pecl-ctemplate/Makefile7
-rw-r--r--textproc/pecl-doublemetaphone/Makefile4
-rw-r--r--textproc/pecl-doublemetaphone/pkg-descr2
-rw-r--r--textproc/pecl-stem/Makefile4
-rw-r--r--textproc/pecl-stem/pkg-descr2
-rw-r--r--textproc/pecl-syck/Makefile4
-rw-r--r--textproc/pecl-syck/pkg-descr2
-rw-r--r--textproc/pecl-wbxml/Makefile2
-rw-r--r--textproc/pecl-wbxml/pkg-descr2
-rw-r--r--textproc/pecl-xdiff/Makefile4
-rw-r--r--textproc/pecl-xdiff/pkg-descr2
-rw-r--r--textproc/pecl-xdiff2/pkg-descr2
-rw-r--r--textproc/pecl-xslcache/Makefile2
-rw-r--r--textproc/pecl-yaml/Makefile2
-rw-r--r--textproc/pecl-yaml/pkg-descr2
-rw-r--r--textproc/php-mecab/Makefile4
-rw-r--r--textproc/php71-ctype/Makefile9
-rw-r--r--textproc/php71-dom/Makefile9
-rw-r--r--textproc/php71-enchant/Makefile9
-rw-r--r--textproc/php71-pspell/Makefile9
-rw-r--r--textproc/php71-simplexml/Makefile9
-rw-r--r--textproc/php71-simplexml/files/patch-config.m443
-rw-r--r--textproc/php71-wddx/Makefile9
-rw-r--r--textproc/php71-wddx/files/patch-config.m422
-rw-r--r--textproc/php71-wddx/files/patch-wddx.c40
-rw-r--r--textproc/php71-xml/Makefile9
-rw-r--r--textproc/php71-xml/files/patch-compat.c13
-rw-r--r--textproc/php71-xmlreader/Makefile9
-rw-r--r--textproc/php71-xmlwriter/Makefile9
-rw-r--r--textproc/php71-xsl/Makefile9
-rw-r--r--textproc/php71-xsl/files/patch-php_xsl.h11
-rw-r--r--textproc/po4a/Makefile2
-rw-r--r--textproc/pugixml/Makefile5
-rw-r--r--textproc/py-Chameleon/Makefile5
-rw-r--r--textproc/py-Chameleon/distinfo6
-rw-r--r--textproc/py-Chameleon/pkg-descr2
-rw-r--r--textproc/py-MarkupSafe/Makefile4
-rw-r--r--textproc/py-agate-dbf/Makefile4
-rw-r--r--textproc/py-agate-dbf/distinfo6
-rw-r--r--textproc/py-agate-excel/Makefile4
-rw-r--r--textproc/py-agate-excel/distinfo6
-rw-r--r--textproc/py-agate/Makefile2
-rw-r--r--textproc/py-agate/distinfo6
-rw-r--r--textproc/py-cloud_sptheme/Makefile3
-rw-r--r--textproc/py-cloud_sptheme/distinfo6
-rw-r--r--textproc/py-cloud_sptheme/files/patch-index__styling.py14
-rw-r--r--textproc/py-creole/Makefile3
-rw-r--r--textproc/py-creole/distinfo5
-rw-r--r--textproc/py-csvkit/Makefile14
-rw-r--r--textproc/py-csvkit/distinfo6
-rw-r--r--textproc/py-csvkit/files/patch-csvkit.egg-info_requires.txt12
-rw-r--r--textproc/py-csvkit/files/patch-setup.py23
-rw-r--r--textproc/py-csvkit/pkg-descr2
-rw-r--r--textproc/py-docutils/Makefile4
-rw-r--r--textproc/py-docutils/distinfo5
-rw-r--r--textproc/py-elasticsearch-py/Makefile2
-rw-r--r--textproc/py-elasticsearch-py/distinfo6
-rw-r--r--textproc/py-enchant/Makefile10
-rw-r--r--textproc/py-enchant/distinfo5
-rw-r--r--textproc/py-enchant/files/patch-setup.py13
-rw-r--r--textproc/py-enchant/pkg-descr2
-rw-r--r--textproc/py-enchant/pkg-plist47
-rw-r--r--textproc/py-excelerator/pkg-descr2
-rw-r--r--textproc/py-hunspell/Makefile30
-rw-r--r--textproc/py-hunspell/distinfo3
-rw-r--r--textproc/py-hunspell/pkg-descr6
-rw-r--r--textproc/py-markdown2/Makefile2
-rw-r--r--textproc/py-markdown2/distinfo5
-rw-r--r--textproc/py-mwparserfromhell/Makefile2
-rw-r--r--textproc/py-mwparserfromhell/distinfo5
-rw-r--r--textproc/py-openpyxl/Makefile2
-rw-r--r--textproc/py-openpyxl/distinfo6
-rw-r--r--textproc/py-pandocfilters/Makefile19
-rw-r--r--textproc/py-pandocfilters/distinfo3
-rw-r--r--textproc/py-pandocfilters/pkg-descr3
-rw-r--r--textproc/py-qrcode/Makefile2
-rw-r--r--textproc/py-qrcode/distinfo5
-rw-r--r--textproc/py-rdflib/Makefile3
-rw-r--r--textproc/py-rdflib/distinfo5
-rw-r--r--textproc/py-regex/Makefile2
-rw-r--r--textproc/py-regex/distinfo6
-rw-r--r--textproc/py-rst2html5/Makefile2
-rw-r--r--textproc/py-rst2html5/distinfo6
-rw-r--r--textproc/py-scour/Makefile20
-rw-r--r--textproc/py-scour/distinfo3
-rw-r--r--textproc/py-scour/pkg-descr8
-rw-r--r--textproc/py-sparqlwrapper/Makefile3
-rw-r--r--textproc/py-sparqlwrapper/distinfo5
-rw-r--r--textproc/py-sphinx/Makefile1
-rw-r--r--textproc/py-tabletext/Makefile18
-rw-r--r--textproc/py-tabletext/distinfo3
-rw-r--r--textproc/py-tabletext/pkg-descr5
-rw-r--r--textproc/py-ucl/Makefile2
-rw-r--r--textproc/py-wstools/Makefile5
-rw-r--r--textproc/py-wstools/distinfo6
-rw-r--r--textproc/py-wstools/files/patch-setup.py25
-rw-r--r--textproc/py-xlsxwriter/Makefile4
-rw-r--r--textproc/py-xlsxwriter/distinfo6
-rw-r--r--textproc/py3-MarkupSafe/Makefile5
-rw-r--r--textproc/py3-asciinema/Makefile7
-rw-r--r--textproc/py3-chardet/Makefile5
-rw-r--r--textproc/py3-hunspell/Makefile7
-rw-r--r--textproc/py3-pager/Makefile4
-rw-r--r--textproc/qrcodegen/Makefile44
-rw-r--r--textproc/qrcodegen/distinfo3
-rw-r--r--textproc/qrcodegen/files/qrcodegen.in6
-rw-r--r--textproc/qrcodegen/pkg-descr23
-rw-r--r--textproc/qrcodegen/pkg-plist6
-rw-r--r--textproc/qstardict/Makefile1
-rw-r--r--textproc/rand/Makefile1
-rw-r--r--textproc/randlm/Makefile8
-rw-r--r--textproc/raptor/Makefile2
-rw-r--r--textproc/rarian/pkg-plist4
-rw-r--r--textproc/rnv/Makefile1
-rw-r--r--textproc/rss2html/Makefile2
-rw-r--r--textproc/ruby-htmlrepair/Makefile28
-rw-r--r--textproc/ruby-htmlrepair/distinfo2
-rw-r--r--textproc/ruby-htmlrepair/pkg-descr7
-rw-r--r--textproc/ruby-htmlsplit/Makefile26
-rw-r--r--textproc/ruby-htmlsplit/distinfo2
-rw-r--r--textproc/ruby-htmlsplit/pkg-descr4
-rw-r--r--textproc/ruby-htree/Makefile2
-rw-r--r--textproc/ruby-rss.alt/Makefile39
-rw-r--r--textproc/ruby-rss.alt/distinfo2
-rw-r--r--textproc/ruby-rss.alt/pkg-descr12
-rw-r--r--textproc/ruby-rss.alt/pkg-plist47
-rw-r--r--textproc/ruby-rss/Makefile44
-rw-r--r--textproc/ruby-rss/distinfo2
-rw-r--r--textproc/ruby-rss/pkg-descr4
-rw-r--r--textproc/ruby-rss/pkg-plist11
-rw-r--r--textproc/ruby-xml-configfile/Makefile34
-rw-r--r--textproc/ruby-xml-configfile/distinfo2
-rw-r--r--textproc/ruby-xml-configfile/pkg-descr4
-rw-r--r--textproc/ruby-xml-configfile/pkg-plist5
-rw-r--r--textproc/ruby-xmlscan/Makefile45
-rw-r--r--textproc/ruby-xmlscan/distinfo2
-rw-r--r--textproc/ruby-xmlscan/pkg-descr2
-rw-r--r--textproc/ruby-xmlscan/pkg-plist35
-rw-r--r--textproc/rubygem-actionpack-xml_parser/Makefile2
-rw-r--r--textproc/rubygem-actionpack-xml_parser/distinfo5
-rw-r--r--textproc/rubygem-actionpack-xml_parser/pkg-descr2
-rw-r--r--textproc/rubygem-actionpack-xml_parser1/Makefile22
-rw-r--r--textproc/rubygem-actionpack-xml_parser1/distinfo3
-rw-r--r--textproc/rubygem-actionpack-xml_parser1/pkg-descr5
-rw-r--r--textproc/rubygem-asciidoctor/Makefile2
-rw-r--r--textproc/rubygem-asciidoctor/distinfo5
-rw-r--r--textproc/rubygem-autoprefixer-rails/Makefile2
-rw-r--r--textproc/rubygem-autoprefixer-rails/distinfo6
-rw-r--r--textproc/rubygem-css_parser/Makefile2
-rw-r--r--textproc/rubygem-css_parser/distinfo6
-rw-r--r--textproc/rubygem-diff-lcs/Makefile14
-rw-r--r--textproc/rubygem-diff-lcs/distinfo5
-rw-r--r--textproc/rubygem-docdiff/Makefile20
-rw-r--r--textproc/rubygem-docdiff/distinfo3
-rw-r--r--textproc/rubygem-docdiff/pkg-descr (renamed from textproc/docdiff/pkg-descr)2
-rw-r--r--textproc/rubygem-elasticsearch-api/Makefile2
-rw-r--r--textproc/rubygem-elasticsearch-api/distinfo5
-rw-r--r--textproc/rubygem-elasticsearch-transport/Makefile2
-rw-r--r--textproc/rubygem-elasticsearch-transport/distinfo5
-rw-r--r--textproc/rubygem-elasticsearch/Makefile2
-rw-r--r--textproc/rubygem-elasticsearch/distinfo5
-rw-r--r--textproc/rubygem-gemoji/Makefile4
-rw-r--r--textproc/rubygem-gemoji/distinfo5
-rw-r--r--textproc/rubygem-github-linguist/Makefile2
-rw-r--r--textproc/rubygem-github-linguist/distinfo5
-rw-r--r--textproc/rubygem-github-markdown/Makefile1
-rw-r--r--textproc/rubygem-github-markup/Makefile3
-rw-r--r--textproc/rubygem-github-markup/distinfo5
-rw-r--r--textproc/rubygem-gitlab-markup/Makefile2
-rw-r--r--textproc/rubygem-gitlab-markup/distinfo6
-rw-r--r--textproc/rubygem-html-pipeline/Makefile2
-rw-r--r--textproc/rubygem-html-pipeline/distinfo5
-rw-r--r--textproc/rubygem-htmlentities/pkg-descr2
-rw-r--r--textproc/rubygem-ini/pkg-descr2
-rw-r--r--textproc/rubygem-itextomml/Makefile2
-rw-r--r--textproc/rubygem-itextomml/distinfo5
-rw-r--r--textproc/rubygem-jekyll-assets/Makefile1
-rw-r--r--textproc/rubygem-jekyll-assets/files/patch-gemspec11
-rw-r--r--textproc/rubygem-jekyll-redirect-from/Makefile4
-rw-r--r--textproc/rubygem-jekyll-redirect-from/distinfo6
-rw-r--r--textproc/rubygem-jekyll-sitemap/Makefile4
-rw-r--r--textproc/rubygem-jekyll-sitemap/distinfo5
-rw-r--r--textproc/rubygem-jemoji/Makefile4
-rw-r--r--textproc/rubygem-jemoji/distinfo6
-rw-r--r--textproc/rubygem-kramdown/Makefile2
-rw-r--r--textproc/rubygem-kramdown/distinfo5
-rw-r--r--textproc/rubygem-kramdown/pkg-descr2
-rw-r--r--textproc/rubygem-libxml-ruby/Makefile2
-rw-r--r--textproc/rubygem-libxml-ruby/distinfo5
-rw-r--r--textproc/rubygem-liquid/Makefile4
-rw-r--r--textproc/rubygem-liquid/distinfo5
-rw-r--r--textproc/rubygem-liquid2/Makefile4
-rw-r--r--textproc/rubygem-liquid3/Makefile20
-rw-r--r--textproc/rubygem-liquid3/distinfo3
-rw-r--r--textproc/rubygem-liquid3/pkg-descr4
-rw-r--r--textproc/rubygem-loggability/Makefile3
-rw-r--r--textproc/rubygem-loggability/distinfo5
-rw-r--r--textproc/rubygem-markaby/Makefile4
-rw-r--r--textproc/rubygem-multi_xml/Makefile3
-rw-r--r--textproc/rubygem-multi_xml/distinfo5
-rw-r--r--textproc/rubygem-nokogiri/Makefile2
-rw-r--r--textproc/rubygem-nokogiri/distinfo6
-rw-r--r--textproc/rubygem-nokogiri/files/patch-gemspec10
-rw-r--r--textproc/rubygem-nokogiri14/Makefile4
-rw-r--r--textproc/rubygem-nokogumbo/Makefile4
-rw-r--r--textproc/rubygem-nokogumbo/distinfo5
-rw-r--r--textproc/rubygem-opml/pkg-descr2
-rw-r--r--textproc/rubygem-ox/Makefile2
-rw-r--r--textproc/rubygem-ox/distinfo6
-rw-r--r--textproc/rubygem-pretty-xml/Makefile2
-rw-r--r--textproc/rubygem-pretty-xml/distinfo6
-rw-r--r--textproc/rubygem-rails-dom-testing/Makefile4
-rw-r--r--textproc/rubygem-rails-dom-testing/distinfo5
-rw-r--r--textproc/rubygem-rails-dom-testing1/Makefile26
-rw-r--r--textproc/rubygem-rails-dom-testing1/distinfo3
-rw-r--r--textproc/rubygem-rails-dom-testing1/pkg-descr8
-rw-r--r--textproc/rubygem-rdiscount/Makefile2
-rw-r--r--textproc/rubygem-rdiscount/distinfo5
-rw-r--r--textproc/rubygem-redcarpet/Makefile2
-rw-r--r--textproc/rubygem-redcarpet/distinfo5
-rw-r--r--textproc/rubygem-rich/Makefile7
-rw-r--r--textproc/rubygem-rouge1/Makefile25
-rw-r--r--textproc/rubygem-rouge1/distinfo3
-rw-r--r--textproc/rubygem-rouge1/pkg-descr4
-rw-r--r--textproc/rubygem-rubypants/Makefile2
-rw-r--r--textproc/rubygem-rubypants/distinfo5
-rw-r--r--textproc/rubygem-rugments/Makefile2
-rw-r--r--textproc/rubygem-sanitize/Makefile2
-rw-r--r--textproc/rubygem-sanitize/distinfo5
-rw-r--r--textproc/rubygem-sass-rails/Makefile26
-rw-r--r--textproc/rubygem-sass-rails/distinfo2
-rw-r--r--textproc/rubygem-sass-rails/files/patch-gemspec11
-rw-r--r--textproc/rubygem-sass-rails/pkg-descr3
-rw-r--r--textproc/rubygem-sass-rails4/Makefile3
-rw-r--r--textproc/rubygem-sass-rails5/Makefile3
-rw-r--r--textproc/rubygem-sass-rails5/distinfo5
-rw-r--r--textproc/rubygem-sass/Makefile2
-rw-r--r--textproc/rubygem-sass/distinfo5
-rw-r--r--textproc/rubygem-scss_lint/Makefile4
-rw-r--r--textproc/rubygem-scss_lint/distinfo5
-rw-r--r--textproc/rubygem-sixarm_ruby_unaccent/Makefile21
-rw-r--r--textproc/rubygem-sixarm_ruby_unaccent/distinfo3
-rw-r--r--textproc/rubygem-sixarm_ruby_unaccent/pkg-descr3
-rw-r--r--textproc/rubygem-spreadsheet/Makefile2
-rw-r--r--textproc/rubygem-spreadsheet/distinfo5
-rw-r--r--textproc/rubygem-syntax/Makefile2
-rw-r--r--textproc/rubygem-syntax/distinfo5
-rw-r--r--textproc/rubygem-terminal-table/Makefile5
-rw-r--r--textproc/rubygem-terminal-table/distinfo5
-rw-r--r--textproc/rubygem-tidy/pkg-descr2
-rw-r--r--textproc/rubygem-twitter-text/Makefile2
-rw-r--r--textproc/rubygem-twitter-text/distinfo5
-rw-r--r--textproc/rubygem-yard/Makefile2
-rw-r--r--textproc/rubygem-yard/distinfo5
-rw-r--r--textproc/sablotron/Makefile26
-rw-r--r--textproc/sablotron/files/patch-configure4
-rw-r--r--textproc/sablotron/pkg-descr2
-rw-r--r--textproc/sary/Makefile2
-rw-r--r--textproc/scew/Makefile4
-rw-r--r--textproc/scim-input-pad/Makefile2
-rw-r--r--textproc/sdcv/Makefile10
-rw-r--r--textproc/sigil/Makefile6
-rw-r--r--textproc/sk-mythes/Makefile2
-rw-r--r--textproc/sk-mythes/distinfo6
-rw-r--r--textproc/source-highlight/Makefile2
-rw-r--r--textproc/spellutils/Makefile2
-rw-r--r--textproc/sphinxsearch-devel/Makefile2
-rw-r--r--textproc/spiff/Makefile9
-rw-r--r--textproc/spiff/distinfo5
-rw-r--r--textproc/splitpatch/Makefile33
-rw-r--r--textproc/splitpatch/distinfo3
-rw-r--r--textproc/splitpatch/files/patch-man_pod2man.mk33
-rw-r--r--textproc/splitpatch/pkg-descr5
-rw-r--r--textproc/srilm/Makefile2
-rw-r--r--textproc/stardict3/Makefile3
-rw-r--r--textproc/supercat/Makefile9
-rw-r--r--textproc/supercat/distinfo5
-rw-r--r--textproc/tclExpat/Makefile2
-rw-r--r--textproc/te-hunspell/Makefile4
-rw-r--r--textproc/teckit/Makefile2
-rw-r--r--textproc/templates_parser/Makefile7
-rw-r--r--textproc/the_silver_searcher/Makefile2
-rw-r--r--textproc/tinyxml/pkg-descr2
-rw-r--r--textproc/tkdiff/pkg-descr2
-rw-r--r--textproc/txt2html/Makefile2
-rw-r--r--textproc/uncrustify/Makefile1
-rw-r--r--textproc/utf8proc/Makefile19
-rw-r--r--textproc/utf8proc/distinfo5
-rw-r--r--textproc/utf8proc/pkg-plist5
-rw-r--r--textproc/wdiff/Makefile3
-rw-r--r--textproc/weka/Makefile3
-rw-r--r--textproc/weka/distinfo5
-rw-r--r--textproc/wv/Makefile2
-rw-r--r--textproc/wv2/Makefile2
-rw-r--r--textproc/xerces-c3/pkg-descr17
-rw-r--r--textproc/xmlppm/Makefile2
-rw-r--r--textproc/xmlroff/Makefile2
-rw-r--r--textproc/xmlwrapp/Makefile2
-rw-r--r--textproc/xslide.el/Makefile7
-rw-r--r--textproc/xsv/Makefile19
-rw-r--r--textproc/xsv/files/patch-setup.py6
-rw-r--r--textproc/xxdiff/Makefile13
-rw-r--r--textproc/yaml-mode.el/Makefile13
-rw-r--r--textproc/yaml-mode.el/distinfo5
-rw-r--r--textproc/zorba/Makefile10
-rw-r--r--textproc/zorba/pkg-descr2
-rw-r--r--textproc/zorba/pkg-plist88
-rw-r--r--textproc/zxing-cpp/Makefile21
-rw-r--r--textproc/zxing-cpp/distinfo3
-rw-r--r--textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp11
-rw-r--r--textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp10
-rw-r--r--textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp14
-rw-r--r--textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h19
-rw-r--r--textproc/zxing-cpp/pkg-descr3
-rw-r--r--textproc/zxing-cpp/pkg-plist104
656 files changed, 3328 insertions, 2359 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index a8db636f6938..153ee077b94f 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -18,6 +18,7 @@
SUBDIR += R-cran-xml2
SUBDIR += R-cran-xtable
SUBDIR += R-cran-yaml
+ SUBDIR += UCD
SUBDIR += ack
SUBDIR += adabrowse
SUBDIR += add-css-links
@@ -25,7 +26,6 @@
SUBDIR += aft
SUBDIR += agrep
SUBDIR += aiksaurus
- SUBDIR += aiksaurus-gtk
SUBDIR += align
SUBDIR += am-aspell
SUBDIR += amberfish
@@ -132,7 +132,6 @@
SUBDIR += docbook2X
SUBDIR += docbook2mdoc
SUBDIR += docbook2odf
- SUBDIR += docdiff
SUBDIR += doclifter
SUBDIR += docproj
SUBDIR += dom4j
@@ -355,15 +354,17 @@
SUBDIR += jaxup
SUBDIR += jdictionary
SUBDIR += jdictionary-int-eng
+ SUBDIR += jid
SUBDIR += jing
SUBDIR += jo
SUBDIR += jq
SUBDIR += jrefentry
SUBDIR += jshon
SUBDIR += kdiff3
+ SUBDIR += kenlm
SUBDIR += kf5-kcodecs
SUBDIR += kf5-sonnet
- SUBDIR += kenlm
+ SUBDIR += kf5-syntax-highlighting
SUBDIR += kibana3
SUBDIR += kibana41
SUBDIR += kibana43
@@ -449,15 +450,11 @@
SUBDIR += linux-c7-aspell
SUBDIR += linux-c7-expat
SUBDIR += linux-c7-libxml2
- SUBDIR += linux-f10-aspell
- SUBDIR += linux-f10-expat
- SUBDIR += linux-f10-libxml2
- SUBDIR += linux-f10-scim-gtk
- SUBDIR += linux-f10-scim-libs
SUBDIR += linuxdoc
SUBDIR += linuxdoc-tools
SUBDIR += localize
SUBDIR += loook
+ SUBDIR += lowdown
SUBDIR += lt-aspell
SUBDIR += lt-hyphen
SUBDIR += lttoolbox
@@ -799,6 +796,7 @@
SUBDIR += p5-String-Fraction
SUBDIR += p5-String-HexConvert
SUBDIR += p5-String-Koremutake
+ SUBDIR += p5-String-LCSS
SUBDIR += p5-String-Print
SUBDIR += p5-String-RewritePrefix
SUBDIR += p5-String-Scanf
@@ -814,6 +812,7 @@
SUBDIR += p5-Syntax-Highlight-Engine-Kate
SUBDIR += p5-Syntax-Highlight-Perl-Improved
SUBDIR += p5-TOML
+ SUBDIR += p5-TOML-Parser
SUBDIR += p5-TeX-Encode
SUBDIR += p5-TeX-Hyphen
SUBDIR += p5-Template-Declare
@@ -1206,6 +1205,16 @@
SUBDIR += php70-xmlreader
SUBDIR += php70-xmlwriter
SUBDIR += php70-xsl
+ SUBDIR += php71-ctype
+ SUBDIR += php71-dom
+ SUBDIR += php71-enchant
+ SUBDIR += php71-pspell
+ SUBDIR += php71-simplexml
+ SUBDIR += php71-wddx
+ SUBDIR += php71-xml
+ SUBDIR += php71-xmlreader
+ SUBDIR += php71-xmlwriter
+ SUBDIR += php71-xsl
SUBDIR += plover
SUBDIR += po4a
SUBDIR += pocketreader
@@ -1253,6 +1262,7 @@
SUBDIR += py-guess-language
SUBDIR += py-hexdump
SUBDIR += py-html2text
+ SUBDIR += py-hunspell
SUBDIR += py-hyperestraier-python
SUBDIR += py-hypua2jamo
SUBDIR += py-jaxml
@@ -1269,6 +1279,7 @@
SUBDIR += py-nltk
SUBDIR += py-numpydoc
SUBDIR += py-openpyxl
+ SUBDIR += py-pandocfilters
SUBDIR += py-paragrep
SUBDIR += py-parsimonious
SUBDIR += py-pdfminer
@@ -1301,6 +1312,7 @@
SUBDIR += py-rst2html5
SUBDIR += py-rstyoutube
SUBDIR += py-rxp
+ SUBDIR += py-scour
SUBDIR += py-sgrep
SUBDIR += py-snowballstemmer
SUBDIR += py-sparqlwrapper
@@ -1315,6 +1327,7 @@
SUBDIR += py-sphinxcontrib-httpdomain
SUBDIR += py-sphinxcontrib-programoutput
SUBDIR += py-syck
+ SUBDIR += py-tabletext
SUBDIR += py-terminaltables
SUBDIR += py-texttable
SUBDIR += py-tinycss
@@ -1346,10 +1359,12 @@
SUBDIR += py3-MarkupSafe
SUBDIR += py3-asciinema
SUBDIR += py3-chardet
+ SUBDIR += py3-hunspell
SUBDIR += py3-libxml2
SUBDIR += py3-pager
SUBDIR += pychm
SUBDIR += qprint
+ SUBDIR += qrcodegen
SUBDIR += qstardict
SUBDIR += qt4-xml
SUBDIR += qt4-xmlpatterns
@@ -1392,19 +1407,14 @@
SUBDIR += ruby-deplate
SUBDIR += ruby-escape
SUBDIR += ruby-format
- SUBDIR += ruby-htmlrepair
- SUBDIR += ruby-htmlsplit
SUBDIR += ruby-htree
SUBDIR += ruby-rd-mode.el
SUBDIR += ruby-rdtool
- SUBDIR += ruby-rss
- SUBDIR += ruby-rss.alt
SUBDIR += ruby-rttool
SUBDIR += ruby-sary
- SUBDIR += ruby-xml-configfile
SUBDIR += ruby-xmlparser
- SUBDIR += ruby-xmlscan
SUBDIR += rubygem-actionpack-xml_parser
+ SUBDIR += rubygem-actionpack-xml_parser1
SUBDIR += rubygem-albino
SUBDIR += rubygem-amatch
SUBDIR += rubygem-asciidoctor
@@ -1425,6 +1435,7 @@
SUBDIR += rubygem-cssmin
SUBDIR += rubygem-diff-lcs
SUBDIR += rubygem-diffy
+ SUBDIR += rubygem-docdiff
SUBDIR += rubygem-elasticsearch
SUBDIR += rubygem-elasticsearch-api
SUBDIR += rubygem-elasticsearch-transport
@@ -1468,6 +1479,7 @@
SUBDIR += rubygem-linguistics
SUBDIR += rubygem-liquid
SUBDIR += rubygem-liquid2
+ SUBDIR += rubygem-liquid3
SUBDIR += rubygem-loggability
SUBDIR += rubygem-loofah
SUBDIR += rubygem-ltsv
@@ -1485,6 +1497,7 @@
SUBDIR += rubygem-phone
SUBDIR += rubygem-pretty-xml
SUBDIR += rubygem-rails-dom-testing
+ SUBDIR += rubygem-rails-dom-testing1
SUBDIR += rubygem-rails-html-sanitizer
SUBDIR += rubygem-rak
SUBDIR += rubygem-rchardet
@@ -1496,15 +1509,15 @@
SUBDIR += rubygem-rich
SUBDIR += rubygem-rmmseg-cpp
SUBDIR += rubygem-rouge
+ SUBDIR += rubygem-rouge1
SUBDIR += rubygem-rttool
- SUBDIR += rubygem-ruby_expect
SUBDIR += rubygem-ruby-augeas
SUBDIR += rubygem-ruby-xslt
+ SUBDIR += rubygem-ruby_expect
SUBDIR += rubygem-rubypants
SUBDIR += rubygem-rugments
SUBDIR += rubygem-sanitize
SUBDIR += rubygem-sass
- SUBDIR += rubygem-sass-rails
SUBDIR += rubygem-sass-rails4
SUBDIR += rubygem-sass-rails5
SUBDIR += rubygem-sass32
@@ -1512,6 +1525,7 @@
SUBDIR += rubygem-scss_lint
SUBDIR += rubygem-shell2html
SUBDIR += rubygem-simplecov-html
+ SUBDIR += rubygem-sixarm_ruby_unaccent
SUBDIR += rubygem-spreadsheet
SUBDIR += rubygem-stamp
SUBDIR += rubygem-syntax
@@ -1585,6 +1599,7 @@
SUBDIR += sphinxsearch
SUBDIR += sphinxsearch-devel
SUBDIR += spiff
+ SUBDIR += splitpatch
SUBDIR += sq-hunspell
SUBDIR += sr-aspell
SUBDIR += sr-hunspell
@@ -1641,7 +1656,6 @@
SUBDIR += txt2html
SUBDIR += txt2man
SUBDIR += txt2tags
- SUBDIR += UCD
SUBDIR += uchardet
SUBDIR += uim
SUBDIR += uim-el
@@ -1736,5 +1750,6 @@
SUBDIR += zsh-syntax-highlighting
SUBDIR += zu-aspell
SUBDIR += zu-hunspell
+ SUBDIR += zxing-cpp
.include <bsd.port.subdir.mk>
diff --git a/textproc/R-cran-rmarkdown/Makefile b/textproc/R-cran-rmarkdown/Makefile
index 89d79d7dd10f..65bfd2287389 100644
--- a/textproc/R-cran-rmarkdown/Makefile
+++ b/textproc/R-cran-rmarkdown/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rmarkdown
-PORTVERSION= 1.0
+PORTVERSION= 1.3
CATEGORIES= textproc
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -11,12 +11,14 @@ COMMENT= Dynamic Documents for R
LICENSE= GPLv3
-CRAN_DEPENDS= R-cran-knitr>=1.13:print/R-cran-knitr \
+CRAN_DEPENDS= R-cran-knitr>=1.14:print/R-cran-knitr \
R-cran-yaml>=2.1.5:textproc/R-cran-yaml \
- R-cran-htmltools>=0.2.4:textproc/R-cran-htmltools \
+ R-cran-htmltools>=0.3.5:textproc/R-cran-htmltools \
R-cran-caTools>0:devel/R-cran-caTools \
+ R-cran-evaluate>=0.8:devel/R-cran-evaluate \
R-cran-base64enc>0:converters/R-cran-base64enc \
- R-cran-jsonlite>0:converters/R-cran-jsonlite
+ R-cran-jsonlite>0:converters/R-cran-jsonlite \
+ R-cran-rprojroot>0:devel/R-cran-rprojroot
BUILD_DEPENDS= ${CRAN_DEPENDS}
RUN_DEPENDS= hs-pandoc>=1.12.3:textproc/hs-pandoc \
${CRAN_DEPENDS}
diff --git a/textproc/R-cran-rmarkdown/distinfo b/textproc/R-cran-rmarkdown/distinfo
index b636d1828337..66b089a308f5 100644
--- a/textproc/R-cran-rmarkdown/distinfo
+++ b/textproc/R-cran-rmarkdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468902196
-SHA256 (rmarkdown_1.0.tar.gz) = ff1ecb74ebc444b9b0b7b547adc512daefe1ee08d06bc0e3ee4eb68e58d2ef30
-SIZE (rmarkdown_1.0.tar.gz) = 2049183
+TIMESTAMP = 1482506475
+SHA256 (rmarkdown_1.3.tar.gz) = 4eb28ad40161b8239803f90f68d1f5199a4252122ad293cc34bd7bf887f37def
+SIZE (rmarkdown_1.3.tar.gz) = 2073859
diff --git a/textproc/R-cran-yaml/Makefile b/textproc/R-cran-yaml/Makefile
index 0af8cd600123..d38a68948ccd 100644
--- a/textproc/R-cran-yaml/Makefile
+++ b/textproc/R-cran-yaml/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 2.1.13
+PORTVERSION= 2.1.14
CATEGORIES= textproc
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -11,6 +11,6 @@ COMMENT= Methods to convert R data to YAML and back
LICENSE= BSD3CLAUSE
-USES= cran:auto-plist
+USES= cran:auto-plist,compiles
.include <bsd.port.mk>
diff --git a/textproc/R-cran-yaml/distinfo b/textproc/R-cran-yaml/distinfo
index 72ca43e85429..2188814bd821 100644
--- a/textproc/R-cran-yaml/distinfo
+++ b/textproc/R-cran-yaml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (yaml_2.1.13.tar.gz) = 26f69aa2008bcacf3b2f95ef82a4667eaec2f2da8487646f71f1e2635d2d7fa2
-SIZE (yaml_2.1.13.tar.gz) = 81045
+TIMESTAMP = 1481016904
+SHA256 (yaml_2.1.14.tar.gz) = 41a559846f6d44cc2dbcb3fc0becbc50d2766d3dc2aad7cfb97c1f9759ec0875
+SIZE (yaml_2.1.14.tar.gz) = 81095
diff --git a/textproc/UCD/distinfo b/textproc/UCD/distinfo
index 0a67e0cfcbfb..9c1ff9f4d848 100644
--- a/textproc/UCD/distinfo
+++ b/textproc/UCD/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1480192452
+TIMESTAMP = 1484504270
SHA256 (UCD-9.0.0/UCD.zip) = df9e028425816fd5117eaea7173704056f88f7cd030681e457c6f3827f9390ec
SIZE (UCD-9.0.0/UCD.zip) = 5655592
-SHA256 (UCD-9.0.0/copyright.html) = de57d1cc3cee5a514557ea6e79a09eea5324ac777b9e802bbb6d1da9cca9cd6d
+SHA256 (UCD-9.0.0/copyright.html) = 9e3e8cfd23e3856941d3aaccf96736fdd16d1e55359b8a0a4ba745f0f5296c3d
SIZE (UCD-9.0.0/copyright.html) = 16571
diff --git a/textproc/aft/Makefile b/textproc/aft/Makefile
index fef80ae0fa0f..1ae6433851d1 100644
--- a/textproc/aft/Makefile
+++ b/textproc/aft/Makefile
@@ -3,6 +3,7 @@
PORTNAME= aft
PORTVERSION= 5.098
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= textproc
MASTER_SITES= http://www.maplefish.com/todd/
diff --git a/textproc/agrep/files/patch-agrep.h b/textproc/agrep/files/patch-agrep.h
index b32f8972c9e6..ad471eb05dac 100644
--- a/textproc/agrep/files/patch-agrep.h
+++ b/textproc/agrep/files/patch-agrep.h
@@ -1,5 +1,5 @@
---- agrep.h.orig 1992-01-17 20:15:13.000000000 +0100
-+++ agrep.h 2011-11-27 13:35:40.000000000 +0100
+--- agrep.h.orig 1992-01-17 19:15:13 UTC
++++ agrep.h
@@ -1,10 +1,10 @@
#include <stdio.h>
+#include <stdlib.h>
@@ -13,7 +13,7 @@
#define CHAR unsigned char
#define MAXPAT 128
#define MAXPATT 256
-@@ -52,3 +52,37 @@
+@@ -52,3 +52,37 @@ extern int strlen();
#define NNLINE 239 /* special symbol for newline in begin of pattern*/
/* matches '\n' and NNLINE */
diff --git a/textproc/agrep/files/patch-asearch.c b/textproc/agrep/files/patch-asearch.c
index 8dbc657ef494..eedc7b9b94cd 100644
--- a/textproc/agrep/files/patch-asearch.c
+++ b/textproc/agrep/files/patch-asearch.c
@@ -1,6 +1,6 @@
---- asearch.c.orig 1992-01-24 02:49:08.000000000 +0100
-+++ asearch.c 2011-11-27 12:05:20.000000000 +0100
-@@ -6,7 +6,9 @@
+--- asearch.c.orig 1992-01-24 01:49:08 UTC
++++ asearch.c
+@@ -6,7 +6,9 @@ extern int DELIMITER, FILENAMEONLY, INVE
extern CHAR CurrentFileName[];
extern int I, num_of_matched, TRUNCATE;
@@ -11,7 +11,7 @@
CHAR old_D_pat[]; int text; register unsigned D;
{
register unsigned i, c, r1, r2, CMask, r_NO_ERR, r_Init1;
-@@ -178,7 +180,7 @@
+@@ -178,7 +180,7 @@ Nextchar1: i=i+1;
return;
}
diff --git a/textproc/agrep/files/patch-asearch1.c b/textproc/agrep/files/patch-asearch1.c
index 48981794e721..6b5e25f8b2a0 100644
--- a/textproc/agrep/files/patch-asearch1.c
+++ b/textproc/agrep/files/patch-asearch1.c
@@ -1,6 +1,6 @@
---- asearch1.c.orig 1992-01-17 22:00:38.000000000 +0100
-+++ asearch1.c 2011-11-27 12:07:32.000000000 +0100
-@@ -8,7 +8,7 @@
+--- asearch1.c.orig 1992-01-17 21:00:38 UTC
++++ asearch1.c
+@@ -8,7 +8,7 @@ extern char CurrentFileName[];
extern int num_of_matched;
diff --git a/textproc/agrep/files/patch-bitap.c b/textproc/agrep/files/patch-bitap.c
index f6ee4b81f618..f9f831fe2dda 100644
--- a/textproc/agrep/files/patch-bitap.c
+++ b/textproc/agrep/files/patch-bitap.c
@@ -1,5 +1,5 @@
---- bitap.c.orig 1992-01-17 22:00:15.000000000 +0100
-+++ bitap.c 2011-11-27 13:33:41.000000000 +0100
+--- bitap.c.orig 1992-01-17 21:00:15 UTC
++++ bitap.c
@@ -13,6 +13,8 @@
#include "agrep.h"
@@ -9,7 +9,7 @@
extern unsigned Init1, D_endpos, endposition, Init[], Mask[], Bit[];
extern int DELIMITER, FILENAMEONLY, D_length, I, AND, REGEX, JUMP, INVERSE;
extern char D_pattern[];
-@@ -22,7 +24,7 @@
+@@ -22,7 +24,7 @@ extern int num_of_matched;
/* bitap dispatches job */
@@ -18,7 +18,7 @@
char old_D_pat[], *Pattern; int fd, M, D;
{
char c;
-@@ -143,7 +145,7 @@
+@@ -143,7 +145,7 @@ char buffer[Max_record+Max_record+BlockS
return;
}
diff --git a/textproc/agrep/files/patch-checkfile.c b/textproc/agrep/files/patch-checkfile.c
index 3255d658550c..99f2edf95e11 100644
--- a/textproc/agrep/files/patch-checkfile.c
+++ b/textproc/agrep/files/patch-checkfile.c
@@ -1,6 +1,6 @@
---- checkfile.c.orig 1992-01-17 20:14:42.000000000 +0100
-+++ checkfile.c 2011-11-27 13:19:28.000000000 +0100
-@@ -65,6 +65,7 @@
+--- checkfile.c.orig 1992-01-17 19:14:42 UTC
++++ checkfile.c
+@@ -65,6 +65,7 @@ int ftype;
return ISSOCKET;
}
*/
diff --git a/textproc/agrep/files/patch-compat.c b/textproc/agrep/files/patch-compat.c
index 92a28e671dcb..d87c299f81db 100644
--- a/textproc/agrep/files/patch-compat.c
+++ b/textproc/agrep/files/patch-compat.c
@@ -1,5 +1,5 @@
---- compat.c.orig 1992-01-21 14:36:26.000000000 +0100
-+++ compat.c 2011-11-27 13:25:35.000000000 +0100
+--- compat.c.orig 1992-01-21 13:36:26 UTC
++++ compat.c
@@ -1,17 +1,18 @@
/* test the conflicts between options */
#include <stdio.h>
diff --git a/textproc/agrep/files/patch-follow.c b/textproc/agrep/files/patch-follow.c
index 6cdd4bc67cac..64ff83378930 100644
--- a/textproc/agrep/files/patch-follow.c
+++ b/textproc/agrep/files/patch-follow.c
@@ -1,5 +1,5 @@
---- follow.c.orig Fri Jan 17 20:14:42 1992
-+++ follow.c Sun Jul 21 03:50:47 2002
+--- follow.c.orig 1992-01-17 19:14:42 UTC
++++ follow.c
@@ -3,14 +3,12 @@
construction. */
diff --git a/textproc/agrep/files/patch-main.c b/textproc/agrep/files/patch-main.c
index 7c32b3b415b9..48ec4a749294 100644
--- a/textproc/agrep/files/patch-main.c
+++ b/textproc/agrep/files/patch-main.c
@@ -1,5 +1,5 @@
---- main.c.orig 1992-04-14 22:41:24.000000000 +0200
-+++ main.c 2011-11-27 13:36:45.000000000 +0100
+--- main.c.orig 1992-04-14 20:41:24 UTC
++++ main.c
@@ -1,6 +1,14 @@
/* Copyright (c) 1991 Sun Wu and Udi Manber. All Rights Reserved. */
#include "agrep.h"
@@ -15,7 +15,7 @@
unsigned Mask[MAXSYM];
unsigned Init1, NO_ERR_MASK, Init[MaxError];
-@@ -33,7 +41,7 @@
+@@ -33,7 +41,7 @@ int NOFILENAME = 0, /* Boolean flag, s
extern int init();
int table[WORD][WORD];
@@ -24,7 +24,7 @@
{
int i;
-@@ -51,7 +59,7 @@
+@@ -51,7 +59,7 @@ initial_value()
for (i=0; i< MAXSYM; i++) Mask[i] = 0;
}
@@ -33,7 +33,7 @@
int M; unsigned *Next, *Next1;
{
int i, j=0, n, k, temp;
-@@ -110,7 +118,7 @@
+@@ -110,7 +118,7 @@ int M; unsigned *Next, *Next1;
return;
}
@@ -42,7 +42,7 @@
int m;
{ int i, ex;
ex= 1;
-@@ -118,7 +126,7 @@
+@@ -118,7 +126,7 @@ int m;
return(ex);
}
@@ -51,7 +51,7 @@
int Text, M, D;
{
register unsigned i, c, r0, r1, r2, r3, CMask, Newline, Init0, r_NO_ERR;
-@@ -393,7 +401,7 @@
+@@ -393,7 +401,7 @@ Nextchar1: i=i+1;
return;
} /* re1 */
@@ -60,7 +60,7 @@
int Text, M, D;
{
register unsigned i, c, r1, r2, r3, CMask, k, Newline, Init0, Init1, end;
-@@ -595,7 +603,7 @@
+@@ -595,7 +603,7 @@ Nextchar1: i++;
} /* re */
@@ -69,7 +69,7 @@
int i, end, j;
CHAR *buffer;
{
-@@ -612,7 +620,7 @@
+@@ -612,7 +620,7 @@ int bp;
while (bp <= i ) putchar(buffer[bp++]);
}
@@ -78,7 +78,7 @@
int argc; char *argv[];
{
int N, M, D=0, fp, fd, i, j;
-@@ -751,7 +759,7 @@
+@@ -751,7 +759,7 @@ int argc; char *argv[];
}
if (!(PAT_FILE) && Pattern[0] == '\0') { /* Pattern not set with -e option */
if (argc == 0) usage();
@@ -87,7 +87,7 @@
argc--;
argv++;
}
-@@ -897,7 +905,7 @@
+@@ -897,7 +905,7 @@ CONT:
} /* end of main() */
@@ -96,7 +96,7 @@
char *fname;
{
int num_read;
-@@ -921,7 +929,7 @@
+@@ -921,7 +929,7 @@ CHAR buf[4097];
}
@@ -105,7 +105,7 @@
{
fprintf(stderr, "usage: %s [-#cdehiklnpstvwxBDGIS] [-f patternfile] pattern [files]\n", Progname);
printf("\n");
-@@ -942,7 +950,7 @@
+@@ -942,7 +950,7 @@ usage()
exit(2);
}
@@ -114,7 +114,7 @@
CHAR *Pattern; int D;
{
char c;
-@@ -999,7 +1007,8 @@
+@@ -999,7 +1007,8 @@ CHAR *Pattern; int D;
return;
}
diff --git a/textproc/agrep/files/patch-maskgen.c b/textproc/agrep/files/patch-maskgen.c
index 188abdff93c5..f6aef650e9c5 100644
--- a/textproc/agrep/files/patch-maskgen.c
+++ b/textproc/agrep/files/patch-maskgen.c
@@ -1,5 +1,5 @@
---- maskgen.c.orig 1992-01-17 20:14:43.000000000 +0100
-+++ maskgen.c 2011-11-27 12:56:20.000000000 +0100
+--- maskgen.c.orig 1992-01-17 19:14:43 UTC
++++ maskgen.c
@@ -2,11 +2,11 @@
#include "agrep.h"
diff --git a/textproc/agrep/files/patch-mgrep.c b/textproc/agrep/files/patch-mgrep.c
index 367e33ac8474..57aba592defe 100644
--- a/textproc/agrep/files/patch-mgrep.c
+++ b/textproc/agrep/files/patch-mgrep.c
@@ -1,5 +1,5 @@
---- mgrep.c.orig 1992-04-11 00:12:27.000000000 +0200
-+++ mgrep.c 2011-11-27 13:42:10.000000000 +0100
+--- mgrep.c.orig 1992-04-10 22:12:27 UTC
++++ mgrep.c
@@ -1,7 +1,10 @@
/* Copyright (c) 1991 Sun Wu and Udi Manber. All Rights Reserved. */
/* multipattern matcher */
@@ -32,7 +32,7 @@
int LONG = 0;
int SHORT = 0;
-@@ -37,7 +45,7 @@
+@@ -37,7 +45,7 @@ unsigned char *patt[max_num];
unsigned char pat_len[max_num];
@@ -41,7 +41,7 @@
int fp;
{
int length=0, i, p=1, pdx=0, num_pat;
-@@ -85,7 +93,7 @@
+@@ -85,7 +93,7 @@ int fp;
if(p!=0 && p < p_size) p_size = p;
}
if(p_size == 0) {
@@ -50,7 +50,7 @@
exit(2);
}
if(length > 400 && p_size > 2) LONG = 1;
-@@ -98,7 +106,7 @@
+@@ -98,7 +106,7 @@ int fp;
}
@@ -59,7 +59,7 @@
int fd;
{
register char r_newline = '\n';
-@@ -136,7 +144,7 @@
+@@ -136,7 +144,7 @@ int fd;
return;
} /* end mgrep */
@@ -68,7 +68,7 @@
unsigned char *text; int len;
{
int i;
-@@ -144,7 +152,7 @@
+@@ -144,7 +152,7 @@ int i;
}
@@ -77,7 +77,7 @@
int start, end; register unsigned char *text;
{
register unsigned char *textend;
-@@ -232,7 +240,7 @@
+@@ -232,7 +240,7 @@ while (text <= textend) {
if(INVERSE && !COUNT) while(lastout <= textend) putchar(*lastout++);
}
@@ -86,7 +86,7 @@
int start, end; register unsigned char *text;
{
register unsigned char *textend;
-@@ -292,7 +300,7 @@
+@@ -292,7 +300,7 @@ while (++text <= textend) {
if(INVERSE && !COUNT) while(lastout <= textend) putchar(*lastout++);
}
diff --git a/textproc/agrep/files/patch-parse.c b/textproc/agrep/files/patch-parse.c
index be259ad02816..1f44b9c377b6 100644
--- a/textproc/agrep/files/patch-parse.c
+++ b/textproc/agrep/files/patch-parse.c
@@ -1,5 +1,5 @@
---- parse.c.orig Fri Jan 17 20:14:43 1992
-+++ parse.c Sun Jul 21 03:50:47 2002
+--- parse.c.orig 1992-01-17 19:14:43 UTC
++++ parse.c
@@ -3,6 +3,7 @@
tree for that regular expression. */
diff --git a/textproc/agrep/files/patch-preprocess.c b/textproc/agrep/files/patch-preprocess.c
index e663b3bb06ff..39ddd171534d 100644
--- a/textproc/agrep/files/patch-preprocess.c
+++ b/textproc/agrep/files/patch-preprocess.c
@@ -1,5 +1,5 @@
---- preprocess.c.orig 1992-01-17 20:14:43.000000000 +0100
-+++ preprocess.c 2011-11-27 12:47:32.000000000 +0100
+--- preprocess.c.orig 1992-01-17 19:14:43 UTC
++++ preprocess.c
@@ -14,6 +14,8 @@
/* D_pattern contains transformed D_pattern */
@@ -9,7 +9,7 @@
extern int SIMPLEPATTERN, WHOLELINE, REGEX, RE_ERR, DELIMITER, TAIL, WORDBOUND;
extern int HEAD;
-@@ -21,7 +23,7 @@
+@@ -21,7 +23,7 @@ extern CHAR Progname[];
extern int D_length;
extern int table[WORD][WORD];
diff --git a/textproc/agrep/files/patch-sgrep.c b/textproc/agrep/files/patch-sgrep.c
index d03663c5e1d9..545a1a6a7b81 100644
--- a/textproc/agrep/files/patch-sgrep.c
+++ b/textproc/agrep/files/patch-sgrep.c
@@ -1,5 +1,5 @@
---- sgrep.c.orig 1992-04-11 00:12:02.000000000 +0200
-+++ sgrep.c 2011-11-27 12:44:11.000000000 +0100
+--- sgrep.c.orig 1992-04-10 22:12:02 UTC
++++ sgrep.c
@@ -1,6 +1,9 @@
/* Copyright (c) 1991 Sun Wu and Udi Manber. All Rights Reserved. */
#include <stdio.h>
@@ -24,7 +24,7 @@
extern unsigned char CurrentFileName[], Progname[];
extern unsigned Mask[];
extern unsigned endposition;
-@@ -30,6 +33,21 @@
+@@ -30,6 +33,21 @@ unsigned char BSize; /* l
unsigned char char_map[MAXSYM];
@@ -46,7 +46,7 @@
/* data area */
int shift_1;
CHARTYPE SHIFT[MAXSYM];
-@@ -39,7 +57,7 @@
+@@ -39,7 +57,7 @@ unsigned Hashmask;
char MEMBER_1[MAXMEMBER_1];
CHARTYPE TR[MAXSYM];
@@ -55,7 +55,7 @@
unsigned char *pat;
int *m;
{
-@@ -64,7 +82,7 @@
+@@ -64,7 +82,7 @@ unsigned char temp[MAXPATT];
}
}
@@ -64,7 +64,7 @@
CHARTYPE *pat; int fd, m, D;
{
CHARTYPE text[BLOCKSIZE+2*MAXLINE+MAXPATT]; /* input text stream */
-@@ -126,7 +144,7 @@
+@@ -126,7 +144,7 @@ CHARTYPE *pat; int fd, m, D;
/* SUN: bm assumes that the content of text[n]...text[n+m-1] is
pat[m-1] such that the skip loop is guaranteed to terminated */
@@ -73,7 +73,7 @@
CHARTYPE *text, *textend, *pat; int m;
{
register int shift;
-@@ -179,7 +197,7 @@
+@@ -179,7 +197,7 @@ return;
/* initmask() initializes the mask table for the pattern */
/* endposition is a mask for the endposition of the pattern */
/* endposition will contain k mask bits if the pattern contains k fragments */
@@ -82,7 +82,7 @@
CHARTYPE *pattern; unsigned *Mask; register int m, D; unsigned *endposition;
{
register unsigned Bit1, c;
-@@ -202,7 +220,7 @@
+@@ -202,7 +220,7 @@ CHARTYPE *pattern; unsigned *Mask; regis
}
}
@@ -91,7 +91,7 @@
CHARTYPE *Pattern; /* can be fine-tuned to choose a better partition */
register int M, D;
{
-@@ -250,7 +268,7 @@
+@@ -250,7 +268,7 @@ unsigned hash, b_size = 3;
}
@@ -100,7 +100,7 @@
int M, D ; register CHARTYPE *text, *textend, *pat;
{
register int i;
-@@ -357,7 +375,7 @@
+@@ -357,7 +375,7 @@ int M, D ; register CHARTYPE *text, *tex
return;
}
@@ -109,7 +109,7 @@
int *i; CHARTYPE *text;
{
int kk, bp;
-@@ -375,9 +393,9 @@
+@@ -375,9 +393,9 @@ int kk, bp;
}
@@ -121,7 +121,7 @@
{
int i, j;
unsigned hash;
-@@ -404,7 +422,7 @@
+@@ -404,7 +422,7 @@ unsigned char lastc;
/* a_monkey() the approximate monkey move */
@@ -130,7 +130,7 @@
register int m, D ; register CHARTYPE *text, *textend, *pat;
{
register CHARTYPE *oldtext;
-@@ -451,7 +469,7 @@
+@@ -451,7 +469,7 @@ register int m1 = m-1-D, j, pos;
CHARTYPE SHIFT_2[MAX_SHIFT_2];
@@ -139,7 +139,7 @@
register int m ; register CHARTYPE *text, *textend, *pat;
{
register unsigned hash, i;
-@@ -494,7 +512,7 @@
+@@ -494,7 +512,7 @@ r_newline = '\n';
}
}
@@ -148,7 +148,7 @@
CHARTYPE *Pattern;
{
int i, j, m;
-@@ -511,7 +529,7 @@
+@@ -511,7 +529,7 @@ unsigned hash;
}
@@ -157,7 +157,7 @@
register int m, n, D;
CHARTYPE *pat, *text;
{
-@@ -566,7 +584,7 @@
+@@ -566,7 +584,7 @@ CHARTYPE *pat, *text;
/* preprocessing for monkey() */
@@ -166,7 +166,7 @@
CHARTYPE *Pattern;
{
int i, j, m;
-@@ -595,7 +613,7 @@
+@@ -595,7 +613,7 @@ unsigned hash;
char *MEMBER_D;
@@ -175,7 +175,7 @@
register int m, D ; register unsigned char *text, *pat, *textend;
{
register unsigned char *oldtext;
-@@ -639,7 +657,7 @@
+@@ -639,7 +657,7 @@ register int m1=m-1-D, j, pos;
}
}
@@ -184,7 +184,7 @@
char *Pattern; int m;
{
int i, j, k;
-@@ -672,7 +690,7 @@
+@@ -672,7 +690,7 @@ char_map['n'] = char_map['n'] = 5;
}
}
diff --git a/textproc/agrep/files/patch-utilities.c b/textproc/agrep/files/patch-utilities.c
index ab9fdc78c53b..d9fcf2f1af14 100644
--- a/textproc/agrep/files/patch-utilities.c
+++ b/textproc/agrep/files/patch-utilities.c
@@ -1,5 +1,5 @@
---- utilities.c.orig Fri Jan 17 20:14:43 1992
-+++ utilities.c Sun Jul 21 03:50:47 2002
+--- utilities.c.orig 1992-01-17 19:14:43 UTC
++++ utilities.c
@@ -2,6 +2,7 @@
and manipulating regular expression syntax trees. */
diff --git a/textproc/aiksaurus-gtk/Makefile b/textproc/aiksaurus-gtk/Makefile
deleted file mode 100644
index f6a78f14c3b8..000000000000
--- a/textproc/aiksaurus-gtk/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-PORTREVISION= 12
-CATEGORIES= textproc deskutils
-PKGNAMESUFFIX= -gtk
-
-COMMENT= GTK+2 front-end for Aiksaurus, a thesaurus
-
-LIB_DEPENDS= libAiksaurus.so:textproc/aiksaurus
-
-MASTERDIR= ${.CURDIR}/../aiksaurus
-PKGDIR= ${.CURDIR}
-
-USE_GNOME= gtk20
-CONFIGURE_ARGS=--with-gtk
-
-pre-install:
- @${REINPLACE_CMD} -e 's|base [$$][(]GTKSRCDIR[)] data|$$(GTKSRCDIR)|g' \
- ${WRKSRC}/Makefile
-
-.include "${MASTERDIR}/Makefile"
diff --git a/textproc/aiksaurus-gtk/pkg-descr b/textproc/aiksaurus-gtk/pkg-descr
deleted file mode 100644
index eb9f56f50a54..000000000000
--- a/textproc/aiksaurus-gtk/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A GTK+2 front-end for Aiksaurus, see more detail in
-textproc/aiksaurus/pkg-descr.
-
-WWW: http://aiksaurus.sourceforge.net/
diff --git a/textproc/aiksaurus-gtk/pkg-plist b/textproc/aiksaurus-gtk/pkg-plist
deleted file mode 100644
index 72322a04b5cb..000000000000
--- a/textproc/aiksaurus-gtk/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/gaiksaurus
-include/Aiksaurus/AiksaurusGTK-C.h
-include/Aiksaurus/AiksaurusGTK.h
-lib/libAiksaurusGTK-1.2.so.0
-lib/libAiksaurusGTK-1.2.so.0.0.1
-lib/libAiksaurusGTK.so
-libdata/pkgconfig/gaiksaurus-1.0.pc
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index 5bf73a435606..3cdc3ffbfbf2 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -18,10 +18,4 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS?=--without-gtk
-.include <bsd.port.pre.mk>
-
-.if defined(PKGNAMESUFFIX) && ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
-BROKEN= does not link against GTK2 on FreeBSD 10+
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/ansifilter/Makefile b/textproc/ansifilter/Makefile
index 8e88250f17de..5be17ae4cf90 100644
--- a/textproc/ansifilter/Makefile
+++ b/textproc/ansifilter/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ansifilter
-PORTVERSION= 1.7
+PORTVERSION= 2.3
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
@@ -12,8 +12,6 @@ COMMENT= Customizable ANSI Code Converter
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
USES= gmake tar:bzip2
MAKEFILE= makefile
diff --git a/textproc/ansifilter/distinfo b/textproc/ansifilter/distinfo
index b342c19255e1..cda2c7747a27 100644
--- a/textproc/ansifilter/distinfo
+++ b/textproc/ansifilter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ansifilter-1.7.tar.bz2) = a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c
-SIZE (ansifilter-1.7.tar.bz2) = 133803
+TIMESTAMP = 1483149014
+SHA256 (ansifilter-2.3.tar.bz2) = 26d5ccd21a05e66a1cf836efd24eaf088243d14c3bf322a26cf635a3dd6a5e48
+SIZE (ansifilter-2.3.tar.bz2) = 89746
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index f390fefc673b..ab095937109f 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.winfield.demon.nl/linux/
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Application for displaying Microsoft(R) Word documents
LICENSE= GPLv2
@@ -38,7 +38,7 @@ CFLAGS+= -DNDEBUG
post-patch:
@${REINPLACE_CMD} -E 's,/usr/share,${LOCALBASE}/share,g; s,fonts2,fonts,' ${WRKSRC}/Unix-only/fontinfo.pl
- @${REINPLACE_CMD} -E 's|LD|CC|g; /^(CC|CFLAGS|OPT)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/${MAKEFILE}
+ @${REINPLACE_CMD} -E 's|LD|CC|g; /^(CC|CFLAGS|OPT)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/Makefile.Linux
@${REINPLACE_CMD} -E 's,/usr/share,${PREFIX}/share,g' ${WRKSRC}/antiword.h
post-install:
diff --git a/textproc/apache-solr/Makefile b/textproc/apache-solr/Makefile
index a333c8a5d726..0045666688bb 100644
--- a/textproc/apache-solr/Makefile
+++ b/textproc/apache-solr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= apache-solr
-PORTVERSION= 6.2.0
+PORTVERSION= 6.4.0
CATEGORIES= textproc java
MASTER_SITES= APACHE/lucene/solr/${PORTVERSION}
DISTNAME= solr-${PORTVERSION}
@@ -39,11 +39,12 @@ do-install:
cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}
${INSTALL_SCRIPT} ${WRKSRC}/bin/solr ${STAGEDIR}${PREFIX}/${CPE_PRODUCT}/bin
${INSTALL_DATA} ${WRKSRC}/bin/solr.in.sh ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
- ${ECHO} SOLR_HOME=\"/var/db/solr\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
- ${ECHO} LOG4J_PROPS=\"/var/db/solr/log4j.properties\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
- ${ECHO} SOLR_LOGS_DIR=\"/var/log/solr\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
- ${ECHO} SOLR_PORT=\"8983\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
- ${ECHO} SOLR_PID_DIR=\"/var/db/solr\" >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+ ${ECHO} 'SOLR_HOME="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+ ${ECHO} 'LOG4J_PROPS="/var/db/solr/log4j.properties"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+ ${ECHO} 'SOLR_LOGS_DIR="/var/log/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+ ${ECHO} 'SOLR_PORT="8983"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+ ${ECHO} 'SOLR_PID_DIR="/var/db/solr"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
+ ${ECHO} 'SOLR_OPTS="$$SOLR_OPTS -Djetty.host=localhost"' >> ${STAGEDIR}${PREFIX}/etc/solr.in.sh-dist
${MKDIR} ${STAGEDIR}/var/db/solr
${MKDIR} ${STAGEDIR}/var/log/solr
diff --git a/textproc/apache-solr/distinfo b/textproc/apache-solr/distinfo
index 61f65099ae65..ed80653ec804 100644
--- a/textproc/apache-solr/distinfo
+++ b/textproc/apache-solr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472734642
-SHA256 (solr-6.2.0.tgz) = ba7c93e1c8d28717d6d84788ebdc2e8e9211a32f48b5a30b2a904762a0b7cd39
-SIZE (solr-6.2.0.tgz) = 149049622
+TIMESTAMP = 1484990324
+SHA256 (solr-6.4.0.tgz) = 1213ae09023058ea1cbd971a1b585f891fb63fa76e128611031bfc28c749b502
+SIZE (solr-6.4.0.tgz) = 147290639
diff --git a/textproc/apache-solr/files/patch-bind-localhost.patch b/textproc/apache-solr/files/patch-bind-localhost.patch
deleted file mode 100644
index a65161ec5a35..000000000000
--- a/textproc/apache-solr/files/patch-bind-localhost.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/etc/jetty-http.xml.bak 2016-09-01 16:16:13.027176858 +0200
-+++ server/etc/jetty-http.xml 2016-09-01 16:16:40.498173610 +0200
-@@ -33,7 +33,7 @@
- </Item>
- </Array>
- </Arg>
-- <Set name="host"><Property name="jetty.host" /></Set>
-+ <Set name="host"><Property name="jetty.host" default="localhost" /></Set>
- <Set name="port"><Property name="jetty.port" default="8983" /></Set>
- <Set name="idleTimeout"><Property name="solr.jetty.http.idleTimeout" default="50000"/></Set>
- <Set name="soLingerTime"><Property name="solr.jetty.http.soLingerTime" default="-1"/></Set>
-@@ -44,4 +44,4 @@
- </Arg>
- </Call>
-
--</Configure>
-\ No newline at end of file
-+</Configure>
diff --git a/textproc/apache-solr/pkg-plist b/textproc/apache-solr/pkg-plist
index 12cd92918847..20d31eff02e3 100644
--- a/textproc/apache-solr/pkg-plist
+++ b/textproc/apache-solr/pkg-plist
@@ -16,9 +16,9 @@ solr/bin/solr.in.cmd
solr/bin/solr.in.sh
solr/contrib/analysis-extras/README.txt
solr/contrib/analysis-extras/lib/icu4j-56.1.jar
-solr/contrib/analysis-extras/lib/morfologik-fsa-2.1.0.jar
-solr/contrib/analysis-extras/lib/morfologik-polish-2.1.0.jar
-solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.0.jar
+solr/contrib/analysis-extras/lib/morfologik-fsa-2.1.1.jar
+solr/contrib/analysis-extras/lib/morfologik-polish-2.1.1.jar
+solr/contrib/analysis-extras/lib/morfologik-stemming-2.1.1.jar
solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-icu-%%PORTVERSION%%.jar
solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-morfologik-%%PORTVERSION%%.jar
solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-smartcn-%%PORTVERSION%%.jar
@@ -26,7 +26,7 @@ solr/contrib/analysis-extras/lucene-libs/lucene-analyzers-stempel-%%PORTVERSION%
solr/contrib/clustering/README.txt
solr/contrib/clustering/lib/attributes-binder-1.3.1.jar
solr/contrib/clustering/lib/carrot2-guava-18.0.jar
-solr/contrib/clustering/lib/carrot2-mini-3.12.0.jar
+solr/contrib/clustering/lib/carrot2-mini-3.15.0.jar
solr/contrib/clustering/lib/jackson-annotations-2.5.4.jar
solr/contrib/clustering/lib/jackson-databind-2.5.4.jar
solr/contrib/clustering/lib/simple-xml-2.7.1.jar
@@ -73,6 +73,7 @@ solr/contrib/extraction/lib/xz-1.5.jar
solr/contrib/langid/README.txt
solr/contrib/langid/lib/jsonic-1.2.7.jar
solr/contrib/langid/lib/langdetect-1.1-20120112.jar
+solr/contrib/ltr/README.txt
solr/contrib/map-reduce/README.txt
solr/contrib/map-reduce/lib/Saxon-HE-9.6.0-2.jar
solr/contrib/map-reduce/lib/argparse4j-0.4.3.jar
@@ -90,8 +91,8 @@ solr/contrib/morphlines-core/README.txt
solr/contrib/morphlines-core/lib/config-1.0.2.jar
solr/contrib/morphlines-core/lib/kite-morphlines-avro-1.1.0.jar
solr/contrib/morphlines-core/lib/kite-morphlines-core-1.1.0.jar
-solr/contrib/morphlines-core/lib/metrics-core-3.0.1.jar
-solr/contrib/morphlines-core/lib/metrics-healthchecks-3.0.1.jar
+solr/contrib/morphlines-core/lib/metrics-core-3.1.2.jar
+solr/contrib/morphlines-core/lib/metrics-healthchecks-3.1.2.jar
solr/contrib/uima/README.txt
solr/contrib/uima/lib/AlchemyAPIAnnotator-2.3.1.jar
solr/contrib/uima/lib/OpenCalaisAnnotator-2.3.1.jar
@@ -112,6 +113,7 @@ solr/dist/solr-core-%%PORTVERSION%%.jar
solr/dist/solr-dataimporthandler-%%PORTVERSION%%.jar
solr/dist/solr-dataimporthandler-extras-%%PORTVERSION%%.jar
solr/dist/solr-langid-%%PORTVERSION%%.jar
+solr/dist/solr-ltr-%%PORTVERSION%%.jar
solr/dist/solr-map-reduce-%%PORTVERSION%%.jar
solr/dist/solr-morphlines-cell-%%PORTVERSION%%.jar
solr/dist/solr-morphlines-core-%%PORTVERSION%%.jar
@@ -120,13 +122,9 @@ solr/dist/solr-test-framework-%%PORTVERSION%%.jar
solr/dist/solr-uima-%%PORTVERSION%%.jar
solr/dist/solr-velocity-%%PORTVERSION%%.jar
solr/dist/solrj-lib/commons-io-2.5.jar
-solr/dist/solrj-lib/guava-14.0.1.jar
solr/dist/solrj-lib/httpclient-4.4.1.jar
solr/dist/solrj-lib/httpcore-4.4.1.jar
solr/dist/solrj-lib/httpmime-4.4.1.jar
-solr/dist/solrj-lib/jackson-annotations-2.5.4.jar
-solr/dist/solrj-lib/jackson-core-2.5.4.jar
-solr/dist/solrj-lib/jackson-databind-2.5.4.jar
solr/dist/solrj-lib/jcl-over-slf4j-1.7.7.jar
solr/dist/solrj-lib/noggit-0.6.jar
solr/dist/solrj-lib/slf4j-api-1.7.7.jar
@@ -136,8 +134,8 @@ solr/dist/solrj-lib/zookeeper-3.4.6.jar
solr/dist/test-framework/README.txt
solr/dist/test-framework/lib/ant-1.8.2.jar
solr/dist/test-framework/lib/junit-4.10.jar
-solr/dist/test-framework/lib/junit4-ant-2.3.4.jar
-solr/dist/test-framework/lib/randomizedtesting-runner-2.3.4.jar
+solr/dist/test-framework/lib/junit4-ant-2.4.0.jar
+solr/dist/test-framework/lib/randomizedtesting-runner-2.4.0.jar
solr/dist/test-framework/lucene-libs/lucene-test-framework-%%PORTVERSION%%.jar
solr/docs/SYSTEM_REQUIREMENTS.html
solr/docs/changes/Changes.html
@@ -376,6 +374,7 @@ solr/docs/solr-cell/org/apache/solr/handler/extraction/ParseContextConfig.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/SolrContentHandler.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/SolrContentHandlerFactory.html
+solr/docs/solr-cell/org/apache/solr/handler/extraction/XLSXResponseWriter.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ExtractingDocumentLoader.MostlyPassthroughHtmlMapper.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ExtractingDocumentLoader.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ExtractingMetadataConstants.html
@@ -386,6 +385,7 @@ solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/ParseContextCon
solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/RegexRulesPasswordProvider.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/SolrContentHandler.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/SolrContentHandlerFactory.html
+solr/docs/solr-cell/org/apache/solr/handler/extraction/class-use/XLSXResponseWriter.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/package-frame.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/package-summary.html
solr/docs/solr-cell/org/apache/solr/handler/extraction/package-tree.html
@@ -484,12 +484,14 @@ solr/docs/solr-core/org/apache/solr/cloud/CloudUtil.html
solr/docs/solr-core/org/apache/solr/cloud/CreateAliasCmd.html
solr/docs/solr-core/org/apache/solr/cloud/CreateCollectionCmd.html
solr/docs/solr-core/org/apache/solr/cloud/CreateShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/CreateSnapshotCmd.html
solr/docs/solr-core/org/apache/solr/cloud/CurrentCoreDescriptorProvider.html
solr/docs/solr-core/org/apache/solr/cloud/DeleteAliasCmd.html
solr/docs/solr-core/org/apache/solr/cloud/DeleteCollectionCmd.html
solr/docs/solr-core/org/apache/solr/cloud/DeleteNodeCmd.html
solr/docs/solr-core/org/apache/solr/cloud/DeleteReplicaCmd.html
solr/docs/solr-core/org/apache/solr/cloud/DeleteShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/DeleteSnapshotCmd.html
solr/docs/solr-core/org/apache/solr/cloud/DistributedMap.html
solr/docs/solr-core/org/apache/solr/cloud/DistributedQueue.html
solr/docs/solr-core/org/apache/solr/cloud/ElectionContext.html
@@ -543,12 +545,14 @@ solr/docs/solr-core/org/apache/solr/cloud/class-use/CloudUtil.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateAliasCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateCollectionCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/class-use/CreateSnapshotCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/CurrentCoreDescriptorProvider.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteAliasCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteCollectionCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteNodeCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteReplicaCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteShardCmd.html
+solr/docs/solr-core/org/apache/solr/cloud/class-use/DeleteSnapshotCmd.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DistributedMap.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/DistributedQueue.html
solr/docs/solr-core/org/apache/solr/cloud/class-use/ElectionContext.html
@@ -618,25 +622,19 @@ solr/docs/solr-core/org/apache/solr/cloud/package-summary.html
solr/docs/solr-core/org/apache/solr/cloud/package-tree.html
solr/docs/solr-core/org/apache/solr/cloud/package-use.html
solr/docs/solr-core/org/apache/solr/cloud/rule/ImplicitSnitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/RemoteCallback.html
solr/docs/solr-core/org/apache/solr/cloud/rule/ReplicaAssigner.Position.html
solr/docs/solr-core/org/apache/solr/cloud/rule/ReplicaAssigner.html
solr/docs/solr-core/org/apache/solr/cloud/rule/Rule.Condition.html
solr/docs/solr-core/org/apache/solr/cloud/rule/Rule.Operand.html
solr/docs/solr-core/org/apache/solr/cloud/rule/Rule.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/Snitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/SnitchContext.SnitchInfo.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/SnitchContext.html
+solr/docs/solr-core/org/apache/solr/cloud/rule/ServerSnitchContext.html
solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ImplicitSnitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/RemoteCallback.html
solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ReplicaAssigner.Position.html
solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ReplicaAssigner.html
solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Rule.Condition.html
solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Rule.Operand.html
solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Rule.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/Snitch.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/SnitchContext.SnitchInfo.html
-solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/SnitchContext.html
+solr/docs/solr-core/org/apache/solr/cloud/rule/class-use/ServerSnitchContext.html
solr/docs/solr-core/org/apache/solr/cloud/rule/package-frame.html
solr/docs/solr-core/org/apache/solr/cloud/rule/package-summary.html
solr/docs/solr-core/org/apache/solr/cloud/rule/package-tree.html
@@ -678,8 +676,11 @@ solr/docs/solr-core/org/apache/solr/core/InitParams.html
solr/docs/solr-core/org/apache/solr/core/JmxMonitoredMap.JmxAugmentedSolrInfoMBean.html
solr/docs/solr-core/org/apache/solr/core/JmxMonitoredMap.html
solr/docs/solr-core/org/apache/solr/core/MMapDirectoryFactory.html
-solr/docs/solr-core/org/apache/solr/core/MapSerializable.html
solr/docs/solr-core/org/apache/solr/core/MemClassLoader.html
+solr/docs/solr-core/org/apache/solr/core/MetricsDirectoryFactory.MetricsDirectory.html
+solr/docs/solr-core/org/apache/solr/core/MetricsDirectoryFactory.MetricsInput.html
+solr/docs/solr-core/org/apache/solr/core/MetricsDirectoryFactory.MetricsOutput.html
+solr/docs/solr-core/org/apache/solr/core/MetricsDirectoryFactory.html
solr/docs/solr-core/org/apache/solr/core/NIOFSDirectoryFactory.html
solr/docs/solr-core/org/apache/solr/core/NRTCachingDirectoryFactory.html
solr/docs/solr-core/org/apache/solr/core/NodeConfig.NodeConfigBuilder.html
@@ -710,6 +711,7 @@ solr/docs/solr-core/org/apache/solr/core/SolrCore.html
solr/docs/solr-core/org/apache/solr/core/SolrDeletionPolicy.html
solr/docs/solr-core/org/apache/solr/core/SolrEventListener.html
solr/docs/solr-core/org/apache/solr/core/SolrInfoMBean.Category.html
+solr/docs/solr-core/org/apache/solr/core/SolrInfoMBean.Group.html
solr/docs/solr-core/org/apache/solr/core/SolrInfoMBean.html
solr/docs/solr-core/org/apache/solr/core/SolrInfoMBeanWrapper.html
solr/docs/solr-core/org/apache/solr/core/SolrResourceLoader.html
@@ -775,8 +777,11 @@ solr/docs/solr-core/org/apache/solr/core/class-use/InitParams.html
solr/docs/solr-core/org/apache/solr/core/class-use/JmxMonitoredMap.JmxAugmentedSolrInfoMBean.html
solr/docs/solr-core/org/apache/solr/core/class-use/JmxMonitoredMap.html
solr/docs/solr-core/org/apache/solr/core/class-use/MMapDirectoryFactory.html
-solr/docs/solr-core/org/apache/solr/core/class-use/MapSerializable.html
solr/docs/solr-core/org/apache/solr/core/class-use/MemClassLoader.html
+solr/docs/solr-core/org/apache/solr/core/class-use/MetricsDirectoryFactory.MetricsDirectory.html
+solr/docs/solr-core/org/apache/solr/core/class-use/MetricsDirectoryFactory.MetricsInput.html
+solr/docs/solr-core/org/apache/solr/core/class-use/MetricsDirectoryFactory.MetricsOutput.html
+solr/docs/solr-core/org/apache/solr/core/class-use/MetricsDirectoryFactory.html
solr/docs/solr-core/org/apache/solr/core/class-use/NIOFSDirectoryFactory.html
solr/docs/solr-core/org/apache/solr/core/class-use/NRTCachingDirectoryFactory.html
solr/docs/solr-core/org/apache/solr/core/class-use/NodeConfig.NodeConfigBuilder.html
@@ -807,6 +812,7 @@ solr/docs/solr-core/org/apache/solr/core/class-use/SolrCore.html
solr/docs/solr-core/org/apache/solr/core/class-use/SolrDeletionPolicy.html
solr/docs/solr-core/org/apache/solr/core/class-use/SolrEventListener.html
solr/docs/solr-core/org/apache/solr/core/class-use/SolrInfoMBean.Category.html
+solr/docs/solr-core/org/apache/solr/core/class-use/SolrInfoMBean.Group.html
solr/docs/solr-core/org/apache/solr/core/class-use/SolrInfoMBean.html
solr/docs/solr-core/org/apache/solr/core/class-use/SolrInfoMBeanWrapper.html
solr/docs/solr-core/org/apache/solr/core/class-use/SolrResourceLoader.html
@@ -819,12 +825,20 @@ solr/docs/solr-core/org/apache/solr/core/package-frame.html
solr/docs/solr-core/org/apache/solr/core/package-summary.html
solr/docs/solr-core/org/apache/solr/core/package-tree.html
solr/docs/solr-core/org/apache/solr/core/package-use.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.CoreSnapshotMetaData.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.SnapshotStatus.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/CollectionSnapshotMetaData.html
solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotManager.html
solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotMetaDataManager.SnapshotMetaData.html
solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotMetaDataManager.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/SolrSnapshotsTool.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/CollectionSnapshotMetaData.CoreSnapshotMetaData.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/CollectionSnapshotMetaData.SnapshotStatus.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/CollectionSnapshotMetaData.html
solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotManager.html
solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotMetaDataManager.SnapshotMetaData.html
solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotMetaDataManager.html
+solr/docs/solr-core/org/apache/solr/core/snapshots/class-use/SolrSnapshotsTool.html
solr/docs/solr-core/org/apache/solr/core/snapshots/package-frame.html
solr/docs/solr-core/org/apache/solr/core/snapshots/package-summary.html
solr/docs/solr-core/org/apache/solr/core/snapshots/package-tree.html
@@ -842,10 +856,22 @@ solr/docs/solr-core/org/apache/solr/handler/CdcrParams.html
solr/docs/solr-core/org/apache/solr/handler/CdcrReplicator.CdcrReplicatorException.html
solr/docs/solr-core/org/apache/solr/handler/CdcrReplicator.html
solr/docs/solr-core/org/apache/solr/handler/CdcrRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/ClassifyStream.html
solr/docs/solr-core/org/apache/solr/handler/ContentStreamHandlerBase.html
solr/docs/solr-core/org/apache/solr/handler/ContentStreamLoader.html
solr/docs/solr-core/org/apache/solr/handler/DocumentAnalysisRequestHandler.html
solr/docs/solr-core/org/apache/solr/handler/DumpRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/ExportHandler.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.DoubleAsc.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.DoubleDesc.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.FieldWriter.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.FloatAsc.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.FloatDesc.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.IgnoreException.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.IntComp.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.PriorityQueue.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.SortValue.html
+solr/docs/solr-core/org/apache/solr/handler/ExportWriter.html
solr/docs/solr-core/org/apache/solr/handler/FieldAnalysisRequestHandler.html
solr/docs/solr-core/org/apache/solr/handler/GraphHandler.DummyErrorStream.html
solr/docs/solr-core/org/apache/solr/handler/GraphHandler.TimerStream.html
@@ -885,6 +911,7 @@ solr/docs/solr-core/org/apache/solr/handler/admin/CoreAdminHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/InfoHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/LoggingHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/LukeRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/admin/MetricsHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/PluginInfoHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/PropertiesRequestHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/SecurityConfHandler.html
@@ -902,6 +929,7 @@ solr/docs/solr-core/org/apache/solr/handler/admin/class-use/CoreAdminHandler.htm
solr/docs/solr-core/org/apache/solr/handler/admin/class-use/InfoHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/class-use/LoggingHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/class-use/LukeRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/admin/class-use/MetricsHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/class-use/PluginInfoHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/class-use/PropertiesRequestHandler.html
solr/docs/solr-core/org/apache/solr/handler/admin/class-use/SecurityConfHandler.html
@@ -928,10 +956,22 @@ solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrParams.html
solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrReplicator.CdcrReplicatorException.html
solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrReplicator.html
solr/docs/solr-core/org/apache/solr/handler/class-use/CdcrRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ClassifyStream.html
solr/docs/solr-core/org/apache/solr/handler/class-use/ContentStreamHandlerBase.html
solr/docs/solr-core/org/apache/solr/handler/class-use/ContentStreamLoader.html
solr/docs/solr-core/org/apache/solr/handler/class-use/DocumentAnalysisRequestHandler.html
solr/docs/solr-core/org/apache/solr/handler/class-use/DumpRequestHandler.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportHandler.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.DoubleAsc.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.DoubleDesc.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.FieldWriter.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.FloatAsc.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.FloatDesc.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.IgnoreException.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.IntComp.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.PriorityQueue.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.SortValue.html
+solr/docs/solr-core/org/apache/solr/handler/class-use/ExportWriter.html
solr/docs/solr-core/org/apache/solr/handler/class-use/FieldAnalysisRequestHandler.html
solr/docs/solr-core/org/apache/solr/handler/class-use/GraphHandler.DummyErrorStream.html
solr/docs/solr-core/org/apache/solr/handler/class-use/GraphHandler.TimerStream.html
@@ -974,6 +1014,7 @@ solr/docs/solr-core/org/apache/solr/handler/component/FacetComponent.QueryFacet.
solr/docs/solr-core/org/apache/solr/handler/component/FacetComponent.ShardFacetCount.html
solr/docs/solr-core/org/apache/solr/handler/component/FacetComponent.html
solr/docs/solr-core/org/apache/solr/handler/component/FieldFacetStats.html
+solr/docs/solr-core/org/apache/solr/handler/component/HighlightComponent.HighlightMethod.html
solr/docs/solr-core/org/apache/solr/handler/component/HighlightComponent.html
solr/docs/solr-core/org/apache/solr/handler/component/HttpShardHandler.html
solr/docs/solr-core/org/apache/solr/handler/component/HttpShardHandlerFactory.html
@@ -1032,6 +1073,7 @@ solr/docs/solr-core/org/apache/solr/handler/component/class-use/FacetComponent.Q
solr/docs/solr-core/org/apache/solr/handler/component/class-use/FacetComponent.ShardFacetCount.html
solr/docs/solr-core/org/apache/solr/handler/component/class-use/FacetComponent.html
solr/docs/solr-core/org/apache/solr/handler/component/class-use/FieldFacetStats.html
+solr/docs/solr-core/org/apache/solr/handler/component/class-use/HighlightComponent.HighlightMethod.html
solr/docs/solr-core/org/apache/solr/handler/component/class-use/HighlightComponent.html
solr/docs/solr-core/org/apache/solr/handler/component/class-use/HttpShardHandler.html
solr/docs/solr-core/org/apache/solr/handler/component/class-use/HttpShardHandlerFactory.html
@@ -1124,6 +1166,8 @@ solr/docs/solr-core/org/apache/solr/highlight/SolrFragListBuilder.html
solr/docs/solr-core/org/apache/solr/highlight/SolrFragmenter.html
solr/docs/solr-core/org/apache/solr/highlight/SolrFragmentsBuilder.html
solr/docs/solr-core/org/apache/solr/highlight/SolrHighlighter.html
+solr/docs/solr-core/org/apache/solr/highlight/UnifiedSolrHighlighter.SolrExtendedUnifiedHighlighter.html
+solr/docs/solr-core/org/apache/solr/highlight/UnifiedSolrHighlighter.html
solr/docs/solr-core/org/apache/solr/highlight/WeightedFragListBuilder.html
solr/docs/solr-core/org/apache/solr/highlight/class-use/BreakIteratorBoundaryScanner.html
solr/docs/solr-core/org/apache/solr/highlight/class-use/DefaultEncoder.html
@@ -1148,6 +1192,8 @@ solr/docs/solr-core/org/apache/solr/highlight/class-use/SolrFragListBuilder.html
solr/docs/solr-core/org/apache/solr/highlight/class-use/SolrFragmenter.html
solr/docs/solr-core/org/apache/solr/highlight/class-use/SolrFragmentsBuilder.html
solr/docs/solr-core/org/apache/solr/highlight/class-use/SolrHighlighter.html
+solr/docs/solr-core/org/apache/solr/highlight/class-use/UnifiedSolrHighlighter.SolrExtendedUnifiedHighlighter.html
+solr/docs/solr-core/org/apache/solr/highlight/class-use/UnifiedSolrHighlighter.html
solr/docs/solr-core/org/apache/solr/highlight/class-use/WeightedFragListBuilder.html
solr/docs/solr-core/org/apache/solr/highlight/package-frame.html
solr/docs/solr-core/org/apache/solr/highlight/package-summary.html
@@ -1158,6 +1204,7 @@ solr/docs/solr-core/org/apache/solr/index/LogByteSizeMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/LogDocMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/MergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/MergePolicyFactoryArgs.html
+solr/docs/solr-core/org/apache/solr/index/NoMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/SimpleMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/SlowCompositeReaderWrapper.html
solr/docs/solr-core/org/apache/solr/index/SortingMergePolicy.html
@@ -1170,6 +1217,7 @@ solr/docs/solr-core/org/apache/solr/index/class-use/LogByteSizeMergePolicyFactor
solr/docs/solr-core/org/apache/solr/index/class-use/LogDocMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/class-use/MergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/class-use/MergePolicyFactoryArgs.html
+solr/docs/solr-core/org/apache/solr/index/class-use/NoMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/class-use/SimpleMergePolicyFactory.html
solr/docs/solr-core/org/apache/solr/index/class-use/SlowCompositeReaderWrapper.html
solr/docs/solr-core/org/apache/solr/index/class-use/SortingMergePolicy.html
@@ -1249,6 +1297,38 @@ solr/docs/solr-core/org/apache/solr/logging/package-frame.html
solr/docs/solr-core/org/apache/solr/logging/package-summary.html
solr/docs/solr-core/org/apache/solr/logging/package-tree.html
solr/docs/solr-core/org/apache/solr/logging/package-use.html
+solr/docs/solr-core/org/apache/solr/metrics/OperatingSystemMetricSet.html
+solr/docs/solr-core/org/apache/solr/metrics/SolrCoreMetricManager.html
+solr/docs/solr-core/org/apache/solr/metrics/SolrMetricInfo.html
+solr/docs/solr-core/org/apache/solr/metrics/SolrMetricManager.PrefixFilter.html
+solr/docs/solr-core/org/apache/solr/metrics/SolrMetricManager.html
+solr/docs/solr-core/org/apache/solr/metrics/SolrMetricProducer.html
+solr/docs/solr-core/org/apache/solr/metrics/SolrMetricReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/OperatingSystemMetricSet.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/SolrCoreMetricManager.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/SolrMetricInfo.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/SolrMetricManager.PrefixFilter.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/SolrMetricManager.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/SolrMetricProducer.html
+solr/docs/solr-core/org/apache/solr/metrics/class-use/SolrMetricReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/package-frame.html
+solr/docs/solr-core/org/apache/solr/metrics/package-summary.html
+solr/docs/solr-core/org/apache/solr/metrics/package-tree.html
+solr/docs/solr-core/org/apache/solr/metrics/package-use.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/JmxObjectNameFactory.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/SolrGangliaReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/SolrGraphiteReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/SolrJmxReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/SolrSlf4jReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/class-use/JmxObjectNameFactory.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/class-use/SolrGangliaReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/class-use/SolrGraphiteReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/class-use/SolrJmxReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/class-use/SolrSlf4jReporter.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/package-frame.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/package-summary.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/package-tree.html
+solr/docs/solr-core/org/apache/solr/metrics/reporters/package-use.html
solr/docs/solr-core/org/apache/solr/package-frame.html
solr/docs/solr-core/org/apache/solr/package-summary.html
solr/docs/solr-core/org/apache/solr/package-tree.html
@@ -1261,6 +1341,7 @@ solr/docs/solr-core/org/apache/solr/parser/QueryParser.html
solr/docs/solr-core/org/apache/solr/parser/QueryParserConstants.html
solr/docs/solr-core/org/apache/solr/parser/QueryParserTokenManager.html
solr/docs/solr-core/org/apache/solr/parser/SolrQueryParserBase.MagicFieldName.html
+solr/docs/solr-core/org/apache/solr/parser/SolrQueryParserBase.RawQuery.html
solr/docs/solr-core/org/apache/solr/parser/SolrQueryParserBase.html
solr/docs/solr-core/org/apache/solr/parser/Token.html
solr/docs/solr-core/org/apache/solr/parser/TokenMgrError.html
@@ -1272,6 +1353,7 @@ solr/docs/solr-core/org/apache/solr/parser/class-use/QueryParser.html
solr/docs/solr-core/org/apache/solr/parser/class-use/QueryParserConstants.html
solr/docs/solr-core/org/apache/solr/parser/class-use/QueryParserTokenManager.html
solr/docs/solr-core/org/apache/solr/parser/class-use/SolrQueryParserBase.MagicFieldName.html
+solr/docs/solr-core/org/apache/solr/parser/class-use/SolrQueryParserBase.RawQuery.html
solr/docs/solr-core/org/apache/solr/parser/class-use/SolrQueryParserBase.html
solr/docs/solr-core/org/apache/solr/parser/class-use/Token.html
solr/docs/solr-core/org/apache/solr/parser/class-use/TokenMgrError.html
@@ -1355,16 +1437,6 @@ solr/docs/solr-core/org/apache/solr/response/SchemaXmlWriter.html
solr/docs/solr-core/org/apache/solr/response/SmileResponseWriter.SmileWriter.html
solr/docs/solr-core/org/apache/solr/response/SmileResponseWriter.html
solr/docs/solr-core/org/apache/solr/response/SolrQueryResponse.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.DoubleAsc.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.DoubleDesc.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.FieldWriter.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.FloatAsc.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.FloatDesc.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.IgnoreException.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.IntComp.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.PriorityQueue.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.SortValue.html
-solr/docs/solr-core/org/apache/solr/response/SortingResponseWriter.html
solr/docs/solr-core/org/apache/solr/response/TextResponseWriter.html
solr/docs/solr-core/org/apache/solr/response/WriteableValue.html
solr/docs/solr-core/org/apache/solr/response/XMLResponseWriter.html
@@ -1392,16 +1464,6 @@ solr/docs/solr-core/org/apache/solr/response/class-use/SchemaXmlWriter.html
solr/docs/solr-core/org/apache/solr/response/class-use/SmileResponseWriter.SmileWriter.html
solr/docs/solr-core/org/apache/solr/response/class-use/SmileResponseWriter.html
solr/docs/solr-core/org/apache/solr/response/class-use/SolrQueryResponse.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.DoubleAsc.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.DoubleDesc.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.FieldWriter.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.FloatAsc.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.FloatDesc.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.IgnoreException.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.IntComp.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.PriorityQueue.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.SortValue.html
-solr/docs/solr-core/org/apache/solr/response/class-use/SortingResponseWriter.html
solr/docs/solr-core/org/apache/solr/response/class-use/TextResponseWriter.html
solr/docs/solr-core/org/apache/solr/response/class-use/WriteableValue.html
solr/docs/solr-core/org/apache/solr/response/class-use/XMLResponseWriter.html
@@ -1542,6 +1604,7 @@ solr/docs/solr-core/org/apache/solr/schema/FieldType.html
solr/docs/solr-core/org/apache/solr/schema/FieldTypePluginLoader.html
solr/docs/solr-core/org/apache/solr/schema/FloatValueFieldType.html
solr/docs/solr-core/org/apache/solr/schema/GeoHashField.html
+solr/docs/solr-core/org/apache/solr/schema/HasImplicitIndexAnalyzer.html
solr/docs/solr-core/org/apache/solr/schema/IndexSchema.DynamicCopy.html
solr/docs/solr-core/org/apache/solr/schema/IndexSchema.DynamicField.html
solr/docs/solr-core/org/apache/solr/schema/IndexSchema.DynamicReplacement.DynamicPattern.html
@@ -1615,6 +1678,7 @@ solr/docs/solr-core/org/apache/solr/schema/class-use/FieldType.html
solr/docs/solr-core/org/apache/solr/schema/class-use/FieldTypePluginLoader.html
solr/docs/solr-core/org/apache/solr/schema/class-use/FloatValueFieldType.html
solr/docs/solr-core/org/apache/solr/schema/class-use/GeoHashField.html
+solr/docs/solr-core/org/apache/solr/schema/class-use/HasImplicitIndexAnalyzer.html
solr/docs/solr-core/org/apache/solr/schema/class-use/IndexSchema.DynamicCopy.html
solr/docs/solr-core/org/apache/solr/schema/class-use/IndexSchema.DynamicField.html
solr/docs/solr-core/org/apache/solr/schema/class-use/IndexSchema.DynamicReplacement.DynamicPattern.html
@@ -1667,6 +1731,7 @@ solr/docs/solr-core/org/apache/solr/schema/package-frame.html
solr/docs/solr-core/org/apache/solr/schema/package-summary.html
solr/docs/solr-core/org/apache/solr/schema/package-tree.html
solr/docs/solr-core/org/apache/solr/schema/package-use.html
+solr/docs/solr-core/org/apache/solr/search/AbstractReRankQuery.html
solr/docs/solr-core/org/apache/solr/search/AnalyticsQuery.html
solr/docs/solr-core/org/apache/solr/search/BitDocSet.html
solr/docs/solr-core/org/apache/solr/search/BitsFilteredDocIdSet.html
@@ -1751,7 +1816,8 @@ solr/docs/solr-core/org/apache/solr/search/QueryUtils.html
solr/docs/solr-core/org/apache/solr/search/QueryWrapperFilter.html
solr/docs/solr-core/org/apache/solr/search/RankQuery.html
solr/docs/solr-core/org/apache/solr/search/RawQParserPlugin.html
-solr/docs/solr-core/org/apache/solr/search/ReRankQParserPlugin.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/ReRankCollector.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/ReRankCollector.html
solr/docs/solr-core/org/apache/solr/search/ReRankQParserPlugin.html
solr/docs/solr-core/org/apache/solr/search/ReRankWeight.html
solr/docs/solr-core/org/apache/solr/search/ReturnFields.html
@@ -1791,6 +1857,7 @@ solr/docs/solr-core/org/apache/solr/search/TextLogisticRegressionQParserPlugin.h
solr/docs/solr-core/org/apache/solr/search/ValueSourceParser.html
solr/docs/solr-core/org/apache/solr/search/WrappedQuery.html
solr/docs/solr-core/org/apache/solr/search/XmlQParserPlugin.html
+solr/docs/solr-core/org/apache/solr/search/class-use/AbstractReRankQuery.html
solr/docs/solr-core/org/apache/solr/search/class-use/AnalyticsQuery.html
solr/docs/solr-core/org/apache/solr/search/class-use/BitDocSet.html
solr/docs/solr-core/org/apache/solr/search/class-use/BitsFilteredDocIdSet.html
@@ -1875,7 +1942,8 @@ solr/docs/solr-core/org/apache/solr/search/class-use/QueryUtils.html
solr/docs/solr-core/org/apache/solr/search/class-use/QueryWrapperFilter.html
solr/docs/solr-core/org/apache/solr/search/class-use/RankQuery.html
solr/docs/solr-core/org/apache/solr/search/class-use/RawQParserPlugin.html
-solr/docs/solr-core/org/apache/solr/search/class-use/ReRankQParserPlugin.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/class-use/ReRankCollector.BoostedComp.html
+solr/docs/solr-core/org/apache/solr/search/class-use/ReRankCollector.html
solr/docs/solr-core/org/apache/solr/search/class-use/ReRankQParserPlugin.html
solr/docs/solr-core/org/apache/solr/search/class-use/ReRankWeight.html
solr/docs/solr-core/org/apache/solr/search/class-use/ReturnFields.html
@@ -1919,17 +1987,21 @@ solr/docs/solr-core/org/apache/solr/search/facet/AggValueSource.html
solr/docs/solr-core/org/apache/solr/search/facet/AvgAgg.html
solr/docs/solr-core/org/apache/solr/search/facet/BlockJoin.html
solr/docs/solr-core/org/apache/solr/search/facet/CountAgg.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetBucket.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetDebugInfo.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetField.FacetMethod.html
-solr/docs/solr-core/org/apache/solr/search/facet/FacetField.SortDirection.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetField.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetFieldMerger.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetMerger.Context.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetMerger.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetModule.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetProcessor.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetQuery.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetRange.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetRangeMerger.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.Domain.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.RefineMethod.html
+solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.SortDirection.html
solr/docs/solr-core/org/apache/solr/search/facet/FacetRequest.html
solr/docs/solr-core/org/apache/solr/search/facet/FieldUtil.html
solr/docs/solr-core/org/apache/solr/search/facet/HLLAgg.HLLFactory.html
@@ -1955,17 +2027,21 @@ solr/docs/solr-core/org/apache/solr/search/facet/class-use/AggValueSource.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/AvgAgg.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/BlockJoin.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/CountAgg.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetBucket.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetDebugInfo.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetField.FacetMethod.html
-solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetField.SortDirection.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetField.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetFieldMerger.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetMerger.Context.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetMerger.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetModule.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetProcessor.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetQuery.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRange.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRangeMerger.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.Domain.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.RefineMethod.html
+solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.SortDirection.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FacetRequest.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/FieldUtil.html
solr/docs/solr-core/org/apache/solr/search/facet/class-use/HLLAgg.HLLFactory.html
@@ -2222,18 +2298,21 @@ solr/docs/solr-core/org/apache/solr/security/AuthorizationResponse.html
solr/docs/solr-core/org/apache/solr/security/BasicAuthPlugin.AuthenticationProvider.html
solr/docs/solr-core/org/apache/solr/security/BasicAuthPlugin.html
solr/docs/solr-core/org/apache/solr/security/ConfigEditablePlugin.html
+solr/docs/solr-core/org/apache/solr/security/ConfigurableInternodeAuthHadoopPlugin.html
solr/docs/solr-core/org/apache/solr/security/DelegationTokenKerberosFilter.SolrZkToCuratorCredentialsACLs.html
solr/docs/solr-core/org/apache/solr/security/DelegationTokenKerberosFilter.html
+solr/docs/solr-core/org/apache/solr/security/HadoopAuthFilter.SolrZkToCuratorCredentialsACLs.html
+solr/docs/solr-core/org/apache/solr/security/HadoopAuthFilter.html
+solr/docs/solr-core/org/apache/solr/security/HadoopAuthPlugin.html
solr/docs/solr-core/org/apache/solr/security/HttpClientInterceptorPlugin.html
solr/docs/solr-core/org/apache/solr/security/KerberosFilter.html
-solr/docs/solr-core/org/apache/solr/security/KerberosPlugin.AttributeOnlyServletContext.html
-solr/docs/solr-core/org/apache/solr/security/KerberosPlugin.RequestContinuesRecorderAuthenticationHandler.html
solr/docs/solr-core/org/apache/solr/security/KerberosPlugin.html
solr/docs/solr-core/org/apache/solr/security/PKIAuthenticationPlugin.PKIHeaderData.html
solr/docs/solr-core/org/apache/solr/security/PKIAuthenticationPlugin.html
solr/docs/solr-core/org/apache/solr/security/PermissionNameProvider.Name.html
solr/docs/solr-core/org/apache/solr/security/PermissionNameProvider.html
solr/docs/solr-core/org/apache/solr/security/PrintWriterWrapper.html
+solr/docs/solr-core/org/apache/solr/security/RequestContinuesRecorderAuthenticationHandler.html
solr/docs/solr-core/org/apache/solr/security/RuleBasedAuthorizationPlugin.html
solr/docs/solr-core/org/apache/solr/security/SecurityPluginHolder.html
solr/docs/solr-core/org/apache/solr/security/Sha256AuthenticationProvider.html
@@ -2246,18 +2325,21 @@ solr/docs/solr-core/org/apache/solr/security/class-use/AuthorizationResponse.htm
solr/docs/solr-core/org/apache/solr/security/class-use/BasicAuthPlugin.AuthenticationProvider.html
solr/docs/solr-core/org/apache/solr/security/class-use/BasicAuthPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/ConfigEditablePlugin.html
+solr/docs/solr-core/org/apache/solr/security/class-use/ConfigurableInternodeAuthHadoopPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/DelegationTokenKerberosFilter.SolrZkToCuratorCredentialsACLs.html
solr/docs/solr-core/org/apache/solr/security/class-use/DelegationTokenKerberosFilter.html
+solr/docs/solr-core/org/apache/solr/security/class-use/HadoopAuthFilter.SolrZkToCuratorCredentialsACLs.html
+solr/docs/solr-core/org/apache/solr/security/class-use/HadoopAuthFilter.html
+solr/docs/solr-core/org/apache/solr/security/class-use/HadoopAuthPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/HttpClientInterceptorPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/KerberosFilter.html
-solr/docs/solr-core/org/apache/solr/security/class-use/KerberosPlugin.AttributeOnlyServletContext.html
-solr/docs/solr-core/org/apache/solr/security/class-use/KerberosPlugin.RequestContinuesRecorderAuthenticationHandler.html
solr/docs/solr-core/org/apache/solr/security/class-use/KerberosPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/PKIAuthenticationPlugin.PKIHeaderData.html
solr/docs/solr-core/org/apache/solr/security/class-use/PKIAuthenticationPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/PermissionNameProvider.Name.html
solr/docs/solr-core/org/apache/solr/security/class-use/PermissionNameProvider.html
solr/docs/solr-core/org/apache/solr/security/class-use/PrintWriterWrapper.html
+solr/docs/solr-core/org/apache/solr/security/class-use/RequestContinuesRecorderAuthenticationHandler.html
solr/docs/solr-core/org/apache/solr/security/class-use/RuleBasedAuthorizationPlugin.html
solr/docs/solr-core/org/apache/solr/security/class-use/SecurityPluginHolder.html
solr/docs/solr-core/org/apache/solr/security/class-use/Sha256AuthenticationProvider.html
@@ -2393,6 +2475,7 @@ solr/docs/solr-core/org/apache/solr/spelling/suggest/tst/package-frame.html
solr/docs/solr-core/org/apache/solr/spelling/suggest/tst/package-summary.html
solr/docs/solr-core/org/apache/solr/spelling/suggest/tst/package-tree.html
solr/docs/solr-core/org/apache/solr/spelling/suggest/tst/package-use.html
+solr/docs/solr-core/org/apache/solr/store/blockcache/BlockCache.OnRelease.html
solr/docs/solr-core/org/apache/solr/store/blockcache/BlockCache.html
solr/docs/solr-core/org/apache/solr/store/blockcache/BlockCacheKey.html
solr/docs/solr-core/org/apache/solr/store/blockcache/BlockCacheLocation.html
@@ -2407,6 +2490,7 @@ solr/docs/solr-core/org/apache/solr/store/blockcache/Metrics.MethodCall.html
solr/docs/solr-core/org/apache/solr/store/blockcache/Metrics.html
solr/docs/solr-core/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.html
solr/docs/solr-core/org/apache/solr/store/blockcache/Store.html
+solr/docs/solr-core/org/apache/solr/store/blockcache/class-use/BlockCache.OnRelease.html
solr/docs/solr-core/org/apache/solr/store/blockcache/class-use/BlockCache.html
solr/docs/solr-core/org/apache/solr/store/blockcache/class-use/BlockCacheKey.html
solr/docs/solr-core/org/apache/solr/store/blockcache/class-use/BlockCacheLocation.html
@@ -2440,9 +2524,11 @@ solr/docs/solr-core/org/apache/solr/store/hdfs/package-summary.html
solr/docs/solr-core/org/apache/solr/store/hdfs/package-tree.html
solr/docs/solr-core/org/apache/solr/store/hdfs/package-use.html
solr/docs/solr-core/org/apache/solr/uninverting/DocTermOrds.html
+solr/docs/solr-core/org/apache/solr/uninverting/UninvertingReader.FieldCacheStats.html
solr/docs/solr-core/org/apache/solr/uninverting/UninvertingReader.Type.html
solr/docs/solr-core/org/apache/solr/uninverting/UninvertingReader.html
solr/docs/solr-core/org/apache/solr/uninverting/class-use/DocTermOrds.html
+solr/docs/solr-core/org/apache/solr/uninverting/class-use/UninvertingReader.FieldCacheStats.html
solr/docs/solr-core/org/apache/solr/uninverting/class-use/UninvertingReader.Type.html
solr/docs/solr-core/org/apache/solr/uninverting/class-use/UninvertingReader.html
solr/docs/solr-core/org/apache/solr/uninverting/package-frame.html
@@ -2469,6 +2555,7 @@ solr/docs/solr-core/org/apache/solr/update/IndexFingerprint.html
solr/docs/solr-core/org/apache/solr/update/LoggingInfoStream.html
solr/docs/solr-core/org/apache/solr/update/MemOutputStream.html
solr/docs/solr-core/org/apache/solr/update/MergeIndexesCommand.html
+solr/docs/solr-core/org/apache/solr/update/PeerSync.PeerSyncResult.html
solr/docs/solr-core/org/apache/solr/update/PeerSync.html
solr/docs/solr-core/org/apache/solr/update/RollbackUpdateCommand.html
solr/docs/solr-core/org/apache/solr/update/SolrCmdDistributor.AbortCheck.html
@@ -2526,6 +2613,7 @@ solr/docs/solr-core/org/apache/solr/update/class-use/IndexFingerprint.html
solr/docs/solr-core/org/apache/solr/update/class-use/LoggingInfoStream.html
solr/docs/solr-core/org/apache/solr/update/class-use/MemOutputStream.html
solr/docs/solr-core/org/apache/solr/update/class-use/MergeIndexesCommand.html
+solr/docs/solr-core/org/apache/solr/update/class-use/PeerSync.PeerSyncResult.html
solr/docs/solr-core/org/apache/solr/update/class-use/PeerSync.html
solr/docs/solr-core/org/apache/solr/update/class-use/RollbackUpdateCommand.html
solr/docs/solr-core/org/apache/solr/update/class-use/SolrCmdDistributor.AbortCheck.html
@@ -2573,7 +2661,9 @@ solr/docs/solr-core/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatin
solr/docs/solr-core/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.html
solr/docs/solr-core/org/apache/solr/update/processor/CdcrUpdateProcessor.html
solr/docs/solr-core/org/apache/solr/update/processor/CdcrUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.Algorithm.html
solr/docs/solr-core/org/apache/solr/update/processor/ClassificationUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/ClassificationUpdateProcessorParams.html
solr/docs/solr-core/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.html
@@ -2622,7 +2712,10 @@ solr/docs/solr-core/org/apache/solr/update/processor/ScriptEngineCustomizer.html
solr/docs/solr-core/org/apache/solr/update/processor/Signature.html
solr/docs/solr-core/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/TemplateUpdateProcessorFactory.Resolved.html
+solr/docs/solr-core/org/apache/solr/update/processor/TemplateUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/TextProfileSignature.html
solr/docs/solr-core/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/TolerantUpdateProcessor.html
@@ -2644,7 +2737,9 @@ solr/docs/solr-core/org/apache/solr/update/processor/class-use/AllValuesOrNoneFi
solr/docs/solr-core/org/apache/solr/update/processor/class-use/AtomicUpdateDocumentMerger.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/CdcrUpdateProcessor.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/CdcrUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/ClassificationUpdateProcessorFactory.Algorithm.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/ClassificationUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/ClassificationUpdateProcessorParams.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/CloneFieldUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/ConcatFieldUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/CountFieldValuesUpdateProcessorFactory.html
@@ -2693,7 +2788,10 @@ solr/docs/solr-core/org/apache/solr/update/processor/class-use/ScriptEngineCusto
solr/docs/solr-core/org/apache/solr/update/processor/class-use/Signature.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/SignatureUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/SimpleUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/SkipExistingDocumentsProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/StatelessScriptUpdateProcessorFactory.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/TemplateUpdateProcessorFactory.Resolved.html
+solr/docs/solr-core/org/apache/solr/update/processor/class-use/TemplateUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/TextProfileSignature.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/TimestampUpdateProcessorFactory.html
solr/docs/solr-core/org/apache/solr/update/processor/class-use/TolerantUpdateProcessor.html
@@ -2735,6 +2833,7 @@ solr/docs/solr-core/org/apache/solr/util/FSHDFSUtils.html
solr/docs/solr-core/org/apache/solr/util/FastWriter.html
solr/docs/solr-core/org/apache/solr/util/FileUtils.html
solr/docs/solr-core/org/apache/solr/util/HdfsUtil.html
+solr/docs/solr-core/org/apache/solr/util/JmxUtil.html
solr/docs/solr-core/org/apache/solr/util/LongPriorityQueue.html
solr/docs/solr-core/org/apache/solr/util/MapListener.html
solr/docs/solr-core/org/apache/solr/util/NumberUtils.html
@@ -2754,6 +2853,7 @@ solr/docs/solr-core/org/apache/solr/util/SimplePostTool.BAOS.html
solr/docs/solr-core/org/apache/solr/util/SimplePostTool.PageFetcherResult.html
solr/docs/solr-core/org/apache/solr/util/SimplePostTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ApiTool.html
+solr/docs/solr-core/org/apache/solr/util/SolrCLI.AssertTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ConfigSetDownloadTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ConfigSetUploadTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ConfigTool.html
@@ -2767,11 +2867,14 @@ solr/docs/solr-core/org/apache/solr/util/SolrCLI.SolrCloudTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.StatusTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.Tool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ToolBase.html
+solr/docs/solr-core/org/apache/solr/util/SolrCLI.UtilsTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkCpTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkLsTool.html
+solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkMkrootTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkMvTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.ZkRmTool.html
solr/docs/solr-core/org/apache/solr/util/SolrCLI.html
+solr/docs/solr-core/org/apache/solr/util/SolrFileCleaningTracker.html
solr/docs/solr-core/org/apache/solr/util/SolrLogLayout.CoreInfo.html
solr/docs/solr-core/org/apache/solr/util/SolrLogLayout.Method.html
solr/docs/solr-core/org/apache/solr/util/SolrLogLayout.TG.html
@@ -2809,6 +2912,7 @@ solr/docs/solr-core/org/apache/solr/util/class-use/FSHDFSUtils.html
solr/docs/solr-core/org/apache/solr/util/class-use/FastWriter.html
solr/docs/solr-core/org/apache/solr/util/class-use/FileUtils.html
solr/docs/solr-core/org/apache/solr/util/class-use/HdfsUtil.html
+solr/docs/solr-core/org/apache/solr/util/class-use/JmxUtil.html
solr/docs/solr-core/org/apache/solr/util/class-use/LongPriorityQueue.html
solr/docs/solr-core/org/apache/solr/util/class-use/MapListener.html
solr/docs/solr-core/org/apache/solr/util/class-use/NumberUtils.html
@@ -2828,6 +2932,7 @@ solr/docs/solr-core/org/apache/solr/util/class-use/SimplePostTool.BAOS.html
solr/docs/solr-core/org/apache/solr/util/class-use/SimplePostTool.PageFetcherResult.html
solr/docs/solr-core/org/apache/solr/util/class-use/SimplePostTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ApiTool.html
+solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.AssertTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ConfigSetDownloadTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ConfigSetUploadTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ConfigTool.html
@@ -2841,11 +2946,14 @@ solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.SolrCloudTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.StatusTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.Tool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ToolBase.html
+solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.UtilsTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkCpTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkLsTool.html
+solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkMkrootTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkMvTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.ZkRmTool.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrCLI.html
+solr/docs/solr-core/org/apache/solr/util/class-use/SolrFileCleaningTracker.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrLogLayout.CoreInfo.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrLogLayout.Method.html
solr/docs/solr-core/org/apache/solr/util/class-use/SolrLogLayout.TG.html
@@ -2896,30 +3004,16 @@ solr/docs/solr-core/org/apache/solr/util/plugin/package-frame.html
solr/docs/solr-core/org/apache/solr/util/plugin/package-summary.html
solr/docs/solr-core/org/apache/solr/util/plugin/package-tree.html
solr/docs/solr-core/org/apache/solr/util/plugin/package-use.html
-solr/docs/solr-core/org/apache/solr/util/stats/Clock.CpuTimeClock.html
-solr/docs/solr-core/org/apache/solr/util/stats/Clock.UserTimeClock.html
-solr/docs/solr-core/org/apache/solr/util/stats/Clock.html
-solr/docs/solr-core/org/apache/solr/util/stats/EWMA.html
-solr/docs/solr-core/org/apache/solr/util/stats/ExponentiallyDecayingSample.html
-solr/docs/solr-core/org/apache/solr/util/stats/Histogram.html
-solr/docs/solr-core/org/apache/solr/util/stats/Meter.html
-solr/docs/solr-core/org/apache/solr/util/stats/Sample.html
-solr/docs/solr-core/org/apache/solr/util/stats/Snapshot.html
-solr/docs/solr-core/org/apache/solr/util/stats/Timer.html
-solr/docs/solr-core/org/apache/solr/util/stats/TimerContext.html
-solr/docs/solr-core/org/apache/solr/util/stats/UniformSample.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Clock.CpuTimeClock.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Clock.UserTimeClock.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Clock.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/EWMA.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/ExponentiallyDecayingSample.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Histogram.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Meter.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Sample.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Snapshot.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/Timer.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/TimerContext.html
-solr/docs/solr-core/org/apache/solr/util/stats/class-use/UniformSample.html
+solr/docs/solr-core/org/apache/solr/util/stats/HttpClientMetricNameStrategy.html
+solr/docs/solr-core/org/apache/solr/util/stats/InstrumentedHttpClient.html
+solr/docs/solr-core/org/apache/solr/util/stats/InstrumentedHttpRequestExecutor.html
+solr/docs/solr-core/org/apache/solr/util/stats/InstrumentedPoolingClientConnectionManager.html
+solr/docs/solr-core/org/apache/solr/util/stats/MetricUtils.html
+solr/docs/solr-core/org/apache/solr/util/stats/class-use/HttpClientMetricNameStrategy.html
+solr/docs/solr-core/org/apache/solr/util/stats/class-use/InstrumentedHttpClient.html
+solr/docs/solr-core/org/apache/solr/util/stats/class-use/InstrumentedHttpRequestExecutor.html
+solr/docs/solr-core/org/apache/solr/util/stats/class-use/InstrumentedPoolingClientConnectionManager.html
+solr/docs/solr-core/org/apache/solr/util/stats/class-use/MetricUtils.html
solr/docs/solr-core/org/apache/solr/util/stats/package-frame.html
solr/docs/solr-core/org/apache/solr/util/stats/package-summary.html
solr/docs/solr-core/org/apache/solr/util/stats/package-tree.html
@@ -3156,6 +3250,152 @@ solr/docs/solr-langid/package-list
solr/docs/solr-langid/prettify.js
solr/docs/solr-langid/script.js
solr/docs/solr-langid/stylesheet.css
+solr/docs/solr-ltr/allclasses-frame.html
+solr/docs/solr-ltr/allclasses-noframe.html
+solr/docs/solr-ltr/constant-values.html
+solr/docs/solr-ltr/deprecated-list.html
+solr/docs/solr-ltr/help-doc.html
+solr/docs/solr-ltr/index.html
+solr/docs/solr-ltr/org/apache/solr/ltr/CSVFeatureLogger.html
+solr/docs/solr-ltr/org/apache/solr/ltr/DocInfo.html
+solr/docs/solr-ltr/org/apache/solr/ltr/FeatureLogger.FeatureFormat.html
+solr/docs/solr-ltr/org/apache/solr/ltr/FeatureLogger.html
+solr/docs/solr-ltr/org/apache/solr/ltr/LTRRescorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/LTRScoringQuery.FeatureInfo.html
+solr/docs/solr-ltr/org/apache/solr/ltr/LTRScoringQuery.ModelWeight.ModelScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/LTRScoringQuery.ModelWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/LTRScoringQuery.html
+solr/docs/solr-ltr/org/apache/solr/ltr/LTRThreadModule.html
+solr/docs/solr-ltr/org/apache/solr/ltr/SolrQueryRequestContextUtils.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/CSVFeatureLogger.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/DocInfo.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/FeatureLogger.FeatureFormat.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/FeatureLogger.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/LTRRescorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/LTRScoringQuery.FeatureInfo.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/LTRScoringQuery.ModelWeight.ModelScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/LTRScoringQuery.ModelWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/LTRScoringQuery.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/LTRThreadModule.html
+solr/docs/solr-ltr/org/apache/solr/ltr/class-use/SolrQueryRequestContextUtils.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/Feature.FeatureWeight.FeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/Feature.FeatureWeight.ValueFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/Feature.FeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/Feature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FeatureException.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FieldLengthFeature.FieldLengthFeatureWeight.FieldLengthFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FieldLengthFeature.FieldLengthFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FieldLengthFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FieldValueFeature.FieldValueFeatureWeight.FieldValueFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FieldValueFeature.FieldValueFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/FieldValueFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/OriginalScoreFeature.OriginalScoreWeight.OriginalScoreScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/OriginalScoreFeature.OriginalScoreWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/OriginalScoreFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/SolrFeature.SolrFeatureWeight.SolrFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/SolrFeature.SolrFeatureWeight.SolrFeatureScorerIterator.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/SolrFeature.SolrFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/SolrFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/ValueFeature.ValueFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/ValueFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/Feature.FeatureWeight.FeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/Feature.FeatureWeight.ValueFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/Feature.FeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/Feature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FeatureException.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FieldLengthFeature.FieldLengthFeatureWeight.FieldLengthFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FieldLengthFeature.FieldLengthFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FieldLengthFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FieldValueFeature.FieldValueFeatureWeight.FieldValueFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FieldValueFeature.FieldValueFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/FieldValueFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/OriginalScoreFeature.OriginalScoreWeight.OriginalScoreScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/OriginalScoreFeature.OriginalScoreWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/OriginalScoreFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/SolrFeature.SolrFeatureWeight.SolrFeatureScorer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/SolrFeature.SolrFeatureWeight.SolrFeatureScorerIterator.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/SolrFeature.SolrFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/SolrFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/ValueFeature.ValueFeatureWeight.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/class-use/ValueFeature.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/feature/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/LTRScoringModel.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/LinearModel.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/ModelException.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.RegressionTree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.RegressionTreeNode.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/MultipleAdditiveTreesModel.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/class-use/LTRScoringModel.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/class-use/LinearModel.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/class-use/ModelException.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/class-use/MultipleAdditiveTreesModel.RegressionTree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/class-use/MultipleAdditiveTreesModel.RegressionTreeNode.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/class-use/MultipleAdditiveTreesModel.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/model/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/IdentityNormalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/MinMaxNormalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/Normalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/NormalizerException.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/StandardNormalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/class-use/IdentityNormalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/class-use/MinMaxNormalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/class-use/Normalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/class-use/NormalizerException.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/class-use/StandardNormalizer.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/norm/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.html
+solr/docs/solr-ltr/org/apache/solr/ltr/response/transform/class-use/LTRFeatureLoggerTransformerFactory.html
+solr/docs/solr-ltr/org/apache/solr/ltr/response/transform/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/response/transform/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/response/transform/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/response/transform/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/LTRQParserPlugin.LTRQParser.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/LTRQParserPlugin.LTRQuery.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/LTRQParserPlugin.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/class-use/LTRQParserPlugin.LTRQParser.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/class-use/LTRQParserPlugin.LTRQuery.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/class-use/LTRQParserPlugin.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/search/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/FeatureStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/ModelStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/class-use/FeatureStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/class-use/ModelStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/package-use.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/ManagedFeatureStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/ManagedModelStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/class-use/ManagedFeatureStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/class-use/ManagedModelStore.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/package-frame.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/package-summary.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/package-tree.html
+solr/docs/solr-ltr/org/apache/solr/ltr/store/rest/package-use.html
+solr/docs/solr-ltr/overview-frame.html
+solr/docs/solr-ltr/overview-summary.html
+solr/docs/solr-ltr/overview-tree.html
+solr/docs/solr-ltr/package-list
+solr/docs/solr-ltr/prettify.js
+solr/docs/solr-ltr/script.js
+solr/docs/solr-ltr/serialized-form.html
+solr/docs/solr-ltr/stylesheet.css
solr/docs/solr-map-reduce/allclasses-frame.html
solr/docs/solr-map-reduce/allclasses-noframe.html
solr/docs/solr-map-reduce/constant-values.html
@@ -3339,6 +3579,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/CloudSolrClient.RouteResp
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/CloudSolrClient.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.Builder.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/DelegationTokenHttpSolrClient.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/HttpClientConfigurer.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/HttpClientUtil.HttpClientFactory.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/HttpClientUtil.html
@@ -3361,6 +3602,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFa
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.KnownType.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/BinaryRequestWriter.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/BinaryResponseParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/CloudSolrClient.Builder.html
@@ -3369,6 +3611,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/CloudSolrClient
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/CloudSolrClient.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/ConcurrentUpdateSolrClient.Builder.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/ConcurrentUpdateSolrClient.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/DelegationTokenHttpSolrClient.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/HttpClientConfigurer.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/HttpClientUtil.HttpClientFactory.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/HttpClientUtil.html
@@ -3391,14 +3634,17 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/SolrPortAwareCo
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/StreamingBinaryResponseParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/XMLResponseParser.KnownType.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/XMLResponseParser.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/class-use/ZkClientClusterStateProvider.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-frame.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-summary.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-tree.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/impl/package-use.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ClassificationEvaluation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ModelCache.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/SolrClientCache.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/Tuple.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/ClassificationEvaluation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/ModelCache.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/SolrClientCache.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/class-use/Tuple.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/comp/ComparatorLambda.html
@@ -3443,17 +3689,37 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/graph/package-frame.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/graph/package-summary.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/graph/package-tree.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/graph/package-use.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/AndOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/BooleanOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/ConcatOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/DistinctOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/EqualsOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/GreaterThanEqualToOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/GreaterThanOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/GroupOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/LeafOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/LessThanEqualToOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/LessThanOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/NotOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/OrOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/ReduceOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/ReplaceOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/StreamOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/AndOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/BooleanOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/ConcatOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/DistinctOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/EqualsOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/GreaterThanEqualToOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/GreaterThanOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/GroupOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/LeafOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/LessThanEqualToOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/LessThanOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/NotOperation.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/OrOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/ReduceOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/ReplaceOperation.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/ops/class-use/ReplaceWithFieldOperation.html
@@ -3477,22 +3743,31 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/BiJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CloudSolrStream.StreamOpener.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CloudSolrStream.TupleWrapper.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CloudSolrStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/CommitStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ComplementStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/DaemonStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ExceptionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ExecutorStream.StreamTask.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ExecutorStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FacetStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.FeaturesSelectionCall.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/FetchStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/HashJoinStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/HavingStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/InnerJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/IntersectStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/JDBCStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/JSONTupleStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/JoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/MergeStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ModelStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/NullStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/ParallelStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/PriorityStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/PushBackStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/RandomStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/RankStream.html
@@ -3510,28 +3785,38 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/TextLogitStream.Term
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/TextLogitStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/TopicStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/TupleStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/TupleStreamParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/UniqueStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/UpdateStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/BiJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CloudSolrStream.StreamOpener.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CloudSolrStream.TupleWrapper.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CloudSolrStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/CommitStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ComplementStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/DaemonStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ExceptionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ExecutorStream.StreamTask.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ExecutorStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FacetStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FeaturesSelectionStream.FeaturesSelectionCall.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FeaturesSelectionStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/FetchStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/HashJoinStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/HavingStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/InnerJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/IntersectStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/JDBCStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/JSONTupleStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/JavabinTupleStreamParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/JoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/LeftOuterJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/MergeStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ModelStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/NullStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/OuterHashJoinStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/ParallelStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/PriorityStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/PushBackStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/RandomStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/RankStream.html
@@ -3549,6 +3834,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/TextLogitS
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/TextLogitStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/TopicStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/TupleStream.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/TupleStreamParser.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/UniqueStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/class-use/UpdateStream.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/io/stream/expr/Explanation.ExpressionType.html
@@ -3617,15 +3903,18 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.Create.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.CreateAlias.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.CreateShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.CreateSnapshot.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.Delete.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteAlias.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteNode.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteReplica.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteReplicaProp.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteSnapshot.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.DeleteStatus.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.ForceLeader.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.List.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.ListSnapshots.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.Migrate.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.MigrateClusterState.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CollectionAdminRequest.OverseerStatus.html
@@ -3656,6 +3945,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.Reque
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.Unload.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.WaitForState.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/CoreStatus.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/DelegationTokenRequest.Cancel.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/DelegationTokenRequest.Get.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/DelegationTokenRequest.Renew.html
@@ -3689,15 +3979,18 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAd
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.Create.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.CreateAlias.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.CreateShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.CreateSnapshot.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.Delete.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteAlias.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteNode.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteReplica.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteReplicaProp.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteShard.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteSnapshot.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.DeleteStatus.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.ForceLeader.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.List.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.ListSnapshots.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.Migrate.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.MigrateClusterState.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CollectionAdminRequest.OverseerStatus.html
@@ -3728,6 +4021,7 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminReq
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminRequest.Unload.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminRequest.WaitForState.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreAdminRequest.html
+solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/CoreStatus.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/DelegationTokenRequest.Cancel.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/DelegationTokenRequest.Get.html
solr/docs/solr-solrj/org/apache/solr/client/solrj/request/class-use/DelegationTokenRequest.Renew.html
@@ -3962,7 +4256,13 @@ solr/docs/solr-solrj/org/apache/solr/client/solrj/util/package-use.html
solr/docs/solr-solrj/org/apache/solr/common/Callable.html
solr/docs/solr-solrj/org/apache/solr/common/EmptyEntityResolver.html
solr/docs/solr-solrj/org/apache/solr/common/EnumFieldValue.html
+solr/docs/solr-solrj/org/apache/solr/common/IteratorWriter.ItemWriter.html
+solr/docs/solr-solrj/org/apache/solr/common/IteratorWriter.html
+solr/docs/solr-solrj/org/apache/solr/common/MapSerializable.html
+solr/docs/solr-solrj/org/apache/solr/common/MapWriter.EntryWriter.html
+solr/docs/solr-solrj/org/apache/solr/common/MapWriter.html
solr/docs/solr-solrj/org/apache/solr/common/NonExistentCoreException.html
+solr/docs/solr-solrj/org/apache/solr/common/PushWriter.html
solr/docs/solr-solrj/org/apache/solr/common/SolrDocument.html
solr/docs/solr-solrj/org/apache/solr/common/SolrDocumentBase.html
solr/docs/solr-solrj/org/apache/solr/common/SolrDocumentList.html
@@ -3976,7 +4276,13 @@ solr/docs/solr-solrj/org/apache/solr/common/ToleratedUpdateError.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/Callable.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/EmptyEntityResolver.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/EnumFieldValue.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/IteratorWriter.ItemWriter.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/IteratorWriter.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/MapSerializable.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/MapWriter.EntryWriter.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/MapWriter.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/NonExistentCoreException.html
+solr/docs/solr-solrj/org/apache/solr/common/class-use/PushWriter.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/SolrDocument.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/SolrDocumentBase.html
solr/docs/solr-solrj/org/apache/solr/common/class-use/SolrDocumentList.html
@@ -4089,6 +4395,20 @@ solr/docs/solr-solrj/org/apache/solr/common/cloud/package-frame.html
solr/docs/solr-solrj/org/apache/solr/common/cloud/package-summary.html
solr/docs/solr-solrj/org/apache/solr/common/cloud/package-tree.html
solr/docs/solr-solrj/org/apache/solr/common/cloud/package-use.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/ImplicitSnitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/RemoteCallback.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/Snitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/SnitchContext.SnitchInfo.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/SnitchContext.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/ImplicitSnitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/RemoteCallback.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/Snitch.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/SnitchContext.SnitchInfo.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/class-use/SnitchContext.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-frame.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-summary.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-tree.html
+solr/docs/solr-solrj/org/apache/solr/common/cloud/rule/package-use.html
solr/docs/solr-solrj/org/apache/solr/common/luke/FieldFlag.html
solr/docs/solr-solrj/org/apache/solr/common/luke/class-use/FieldFlag.html
solr/docs/solr-solrj/org/apache/solr/common/luke/package-frame.html
@@ -4210,6 +4530,7 @@ solr/docs/solr-solrj/org/apache/solr/common/util/JavaBinCodec.WritableDocFields.
solr/docs/solr-solrj/org/apache/solr/common/util/JavaBinCodec.html
solr/docs/solr-solrj/org/apache/solr/common/util/JsonRecordReader.Handler.html
solr/docs/solr-solrj/org/apache/solr/common/util/JsonRecordReader.html
+solr/docs/solr-solrj/org/apache/solr/common/util/MapBackedCache.html
solr/docs/solr-solrj/org/apache/solr/common/util/NamedList.NamedListEntry.html
solr/docs/solr-solrj/org/apache/solr/common/util/NamedList.html
solr/docs/solr-solrj/org/apache/solr/common/util/ObjectReleaseTracker.html
@@ -4250,6 +4571,7 @@ solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JavaBinCodec.Writable
solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JavaBinCodec.html
solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JsonRecordReader.Handler.html
solr/docs/solr-solrj/org/apache/solr/common/util/class-use/JsonRecordReader.html
+solr/docs/solr-solrj/org/apache/solr/common/util/class-use/MapBackedCache.html
solr/docs/solr-solrj/org/apache/solr/common/util/class-use/NamedList.NamedListEntry.html
solr/docs/solr-solrj/org/apache/solr/common/util/class-use/NamedList.html
solr/docs/solr-solrj/org/apache/solr/common/util/class-use/ObjectReleaseTracker.html
@@ -4432,6 +4754,8 @@ solr/docs/solr-test-framework/org/apache/solr/util/BadZookeeperThreadsFilter.htm
solr/docs/solr-test-framework/org/apache/solr/util/BaseTestHarness.html
solr/docs/solr-test-framework/org/apache/solr/util/DOMUtilTestBase.html
solr/docs/solr-test-framework/org/apache/solr/util/ExternalPaths.html
+solr/docs/solr-test-framework/org/apache/solr/util/LogLevel.Configurer.html
+solr/docs/solr-test-framework/org/apache/solr/util/LogLevel.html
solr/docs/solr-test-framework/org/apache/solr/util/RESTfulServerProvider.html
solr/docs/solr-test-framework/org/apache/solr/util/RandomForceMergePolicy.html
solr/docs/solr-test-framework/org/apache/solr/util/RandomForceMergePolicyFactory.html
@@ -4454,6 +4778,8 @@ solr/docs/solr-test-framework/org/apache/solr/util/class-use/BadZookeeperThreads
solr/docs/solr-test-framework/org/apache/solr/util/class-use/BaseTestHarness.html
solr/docs/solr-test-framework/org/apache/solr/util/class-use/DOMUtilTestBase.html
solr/docs/solr-test-framework/org/apache/solr/util/class-use/ExternalPaths.html
+solr/docs/solr-test-framework/org/apache/solr/util/class-use/LogLevel.Configurer.html
+solr/docs/solr-test-framework/org/apache/solr/util/class-use/LogLevel.html
solr/docs/solr-test-framework/org/apache/solr/util/class-use/RESTfulServerProvider.html
solr/docs/solr-test-framework/org/apache/solr/util/class-use/RandomForceMergePolicy.html
solr/docs/solr-test-framework/org/apache/solr/util/class-use/RandomForceMergePolicyFactory.html
@@ -5058,13 +5384,16 @@ solr/licenses/bcprov-jdk15-1.45.jar.sha1
solr/licenses/boilerpipe-1.1.0.jar.sha1
solr/licenses/boilerpipe-LICENSE-ASL.txt
solr/licenses/boilerpipe-NOTICE.txt
+solr/licenses/byte-buddy-1.6.2.jar.sha1
+solr/licenses/byte-buddy-LICENSE-ASL.txt
+solr/licenses/byte-buddy-NOTICE.txt
solr/licenses/caffeine-1.0.1.jar.sha1
solr/licenses/caffeine-LICENSE-ASL.txt
solr/licenses/caffeine-NOTICE.txt
solr/licenses/carrot2-guava-18.0.jar.sha1
solr/licenses/carrot2-guava-LICENSE-ASL.txt
solr/licenses/carrot2-guava-NOTICE.txt
-solr/licenses/carrot2-mini-3.12.0.jar.sha1
+solr/licenses/carrot2-mini-3.15.0.jar.sha1
solr/licenses/carrot2-mini-LICENSE-BSD_LIKE.txt
solr/licenses/carrot2-mini-NOTICE.txt
solr/licenses/cglib-nodep-2.2.jar.sha1
@@ -5094,7 +5423,7 @@ solr/licenses/commons-digester-NOTICE.txt
solr/licenses/commons-exec-1.3.jar.sha1
solr/licenses/commons-exec-LICENSE-ASL.txt
solr/licenses/commons-exec-NOTICE.txt
-solr/licenses/commons-fileupload-1.3.1.jar.sha1
+solr/licenses/commons-fileupload-1.3.2.jar.sha1
solr/licenses/commons-fileupload-LICENSE-ASL.txt
solr/licenses/commons-fileupload-NOTICE.txt
solr/licenses/commons-io-2.5.jar.sha1
@@ -5134,6 +5463,9 @@ solr/licenses/fontbox-LICENSE-ASL.txt
solr/licenses/fontbox-NOTICE.txt
solr/licenses/gimap-1.5.1.jar.sha1
solr/licenses/gimap-LICENSE-CDDL.txt
+solr/licenses/gmetric4j-1.0.7.jar.sha1
+solr/licenses/gmetric4j-LICENSE-BSD.txt
+solr/licenses/gmetric4j-NOTICE.txt
solr/licenses/guava-14.0.1.jar.sha1
solr/licenses/guava-LICENSE-ASL.txt
solr/licenses/guava-NOTICE.txt
@@ -5274,7 +5606,7 @@ solr/licenses/javax.servlet-api-NOTICE.txt
solr/licenses/jaxb-impl-2.2.3-1.jar.sha1
solr/licenses/jaxb-impl-LICENSE-CDDL.txt
solr/licenses/jcl-over-slf4j-1.7.7.jar.sha1
-solr/licenses/jcl-over-slf4j-LICENSE-BSD_LIKE.txt
+solr/licenses/jcl-over-slf4j-LICENSE-MIT.txt
solr/licenses/jcl-over-slf4j-NOTICE.txt
solr/licenses/jdom-1.0.jar.sha1
solr/licenses/jdom-LICENSE-BSD_LIKE.txt
@@ -5295,20 +5627,20 @@ solr/licenses/jersey-server-LICENSE-CDDL.txt
solr/licenses/jetty-6.1.26.jar.sha1
solr/licenses/jetty-LICENSE-ASL.txt
solr/licenses/jetty-NOTICE.txt
-solr/licenses/jetty-continuation-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-deploy-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-http-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-jmx-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-rewrite-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-security-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-server-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-servlet-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-servlets-9.3.8.v20160314.jar.sha1
+solr/licenses/jetty-continuation-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-deploy-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-http-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-io-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-jmx-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-rewrite-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-security-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-server-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-servlet-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-servlets-9.3.14.v20161028.jar.sha1
solr/licenses/jetty-util-6.1.26.jar.sha1
-solr/licenses/jetty-util-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-webapp-9.3.8.v20160314.jar.sha1
-solr/licenses/jetty-xml-9.3.8.v20160314.jar.sha1
+solr/licenses/jetty-util-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-webapp-9.3.14.v20161028.jar.sha1
+solr/licenses/jetty-xml-9.3.14.v20161028.jar.sha1
solr/licenses/jmatio-1.0.jar.sha1
solr/licenses/jmatio-LICENSE-BSD.txt
solr/licenses/jmatio-NOTICE.txt
@@ -5319,12 +5651,12 @@ solr/licenses/jsonic-1.2.7.jar.sha1
solr/licenses/jsonic-LICENSE-ASL.txt
solr/licenses/jsonic-NOTICE.txt
solr/licenses/jul-to-slf4j-1.7.7.jar.sha1
-solr/licenses/jul-to-slf4j-LICENSE-BSD_LIKE.txt
+solr/licenses/jul-to-slf4j-LICENSE-MIT.txt
solr/licenses/jul-to-slf4j-NOTICE.txt
solr/licenses/junit-4.10.jar.sha1
solr/licenses/junit-LICENSE-CPL.txt
solr/licenses/junit-NOTICE.txt
-solr/licenses/junit4-ant-2.3.4.jar.sha1
+solr/licenses/junit4-ant-2.4.0.jar.sha1
solr/licenses/junit4-ant-LICENSE-ASL.txt
solr/licenses/junit4-ant-NOTICE.txt
solr/licenses/juniversalchardet-1.0.3.jar.sha1
@@ -5370,27 +5702,42 @@ solr/licenses/leveldbjni-NOTICE.txt
solr/licenses/log4j-1.2.17.jar.sha1
solr/licenses/log4j-LICENSE-ASL.txt
solr/licenses/log4j-NOTICE.txt
-solr/licenses/mail-LICENSE-CDDL.txt
solr/licenses/metadata-extractor-2.8.1.jar.sha1
solr/licenses/metadata-extractor-LICENSE-PD.txt
-solr/licenses/metrics-core-3.0.1.jar.sha1
+solr/licenses/metrics-core-3.1.2.jar.sha1
solr/licenses/metrics-core-LICENSE-ASL.txt
solr/licenses/metrics-core-NOTICE.txt
-solr/licenses/metrics-healthchecks-3.0.1.jar.sha1
+solr/licenses/metrics-ganglia-3.1.2.jar.sha1
+solr/licenses/metrics-ganglia-LICENSE-ASL.txt
+solr/licenses/metrics-ganglia-NOTICE.txt
+solr/licenses/metrics-graphite-3.1.2.jar.sha1
+solr/licenses/metrics-graphite-LICENSE-ASL.txt
+solr/licenses/metrics-graphite-NOTICE.txt
+solr/licenses/metrics-healthchecks-3.1.2.jar.sha1
solr/licenses/metrics-healthchecks-LICENSE-ASL.txt
solr/licenses/metrics-healthchecks-NOTICE.txt
+solr/licenses/metrics-jetty-LICENSE-ASL.txt
+solr/licenses/metrics-jetty-NOTICE.txt
+solr/licenses/metrics-jetty9-3.1.2.jar.sha1
+solr/licenses/metrics-json-LICENSE-ASL.txt
+solr/licenses/metrics-json-NOTICE.txt
+solr/licenses/metrics-jvm-3.1.2.jar.sha1
+solr/licenses/metrics-jvm-LICENSE-ASL.txt
+solr/licenses/metrics-jvm-NOTICE.txt
+solr/licenses/metrics-servlets-LICENSE-ASL.txt
+solr/licenses/metrics-servlets-NOTICE.txt
solr/licenses/mina-core-2.0.0-M5.jar.sha1
solr/licenses/mina-core-LICENSE-ASL.txt
solr/licenses/mina-core-NOTICE.txt
-solr/licenses/mockito-core-1.9.5.jar.sha1
+solr/licenses/mockito-core-2.6.2.jar.sha1
solr/licenses/mockito-core-LICENSE-MIT.txt
-solr/licenses/morfologik-fsa-2.1.0.jar.sha1
+solr/licenses/morfologik-fsa-2.1.1.jar.sha1
solr/licenses/morfologik-fsa-LICENSE-BSD.txt
solr/licenses/morfologik-fsa-NOTICE.txt
-solr/licenses/morfologik-polish-2.1.0.jar.sha1
+solr/licenses/morfologik-polish-2.1.1.jar.sha1
solr/licenses/morfologik-polish-LICENSE-BSD.txt
solr/licenses/morfologik-polish-NOTICE.txt
-solr/licenses/morfologik-stemming-2.1.0.jar.sha1
+solr/licenses/morfologik-stemming-2.1.1.jar.sha1
solr/licenses/morfologik-stemming-LICENSE-BSD.txt
solr/licenses/morfologik-stemming-NOTICE.txt
solr/licenses/mrunit-1.0.0-hadoop2.jar.sha1
@@ -5405,7 +5752,7 @@ solr/licenses/netty-all-NOTICE.txt
solr/licenses/noggit-0.6.jar.sha1
solr/licenses/noggit-LICENSE-ASL.txt
solr/licenses/noggit-NOTICE.txt
-solr/licenses/objenesis-1.2.jar.sha1
+solr/licenses/objenesis-2.5.jar.sha1
solr/licenses/objenesis-LICENSE-ASL.txt
solr/licenses/objenesis-NOTICE.txt
solr/licenses/org.restlet-2.3.0.jar.sha1
@@ -5441,7 +5788,7 @@ solr/licenses/presto-parser-NOTICE.txt
solr/licenses/protobuf-java-2.5.0.jar.sha1
solr/licenses/protobuf-java-LICENSE-BSD.txt
solr/licenses/protobuf-java-NOTICE.txt
-solr/licenses/randomizedtesting-runner-2.3.4.jar.sha1
+solr/licenses/randomizedtesting-runner-2.4.0.jar.sha1
solr/licenses/randomizedtesting-runner-LICENSE-ASL.txt
solr/licenses/randomizedtesting-runner-NOTICE.txt
solr/licenses/rome-1.0.jar.sha1
@@ -5453,7 +5800,7 @@ solr/licenses/servlet-api-NOTICE.txt
solr/licenses/simple-xml-2.7.1.jar.sha1
solr/licenses/simple-xml-LICENSE-ASL.txt
solr/licenses/simple-xml-NOTICE.txt
-solr/licenses/slf4j-LICENSE-BSD_LIKE.txt
+solr/licenses/slf4j-LICENSE-MIT.txt
solr/licenses/slf4j-NOTICE.txt
solr/licenses/slf4j-api-1.7.7.jar.sha1
solr/licenses/slf4j-log4j12-1.7.7.jar.sha1
@@ -5533,27 +5880,35 @@ solr/server/lib/ext/jul-to-slf4j-1.7.7.jar
solr/server/lib/ext/log4j-1.2.17.jar
solr/server/lib/ext/slf4j-api-1.7.7.jar
solr/server/lib/ext/slf4j-log4j12-1.7.7.jar
+solr/server/lib/gmetric4j-1.0.7.jar
solr/server/lib/javax.servlet-api-3.1.0.jar
-solr/server/lib/jetty-continuation-9.3.8.v20160314.jar
-solr/server/lib/jetty-deploy-9.3.8.v20160314.jar
-solr/server/lib/jetty-http-9.3.8.v20160314.jar
-solr/server/lib/jetty-io-9.3.8.v20160314.jar
-solr/server/lib/jetty-jmx-9.3.8.v20160314.jar
-solr/server/lib/jetty-rewrite-9.3.8.v20160314.jar
-solr/server/lib/jetty-security-9.3.8.v20160314.jar
-solr/server/lib/jetty-server-9.3.8.v20160314.jar
-solr/server/lib/jetty-servlet-9.3.8.v20160314.jar
-solr/server/lib/jetty-servlets-9.3.8.v20160314.jar
-solr/server/lib/jetty-util-9.3.8.v20160314.jar
-solr/server/lib/jetty-webapp-9.3.8.v20160314.jar
-solr/server/lib/jetty-xml-9.3.8.v20160314.jar
+solr/server/lib/jetty-continuation-9.3.14.v20161028.jar
+solr/server/lib/jetty-deploy-9.3.14.v20161028.jar
+solr/server/lib/jetty-http-9.3.14.v20161028.jar
+solr/server/lib/jetty-io-9.3.14.v20161028.jar
+solr/server/lib/jetty-jmx-9.3.14.v20161028.jar
+solr/server/lib/jetty-rewrite-9.3.14.v20161028.jar
+solr/server/lib/jetty-security-9.3.14.v20161028.jar
+solr/server/lib/jetty-server-9.3.14.v20161028.jar
+solr/server/lib/jetty-servlet-9.3.14.v20161028.jar
+solr/server/lib/jetty-servlets-9.3.14.v20161028.jar
+solr/server/lib/jetty-util-9.3.14.v20161028.jar
+solr/server/lib/jetty-webapp-9.3.14.v20161028.jar
+solr/server/lib/jetty-xml-9.3.14.v20161028.jar
+solr/server/lib/metrics-core-3.1.2.jar
+solr/server/lib/metrics-ganglia-3.1.2.jar
+solr/server/lib/metrics-graphite-3.1.2.jar
+solr/server/lib/metrics-jetty9-3.1.2.jar
+solr/server/lib/metrics-jvm-3.1.2.jar
solr/server/modules/http.mod
solr/server/modules/https.mod
solr/server/modules/server.mod
solr/server/modules/ssl.mod
solr/server/resources/jetty-logging.properties
solr/server/resources/log4j.properties
+solr/server/resources/log4j.properties.bak
solr/server/scripts/cloud-scripts/log4j.properties
+solr/server/scripts/cloud-scripts/snapshotscli.sh
solr/server/scripts/cloud-scripts/zkcli.bat
solr/server/scripts/cloud-scripts/zkcli.sh
solr/server/scripts/map-reduce/set-map-reduce-classpath.sh
@@ -5566,7 +5921,7 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/commons-codec-1.10.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/commons-collections-3.2.2.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/commons-configuration-1.6.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/commons-exec-1.3.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.1.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.2.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/commons-io-2.5.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/commons-lang-2.6.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/curator-client-2.8.0.jar
@@ -5583,10 +5938,10 @@ solr/server/solr-webapp/webapp/WEB-INF/lib/htrace-core-3.2.0-incubating.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/httpclient-4.4.1.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/httpcore-4.4.1.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/httpmime-4.4.1.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-annotations-2.5.4.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-2.5.4.jar
-solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-databind-2.5.4.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-core-asl-1.9.13.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-dataformat-smile-2.5.4.jar
+solr/server/solr-webapp/webapp/WEB-INF/lib/jackson-mapper-asl-1.9.13.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/joda-time-2.2.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-%%PORTVERSION%%.jar
solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-%%PORTVERSION%%.jar
@@ -6131,6 +6486,7 @@ solr/server/solr/configsets/sample_techproducts_configs/conf/lang/userdict_ja.tx
solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
solr/server/solr/configsets/sample_techproducts_configs/conf/mapping-FoldToASCII.txt
solr/server/solr/configsets/sample_techproducts_configs/conf/mapping-ISOLatin1Accent.txt
+solr/server/solr/configsets/sample_techproducts_configs/conf/params.json
solr/server/solr/configsets/sample_techproducts_configs/conf/protwords.txt
solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
solr/server/solr/configsets/sample_techproducts_configs/conf/spellings.txt
@@ -6183,4 +6539,3 @@ solr/server/solr/zoo.cfg
solr/server/start.jar
@dir /var/db/solr
@dir /var/log/solr
-
diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile
index 253ab14d7497..0d0d506f942a 100644
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -3,7 +3,7 @@
PORTNAME= artha
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 6c17e6b6b605..6749deaf9d0b 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aspell
PORTVERSION= 0.60.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= GNU/aspell
diff --git a/textproc/augeas/Makefile b/textproc/augeas/Makefile
index e62b584d3e00..2a021c2f943c 100644
--- a/textproc/augeas/Makefile
+++ b/textproc/augeas/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= augeas
-PORTVERSION= 1.4.0
+PORTVERSION= 1.7.0
CATEGORIES= textproc
MASTER_SITES= http://download.augeas.net/
diff --git a/textproc/augeas/distinfo b/textproc/augeas/distinfo
index f7d2031069a3..9bb80316b76b 100644
--- a/textproc/augeas/distinfo
+++ b/textproc/augeas/distinfo
@@ -1,2 +1,3 @@
-SHA256 (augeas-1.4.0.tar.gz) = 659fae7ac229029e60a869a3b88c616cfd51cf2fba286cdfe3af3a052cb35b30
-SIZE (augeas-1.4.0.tar.gz) = 2029025
+TIMESTAMP = 1482493033
+SHA256 (augeas-1.7.0.tar.gz) = b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763
+SIZE (augeas-1.7.0.tar.gz) = 2156168
diff --git a/textproc/augeas/files/patch-lenses_pg__hba.aug b/textproc/augeas/files/patch-lenses_pg__hba.aug
new file mode 100644
index 000000000000..c97a5ec94da6
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_pg__hba.aug
@@ -0,0 +1,10 @@
+--- lenses/pg_hba.aug.orig 2016-12-23 12:13:13 UTC
++++ lenses/pg_hba.aug
+@@ -81,6 +81,7 @@ module Pg_Hba =
+ (* View: filter
+ The pg_hba.conf conf file *)
+ let filter = (incl "/var/lib/pgsql/data/pg_hba.conf" .
++ incl "/usr/local/pgsql/data/pg_hba.conf" .
+ incl "/var/lib/pgsql/*/data/pg_hba.conf" .
+ incl "/var/lib/postgresql/*/data/pg_hba.conf" .
+ incl "/etc/postgresql/*/*/pg_hba.conf" )
diff --git a/textproc/augeas/files/patch-lenses_postgresql.aug b/textproc/augeas/files/patch-lenses_postgresql.aug
new file mode 100644
index 000000000000..e5c87a90b461
--- /dev/null
+++ b/textproc/augeas/files/patch-lenses_postgresql.aug
@@ -0,0 +1,10 @@
+--- lenses/postgresql.aug.orig 2016-12-23 12:13:09 UTC
++++ lenses/postgresql.aug
+@@ -70,6 +70,7 @@ let lns = (Util.empty | Util.comment | e
+
+ (* Variable: filter *)
+ let filter = (incl "/var/lib/pgsql/data/postgresql.conf" .
++ incl "/usr/local/pgsql/data/postgresql.conf" .
+ incl "/var/lib/pgsql/*/data/postgresql.conf" .
+ incl "/var/lib/postgresql/*/data/postgresql.conf" .
+ incl "/etc/postgresql/*/*/postgresql.conf" )
diff --git a/textproc/augeas/pkg-plist b/textproc/augeas/pkg-plist
index 64cc9907281c..83c5b86891f1 100644
--- a/textproc/augeas/pkg-plist
+++ b/textproc/augeas/pkg-plist
@@ -6,11 +6,11 @@ include/fa.h
lib/libaugeas.a
lib/libaugeas.so
lib/libaugeas.so.0
-lib/libaugeas.so.0.20.0
+lib/libaugeas.so.0.21.1
lib/libfa.a
lib/libfa.so
lib/libfa.so.1
-lib/libfa.so.1.4.1
+lib/libfa.so.1.4.4
libdata/pkgconfig/augeas.pc
man/man1/augparse.1.gz
man/man1/augtool.1.gz
@@ -46,7 +46,9 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/collectd.aug
%%DATADIR%%/lenses/dist/cpanel.aug
%%DATADIR%%/lenses/dist/cron.aug
+%%DATADIR%%/lenses/dist/cron_user.aug
%%DATADIR%%/lenses/dist/crypttab.aug
+%%DATADIR%%/lenses/dist/csv.aug
%%DATADIR%%/lenses/dist/cups.aug
%%DATADIR%%/lenses/dist/cyrus_imapd.aug
%%DATADIR%%/lenses/dist/darkice.aug
@@ -107,6 +109,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/lvm.aug
%%DATADIR%%/lenses/dist/mailscanner.aug
%%DATADIR%%/lenses/dist/mailscanner_rules.aug
+%%DATADIR%%/lenses/dist/masterpasswd.aug
%%DATADIR%%/lenses/dist/mcollective.aug
%%DATADIR%%/lenses/dist/mdadm_conf.aug
%%DATADIR%%/lenses/dist/memcached.aug
@@ -129,6 +132,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/ntp.aug
%%DATADIR%%/lenses/dist/ntpd.aug
%%DATADIR%%/lenses/dist/odbc.aug
+%%DATADIR%%/lenses/dist/opendkim.aug
%%DATADIR%%/lenses/dist/openshift_config.aug
%%DATADIR%%/lenses/dist/openshift_http.aug
%%DATADIR%%/lenses/dist/openshift_quickstarts.aug
@@ -145,6 +149,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/postfix_access.aug
%%DATADIR%%/lenses/dist/postfix_main.aug
%%DATADIR%%/lenses/dist/postfix_master.aug
+%%DATADIR%%/lenses/dist/postfix_passwordmap.aug
%%DATADIR%%/lenses/dist/postfix_sasl_smtpd.aug
%%DATADIR%%/lenses/dist/postfix_transport.aug
%%DATADIR%%/lenses/dist/postfix_virtual.aug
@@ -163,6 +168,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/redis.aug
%%DATADIR%%/lenses/dist/reprepro_uploaders.aug
%%DATADIR%%/lenses/dist/resolv.aug
+%%DATADIR%%/lenses/dist/rhsm.aug
%%DATADIR%%/lenses/dist/rmt.aug
%%DATADIR%%/lenses/dist/rsyncd.aug
%%DATADIR%%/lenses/dist/rsyslog.aug
@@ -189,6 +195,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/ssh.aug
%%DATADIR%%/lenses/dist/sshd.aug
%%DATADIR%%/lenses/dist/sssd.aug
+%%DATADIR%%/lenses/dist/star.aug
%%DATADIR%%/lenses/dist/stunnel.aug
%%DATADIR%%/lenses/dist/subversion.aug
%%DATADIR%%/lenses/dist/sudoers.aug
@@ -208,7 +215,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_aptcacherngsecurity.aug
%%DATADIR%%/lenses/dist/tests/test_aptconf.aug
%%DATADIR%%/lenses/dist/tests/test_aptpreferences.aug
-%%DATADIR%%/lenses/dist/tests/test_aptsource.aug
+%%DATADIR%%/lenses/dist/tests/test_aptsources.aug
%%DATADIR%%/lenses/dist/tests/test_authorized_keys.aug
%%DATADIR%%/lenses/dist/tests/test_automaster.aug
%%DATADIR%%/lenses/dist/tests/test_automounter.aug
@@ -229,7 +236,9 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_collectd.aug
%%DATADIR%%/lenses/dist/tests/test_cpanel.aug
%%DATADIR%%/lenses/dist/tests/test_cron.aug
+%%DATADIR%%/lenses/dist/tests/test_cron_user.aug
%%DATADIR%%/lenses/dist/tests/test_crypttab.aug
+%%DATADIR%%/lenses/dist/tests/test_csv.aug
%%DATADIR%%/lenses/dist/tests/test_cups.aug
%%DATADIR%%/lenses/dist/tests/test_cyrus_imapd.aug
%%DATADIR%%/lenses/dist/tests/test_darkice.aug
@@ -291,6 +300,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_lvm.aug
%%DATADIR%%/lenses/dist/tests/test_mailscanner.aug
%%DATADIR%%/lenses/dist/tests/test_mailscanner_rules.aug
+%%DATADIR%%/lenses/dist/tests/test_masterpasswd.aug
%%DATADIR%%/lenses/dist/tests/test_mcollective.aug
%%DATADIR%%/lenses/dist/tests/test_mdadm_conf.aug
%%DATADIR%%/lenses/dist/tests/test_memcached.aug
@@ -313,6 +323,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_ntp.aug
%%DATADIR%%/lenses/dist/tests/test_ntpd.aug
%%DATADIR%%/lenses/dist/tests/test_odbc.aug
+%%DATADIR%%/lenses/dist/tests/test_opendkim.aug
%%DATADIR%%/lenses/dist/tests/test_openshift_config.aug
%%DATADIR%%/lenses/dist/tests/test_openshift_http.aug
%%DATADIR%%/lenses/dist/tests/test_openshift_quickstarts.aug
@@ -329,6 +340,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_postfix_access.aug
%%DATADIR%%/lenses/dist/tests/test_postfix_main.aug
%%DATADIR%%/lenses/dist/tests/test_postfix_master.aug
+%%DATADIR%%/lenses/dist/tests/test_postfix_passwordmap.aug
%%DATADIR%%/lenses/dist/tests/test_postfix_sasl_smtpd.aug
%%DATADIR%%/lenses/dist/tests/test_postfix_transport.aug
%%DATADIR%%/lenses/dist/tests/test_postfix_virtual.aug
@@ -347,6 +359,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_redis.aug
%%DATADIR%%/lenses/dist/tests/test_reprepro_uploaders.aug
%%DATADIR%%/lenses/dist/tests/test_resolv.aug
+%%DATADIR%%/lenses/dist/tests/test_rhsm.aug
%%DATADIR%%/lenses/dist/tests/test_rmt.aug
%%DATADIR%%/lenses/dist/tests/test_rsyncd.aug
%%DATADIR%%/lenses/dist/tests/test_rsyslog.aug
@@ -372,6 +385,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_ssh.aug
%%DATADIR%%/lenses/dist/tests/test_sshd.aug
%%DATADIR%%/lenses/dist/tests/test_sssd.aug
+%%DATADIR%%/lenses/dist/tests/test_star.aug
%%DATADIR%%/lenses/dist/tests/test_stunnel.aug
%%DATADIR%%/lenses/dist/tests/test_subversion.aug
%%DATADIR%%/lenses/dist/tests/test_sudoers.aug
@@ -381,6 +395,8 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_syslog.aug
%%DATADIR%%/lenses/dist/tests/test_systemd.aug
%%DATADIR%%/lenses/dist/tests/test_thttpd.aug
+%%DATADIR%%/lenses/dist/tests/test_tmpfiles.aug
+%%DATADIR%%/lenses/dist/tests/test_trapperkeeper.aug
%%DATADIR%%/lenses/dist/tests/test_tuned.aug
%%DATADIR%%/lenses/dist/tests/test_up2date.aug
%%DATADIR%%/lenses/dist/tests/test_updatedb.aug
@@ -396,8 +412,11 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/tests/test_xorg.aug
%%DATADIR%%/lenses/dist/tests/test_xymon.aug
%%DATADIR%%/lenses/dist/tests/test_xymon_alerting.aug
+%%DATADIR%%/lenses/dist/tests/test_yaml.aug
%%DATADIR%%/lenses/dist/tests/test_yum.aug
%%DATADIR%%/lenses/dist/thttpd.aug
+%%DATADIR%%/lenses/dist/tmpfiles.aug
+%%DATADIR%%/lenses/dist/trapperkeeper.aug
%%DATADIR%%/lenses/dist/tuned.aug
%%DATADIR%%/lenses/dist/up2date.aug
%%DATADIR%%/lenses/dist/updatedb.aug
@@ -413,6 +432,7 @@ man/man1/augtool.1.gz
%%DATADIR%%/lenses/dist/xorg.aug
%%DATADIR%%/lenses/dist/xymon.aug
%%DATADIR%%/lenses/dist/xymon_alerting.aug
+%%DATADIR%%/lenses/dist/yaml.aug
%%DATADIR%%/lenses/dist/yum.aug
share/vim/vimfiles/ftdetect/augeas.vim
share/vim/vimfiles/syntax/augeas.vim
diff --git a/textproc/bbe/pkg-descr b/textproc/bbe/pkg-descr
index d96d7a48062d..e9a253398efc 100644
--- a/textproc/bbe/pkg-descr
+++ b/textproc/bbe/pkg-descr
@@ -11,4 +11,4 @@ and block number of found blocks. Block contents can also
be printed in different formats like hex, octal, ASCII, and
binary.
-WWW: http://sourceforge.net/projects/bbe-/
+WWW: https://sourceforge.net/projects/bbe-/
diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index 3396e3a6575f..9085f499341f 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bibtool
-PORTVERSION= 2.65
+PORTVERSION= 2.66
CATEGORIES= textproc print
MASTER_SITES= TEX_CTAN/biblio/bibtex/utils/${PORTNAME}
DISTNAME= BibTool-${PORTVERSION}
diff --git a/textproc/bibtool/distinfo b/textproc/bibtool/distinfo
index 92cb4b405ea7..e3153fa14572 100644
--- a/textproc/bibtool/distinfo
+++ b/textproc/bibtool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466528419
-SHA256 (BibTool-2.65.tar.gz) = 8469c37a1ae0b39af19a54f1f6c607af067430c4591319ae6e2a61d6a7d239f7
-SIZE (BibTool-2.65.tar.gz) = 728543
+TIMESTAMP = 1482843712
+SHA256 (BibTool-2.66.tar.gz) = e59bc19a923335dec9942bf17f5f0a5175cd763fc5d178ec6898709742b6847d
+SIZE (BibTool-2.66.tar.gz) = 736192
diff --git a/textproc/bibtool/pkg-plist b/textproc/bibtool/pkg-plist
index d5fda1920665..58e97cf2f0b8 100644
--- a/textproc/bibtool/pkg-plist
+++ b/textproc/bibtool/pkg-plist
@@ -6,6 +6,8 @@ lib/BibTool/default.rsc
lib/BibTool/field.rsc
lib/BibTool/improve.rsc
lib/BibTool/iso2tex.rsc
+lib/BibTool/keep_biblatex.rsc
+lib/BibTool/keep_bibtex.rsc
lib/BibTool/month.rsc
lib/BibTool/opt.rsc
lib/BibTool/sort_fld.rsc
diff --git a/textproc/catdoc/pkg-descr b/textproc/catdoc/pkg-descr
index 364418fd3201..3a830dc7af50 100644
--- a/textproc/catdoc/pkg-descr
+++ b/textproc/catdoc/pkg-descr
@@ -7,4 +7,4 @@ mode. Also included are:
(comma-separated value) lines; and
- catppt, which extracts text from PowerPoint files.
-WWW: http://wagner.pp.ru/~vitus/software/catdoc/
+WWW: http://www.wagner.pp.ru/~vitus/software/catdoc/
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 9f72be513618..bf30289bdc6d 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= textproc
MASTER_SITES= LOCAL/sanpei
EXTRACT_SUFX= # empty
-MAINTAINER= sanpei@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Word context diff
USES= perl5 shebangfix
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 002c4a243748..871aa2e2ca5b 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -3,7 +3,7 @@
PORTNAME= clucene
PORTVERSION= 2.3.3.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-core-unstable/2.3
DISTNAME= ${PORTNAME}-core-${PORTVERSION}
diff --git a/textproc/clucene/pkg-descr b/textproc/clucene/pkg-descr
index 72feb1594226..4c9338b98485 100644
--- a/textproc/clucene/pkg-descr
+++ b/textproc/clucene/pkg-descr
@@ -2,4 +2,4 @@ CLucene is a C++ port of Lucene: the high-performance,
full-featured text search engine written in Java.
CLucene is faster than lucene as it is written in C++.
-WWW: http://sourceforge.net/projects/clucene/
+WWW: https://sourceforge.net/projects/clucene/
diff --git a/textproc/codespell/Makefile b/textproc/codespell/Makefile
index 65e85271b3d1..dae471052df6 100644
--- a/textproc/codespell/Makefile
+++ b/textproc/codespell/Makefile
@@ -8,8 +8,9 @@ MAINTAINER= gjb@FreeBSD.org
COMMENT= Source code spelling checker
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
-USES= python:3 tar:xz
+USES= python:3
USE_GITHUB= yes
GH_ACCOUNT= lucasdemarchi
@@ -18,25 +19,29 @@ GH_TAGNAME= 4cb7fe3
OPTIONS_DEFINE= DOCS EXAMPLES
PLIST_FILES= bin/codespell
-PORTDOCS= COPYING NEWS TODO
+PORTDOCS= NEWS TODO
PORTEXAMPLES= *
+NO_ARCH= yes
+
SUB_FILES+= pkg-message
do-build:
- ${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
+ @${REINPLACE_CMD} 's|#!/usr/bin/env python3|#!${PYTHON_CMD}|' \
${WRKSRC}/codespell.py
- ${REINPLACE_CMD} "s|^default_dictionary = .*|default_dictionary = '${EXAMPLESDIR}/data/dictionary.txt'|" \
+ @${REINPLACE_CMD} "s|^default_dictionary = .*|default_dictionary = '${EXAMPLESDIR}/data/dictionary.txt'|" \
${WRKSRC}/codespell.py
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/codespell.py ${STAGEDIR}${PREFIX}/bin/codespell
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
. for i in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
. endfor
+do-install-EXAMPLES-on:
.for i in data example
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${i}
${INSTALL_DATA} ${WRKSRC}/${i}/* ${STAGEDIR}${EXAMPLESDIR}/${i}
diff --git a/textproc/dictem/pkg-descr b/textproc/dictem/pkg-descr
index 289cba93a9f6..8712094904b7 100644
--- a/textproc/dictem/pkg-descr
+++ b/textproc/dictem/pkg-descr
@@ -6,4 +6,4 @@ implements all functions of the client part of DICT protocol
obtaining information about available strategies, provided databases,
information about DICT server etc.
-WWW: http://sourceforge.net/projects/dictem
+WWW: https://sourceforge.net/projects/dictem/
diff --git a/textproc/dictionary/Makefile b/textproc/dictionary/Makefile
index 0d7b4e2f27ef..5649d32c05f0 100644
--- a/textproc/dictionary/Makefile
+++ b/textproc/dictionary/Makefile
@@ -12,23 +12,29 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Dictionary client for Emacs
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/GPL
+
USE_EMACS= yes
LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
ELS= connection.el dictionary.el link.el
-DOCSDIR= README
+
+PORTDOCS= *
+
+OPTIONS_DEFINE= DOCS
do-build:
- cd ${WRKSRC}; ${EMACS_CMD} -batch -l lpath.el -f batch-byte-compile ${ELS}
+ cd ${WRKSRC} && ${EMACS_CMD} -batch -l lpath.el -f batch-byte-compile ${ELS}
do-install:
@${MKDIR} ${STAGEDIR}${LISPDIR}
.for i in ${ELS} *.elc dictionary-init.el
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${LISPDIR}
.endfor
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/textproc/diffstat/Makefile b/textproc/diffstat/Makefile
index 6da4c3a4a14c..48e3fe68c64d 100644
--- a/textproc/diffstat/Makefile
+++ b/textproc/diffstat/Makefile
@@ -5,11 +5,14 @@ PORTNAME= diffstat
PORTVERSION= 1.61
CATEGORIES= textproc devel
MASTER_SITES= ftp://invisible-island.net/${PORTNAME}/
-EXTRACT_SUFX= .tgz
MAINTAINER= bapt@FreeBSD.org
COMMENT= Makes a histogram summarizing "diff" output
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USES= tar:tgz
GNU_CONFIGURE= yes
MAKEFILE= makefile
diff --git a/textproc/dixit/pkg-descr b/textproc/dixit/pkg-descr
index 785d1b3c4f58..dda98bb296f2 100644
--- a/textproc/dixit/pkg-descr
+++ b/textproc/dixit/pkg-descr
@@ -17,4 +17,4 @@ explicativ al limbii romane" (2002).
Any resemblance to dict is not entirely coincidental, but the database doesn't
have the same format :(
-WWW: http://sourceforge.net/projects/dixit/
+WWW: https://sourceforge.net/projects/dixit/
diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile
index ebcd9671f279..e52c6354ea10 100644
--- a/textproc/docbook2X/Makefile
+++ b/textproc/docbook2X/Makefile
@@ -3,7 +3,7 @@
PORTNAME= docbook2X
PORTVERSION= 0.8.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/docbook2mdoc/Makefile b/textproc/docbook2mdoc/Makefile
index 57aa2f875a09..e3c4a4ab3561 100644
--- a/textproc/docbook2mdoc/Makefile
+++ b/textproc/docbook2mdoc/Makefile
@@ -2,6 +2,7 @@
PORTNAME= docbook2mdoc
PORTVERSION= 0.0.9
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://mdocml.bsd.lv/docbook2mdoc/snapshots/
diff --git a/textproc/docdiff/Makefile b/textproc/docdiff/Makefile
deleted file mode 100644
index cafa706d0d1a..000000000000
--- a/textproc/docdiff/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= docdiff
-PORTVERSION= 0.4.0
-CATEGORIES= textproc
-MASTER_SITES= SF
-
-MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Compares two text files by word, by character, or by line
-
-LICENSE= BSD3CLAUSE
-
-OPTIONS_DEFINE= DOCS
-
-NO_BUILD= yes
-USE_RUBY= yes
-USES= shebangfix
-
-PORTDOCS= readme.html readme.en.html readme.ja.html
-
-SHEBANG_FILES= ${PORTNAME}.rb
-
-post-patch:
- @${REINPLACE_CMD} -e '/ :format/ s|html|tty|' \
- -e '/SystemConfigFileName =/ s|etc.*conf|${PREFIX}/etc/${PORTNAME}.conf|' \
- -e 's|/etc/${PORTNAME}/${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}.conf|' \
- ${WRKSRC}/${PORTNAME}.rb
-
-do-install:
- cd ${WRKSRC}/${PORTNAME}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}/
- ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.rb ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.example ${STAGEDIR}${PREFIX}/etc/
- ${MKDIR} ${STAGEDIR}${DOCSDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-
-.include <bsd.port.mk>
diff --git a/textproc/docdiff/distinfo b/textproc/docdiff/distinfo
deleted file mode 100644
index 252e0d1b6695..000000000000
--- a/textproc/docdiff/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docdiff-0.4.0.tar.gz) = 38f1e7d7e02c1bab801aab32c8e366a73a228b40516c71e1c1d3888d3ae2a935
-SIZE (docdiff-0.4.0.tar.gz) = 212317
diff --git a/textproc/docdiff/pkg-plist b/textproc/docdiff/pkg-plist
deleted file mode 100644
index b80073bd2d8e..000000000000
--- a/textproc/docdiff/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-bin/docdiff
-etc/docdiff.conf.example
-%%RUBY_SITELIBDIR%%/docdiff/charstring.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/contours.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/editscript.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/rcsdiff.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/shortestpath.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/speculative.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/subsequence.rb
-%%RUBY_SITELIBDIR%%/docdiff/diff/unidiff.rb
-%%RUBY_SITELIBDIR%%/docdiff/difference.rb
-%%RUBY_SITELIBDIR%%/docdiff/document.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/en_ascii.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/ja_eucjp.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/ja_sjis.rb
-%%RUBY_SITELIBDIR%%/docdiff/encoding/ja_utf8.rb
-%%RUBY_SITELIBDIR%%/docdiff/view.rb
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index f797869a965e..c1b3aac0dc29 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= domc
PORTVERSION= 0.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.ioplex.com/~miallen/domc/dl/
diff --git a/textproc/dsssl-docbook-modular/pkg-descr b/textproc/dsssl-docbook-modular/pkg-descr
index 0bcb409f5c81..5d0ca0a2141f 100644
--- a/textproc/dsssl-docbook-modular/pkg-descr
+++ b/textproc/dsssl-docbook-modular/pkg-descr
@@ -2,4 +2,4 @@ These are DSSSL stylesheets for the DocBook DTD by Norm Walsh. Use them
in conjunction with a DSSSL processor (such as jade) to convert documents
marked up as DocBook to RTF, HTML and TeX.
-WWW: http://sourceforge.net/projects/docbook/
+WWW: https://sourceforge.net/projects/docbook/
diff --git a/textproc/dtdparse/pkg-descr b/textproc/dtdparse/pkg-descr
index 36b8fb992c27..60f57bbae3a8 100644
--- a/textproc/dtdparse/pkg-descr
+++ b/textproc/dtdparse/pkg-descr
@@ -2,4 +2,4 @@ DTDParse is a tool for manipulating XML and SGML Document Type
Definitions (DTDs). DTDParse is designed primarily to aid in the
understanding and documentation of DTDs.
-WWW: http://sourceforge.net/projects/dtdparse/
+WWW: https://sourceforge.net/projects/dtdparse/
diff --git a/textproc/duncan/Makefile b/textproc/duncan/Makefile
index eea4301e74ac..bb5be58d704f 100644
--- a/textproc/duncan/Makefile
+++ b/textproc/duncan/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= duncan
-PORTVERSION= 0.1
-PORTREVISION= 6
+PORTVERSION= 0.2
CATEGORIES= textproc gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/Dictionaries/files/
DISTNAME= Duncan-${PORTVERSION}
diff --git a/textproc/duncan/distinfo b/textproc/duncan/distinfo
index 5cf1984ae64d..67ddd1e63dd0 100644
--- a/textproc/duncan/distinfo
+++ b/textproc/duncan/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Duncan-0.1.tar.gz) = 4df0743d645f814119a6982131638c964ffee605d670e59d8a260bbee82456d1
-SIZE (Duncan-0.1.tar.gz) = 2035955
+TIMESTAMP = 1483149143
+SHA256 (Duncan-0.2.tar.gz) = 4df0743d645f814119a6982131638c964ffee605d670e59d8a260bbee82456d1
+SIZE (Duncan-0.2.tar.gz) = 2035955
diff --git a/textproc/ebook-tools/pkg-descr b/textproc/ebook-tools/pkg-descr
index 5f7a25edd8ea..7cfd3d786c86 100644
--- a/textproc/ebook-tools/pkg-descr
+++ b/textproc/ebook-tools/pkg-descr
@@ -1,4 +1,4 @@
ebook-tools provides tools for accessing and converting
various ebook file formats.
-WWW: http://sourceforge.net/projects/ebook-tools
+WWW: https://sourceforge.net/projects/ebook-tools/
diff --git a/textproc/elasticsearch-plugin-migration/Makefile b/textproc/elasticsearch-plugin-migration/Makefile
index e4d1de2095a0..43f2fb1cb1d7 100644
--- a/textproc/elasticsearch-plugin-migration/Makefile
+++ b/textproc/elasticsearch-plugin-migration/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= migration
-PORTVERSION= 1.18
+PORTVERSION= 1.19
DISTVERSIONPREFIX= v
CATEGORIES= textproc
PKGNAMEPREFIX= elasticsearch-plugin-
diff --git a/textproc/elasticsearch-plugin-migration/distinfo b/textproc/elasticsearch-plugin-migration/distinfo
index 0f688d3e6d5c..ecb2c7964774 100644
--- a/textproc/elasticsearch-plugin-migration/distinfo
+++ b/textproc/elasticsearch-plugin-migration/distinfo
@@ -1,2 +1,3 @@
-SHA256 (elastic-elasticsearch-migration-v1.18_GH0.tar.gz) = 4f7626dab2664f93dd6fae4187f43918781b88d3d0781f085c3d40b858a10e75
-SIZE (elastic-elasticsearch-migration-v1.18_GH0.tar.gz) = 551351
+TIMESTAMP = 1484581091
+SHA256 (elastic-elasticsearch-migration-v1.19_GH0.tar.gz) = cba2b25432177611be4aeda2d033ea6e2e6bd11b4c07b918e27d978ff8dae3b0
+SIZE (elastic-elasticsearch-migration-v1.19_GH0.tar.gz) = 551531
diff --git a/textproc/elasticsearch/Makefile b/textproc/elasticsearch/Makefile
index 34d661e4de7c..a9fe0260c1d7 100644
--- a/textproc/elasticsearch/Makefile
+++ b/textproc/elasticsearch/Makefile
@@ -67,17 +67,11 @@ GROUPS= ${SEARCHGROUP}
ELASTIC_DBDIR= /var/db/elasticsearch
ELASTIC_LOGDIR= /var/log/elasticsearch
-.if ${OPSYS} == FreeBSD
-. if ${OSVERSION} >= 1000000
-PLATFORM_VER= 1
-. else
-PLATFORM_VER= 9
-. endif
-.else
-BROKEN= ${OPSYS} platform is not supported
+.if ${OPSYS} != FreeBSD
+IGNORE= ${OPSYS} platform is not supported
.endif
-SIGAR_LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-${PLATFORM_VER}.so
+SIGAR_LIBNAME= libsigar-${ARCH:S,i386,x86,}-freebsd-9.so
SUB_LIST= SEARCHUSER=${SEARCHUSER} \
SEARCHGROUP=${SEARCHGROUP} \
diff --git a/textproc/elasticsearch2-plugin-migration/Makefile b/textproc/elasticsearch2-plugin-migration/Makefile
index f98d03fd6b60..7420db3370c0 100644
--- a/textproc/elasticsearch2-plugin-migration/Makefile
+++ b/textproc/elasticsearch2-plugin-migration/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= migration
-PORTVERSION= 2.0.2
+PORTVERSION= 2.0.3
DISTVERSIONPREFIX= v
CATEGORIES= textproc
PKGNAMEPREFIX= elasticsearch2-plugin-
diff --git a/textproc/elasticsearch2-plugin-migration/distinfo b/textproc/elasticsearch2-plugin-migration/distinfo
index 5063cd6ba278..2f5bd767b06c 100644
--- a/textproc/elasticsearch2-plugin-migration/distinfo
+++ b/textproc/elasticsearch2-plugin-migration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478171178
-SHA256 (elastic-elasticsearch-migration-v2.0.2_GH0.tar.gz) = a19691c83b4e12cd275ba90c9c8416613516896fc064fc7d3e9fd8411038aec0
-SIZE (elastic-elasticsearch-migration-v2.0.2_GH0.tar.gz) = 289156
+TIMESTAMP = 1484141014
+SHA256 (elastic-elasticsearch-migration-v2.0.3_GH0.tar.gz) = 6e4f8941187b159dcb0dd8c84f0da87a3e19ae6a8b7e059231b82f4bfdf6b928
+SIZE (elastic-elasticsearch-migration-v2.0.3_GH0.tar.gz) = 289490
diff --git a/textproc/elasticsearch2-plugin-sql/Makefile b/textproc/elasticsearch2-plugin-sql/Makefile
index 59631e915856..29c397cbe30f 100644
--- a/textproc/elasticsearch2-plugin-sql/Makefile
+++ b/textproc/elasticsearch2-plugin-sql/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sql
-PORTVERSION= 2.4.1.0
+PORTVERSION= 2.4.2.1
CATEGORIES= textproc
MASTER_SITES= https://github.com/NLPchina/elasticsearch-sql/releases/download/${PORTVERSION}/
PKGNAMEPREFIX= elasticsearch2-plugin-
@@ -12,7 +12,7 @@ COMMENT= ElasticSearch SQL plugin
LICENSE= APACHE20
-RUN_DEPENDS= elasticsearch2>=2.4.0:textproc/elasticsearch2
+RUN_DEPENDS= elasticsearch2>=2.4.2:textproc/elasticsearch2
CONFLICTS= elasticsearch-plugin-sql-1.*
diff --git a/textproc/elasticsearch2-plugin-sql/distinfo b/textproc/elasticsearch2-plugin-sql/distinfo
index 0a429b5db4ac..879d9de1d6c1 100644
--- a/textproc/elasticsearch2-plugin-sql/distinfo
+++ b/textproc/elasticsearch2-plugin-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480495548
-SHA256 (elasticsearch-sql-2.4.1.0.zip) = 3ddaa96d111e7b4d90eafbfbf20864b258ebec68d05f98d4ea4b243a61d83be0
-SIZE (elasticsearch-sql-2.4.1.0.zip) = 4175873
+TIMESTAMP = 1484050899
+SHA256 (elasticsearch-sql-2.4.2.1.zip) = c7ce61906585f38134ee7b9af1b5ded727e91b22ea575dfc3cc6a3f88c0edcc7
+SIZE (elasticsearch-sql-2.4.2.1.zip) = 4180276
diff --git a/textproc/elixir-earmark/Makefile b/textproc/elixir-earmark/Makefile
index d92712e700fb..7c626f9538c9 100644
--- a/textproc/elixir-earmark/Makefile
+++ b/textproc/elixir-earmark/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= earmark
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1
DISTVERSIONPREFIX= v
CATEGORIES= textproc
PKGNAMEPREFIX= elixir-
diff --git a/textproc/elixir-earmark/distinfo b/textproc/elixir-earmark/distinfo
index df18ac60ab5a..cbba4eb7ff16 100644
--- a/textproc/elixir-earmark/distinfo
+++ b/textproc/elixir-earmark/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478161872
-SHA256 (pragdave-earmark-v1.0.3_GH0.tar.gz) = 6e1fc6efa1dca82c2aa0021865df89e7fbb37930a4b825e588d50d16c3df6d5c
-SIZE (pragdave-earmark-v1.0.3_GH0.tar.gz) = 84001
+TIMESTAMP = 1481797030
+SHA256 (pragdave-earmark-v1.1_GH0.tar.gz) = a0cb1f3f764724ce345f53dee0cd7ecde54ac598fecd34aa20bf0329c50fa7fe
+SIZE (pragdave-earmark-v1.1_GH0.tar.gz) = 91270
diff --git a/textproc/elixir-earmark/pkg-plist b/textproc/elixir-earmark/pkg-plist
index defa45aab60e..ffac49ad3aa9 100644
--- a/textproc/elixir-earmark/pkg-plist
+++ b/textproc/elixir-earmark/pkg-plist
@@ -1,4 +1,3 @@
-lib/elixir/lib/earmark/ebin/Elixir.Collectable.Earmark.Options.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.BlockQuote.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.Code.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.FnDef.beam
@@ -11,6 +10,7 @@ lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.IdDef.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.List.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.ListItem.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.Para.beam
+lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.Plugin.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.Ruler.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.Table.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Block.beam
@@ -21,6 +21,7 @@ lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.LeexHelpers.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.LineHelpers.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.LinkParser.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.LookaheadHelpers.beam
+lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.ReparseHelpers.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.StringHelpers.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.YeccHelpers.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Helpers.beam
@@ -40,13 +41,17 @@ lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.Ial.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.IdDef.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.Indent.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.ListItem.beam
+lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.Plugin.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.Ruler.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.SetextUnderlineHeading.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.TableLine.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.Text.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Line.beam
+lib/elixir/lib/earmark/ebin/Elixir.Earmark.Message.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Options.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Parser.beam
+lib/elixir/lib/earmark/ebin/Elixir.Earmark.Plugin.Error.beam
+lib/elixir/lib/earmark/ebin/Elixir.Earmark.Plugin.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Scanner.Backtix.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Scanner.Blockquote.beam
lib/elixir/lib/earmark/ebin/Elixir.Earmark.Scanner.CodeFence.beam
@@ -77,13 +82,16 @@ lib/elixir/lib/earmark/lib/earmark/helpers/leex_helpers.ex
lib/elixir/lib/earmark/lib/earmark/helpers/line_helpers.ex
lib/elixir/lib/earmark/lib/earmark/helpers/link_parser.ex
lib/elixir/lib/earmark/lib/earmark/helpers/lookahead_helpers.ex
+lib/elixir/lib/earmark/lib/earmark/helpers/reparse_helpers.ex
lib/elixir/lib/earmark/lib/earmark/helpers/string_helpers.ex
lib/elixir/lib/earmark/lib/earmark/helpers/yecc_helpers.ex
lib/elixir/lib/earmark/lib/earmark/html_renderer.ex
lib/elixir/lib/earmark/lib/earmark/inline.ex
lib/elixir/lib/earmark/lib/earmark/line.ex
+lib/elixir/lib/earmark/lib/earmark/message.ex
lib/elixir/lib/earmark/lib/earmark/options.ex
lib/elixir/lib/earmark/lib/earmark/parser.ex
+lib/elixir/lib/earmark/lib/earmark/plugin.ex
lib/elixir/lib/earmark/lib/earmark/scanner.ex
lib/elixir/lib/earmark/lib/earmark/types.ex
%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/textproc/en-hunspell/Makefile b/textproc/en-hunspell/Makefile
index 25efde1010ac..32b80813ffb4 100644
--- a/textproc/en-hunspell/Makefile
+++ b/textproc/en-hunspell/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hunspell
-PORTVERSION= 2016.11.20
+PORTVERSION= 2017.01.22
CATEGORIES= textproc
MASTER_SITES= SF/wordlist/speller/${PORTVERSION}/
PKGNAMEPREFIX= en-
diff --git a/textproc/en-hunspell/distinfo b/textproc/en-hunspell/distinfo
index cad19e182a89..6e888294967b 100644
--- a/textproc/en-hunspell/distinfo
+++ b/textproc/en-hunspell/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1479734265
-SHA256 (hunspell/hunspell-en_CA-2016.11.20.zip) = ec21856e3de83d02a2b28cbad7bcad45be58546010a53ec1111637f0f8bb9afe
-SIZE (hunspell/hunspell-en_CA-2016.11.20.zip) = 196688
-SHA256 (hunspell/hunspell-en_CA-large-2016.11.20.zip) = d9061f967d647ca500f821164b1908cf02831909423d8f4dd0496a332702f8a4
-SIZE (hunspell/hunspell-en_CA-large-2016.11.20.zip) = 312452
-SHA256 (hunspell/hunspell-en_GB-large-2016.11.20.zip) = 1dbfa6eb6ef9143be0fd3274e22b6d961cfae73ee78db8227f8df27fdae832a4
-SIZE (hunspell/hunspell-en_GB-large-2016.11.20.zip) = 314910
-SHA256 (hunspell/hunspell-en_GB-ise-2016.11.20.zip) = 1e800832d2d1f85b134b54e8227e261312935101538a1e662c014a009e72919a
-SIZE (hunspell/hunspell-en_GB-ise-2016.11.20.zip) = 196817
-SHA256 (hunspell/hunspell-en_GB-ize-2016.11.20.zip) = 8d9574d675f6c2dabe8639900d630c21bd0673f0c8760d180ca90d422b49d97e
-SIZE (hunspell/hunspell-en_GB-ize-2016.11.20.zip) = 196762
-SHA256 (hunspell/hunspell-en_US-2016.11.20.zip) = c895198fc88a2f368bc09f2eebed46c01d98d82724542de5e688a6c75ddc1414
-SIZE (hunspell/hunspell-en_US-2016.11.20.zip) = 196166
-SHA256 (hunspell/hunspell-en_US-large-2016.11.20.zip) = 6546eae2501b8508f69bf9da9a53b95382251ff4393ccbc5e5ab45a2ec993619
-SIZE (hunspell/hunspell-en_US-large-2016.11.20.zip) = 310851
+TIMESTAMP = 1485874023
+SHA256 (hunspell/hunspell-en_CA-2017.01.22.zip) = ef8f39eff987b72c788ae5a66f86895b3d0c5dd321b87d18fa5f26aa51d53f04
+SIZE (hunspell/hunspell-en_CA-2017.01.22.zip) = 196707
+SHA256 (hunspell/hunspell-en_CA-large-2017.01.22.zip) = 14f848df5fdee6763b137dc0cca3fcc6af44889605fadda85e5129355a7672f3
+SIZE (hunspell/hunspell-en_CA-large-2017.01.22.zip) = 312464
+SHA256 (hunspell/hunspell-en_GB-large-2017.01.22.zip) = 4864b776549a884eca95573bf40cbc465319e069e6d77a458eccaebe1161d196
+SIZE (hunspell/hunspell-en_GB-large-2017.01.22.zip) = 314925
+SHA256 (hunspell/hunspell-en_GB-ise-2017.01.22.zip) = 9b509e954ed3bbde90b16b19109d3a93f51ecb013baf0e1ded99104f872af407
+SIZE (hunspell/hunspell-en_GB-ise-2017.01.22.zip) = 196836
+SHA256 (hunspell/hunspell-en_GB-ize-2017.01.22.zip) = 5bab24065463b942149c1903218bc58d2ae64ca63ca940a45395c969437cb1f5
+SIZE (hunspell/hunspell-en_GB-ize-2017.01.22.zip) = 196782
+SHA256 (hunspell/hunspell-en_US-2017.01.22.zip) = 512468d80eee680358fc8a9a877f315c65218dcb14a880c819f8fc9d401d6c6b
+SIZE (hunspell/hunspell-en_US-2017.01.22.zip) = 196187
+SHA256 (hunspell/hunspell-en_US-large-2017.01.22.zip) = 45ef7af6a766679bea3cb06ffbd4fbabfbca864290a48ccbf95557de6d2b11da
+SIZE (hunspell/hunspell-en_US-large-2017.01.22.zip) = 310864
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 29a6f6ed5bbf..357acb23fde1 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -3,7 +3,7 @@
PORTNAME= enchant
PORTVERSION= 1.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc gnome
MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
DIST_SUBDIR= gnome2
@@ -39,7 +39,7 @@ HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:hebrew/hspell
HSPELL_CONFIGURE_ENABLE= hspell
HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE}
-HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell
+HUNSPELL_LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
HUNSPELL_CONFIGURE_ENABLE= myspell
HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \
--with-myspell-dir=${LOCALBASE}/share/hunspell
diff --git a/textproc/erlang-fast_xml/Makefile b/textproc/erlang-fast_xml/Makefile
index 36b997790a08..ec88370d31eb 100644
--- a/textproc/erlang-fast_xml/Makefile
+++ b/textproc/erlang-fast_xml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fast_xml
-PORTVERSION= 1.1.18
+PORTVERSION= 1.1.20
CATEGORIES= textproc
PKGNAMEPREFIX= erlang-
diff --git a/textproc/erlang-fast_xml/distinfo b/textproc/erlang-fast_xml/distinfo
index dedd2497de4a..28969afd6548 100644
--- a/textproc/erlang-fast_xml/distinfo
+++ b/textproc/erlang-fast_xml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480079268
-SHA256 (processone-fast_xml-1.1.18_GH0.tar.gz) = 9cf774dc117ac6c9e8737b810ca9991788b878188b1608a668094b1b377957e5
-SIZE (processone-fast_xml-1.1.18_GH0.tar.gz) = 89244
+TIMESTAMP = 1485682399
+SHA256 (processone-fast_xml-1.1.20_GH0.tar.gz) = 6bc4c69f3b3b605e4f389f9969c250f61710c1977792e8d258b9ecde7f07ffe4
+SIZE (processone-fast_xml-1.1.20_GH0.tar.gz) = 89446
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index 50b72683dc52..e5f9d169844b 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -4,6 +4,7 @@
PORTNAME= exempi
PORTVERSION= 2.2.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://libopenraw.freedesktop.org/download/
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 9e7c494009e3..170d427f6f6c 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= expat
PORTVERSION= 2.2.0
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF
@@ -17,7 +18,4 @@ ALL_TARGET= default
USES= libtool pathfix tar:bz2
USE_LDCONFIG= yes
-post-install:
- ${LN} -s libexpat.so.1 ${STAGEDIR}${PREFIX}/lib/libexpat.so.6
-
.include <bsd.port.mk>
diff --git a/textproc/expat2/pkg-descr b/textproc/expat2/pkg-descr
index 196c94ab5aa9..03786586abe4 100644
--- a/textproc/expat2/pkg-descr
+++ b/textproc/expat2/pkg-descr
@@ -1,4 +1,4 @@
Expat is an XML 1.0 parser written in C. It aims to be fully
conforming. It is currently not a validating XML processor.
-WWW: http://sourceforge.net/projects/expat/
+WWW: https://sourceforge.net/projects/expat/
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index 1be03106dd4e..533bc308d9e5 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -6,6 +6,5 @@ lib/libexpat.a
lib/libexpat.so
lib/libexpat.so.1
lib/libexpat.so.1.6.2
-lib/libexpat.so.6
libdata/pkgconfig/expat.pc
man/man1/xmlwf.1.gz
diff --git a/textproc/extract_url/Makefile b/textproc/extract_url/Makefile
index d5429459e0d9..0e070e929a9d 100644
--- a/textproc/extract_url/Makefile
+++ b/textproc/extract_url/Makefile
@@ -2,20 +2,16 @@
# $FreeBSD$
PORTNAME= extract_url
-PORTVERSION= 1.5.8
-PORTREVISION= 1
+PORTVERSION= 1.6.2
+DISTVERSIONPREFIX= v
CATEGORIES= textproc
-MASTER_SITES= GOOGLE_CODE
-PROJECTHOST= extracturl
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= dbaio@bsd.com.br
COMMENT= Perl script that extracts URLs from email in MIME or plain text format
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN= Unfetchable (google code has gone away)
-
BUILD_DEPENDS= p5-MIME-Tools>=0:mail/p5-MIME-Tools \
p5-HTML-Parser>=0:www/p5-HTML-Parser
RUN_DEPENDS:= ${BUILD_DEPENDS}
@@ -25,26 +21,26 @@ MAKE_ARGS= all prefix=${PREFIX} man_prefix=${PREFIX}
SUB_FILES= pkg-message
NO_ARCH= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_GITHUB= yes
+GH_ACCOUNT= m3m0ryh0l3
+GH_PROJECT= extracturl
PLIST_FILES= bin/extract_url \
- etc/extract_urlview.sample \
+ share/extract_url/extract_urlview.sample \
man/man1/extract_url.1.gz
PORTDOCS= AUTHORS NEWS README
-OPTIONS_DEFINE= DOCS GETOPT_LONG URI_FIND
+OPTIONS_DEFINE= DOCS URI_FIND
OPTIONS_RADIO= URL_SELECTOR
OPTIONS_RADIO_URL_SELECTOR= CURSES_UI URLVIEW
-OPTIONS_DEFAULT= CURSES_UI GETOPT_LONG URI_FIND
+OPTIONS_DEFAULT= CURSES_UI URI_FIND
OPTIONS_SUB= yes
CURSES_UI_DESC= Allows it to fully replace urlview
-GETOPT_LONG_DESC= Recognizes long options --version and --list
URI_FIND_DESC= Recognizes more exotic URL variations in plain text
URLVIEW_DESC= Uses urlview for the URL selector menu
CURSES_UI_RUN_DEPENDS= p5-Curses-UI>=0:devel/p5-Curses-UI
-GETOPT_LONG_RUN_DEPENDS=p5-Getopt-Long>=0:devel/p5-Getopt-Long
URLVIEW_RUN_DEPENDS= urlview>=0:textproc/urlview
URI_FIND_RUN_DEPENDS= p5-URI-Find>=0:textproc/p5-URI-Find
@@ -53,8 +49,9 @@ post-patch:
${WRKSRC}/${MAKEFILE}
post-install:
- ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}view \
- ${STAGEDIR}${PREFIX}/etc/${PORTNAME}view.sample
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}view.sample \
+ ${STAGEDIR}${DATADIR}/
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/extract_url/distinfo b/textproc/extract_url/distinfo
index 90df858c7f65..08151f50619e 100644
--- a/textproc/extract_url/distinfo
+++ b/textproc/extract_url/distinfo
@@ -1,2 +1,3 @@
-SHA256 (extract_url-1.5.8.tar.gz) = 58eac907cb926deba74ab81e7503a1055fd3cbe20952f011d8e6b75da12d6bcc
-SIZE (extract_url-1.5.8.tar.gz) = 13861
+TIMESTAMP = 1485332045
+SHA256 (m3m0ryh0l3-extracturl-v1.6.2_GH0.tar.gz) = 5f0b568d5c9449f477527b4077d8269f1f5e6d6531dfa5eb6ca72dbacab6f336
+SIZE (m3m0ryh0l3-extracturl-v1.6.2_GH0.tar.gz) = 16296
diff --git a/textproc/extract_url/files/extract_urlview b/textproc/extract_url/files/extract_urlview
deleted file mode 100644
index b08a38f4bddb..000000000000
--- a/textproc/extract_url/files/extract_urlview
+++ /dev/null
@@ -1,31 +0,0 @@
-################################
-### extract_url(1) configuration
-#
-# Copy this file to ~/.extract_urlview
-
-# Command used to view URLs
-#COMMAND firefox %s &
-
-# URL will be opened without prompting when emails contains only one
-#SHORTCUT
-
-# Turn off showing the full URL before opening it
-#NOREVIEW
-
-# Disable the automatic exit of URL selection menu after viewing a URL
-#PERSISTENT
-
-# Ignore links that don't correspond to any text
-#IGNORE_EMPTY_TAGS
-
-# Specify which HTML tags will be examined for URLs
-#HTML_TAGS a,applet,area,blockquote,embed,form,frame,iframe,input,ins,isindex,head,layer,link,object,q,script,xmp
-
-# Key for PERSISTENT behaviour, or opposite if PERSISTENT is specified
-#ALTSELECT k
-
-# Show [url] list or show URLs in [context] when the program is run
-#DEFAULT_VIEW url
-
-# Sanitize URLs before they are displayed
-#DISPLAY_SANITIZED
diff --git a/textproc/extract_url/files/pkg-message.in b/textproc/extract_url/files/pkg-message.in
index f6ad289066f7..72eb7f882f13 100644
--- a/textproc/extract_url/files/pkg-message.in
+++ b/textproc/extract_url/files/pkg-message.in
@@ -8,7 +8,7 @@ the extract_url configuration file can be copied, please type as user:
su - user
- cp %%PREFIX%%/etc/extract_urlview.sample ~/.extract_urlview
+ cp %%DATADIR%%/extract_urlview.sample ~/.extract_urlview
exit
diff --git a/textproc/fcitx-qt5/Makefile b/textproc/fcitx-qt5/Makefile
index 8d7b39baf085..591646ba2c2a 100644
--- a/textproc/fcitx-qt5/Makefile
+++ b/textproc/fcitx-qt5/Makefile
@@ -12,7 +12,6 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS+= libfcitx-config.so:chinese/fcitx \
- libQt5DBus.so:devel/dbus-qt5 \
libxkbcommon.so:x11/libxkbcommon
USE_GITHUB= yes
@@ -20,7 +19,7 @@ GH_ACCOUNT= fcitx
USES= compiler:c++11-lib cmake gettext kde:5 pkgconfig
USE_KDE= ecm
-USE_QT5= core gui qmake widgets buildtools_build
+USE_QT5= core dbus gui qmake widgets buildtools_build
USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile
index e658694ccc7c..800fb8a138ef 100644
--- a/textproc/fzf/Makefile
+++ b/textproc/fzf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fzf
-PORTVERSION= 0.15.8
+PORTVERSION= 0.16.1
CATEGORIES= textproc
MAINTAINER= sascha@root-login.org
@@ -19,7 +19,8 @@ GH_SUBDIR:= src/github.com/${GH_ACCOUNT}/${PORTNAME}
GH_TUPLE= junegunn:go-runewidth:63c378b:runwidth/src/github.com/junegunn/go-runewidth \
junegunn:go-shellwords:35d512a:shellwords/src/github.com/junegunn/go-shellwords \
- junegunn:go-isatty:66b8e73:isatty/src/github.com/junegunn/go-isatty
+ junegunn:go-isatty:66b8e73:isatty/src/github.com/junegunn/go-isatty \
+ golang:crypto:b8a2a83:terminal/src/golang.org/x/crypto
MAKE_ENV+= CGO_CPPFLAGS="-I${NCURSESINC} -I${NCURSESBASE}/include" \
CGO_LDFLAGS="-L${NCURSESLIB}"
diff --git a/textproc/fzf/distinfo b/textproc/fzf/distinfo
index 6852d1ba81e5..d1b84499cf3c 100644
--- a/textproc/fzf/distinfo
+++ b/textproc/fzf/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1479595305
-SHA256 (junegunn-fzf-0.15.8_GH0.tar.gz) = f02ba45837e8583a3aa4e54a7d0b7d493f5314be6923ca80a639b43d6c0f4a4f
-SIZE (junegunn-fzf-0.15.8_GH0.tar.gz) = 120461
+TIMESTAMP = 1484775525
+SHA256 (junegunn-fzf-0.16.1_GH0.tar.gz) = f8a05e9e72f6e2b87bec63809843afa77fd89067722407f6f9a86299c6215fce
+SIZE (junegunn-fzf-0.16.1_GH0.tar.gz) = 134317
SHA256 (junegunn-go-runewidth-63c378b_GH0.tar.gz) = e7cba5116e6f7051984005f5ab6c23d448307a6fced09eb9bd1bf49f3317b36d
SIZE (junegunn-go-runewidth-63c378b_GH0.tar.gz) = 4503
SHA256 (junegunn-go-shellwords-35d512a_GH0.tar.gz) = ea496265b81c60c0d590e369ca7cbcf3e87ec39d6f49c7462a7ab0483582b6fa
SIZE (junegunn-go-shellwords-35d512a_GH0.tar.gz) = 2340
SHA256 (junegunn-go-isatty-66b8e73_GH0.tar.gz) = 261ec4d11cc7615205c67a1dd9ffe1f88166fc50db0022700a82f39ab7e47b0d
SIZE (junegunn-go-isatty-66b8e73_GH0.tar.gz) = 1956
+SHA256 (golang-crypto-b8a2a83_GH0.tar.gz) = 9c6b4a4f6daf7dbd0c3606184076c3dc2694a0e811061e1c8723940170f33f58
+SIZE (golang-crypto-b8a2a83_GH0.tar.gz) = 1305071
diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index a2d742c837a5..894c62afad49 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdome2
PORTVERSION= 0.8.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc
MASTER_SITES= http://gdome2.cs.unibo.it/tarball/
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index e60f7c8f8235..46f7082cb8fc 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-spell
PORTVERSION= 1.0.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/textproc/gnugrep/Makefile b/textproc/gnugrep/Makefile
index 5044a9c2bc9f..97c175ad8e70 100644
--- a/textproc/gnugrep/Makefile
+++ b/textproc/gnugrep/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= grep
-PORTVERSION= 2.26
+PORTVERSION= 2.27
CATEGORIES= textproc
MASTER_SITES= GNU
PKGNAMEPREFIX= gnu
diff --git a/textproc/gnugrep/distinfo b/textproc/gnugrep/distinfo
index a5c780351ccb..115643780796 100644
--- a/textproc/gnugrep/distinfo
+++ b/textproc/gnugrep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478463780
-SHA256 (grep-2.26.tar.xz) = 246a8fb37e82aa33d495b07c22fdab994c039ab0f818538eac81b01e78636870
-SIZE (grep-2.26.tar.xz) = 1356292
+TIMESTAMP = 1482836406
+SHA256 (grep-2.27.tar.xz) = ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb
+SIZE (grep-2.27.tar.xz) = 1360388
diff --git a/textproc/goldendict/Makefile b/textproc/goldendict/Makefile
index 4473f1deabcb..71a528cfdc36 100644
--- a/textproc/goldendict/Makefile
+++ b/textproc/goldendict/Makefile
@@ -3,7 +3,7 @@
PORTNAME= goldendict
PORTVERSION= 1.0.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:C|(.*)\.[0-9]*$|\1|}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -13,7 +13,7 @@ COMMENT= Feature-rich Qt4 based dictionary lookup program
LICENSE= GPLv3
-LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \
+LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \
libvorbis.so:audio/libvorbis
NO_WRKSUBDIR= yes
diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 8cb3e35fa004..a61f6206519d 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -2,6 +2,7 @@
PORTNAME= groonga
PORTVERSION= 6.0.7
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://packages.groonga.org/source/groonga/
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 2f7b9cbb6a35..eb34f16b0251 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sed
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= GNU
PKGNAMEPREFIX= g
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 5ac4e6e0401a..f5560ad3eedd 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtkspell
PORTVERSION= 2.0.16
-PORTREVISION?= 5
+PORTREVISION?= 6
CATEGORIES= textproc gnome
MASTER_SITES= LOCAL/marcus
diff --git a/textproc/gu-aspell/pkg-descr b/textproc/gu-aspell/pkg-descr
index b30bfa83e369..99c8470af4a0 100644
--- a/textproc/gu-aspell/pkg-descr
+++ b/textproc/gu-aspell/pkg-descr
@@ -1,3 +1,3 @@
Aspell Gujarati dictionary.
-WWW: http://sourceforge.net/projects/aspell-gu/
+WWW: https://sourceforge.net/projects/aspell-gu/
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index 2051703f27cc..563c835a989b 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -4,7 +4,7 @@
# 3.29+ needs to_string() which gcc48 (for 9.3-R) doesn't provide
PORTNAME= highlight
PORTVERSION= 3.29
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 3
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
diff --git a/textproc/hs-regex-base/pkg-descr b/textproc/hs-regex-base/pkg-descr
index f1d4c2808f27..c24551b04a22 100644
--- a/textproc/hs-regex-base/pkg-descr
+++ b/textproc/hs-regex-base/pkg-descr
@@ -1,3 +1,3 @@
Interface API for regex-posix,pcre,parsec,tdfa,dfa.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: https://sourceforge.net/projects/lazy-regex/
diff --git a/textproc/hs-regex-compat/pkg-descr b/textproc/hs-regex-compat/pkg-descr
index 681a5437291f..592769ba91cd 100644
--- a/textproc/hs-regex-compat/pkg-descr
+++ b/textproc/hs-regex-compat/pkg-descr
@@ -1,3 +1,3 @@
One module layer over regex-posix to replace Text.Regex.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: https://sourceforge.net/projects/lazy-regex/
diff --git a/textproc/hs-regex-posix/pkg-descr b/textproc/hs-regex-posix/pkg-descr
index 7e6a8fd06da4..fa30b4dfef5f 100644
--- a/textproc/hs-regex-posix/pkg-descr
+++ b/textproc/hs-regex-posix/pkg-descr
@@ -1,3 +1,3 @@
The posix regex backend for regex-base.
-WWW: http://sourceforge.net/projects/lazy-regex
+WWW: https://sourceforge.net/projects/lazy-regex/
diff --git a/textproc/html-xml-utils/Makefile b/textproc/html-xml-utils/Makefile
index 7507c30b630a..42b3f30baaee 100644
--- a/textproc/html-xml-utils/Makefile
+++ b/textproc/html-xml-utils/Makefile
@@ -3,6 +3,7 @@
PORTNAME= html-xml-utils
PORTVERSION= 7.1
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.w3.org/Tools/HTML-XML-utils/
@@ -10,13 +11,15 @@ MAINTAINER= takefu@airport.fm
COMMENT= Utilities for manipulating HTML and XML files
LICENSE= W3C
-LICENSE_NAME= W3C Software Notice and License
+LICENSE_GROUPS= FSF GPL OSI
+LICENSE_NAME= W3C Software Notice and License (2002-12-31)
LICENSE_FILE= ${WRKSRC}/COPYING
-LICENSE_PERMS= auto-accept
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= gmake iconv localbase shebangfix
GNU_CONFIGURE= yes
SHEBANG_FILES= ${WRKSRC}/hxcite-mkbib
+CONFIGURE_ARGS= LDFLAGS=${ICONV_LIB}
.include <bsd.port.mk>
diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index efe94bbf8f5e..46cdd450d3ca 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= htmldoc
PORTVERSION= 1.8.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://www.msweet.org/files/project1/ \
EASYSW/${PORTNAME}/${PORTVERSION}
diff --git a/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx b/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx
new file mode 100644
index 000000000000..2b70322610ec
--- /dev/null
+++ b/textproc/htmldoc/files/patch-htmldoc_htmlsep.cxx
@@ -0,0 +1,11 @@
+--- htmldoc/htmlsep.cxx.orig 2013-08-09 13:43:34 UTC
++++ htmldoc/htmlsep.cxx
+@@ -524,7 +524,7 @@ write_doc(FILE **out, // I - Output
+ if (t->markup >= MARKUP_H1 && t->markup < (MARKUP_H1 + TocLevels) &&
+ htmlGetVariable(t, (uchar *)"_HD_OMIT_TOC") == NULL)
+ {
+- if (heading >= 0)
++ if (*heading >= 0)
+ write_footer(out, *heading);
+
+ (*heading) ++;
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index d69c6dce7f54..a2d08eaa3fe1 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -11,6 +11,9 @@ DISTNAME= ${PORTNAME}
MAINTAINER= pi@FreeBSD.org
COMMENT= HTML to LaTeX to PDF Converter
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/copying.txt
+
LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick
USES= bison gmake
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index bed986105b3d..e027c9ad797c 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -2,22 +2,25 @@
# $FreeBSD$
PORTNAME= hunspell
-PORTVERSION= 1.5.4
+PORTVERSION= 1.6.0
DISTVERSIONPREFIX= v
CATEGORIES= textproc
+DIST_SUBDIR= ${PORTNAME}
MAINTAINER= office@FreeBSD.org
COMMENT= Improved spell-checker for Hungarian and other languages
-LICENSE= GPLv2 LGPL21 MPL
+LICENSE= GPLv2+ LGPL21+ MPL
LICENSE_COMB= dual
-LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPL
+LICENSE_FILE_GPLv2+ = ${_LICENSE_STORE}/GPLv2
+LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21
LICENSE_FILE_MPL= ${WRKSRC}/COPYING.MPL
CONFLICTS_INSTALL= tinker-[0-9]*
CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui
GNU_CONFIGURE= yes
-USES= libtool:keepla pathfix iconv ncurses readline shebangfix perl5
+USES= autoreconf libtool:keepla pathfix iconv ncurses \
+ readline shebangfix perl5
USE_GITHUB= yes
SHEBANG_FILES= src/tools/ispellaff2myspell
USE_LDCONFIG= yes
@@ -29,4 +32,10 @@ PLIST_SUB= SHLIB_VER=${PORTVERSION:R}
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/tools/hunspell.cxx
+makepatch-clean:
+ @${RM} ${WRKSRC}/tests/suggestiontest/Makefile.orig
+
.include <bsd.port.mk>
+
+# XXX Don't override definition in Mk/bsd.port.mk
+makepatch: makepatch-clean
diff --git a/textproc/hunspell/distinfo b/textproc/hunspell/distinfo
index 78b26ff658c3..66b8c01359f4 100644
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480524200
-SHA256 (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59
-SIZE (hunspell-hunspell-v1.5.4_GH0.tar.gz) = 1110858
+TIMESTAMP = 1482369634
+SHA256 (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2
+SIZE (hunspell/hunspell-hunspell-v1.6.0_GH0.tar.gz) = 699377
diff --git a/textproc/hunspell/files/patch-add-const b/textproc/hunspell/files/patch-add-const
index d8c7bd38cf37..b43c48b95b84 100644
--- a/textproc/hunspell/files/patch-add-const
+++ b/textproc/hunspell/files/patch-add-const
@@ -66,25 +66,3 @@ reverting https://github.com/hunspell/hunspell/commit/dd4b14899bfb
/* morphological functions */
---- src/win_api/hunspelldll.c.orig 2016-11-28 10:34:55 UTC
-+++ src/win_api/hunspelldll.c
-@@ -73,7 +73,7 @@ LIBHUNSPELL_DLL_EXPORTED void hunspell_f
- pMS->free_list(slst, len);
- }
-
--LIBHUNSPELL_DLL_EXPORTED char* hunspell_get_dic_encoding(Hunspell* pMS) {
-+LIBHUNSPELL_DLL_EXPORTED const char* hunspell_get_dic_encoding(Hunspell* pMS) {
- return pMS->get_dic_encoding();
- }
-
---- src/win_api/hunspelldll.h.orig 2016-11-28 10:34:55 UTC
-+++ src/win_api/hunspelldll.h
-@@ -59,7 +59,7 @@ LIBHUNSPELL_DLL_EXPORTED void hunspell_f
- char*** slst,
- int len);
- // make local copy of returned string!!
--LIBHUNSPELL_DLL_EXPORTED char* hunspell_get_dic_encoding(Hunspell* pMS);
-+LIBHUNSPELL_DLL_EXPORTED const char* hunspell_get_dic_encoding(Hunspell* pMS);
-
- // add word to dict (word is valid until spell object is not destroyed)
- LIBHUNSPELL_DLL_EXPORTED int hunspell_add(Hunspell* pMS, char* word);
diff --git a/textproc/ibus-kmfl/Makefile b/textproc/ibus-kmfl/Makefile
index cbfe135d2a32..50a93fdaade1 100644
--- a/textproc/ibus-kmfl/Makefile
+++ b/textproc/ibus-kmfl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ibus-kmfl
PORTVERSION= 1.0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= SF/kmfl/${PORTNAME}/${PORTVERSION} \
http://anthesphoria.net/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
diff --git a/textproc/icdiff/Makefile b/textproc/icdiff/Makefile
index 8929adb4f513..111d136f4d42 100644
--- a/textproc/icdiff/Makefile
+++ b/textproc/icdiff/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= icdiff
-PORTVERSION= 1.8.5
+PORTVERSION= 1.8.6
CATEGORIES= textproc
MASTER_SITES= CHEESESHOP
diff --git a/textproc/icdiff/distinfo b/textproc/icdiff/distinfo
index c78cba1481f5..559d64daf76a 100644
--- a/textproc/icdiff/distinfo
+++ b/textproc/icdiff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476449460
-SHA256 (icdiff-1.8.5.tar.gz) = d0fc55ff53f4ca1af6612dadeac9635a3f2ede269530ca5af6bbe22544d16e5c
-SIZE (icdiff-1.8.5.tar.gz) = 8682
+TIMESTAMP = 1482046470
+SHA256 (icdiff-1.8.6.tar.gz) = 6e08a7ad1166dede67d5a3d5e9cdc32e366363501775e5d7712841170954d9b0
+SIZE (icdiff-1.8.6.tar.gz) = 8902
diff --git a/textproc/irstlm/Makefile b/textproc/irstlm/Makefile
index 633b78b70be1..661a8122a36a 100644
--- a/textproc/irstlm/Makefile
+++ b/textproc/irstlm/Makefile
@@ -15,6 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_PERL5= run
+USE_CXXSTD= gnu++98
USES= autoreconf libtool perl5 shebangfix tar:tgz
USE_LDCONFIG= yes
SHEBANG_FILES= scripts/add-start-end.sh scripts/lm-stat.pl scripts/sort-lm.pl scripts/build-lm-qsub.sh scripts/mdtsel.sh scripts/split-dict.pl scripts/build-lm.sh scripts/merge-sublm.pl scripts/split-ngt.sh scripts/build-sublm.pl scripts/ngram-split.pl scripts/goograms2ngrams.pl scripts/rm-start-end.sh
diff --git a/textproc/jid/Makefile b/textproc/jid/Makefile
new file mode 100644
index 000000000000..d745a6211a3d
--- /dev/null
+++ b/textproc/jid/Makefile
@@ -0,0 +1,41 @@
+# Created by: Sofian Brabez <sbz@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= jid
+PORTVERSION= 0.6.3
+CATEGORIES= textproc
+
+MAINTAINER= sbz@FreeBSD.org
+COMMENT= JSON Incremental Digger
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USE_GITHUB= yes
+GH_ACCOUNT= simeji
+GH_TUPLE= bitly:go-simplejson:aabad6e:simplejson \
+ mattn:go-runewidth:d6bea18f:runewidth \
+ nsf:termbox-go:abe82ce:termbox \
+ pkg:errors:645ef00:errors
+
+USES= go
+
+PLIST_FILES= bin/jid
+
+pre-build: .SILENT
+ ${MKDIR} ${WRKDIR}/src/github.com/mattn
+ ${MV} ${WRKDIR}/go-runewidth-d6bea18f ${WRKDIR}/src/github.com/mattn/go-runewidth
+ ${MKDIR} ${WRKDIR}/src/github.com/bitly
+ ${MV} ${WRKDIR}/go-simplejson-aabad6e ${WRKDIR}/src/github.com/bitly/go-simplejson
+ ${MKDIR} ${WRKDIR}/src/github.com/nsf
+ ${MV} ${WRKDIR}/termbox-go-abe82ce ${WRKDIR}/src/github.com/nsf/termbox-go
+ ${MKDIR} ${WRKDIR}/src/github.com/pkg
+ ${MV} ${WRKDIR}/errors-645ef00 ${WRKDIR}/src/github.com/pkg/errors
+ ${MKDIR} ${WRKDIR}/src/github.com/simeji
+ ${CP} -r ${WRKDIR}/jid-${PORTVERSION} ${WRKDIR}/src/github.com/simeji/jid
+
+do-build:
+ @(cd ${WRKDIR}/src/github.com/simeji/jid; \
+ ${SETENV} ${GO_ENV} ${GO_CMD} build -v -o ${WRKDIR}/bin/jid cmd/jid/jid.go)
+
+.include <bsd.port.mk>
diff --git a/textproc/jid/distinfo b/textproc/jid/distinfo
new file mode 100644
index 000000000000..9b4bf8c7613a
--- /dev/null
+++ b/textproc/jid/distinfo
@@ -0,0 +1,11 @@
+TIMESTAMP = 1484951365
+SHA256 (simeji-jid-0.6.3_GH0.tar.gz) = a8f60c3aaf1ebe78bfc3c20e1b0ff06f0879c78f52901759f030166acb9353ca
+SIZE (simeji-jid-0.6.3_GH0.tar.gz) = 11979
+SHA256 (bitly-go-simplejson-aabad6e_GH0.tar.gz) = 37fd05170e7c632bfb85ce6646ce2bfbc4c3e50610bbfa9922f98d1f749ef754
+SIZE (bitly-go-simplejson-aabad6e_GH0.tar.gz) = 5992
+SHA256 (mattn-go-runewidth-d6bea18f_GH0.tar.gz) = 7ad847cd4cba8007609f8e0d42f90ff6220ae63c85a0e441eb10558859226fef
+SIZE (mattn-go-runewidth-d6bea18f_GH0.tar.gz) = 5877
+SHA256 (nsf-termbox-go-abe82ce_GH0.tar.gz) = d74082bddc8d7de6f2444cdbb553e6bd409bf93e8fe76ca4eff4911ccdbd9726
+SIZE (nsf-termbox-go-abe82ce_GH0.tar.gz) = 30258
+SHA256 (pkg-errors-645ef00_GH0.tar.gz) = b2e989515688d916216dd0a1b82cd9b18e8fb4fdf0370473996bdde41b83a41f
+SIZE (pkg-errors-645ef00_GH0.tar.gz) = 11342
diff --git a/textproc/jid/pkg-descr b/textproc/jid/pkg-descr
new file mode 100644
index 000000000000..524302d21fdd
--- /dev/null
+++ b/textproc/jid/pkg-descr
@@ -0,0 +1,4 @@
+JSON Incremental Digger is a very simple tool. You can drill down JSON
+interactively by using filtering queries like jq.
+
+WWW: https://github.com/simeji/jid
diff --git a/textproc/kenlm/Makefile b/textproc/kenlm/Makefile
index 1a9786536caf..c5f3d740e9d3 100644
--- a/textproc/kenlm/Makefile
+++ b/textproc/kenlm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kenlm
PORTVERSION= 20140830
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://kheafield.com/code/
DISTNAME= ${PORTNAME}
@@ -11,8 +11,6 @@ DISTNAME= ${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= KenLM Language Model Toolkit
-BROKEN_powerpc64= Does not build
-
BUILD_DEPENDS= bjam:devel/boost-jam \
bash:shells/bash
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
@@ -22,6 +20,9 @@ USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC}/jam-files/boost-build
+BROKEN_aarch64= Fails to compile: target architecture was not detected as supported by Double-Conversion
+BROKEN_powerpc64= Does not build
+
do-build:
(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/bjam --toolset=${CHOSEN_COMPILER_TYPE} --with-boost=${LOCALBASE} ${_MAKE_JOBS})
diff --git a/textproc/kf5-kcodecs/distinfo b/textproc/kf5-kcodecs/distinfo
index 3e7bb135cfe7..5da4446e60bc 100644
--- a/textproc/kf5-kcodecs/distinfo
+++ b/textproc/kf5-kcodecs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475424081
-SHA256 (KDE/frameworks/5.27.0/kcodecs-5.27.0.tar.xz) = 0ac9b24fa94240cff53cde2a9ef565c0f85d9883087b8f7c815b83aacd119338
-SIZE (KDE/frameworks/5.27.0/kcodecs-5.27.0.tar.xz) = 2741924
+TIMESTAMP = 1483950430
+SHA256 (KDE/frameworks/5.30.0/kcodecs-5.30.0.tar.xz) = 6eb6935512e01a70d730938c28cb84852e73d4c023deebb5f2946b4c760f2aee
+SIZE (KDE/frameworks/5.30.0/kcodecs-5.30.0.tar.xz) = 220112
diff --git a/textproc/kf5-sonnet/Makefile b/textproc/kf5-sonnet/Makefile
index ccadea955441..fb42b61b20c1 100644
--- a/textproc/kf5-sonnet/Makefile
+++ b/textproc/kf5-sonnet/Makefile
@@ -3,14 +3,13 @@
PORTNAME= sonnet
PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
-PORTREVISION= 1
CATEGORIES= textproc kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 plugin-based spell checking library
LIB_DEPENDS= libaspell.so:textproc/aspell \
- libhunspell-1.5.so:textproc/hunspell
+ libhunspell-1.6.so:textproc/hunspell
USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz
USE_KDE= ecm
diff --git a/textproc/kf5-sonnet/distinfo b/textproc/kf5-sonnet/distinfo
index 5c3f056e8b95..0d8f275c3efd 100644
--- a/textproc/kf5-sonnet/distinfo
+++ b/textproc/kf5-sonnet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475424082
-SHA256 (KDE/frameworks/5.27.0/sonnet-5.27.0.tar.xz) = 3bef88e61303e172fa6e3d824b01c371c44b81629cb67267717a27309e7d231e
-SIZE (KDE/frameworks/5.27.0/sonnet-5.27.0.tar.xz) = 2653172
+TIMESTAMP = 1483950430
+SHA256 (KDE/frameworks/5.30.0/sonnet-5.30.0.tar.xz) = 99fd42d919d3350e22ae99fc480a14bc30ebd461b064ef24aed5042c772a91c4
+SIZE (KDE/frameworks/5.30.0/sonnet-5.30.0.tar.xz) = 281828
diff --git a/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake b/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake
deleted file mode 100644
index 5b352f7b9ccf..000000000000
--- a/textproc/kf5-sonnet/files/patch-cmake_FindHUNSPELL.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindHUNSPELL.cmake.orig 2016-10-02 10:04:15 UTC
-+++ cmake/FindHUNSPELL.cmake
-@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL
-
- FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-
--FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2)
-+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2)
-
- # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if
- # all listed variables are TRUE
diff --git a/textproc/kf5-syntax-highlighting/Makefile b/textproc/kf5-syntax-highlighting/Makefile
new file mode 100644
index 000000000000..910afa1a0b5a
--- /dev/null
+++ b/textproc/kf5-syntax-highlighting/Makefile
@@ -0,0 +1,16 @@
+# Created by: tcberner
+# $FreeBSD$
+
+PORTNAME= syntax-highlighting
+PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+CATEGORIES= textproc kde kde-frameworks
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= KF5 syntax highlighting engine for structured text and code
+
+USES= cmake:outsource compiler:c++11-lib kde:5 perl5 tar:xz
+USE_KDE= ecm
+USE_QT5= buildtools_build core gui linguisttools_build \
+ network testlib qmake_build
+
+.include <bsd.port.mk>
diff --git a/textproc/kf5-syntax-highlighting/distinfo b/textproc/kf5-syntax-highlighting/distinfo
new file mode 100644
index 000000000000..49bf747546c9
--- /dev/null
+++ b/textproc/kf5-syntax-highlighting/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483952997
+SHA256 (KDE/frameworks/5.30.0/syntax-highlighting-5.30.0.tar.xz) = a3d4d68c45f95133b4f242be24ecf88620478bbcd84ced1f1bea080667783746
+SIZE (KDE/frameworks/5.30.0/syntax-highlighting-5.30.0.tar.xz) = 974816
diff --git a/textproc/kf5-syntax-highlighting/files/patch-src_cli_kate-syntax-highlighter.cpp b/textproc/kf5-syntax-highlighting/files/patch-src_cli_kate-syntax-highlighter.cpp
new file mode 100644
index 000000000000..23b8394ca65a
--- /dev/null
+++ b/textproc/kf5-syntax-highlighting/files/patch-src_cli_kate-syntax-highlighter.cpp
@@ -0,0 +1,14 @@
+Fix build on 9.3
+
+/wrkdirs/usr/ports/textproc/kf5-syntax-highlighting/work/syntax-highlighting-5.29.0/src/cli/kate-syntax-highlighter.cpp:121:35: error: 'stdout' was not declared in this scope
+
+--- src/cli/kate-syntax-highlighter.cpp.orig 2016-12-13 11:57:30 UTC
++++ src/cli/kate-syntax-highlighter.cpp
+@@ -28,6 +28,7 @@
+ #include <QVector>
+
+ #include <iostream>
++#include <cstdio>
+
+ using namespace KSyntaxHighlighting;
+
diff --git a/textproc/kf5-syntax-highlighting/pkg-descr b/textproc/kf5-syntax-highlighting/pkg-descr
new file mode 100644
index 000000000000..470d65a88632
--- /dev/null
+++ b/textproc/kf5-syntax-highlighting/pkg-descr
@@ -0,0 +1,3 @@
+Syntax highlighting Engine for Structured Text and Code.
+
+WWW: http://api.kde.org/frameworks-api/frameworks5-apidocs/sytnax-highlighting/html/index.html
diff --git a/textproc/kf5-syntax-highlighting/pkg-plist b/textproc/kf5-syntax-highlighting/pkg-plist
new file mode 100644
index 000000000000..0e7d15cf71f8
--- /dev/null
+++ b/textproc/kf5-syntax-highlighting/pkg-plist
@@ -0,0 +1,112 @@
+bin/kate-syntax-highlighter
+etc/xdg/org_kde_ksyntaxhighlighting.categories
+include/KF5/KSyntaxHighlighting/AbstractHighlighter
+include/KF5/KSyntaxHighlighting/Definition
+include/KF5/KSyntaxHighlighting/FoldingRegion
+include/KF5/KSyntaxHighlighting/Format
+include/KF5/KSyntaxHighlighting/Repository
+include/KF5/KSyntaxHighlighting/State
+include/KF5/KSyntaxHighlighting/SyntaxHighlighter
+include/KF5/KSyntaxHighlighting/Theme
+include/KF5/KSyntaxHighlighting/abstracthighlighter.h
+include/KF5/KSyntaxHighlighting/definition.h
+include/KF5/KSyntaxHighlighting/foldingregion.h
+include/KF5/KSyntaxHighlighting/format.h
+include/KF5/KSyntaxHighlighting/ksyntaxhighlighting_export.h
+include/KF5/KSyntaxHighlighting/repository.h
+include/KF5/KSyntaxHighlighting/state.h
+include/KF5/KSyntaxHighlighting/syntaxhighlighter.h
+include/KF5/KSyntaxHighlighting/theme.h
+include/KF5/ksyntaxhighlighting_version.h
+lib/cmake/KF5SyntaxHighlighting/KF5SyntaxHighlightingConfig.cmake
+lib/cmake/KF5SyntaxHighlighting/KF5SyntaxHighlightingConfigVersion.cmake
+lib/cmake/KF5SyntaxHighlighting/KF5SyntaxHighlightingTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KF5SyntaxHighlighting/KF5SyntaxHighlightingTargets.cmake
+lib/libKF5SyntaxHighlighting.so
+lib/libKF5SyntaxHighlighting.so.5
+lib/libKF5SyntaxHighlighting.so.%%KDE_FRAMEWORKS_VERSION%%
+%%QT_MKSPECDIR%%/modules/qt_KSyntaxHighlighting.pri
+share/locale/af/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ar/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ast/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/be/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/bg/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/bn/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/br/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/bs/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ca/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ca@valencia/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/cs/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/cy/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/da/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/de/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/el/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/en_GB/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/eo/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/es/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/et/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/eu/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/fa/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/fi/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/fr/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/fy/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ga/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/gl/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/gu/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/he/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/hi/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/hr/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/hsb/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/hu/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ia/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/is/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/it/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ja/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ka/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/kk/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/km/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ko/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ku/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/lb/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/lt/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/lv/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/mai/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/mk/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ml/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/mr/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ms/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/nb/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/nds/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ne/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/nl/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/nn/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/oc/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/pa/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/pl/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/pt/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/pt_BR/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ro/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ru/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/se/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/si/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sk/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sl/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sq/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sr/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sr@ijekavian/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sr@ijekavianlatin/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sr@latin/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/sv/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ta/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/tg/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/th/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/tr/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/ug/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/uk/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/uz/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/uz@cyrillic/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/vi/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/wa/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/xh/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/zh_CN/LC_MESSAGES/syntaxhighlighting5_qt.qm
+share/locale/zh_TW/LC_MESSAGES/syntaxhighlighting5_qt.qm
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index 7f9c6bea2c5d..e14f05cd1298 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kmflcomp
PORTVERSION= 0.9.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/kmfl/kmfl/${PORTVERSION}:1 \
SF/kmfl/kmfl/Documentation:2 \
diff --git a/textproc/ku-aspell/pkg-descr b/textproc/ku-aspell/pkg-descr
index a1ff5a613038..a3c7ab727e50 100644
--- a/textproc/ku-aspell/pkg-descr
+++ b/textproc/ku-aspell/pkg-descr
@@ -1,3 +1,3 @@
Aspell Kurdi dictionary.
-WWW: http://sourceforge.net/projects/myspellkurdish/
+WWW: https://sourceforge.net/projects/myspellkurdish/
diff --git a/textproc/lasem/Makefile b/textproc/lasem/Makefile
index 4ecda06dac89..2b27e9b9bac6 100644
--- a/textproc/lasem/Makefile
+++ b/textproc/lasem/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lasem
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index e6906804b7dc..000af315a944 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= hrs@FreeBSD.org
COMMENT= Convert LaTeX documents to HTML
LICENSE= GPLv2
-LICENSE_FILES= ${WRKSRC}/LICENSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${LOCALBASE}/bin/anytopnm:graphics/netpbm
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/textproc/libabw/Makefile b/textproc/libabw/Makefile
index b293080ea379..ef54c1cab356 100644
--- a/textproc/libabw/Makefile
+++ b/textproc/libabw/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libabw
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= LODEV/${PORTNAME}
diff --git a/textproc/libabw/files/patch-libabw.pc.in b/textproc/libabw/files/patch-libabw.pc.in
deleted file mode 100644
index 3033418f64b2..000000000000
--- a/textproc/libabw/files/patch-libabw.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- libabw.pc.in.orig 2014-04-16 17:04:09 UTC
-+++ libabw.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0 librevenge-stre
- Libs: -L${libdir} -labw-@ABW_MAJOR_VERSION@.@ABW_MINOR_VERSION@
- Cflags: -I${includedir}/libabw-@ABW_MAJOR_VERSION@.@ABW_MINOR_VERSION@
-
--Requires.private: libxml-2.0 zlib
-+Requires.private: libxml-2.0
diff --git a/textproc/libcsv/Makefile b/textproc/libcsv/Makefile
index 39518580593e..65ac36c9e108 100644
--- a/textproc/libcsv/Makefile
+++ b/textproc/libcsv/Makefile
@@ -3,15 +3,16 @@
PORTNAME= libcsv
PORTVERSION= 3.0.3
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= bob@eager.cx
COMMENT= Small, simple and fast CSV library
LICENSE= LGPL21
-OPTIONS_DEFINE= PROFILE
+OPTIONS_DEFINE= EXAMPLES PROFILE
MAKEFILE= Makefile.lib
USES= uidfix
@@ -21,17 +22,16 @@ PLIST_SUB= SHLIB_MAJOR="${SHLIB_MAJOR}"
SHLIB_MAJOR= 3
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPROFILE}
-PLIST_SUB+= PROFILE=""
-.else
-MAKE_ENV+= NO_PROFILE=true
-PLIST_SUB+= PROFILE="@comment "
-.endif
+PROFILE_PLIST_SUB= PROFILE=""
+PROFILE_MAKE_ENV_OFF= NO_PROFILE=true
+PROFILE_PLIST_SUB_OFF= PROFILE="@comment "
do-configure:
@${SED} -e 's|%%SHLIB_MAJOR%%|${SHLIB_MAJOR}|' \
< ${FILESDIR}/Makefile > ${WRKSRC}/${MAKEFILE}
+do-install-EXAMPLES-on:
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
+
.include <bsd.port.mk>
diff --git a/textproc/libcsv/files/patch-csv.3 b/textproc/libcsv/files/patch-csv.3
new file mode 100644
index 000000000000..71f6ae0f8ddb
--- /dev/null
+++ b/textproc/libcsv/files/patch-csv.3
@@ -0,0 +1,127 @@
+--- csv.3.orig 2013-01-10 00:04:17 UTC
++++ csv.3
+@@ -1,4 +1,4 @@
+-.TH CSV 3 "9 January 2013"
++.TH CSV 3 "2 January 2016"
+ .SH NAME
+ csv \- CSV parser and writer library
+ .SH SYNOPSIS
+@@ -36,6 +36,9 @@ void csv_free(struct csv_parser *\fIp\fB
+
+ unsigned char csv_get_delim(struct csv_parser *\fIp\fB);
+ unsigned char csv_get_quote(struct csv_parser *\fIp\fB);
++void csv_set_delim(struct csv_parser *\fIp\fB, unsigned char \fIc\fB);
++void csv_set_quote(struct csv_parser *\fIp\fB, unsigned char \fIc\fP);
++
+ void csv_set_space_func(struct csv_parser *\fIp\fB, int (*\fIf\fB)(unsigned char));
+ void csv_set_term_func(struct csv_parser *\fIp\fB, int (*\fIf\fB)(unsigned char));
+
+@@ -75,7 +78,7 @@ The idea behind parsing with \fBlibcsv\f
+ end-of-row events. \fBcsv_parse()\fP parses the data provided calling the
+ user-defined callback functions as it reads fields and rows.
+ When complete, \fBcsv_fini()\fP is called to finish processing the current
+-field and make a final call to the callback functions if neccessary.
++field and make a final call to the callback functions if necessary.
+ \fBcsv_free()\fP is then called to free the parser object.
+ \fBcsv_error()\fP and \fBcsv_strerror()\fP provide information about errors
+ encountered by the functions.
+@@ -147,8 +150,8 @@ Multiple options can be specified by OR-
+ .RE
+
+ By default \fIcb2\fP is not called when rows that do not contain any fields
+-are encountered. This behavior is meant to accomodate files using
+-only either a linefeed or a carriage return as a record seperator to
++are encountered. This behavior is meant to accommodate files using
++only either a linefeed or a carriage return as a record separator to
+ be parsed properly while at the same time being able to parse files with rows
+ terminated by multiple characters from resulting in blank rows after
+ each actual row of data (for example, processing a text CSV file
+@@ -178,7 +181,7 @@ functions may be called many times durin
+ depending on the amount of data being processed in a given call.
+ .PP
+ \fBcsv_parse()\fP returns the number of bytes processed, on a successful
+-call this will be \fIlen\fP, if it is less than len an error has occured.
++call this will be \fIlen\fP, if it is less than len an error has occurred.
+ An error can occur, for example, if there is insufficient memory
+ to store the contents of the current field in the entry buffer.
+ An error can also occur if malformed data is encountered while running
+@@ -192,7 +195,7 @@ of the error. \fBcsv_error()\fP takes a
+ .PP
+ .RS
+ .TP
+-\fBCSV_EPARSE\fP\ \ \ A parse error has occured while in strict mode
++\fBCSV_EPARSE\fP\ \ \ A parse error has occurred while in strict mode
+ .TP
+ \fBCSV_ENOMEM\fP\ \ \ There was not enough memory while attempting to increase the entry buffer for the current field
+ .TP
+@@ -210,7 +213,7 @@ to call the \fBcsv_fini()\fP function.
+ function with any remaining data in the entry buffer (if there is
+ any) and call the \fIcb2\fP function unless we are already at the end of a row
+ (the last byte processed was a newline character for example).
+-It is neccessary to call this function because the file being
++It is necessary to call this function because the file being
+ processed might not end with a carriage return or newline but the
+ data that has been read in to this point still needs to be
+ submitted to the callback routines.
+@@ -293,13 +296,14 @@ CUSTOMIZING THE PARSER
+ .br
+ The \fBcsv_set_delim()\fP and \fBcsv_set_quote()\fP functions provide a
+ means to change the characters that the parser will consider the delimiter
+-and quote characters respetively, cast to unsigned char. \fBcsv_get_delim()\fP and \fBcsv_get_delim()\fP
++and quote characters respetively, cast to unsigned char. \fBcsv_get_delim()\fP
++and \fBcsv_set_delim()\fP
+ return the current delimiter and quote characters respectively. When
+ \fBcsv_init()\fP is called the delimiter is set to \fBCSV_COMMA\fP and the quote
+ to \fBCSV_QUOTE\fP. Note that the rest of the CSV conventions still apply
+ when these functions are used to change the delimiter and/or quote characters,
+ fields containing the new quote character or delimiter must be quoted and quote
+-characters must be escaped with an immediately preceeding instance of the same
++characters must be escaped with an immediately preceding instance of the same
+ character.
+ Additionally, the \fBcsv_set_space_func()\fP and \fBcsv_set_term_func()\fP
+ allow a user-defined function to be provided which will be used determine
+@@ -333,7 +337,7 @@ reflect the most common usage of the for
+ .PP
+ .RS
+ .TP
+-Fields are seperated with commas.
++Fields are separated with commas.
+ .TP
+ Rows are delimited by newline sequences (see below).
+ .TP
+@@ -385,7 +389,7 @@ will be interpreted as 3 fields, equival
+ RFC 4180 limits the allowable characters in a CSV field, \fBlibcsv\fP
+ allows any character to be present in a field provided it adheres
+ to the conventions mentioned above. This makes it possible to
+-store binary data in CSV format, an attribute that many application rely on.
++store binary data in CSV format, an attribute that many applications rely on.
+ .PP
+ RFC 4180 states that a Carriage Return plus Linefeed combination is
+ used to delimit records, \fBlibcsv\fP allows any combination of Carriage
+@@ -409,7 +413,7 @@ would be parsed equivalently to the corr
+ .fi
+ This is often desirable as there are some applications that do
+ not adhere to the specifications previously discussed. However,
+-there are instances where malformed CSV data is ambigious, namely
++there are instances where malformed CSV data is ambiguous, namely
+ when a comma or newline is the next non-space character following
+ a quote such as:
+ .nf
+@@ -420,7 +424,7 @@ This could either be parsed as a single
+
+ \fBSally said "Hello", Wally said "Goodbye"\fP
+
+-or as 2 seperate fields:
++or as 2 separate fields:
+
+ .fi
+ \fBSally said "Hello\fP
+@@ -431,7 +435,7 @@ Since the data is malformed, there is no
+ before the comma is meant to be a literal quote or if it signifies
+ the end of the field. This is of course not an issue for properly
+ formed data as all quotes must be escaped. \fBlibcsv\fP will parse this
+-example as 2 seperate fields.
++example as 2 separate fields.
+
+ \fBlibcsv\fP provides a strict mode that will return with a parse error
+ if a quote is seen inside a non-quoted field or if a non-escaped
diff --git a/textproc/libcsv/files/patch-csv.h b/textproc/libcsv/files/patch-csv.h
new file mode 100644
index 000000000000..27650397e0dc
--- /dev/null
+++ b/textproc/libcsv/files/patch-csv.h
@@ -0,0 +1,10 @@
+--- csv.h.orig 2012-12-28 22:50:44 UTC
++++ csv.h
+@@ -79,6 +79,7 @@ void csv_set_term_func(struct csv_parser
+ void csv_set_realloc_func(struct csv_parser *p, void *(*)(void *, size_t));
+ void csv_set_free_func(struct csv_parser *p, void (*)(void *));
+ void csv_set_blk_size(struct csv_parser *p, size_t);
++size_t csv_get_blk_size(struct csv_parser *p);
+ size_t csv_get_buffer_size(struct csv_parser *p);
+
+ #ifdef __cplusplus
diff --git a/textproc/libcsv/files/patch-libcsv.c b/textproc/libcsv/files/patch-libcsv.c
new file mode 100644
index 000000000000..7ef2bcb587f9
--- /dev/null
+++ b/textproc/libcsv/files/patch-libcsv.c
@@ -0,0 +1,18 @@
+--- libcsv.c.orig 2012-12-28 22:50:44 UTC
++++ libcsv.c
+@@ -259,6 +259,15 @@ csv_set_blk_size(struct csv_parser *p, s
+ }
+
+ size_t
++csv_get_blk_size(struct csv_parser *p)
++{
++ /* Get the block size used to increment buffer size */
++ if (p)
++ return p->blk_size;
++ return 0;
++}
++
++size_t
+ csv_get_buffer_size(struct csv_parser *p)
+ {
+ /* Get the size of the entry buffer */
diff --git a/textproc/libcsv/pkg-descr b/textproc/libcsv/pkg-descr
index 859a6bdab635..97e648b85894 100644
--- a/textproc/libcsv/pkg-descr
+++ b/textproc/libcsv/pkg-descr
@@ -3,4 +3,4 @@ that can read and write CSV data. It provides a straight-forward
interface using callback functions to handle parsed fields and rows and
can parse improperly formatted CSV files.
-WWW: http://sourceforge.net/projects/libcsv/
+WWW: https://sourceforge.net/projects/libcsv/
diff --git a/textproc/libcsv/pkg-plist b/textproc/libcsv/pkg-plist
index b194b905de98..bdebc5d98333 100644
--- a/textproc/libcsv/pkg-plist
+++ b/textproc/libcsv/pkg-plist
@@ -4,3 +4,7 @@ lib/libcsv.so
lib/libcsv.so.%%SHLIB_MAJOR%%
%%PROFILE%%lib/libcsv_p.a
man/man3/csv.3.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csvfix.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csvinfo.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csvtest.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/csvvalid.c
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index 2965ecb7030c..a218076ce8e7 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libe-book
PORTVERSION= 0.1.2
-PORTREVISION= 7
+PORTREVISION= 10
CATEGORIES= textproc
MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/
@@ -23,7 +23,6 @@ USES= compiler:c++11-lang gmake gperf libtool pathfix pkgconfig \
tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= ZLIB_CFLAGS="-DWEHAVEZLIBINBASE" ZLIB_LIBS="-DWEDOHAVEIT"
INSTALL_TARGET= install-strip
CONFIGURE_ARGS= --disable-werror --disable-tests
CPPFLAGS+= -I${LOCALBASE}/include -DBOOST_ERROR_CODE_HEADER_ONLY
diff --git a/textproc/libe-book/files/patch-libe-book.pc.in b/textproc/libe-book/files/patch-libe-book.pc.in
deleted file mode 100644
index ec21d46dc079..000000000000
--- a/textproc/libe-book/files/patch-libe-book.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- libe-book.pc.in.orig 2014-06-27 10:20:12 UTC
-+++ libe-book.pc.in
-@@ -10,4 +10,4 @@ Requires: librevenge-0.0 librevenge-stre
- Libs: -L${libdir} -le-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@
- Cflags: -I${includedir}/libe-book-@EBOOK_MAJOR_VERSION@.@EBOOK_MINOR_VERSION@
-
--Requires.private: icu-uc @REQUIRES_EXPERIMENTAL@ libxml-2.0 zlib
-+Requires.private: icu-uc @REQUIRES_EXPERIMENTAL@ libxml-2.0
diff --git a/textproc/libe-book/pkg-descr b/textproc/libe-book/pkg-descr
index 39a54d8d3279..7f58b0710121 100644
--- a/textproc/libe-book/pkg-descr
+++ b/textproc/libe-book/pkg-descr
@@ -11,4 +11,4 @@ Currently supported are:
- zTXT
- ZVR (simple compressed text format)
-WWW: http://sourceforge.net/projects/libebook/
+WWW: https://sourceforge.net/projects/libebook/
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 4eda2c2c5444..8473882d6dca 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libextractor
PORTVERSION= 1.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= GNU
diff --git a/textproc/libfo/Makefile b/textproc/libfo/Makefile
index efe2613290c1..945d673479ca 100644
--- a/textproc/libfo/Makefile
+++ b/textproc/libfo/Makefile
@@ -26,7 +26,7 @@ USE_GITHUB= yes
GH_PROJECT= xmlroff
GH_ACCOUNT= xmlroff
USE_LDCONFIG= yes
-WRKSRC= ${WRKDIR}/xmlroff-${PORTVERSION}/xmlroff
+WRKSRC_SUBDIR= xmlroff
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/textproc/libkolabxml/Makefile b/textproc/libkolabxml/Makefile
index c9464f1558d0..29d151fddbb3 100644
--- a/textproc/libkolabxml/Makefile
+++ b/textproc/libkolabxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libkolabxml
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://mirror.kolabsys.com/pub/releases/
diff --git a/textproc/liblrdf/pkg-descr b/textproc/liblrdf/pkg-descr
index 2a5f87c0e2bb..aecc22f8d716 100644
--- a/textproc/liblrdf/pkg-descr
+++ b/textproc/liblrdf/pkg-descr
@@ -4,4 +4,4 @@ plugins. It can also be used for general RDF manipulation.
It can read RDF/XLM and N3 files and export N3 files, it also has a light
taxonomic inference capability.
-WWW: http://sourceforge.net/projects/lrdf/
+WWW: https://sourceforge.net/projects/lrdf/
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 8706a057e864..3258c38efc4d 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libmrss
PORTVERSION= 0.19.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= http://www.autistici.org/bakunin/libmrss/
diff --git a/textproc/libmwaw03/Makefile b/textproc/libmwaw03/Makefile
index 62944c9deb0f..6ac9589359cf 100644
--- a/textproc/libmwaw03/Makefile
+++ b/textproc/libmwaw03/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libmwaw
-PORTVERSION= 0.3.9
+PORTVERSION= 0.3.10
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= 03
diff --git a/textproc/libmwaw03/distinfo b/textproc/libmwaw03/distinfo
index cc1e8ff16b80..420e6a697c3a 100644
--- a/textproc/libmwaw03/distinfo
+++ b/textproc/libmwaw03/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480077073
-SHA256 (libmwaw-0.3.9.tar.xz) = f7fca4d31510e52cda94f1272147f385e372448c0aaef16f07a5e8b3ceb5b2a0
-SIZE (libmwaw-0.3.9.tar.xz) = 1226044
+TIMESTAMP = 1486079094
+SHA256 (libmwaw-0.3.10.tar.xz) = b246a0c15fcf98076f2a1f2cf4d44a714f5c8eb39690442fc7fbbd01fa34f220
+SIZE (libmwaw-0.3.10.tar.xz) = 1229964
diff --git a/textproc/libmwaw03/pkg-plist b/textproc/libmwaw03/pkg-plist
index 61afa5ac1026..da29dc0cf468 100644
--- a/textproc/libmwaw03/pkg-plist
+++ b/textproc/libmwaw03/pkg-plist
@@ -9,5 +9,5 @@ include/libmwaw-0.3/libmwaw/MWAWDocument.hxx
include/libmwaw-0.3/libmwaw/libmwaw.hxx
lib/libmwaw-0.3.so
lib/libmwaw-0.3.so.3
-lib/libmwaw-0.3.so.3.0.9
+lib/libmwaw-0.3.so.3.0.10
libdata/pkgconfig/libmwaw-0.3.pc
diff --git a/textproc/libnxml/Makefile b/textproc/libnxml/Makefile
index 4ad917ff7fb2..64f100b6c6c2 100644
--- a/textproc/libnxml/Makefile
+++ b/textproc/libnxml/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libnxml
PORTVERSION= 0.18.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc devel
MASTER_SITES= http://www.autistici.org/bakunin/libnxml/ \
http://nivi.interfree.it/distfiles/${PORTNAME}/${PORTVERSION}/
diff --git a/textproc/libodfgen01/Makefile b/textproc/libodfgen01/Makefile
index 896aea8b5327..adb566c0592d 100644
--- a/textproc/libodfgen01/Makefile
+++ b/textproc/libodfgen01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libodfgen
PORTVERSION= 0.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= 01
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 91f9659592ed..1544edb4deab 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libparsifal
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://www.saunalahti.fi/~samiuus/toni/xmlproc/
diff --git a/textproc/librevenge/Makefile b/textproc/librevenge/Makefile
index b2efbe75e47f..ba402c679a45 100644
--- a/textproc/librevenge/Makefile
+++ b/textproc/librevenge/Makefile
@@ -2,7 +2,7 @@
PORTNAME= librevenge
PORTVERSION= 0.0.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 5457a0db9055..540a7cae6ee5 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libtre
PORTVERSION= 0.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://laurikari.net/tre/ \
LOCAL/bf
diff --git a/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index a0ecaa6ad451..99085ec31357 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libvisio
PORTVERSION= 0.1.5
-PORTREVISION= 5
+PORTREVISION= 7
CATEGORIES= textproc devel
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
PKGNAMESUFFIX= 01
@@ -26,7 +26,4 @@ USE_GNOME= libxml2
USES= compiler:c++0x gmake gperf libtool pathfix perl5 pkgconfig tar:xz
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} -e "s,zlib,,g" ${WRKSRC}/libvisio.pc.in
-
.include <bsd.port.mk>
diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile
index b92bdddef423..77cad62f04e3 100644
--- a/textproc/libwps/Makefile
+++ b/textproc/libwps/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libwps
-PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTVERSION= 0.4.5
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/libwps/distinfo b/textproc/libwps/distinfo
index 32a73ad2bbf1..a0ce0b518781 100644
--- a/textproc/libwps/distinfo
+++ b/textproc/libwps/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478071443
-SHA256 (libwps-0.4.4.tar.bz2) = 387c46d9543bb566381fddb8991e2838599fc500ee132fef9631a704c5cbed73
-SIZE (libwps-0.4.4.tar.bz2) = 749717
+TIMESTAMP = 1484871094
+SHA256 (libwps-0.4.5.tar.bz2) = 9192ad0c0ad22bfc24ace884286820029c0decc26ad37e0bed0efbd91ff72ea9
+SIZE (libwps-0.4.5.tar.bz2) = 754271
diff --git a/textproc/libwps/pkg-plist b/textproc/libwps/pkg-plist
index 5e5b273251b3..7f8fef20fa16 100644
--- a/textproc/libwps/pkg-plist
+++ b/textproc/libwps/pkg-plist
@@ -8,5 +8,5 @@ include/libwps-0.4/libwps/WPSDocument.h
include/libwps-0.4/libwps/libwps.h
lib/libwps-0.4.so
lib/libwps-0.4.so.4
-lib/libwps-0.4.so.4.0.4
+lib/libwps-0.4.so.4.0.5
libdata/pkgconfig/libwps-0.4.pc
diff --git a/textproc/libwps03/Makefile b/textproc/libwps03/Makefile
index 1a7e23438295..602041d1cfd0 100644
--- a/textproc/libwps03/Makefile
+++ b/textproc/libwps03/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libwps
PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMESUFFIX= 03
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 842af5a09bdf..171839a0ceab 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libxml++
PORTVERSION= 2.34.2
-PORTREVISION?= 2
+PORTREVISION?= 4
CATEGORIES= textproc
MASTER_SITES= GNOME
diff --git a/textproc/libxml++26/files/patch-c++11 b/textproc/libxml++26/files/patch-c++11
new file mode 100644
index 000000000000..6374f9db386f
--- /dev/null
+++ b/textproc/libxml++26/files/patch-c++11
@@ -0,0 +1,46 @@
+From 7dbfb0aed508451e8237c34472815e44925a545c Mon Sep 17 00:00:00 2001
+From: Mikhail Titov <mlt@gmx.us>
+Date: Thu, 30 Apr 2015 17:51:20 +0200
+Subject: Fix the build with C++11 compilers, such as MS Visual C++ 2013.
+
+Implicit conversions from streams to bool are no longer allowed.
+---
+ libxml++/io/istreamparserinputbuffer.cc | 2 +-
+ libxml++/io/ostreamoutputbuffer.cc | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libxml++/io/istreamparserinputbuffer.cc b/libxml++/io/istreamparserinputbuffer.cc
+index b1d6e5b..7a7f283 100644
+--- libxml++/io/istreamparserinputbuffer.cc
++++ libxml++/io/istreamparserinputbuffer.cc
+@@ -39,6 +39,6 @@ namespace xmlpp
+
+ bool IStreamParserInputBuffer::do_close()
+ {
+- return input_;
++ return input_.good();
+ }
+ }
+diff --git a/libxml++/io/ostreamoutputbuffer.cc b/libxml++/io/ostreamoutputbuffer.cc
+index 0a3e6db..b23a8b6 100644
+--- libxml++/io/ostreamoutputbuffer.cc
++++ libxml++/io/ostreamoutputbuffer.cc
+@@ -29,13 +29,13 @@ namespace xmlpp
+ // here we rely on the ostream implicit conversion to boolean, to know if the stream can be used and/or if the write succeded.
+ if(output_)
+ output_.write(buffer, len);
+- return output_;
++ return output_.good();
+ }
+
+ bool OStreamOutputBuffer::do_close()
+ {
+ if(output_)
+ output_.flush();
+- return output_;
++ return output_.good();
+ }
+ }
+--
+cgit v0.12
+
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index f11effd5dad0..06d0e662beb0 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxode
PORTVERSION= 0.71
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 92f897eb7f99..8c37d5183d30 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxslt
PORTVERSION= 1.1.29
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= textproc gnome
MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
http://xmlsoft.org/sources/ \
@@ -49,12 +49,6 @@ post-patch:
s|[$$](bindir)/xmllint|../xmllint/xmllint|g' \
${WRKSRC}/doc/Makefile.in
-.if !defined(MASTERDIR)
-post-install:
- ${LN} -s libxslt.so.1 ${STAGEDIR}${PREFIX}/lib/libxslt.so.2
- ${LN} -s libexslt.so.0 ${STAGEDIR}${PREFIX}/lib/libexslt.so.8
-.endif
-
.include <bsd.port.mk>
.endif
diff --git a/textproc/libxslt/pkg-plist b/textproc/libxslt/pkg-plist
index 10a3a538a952..4a1ec8dc20fc 100644
--- a/textproc/libxslt/pkg-plist
+++ b/textproc/libxslt/pkg-plist
@@ -28,12 +28,10 @@ lib/libexslt.a
lib/libexslt.so
lib/libexslt.so.0
lib/libexslt.so.0.8.17
-lib/libexslt.so.8
lib/libxslt.a
lib/libxslt.so
lib/libxslt.so.1
lib/libxslt.so.1.1.29
-lib/libxslt.so.2
lib/xsltConf.sh
libdata/pkgconfig/libexslt.pc
libdata/pkgconfig/libxslt.pc
diff --git a/textproc/linux-c6-aspell/Makefile b/textproc/linux-c6-aspell/Makefile
index 74fa4cca617e..7b837b33a9ad 100644
--- a/textproc/linux-c6-aspell/Makefile
+++ b/textproc/linux-c6-aspell/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aspell
PORTVERSION= 0.60.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
@@ -11,11 +11,13 @@ COMMENT= Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI
LICENSE= LGPL21+
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 12.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/textproc/linux-c6-aspell/distinfo b/textproc/linux-c6-aspell/distinfo
new file mode 100644
index 000000000000..bb3f107352f1
--- /dev/null
+++ b/textproc/linux-c6-aspell/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485622810
+SHA256 (centos/aspell-0.60.6-12.el6.i686.rpm) = 499329444b80698880b4c71d98addcf3fe7f7d1ed421c6d2e55a5cf4ebab6af2
+SIZE (centos/aspell-0.60.6-12.el6.i686.rpm) = 644304
+SHA256 (centos/aspell-0.60.6-12.el6.x86_64.rpm) = 1fced5d3306d2e015033dfcb2b0fe40442472652106dc462104d82a041636586
+SIZE (centos/aspell-0.60.6-12.el6.x86_64.rpm) = 663640
+SHA256 (centos/aspell-0.60.6-12.el6.src.rpm) = 2806d7c0b3a9a3d81f543b225429303164c542cbf9a4835e5ccd6a0f73bc5eb2
+SIZE (centos/aspell-0.60.6-12.el6.src.rpm) = 1776695
diff --git a/textproc/linux-c6-aspell/distinfo.i386 b/textproc/linux-c6-aspell/distinfo.i386
deleted file mode 100644
index 4a9a5443fbb2..000000000000
--- a/textproc/linux-c6-aspell/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256807
-SHA256 (rpm/i686/centos/6.8/aspell-0.60.6-12.el6.i686.rpm) = 499329444b80698880b4c71d98addcf3fe7f7d1ed421c6d2e55a5cf4ebab6af2
-SIZE (rpm/i686/centos/6.8/aspell-0.60.6-12.el6.i686.rpm) = 644304
-SHA256 (rpm/i686/centos/6.8/aspell-0.60.6-12.el6.src.rpm) = 2806d7c0b3a9a3d81f543b225429303164c542cbf9a4835e5ccd6a0f73bc5eb2
-SIZE (rpm/i686/centos/6.8/aspell-0.60.6-12.el6.src.rpm) = 1776695
diff --git a/textproc/linux-c6-aspell/distinfo.x86_64 b/textproc/linux-c6-aspell/distinfo.x86_64
deleted file mode 100644
index 3140214f076a..000000000000
--- a/textproc/linux-c6-aspell/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257439
-SHA256 (rpm/x86_64/centos/6.8/aspell-0.60.6-12.el6.x86_64.rpm) = 1fced5d3306d2e015033dfcb2b0fe40442472652106dc462104d82a041636586
-SIZE (rpm/x86_64/centos/6.8/aspell-0.60.6-12.el6.x86_64.rpm) = 663640
-SHA256 (rpm/x86_64/centos/6.8/aspell-0.60.6-12.el6.i686.rpm) = 499329444b80698880b4c71d98addcf3fe7f7d1ed421c6d2e55a5cf4ebab6af2
-SIZE (rpm/x86_64/centos/6.8/aspell-0.60.6-12.el6.i686.rpm) = 644304
-SHA256 (rpm/x86_64/centos/6.8/aspell-0.60.6-12.el6.src.rpm) = 2806d7c0b3a9a3d81f543b225429303164c542cbf9a4835e5ccd6a0f73bc5eb2
-SIZE (rpm/x86_64/centos/6.8/aspell-0.60.6-12.el6.src.rpm) = 1776695
diff --git a/textproc/linux-c6-aspell/pkg-plist.x86_64 b/textproc/linux-c6-aspell/pkg-plist.amd64
index 869bce44330e..368898d5d2d4 100644
--- a/textproc/linux-c6-aspell/pkg-plist.x86_64
+++ b/textproc/linux-c6-aspell/pkg-plist.amd64
@@ -173,36 +173,36 @@ usr/lib64/libaspell.so.15
usr/lib64/libaspell.so.15.1.4
usr/lib64/libpspell.so.15
usr/lib64/libpspell.so.15.1.4
-usr/share/doc/aspell-0.60.6/COPYING
-usr/share/doc/aspell-0.60.6/README
-usr/share/doc/aspell-0.60.6/TODO
-usr/share/doc/aspell-0.60.6/aspell-import
-usr/share/doc/aspell-0.60.6/aspell-import.1
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/aspell-import
+%%PORTDOCS%%%%DOCSDIR%%/aspell-import.1
usr/share/info/aspell.info.gz
-usr/share/locale/be/LC_MESSAGES/aspell.mo
-usr/share/locale/ca/LC_MESSAGES/aspell.mo
-usr/share/locale/cs/LC_MESSAGES/aspell.mo
-usr/share/locale/da/LC_MESSAGES/aspell.mo
-usr/share/locale/de/LC_MESSAGES/aspell.mo
-usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
-usr/share/locale/es/LC_MESSAGES/aspell.mo
-usr/share/locale/fr/LC_MESSAGES/aspell.mo
-usr/share/locale/ga/LC_MESSAGES/aspell.mo
-usr/share/locale/it/LC_MESSAGES/aspell.mo
-usr/share/locale/mn/LC_MESSAGES/aspell.mo
-usr/share/locale/nl/LC_MESSAGES/aspell.mo
-usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
-usr/share/locale/ro/LC_MESSAGES/aspell.mo
-usr/share/locale/ru/LC_MESSAGES/aspell.mo
-usr/share/locale/rw/LC_MESSAGES/aspell.mo
-usr/share/locale/sk/LC_MESSAGES/aspell.mo
-usr/share/locale/sl/LC_MESSAGES/aspell.mo
-usr/share/locale/sr/LC_MESSAGES/aspell.mo
-usr/share/locale/sv/LC_MESSAGES/aspell.mo
-usr/share/locale/tg/LC_MESSAGES/aspell.mo
-usr/share/locale/uk/LC_MESSAGES/aspell.mo
-usr/share/locale/vi/LC_MESSAGES/aspell.mo
-usr/share/locale/wa/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/be/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/mn/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/rw/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/tg/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/wa/LC_MESSAGES/aspell.mo
usr/share/man/man1/aspell.1.gz
usr/share/man/man1/prezip-bin.1.gz
usr/share/man/man1/run-with-aspell.1.gz
diff --git a/textproc/linux-c6-aspell/pkg-plist.i386 b/textproc/linux-c6-aspell/pkg-plist.i386
index 3d44d314faf5..0c4cde5ef32b 100644
--- a/textproc/linux-c6-aspell/pkg-plist.i386
+++ b/textproc/linux-c6-aspell/pkg-plist.i386
@@ -90,36 +90,36 @@ usr/lib/libaspell.so.15
usr/lib/libaspell.so.15.1.4
usr/lib/libpspell.so.15
usr/lib/libpspell.so.15.1.4
-usr/share/doc/aspell-0.60.6/COPYING
-usr/share/doc/aspell-0.60.6/README
-usr/share/doc/aspell-0.60.6/TODO
-usr/share/doc/aspell-0.60.6/aspell-import
-usr/share/doc/aspell-0.60.6/aspell-import.1
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/aspell-import
+%%PORTDOCS%%%%DOCSDIR%%/aspell-import.1
usr/share/info/aspell.info.gz
-usr/share/locale/be/LC_MESSAGES/aspell.mo
-usr/share/locale/ca/LC_MESSAGES/aspell.mo
-usr/share/locale/cs/LC_MESSAGES/aspell.mo
-usr/share/locale/da/LC_MESSAGES/aspell.mo
-usr/share/locale/de/LC_MESSAGES/aspell.mo
-usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
-usr/share/locale/es/LC_MESSAGES/aspell.mo
-usr/share/locale/fr/LC_MESSAGES/aspell.mo
-usr/share/locale/ga/LC_MESSAGES/aspell.mo
-usr/share/locale/it/LC_MESSAGES/aspell.mo
-usr/share/locale/mn/LC_MESSAGES/aspell.mo
-usr/share/locale/nl/LC_MESSAGES/aspell.mo
-usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
-usr/share/locale/ro/LC_MESSAGES/aspell.mo
-usr/share/locale/ru/LC_MESSAGES/aspell.mo
-usr/share/locale/rw/LC_MESSAGES/aspell.mo
-usr/share/locale/sk/LC_MESSAGES/aspell.mo
-usr/share/locale/sl/LC_MESSAGES/aspell.mo
-usr/share/locale/sr/LC_MESSAGES/aspell.mo
-usr/share/locale/sv/LC_MESSAGES/aspell.mo
-usr/share/locale/tg/LC_MESSAGES/aspell.mo
-usr/share/locale/uk/LC_MESSAGES/aspell.mo
-usr/share/locale/vi/LC_MESSAGES/aspell.mo
-usr/share/locale/wa/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/be/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/mn/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/rw/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/tg/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/wa/LC_MESSAGES/aspell.mo
usr/share/man/man1/aspell.1.gz
usr/share/man/man1/prezip-bin.1.gz
usr/share/man/man1/run-with-aspell.1.gz
diff --git a/textproc/linux-c6-expat/Makefile b/textproc/linux-c6-expat/Makefile
index f012eab979e3..b212984d9b50 100644
--- a/textproc/linux-c6-expat/Makefile
+++ b/textproc/linux-c6-expat/Makefile
@@ -3,20 +3,16 @@
PORTNAME= expat
PORTVERSION= 2.0.1
-PORTREVISION= 3
+PORTREVISION= 5
CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Linux/i386 binary port of Expat XML-parsing library (Linux CentOS ${LINUX_DIST_VER})
-
-CONFLICTS= linux-expat-[0-9]* linux-f8-expat-[0-9]* linux-f10-expat-[0-9]*
+COMMENT= XML 1.0 parser written in C (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
RPMVERSION= 13.el6_8
USES= linux:c6
-USE_LINUX_RPM= yes
USE_LDCONFIG= yes
-
-PORTDOCS= COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/textproc/linux-c6-expat/distinfo b/textproc/linux-c6-expat/distinfo
new file mode 100644
index 000000000000..c575ea4febd0
--- /dev/null
+++ b/textproc/linux-c6-expat/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485435101
+SHA256 (centos/expat-2.0.1-13.el6_8.i686.rpm) = d8059e72fad589ffb0f0cdac95587126c947c071188cfeb5c2b8e6fd989d7742
+SIZE (centos/expat-2.0.1-13.el6_8.i686.rpm) = 80652
+SHA256 (centos/expat-2.0.1-13.el6_8.x86_64.rpm) = 668543cbe7d320c097b893acdf692a38745096590b58615eb67ea940374a2125
+SIZE (centos/expat-2.0.1-13.el6_8.x86_64.rpm) = 78448
+SHA256 (centos/expat-2.0.1-13.el6_8.src.rpm) = 1c09bb9d3eb76d17de44a027bb97381053fb94000567865ecc4569429afb4c57
+SIZE (centos/expat-2.0.1-13.el6_8.src.rpm) = 469418
diff --git a/textproc/linux-c6-expat/distinfo.i386 b/textproc/linux-c6-expat/distinfo.i386
deleted file mode 100644
index 86c4d2dc7bd1..000000000000
--- a/textproc/linux-c6-expat/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1480449540
-SHA256 (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = d8059e72fad589ffb0f0cdac95587126c947c071188cfeb5c2b8e6fd989d7742
-SIZE (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = 80652
-SHA256 (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 1c09bb9d3eb76d17de44a027bb97381053fb94000567865ecc4569429afb4c57
-SIZE (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 469418
diff --git a/textproc/linux-c6-expat/distinfo.x86_64 b/textproc/linux-c6-expat/distinfo.x86_64
deleted file mode 100644
index b6efdd89d33f..000000000000
--- a/textproc/linux-c6-expat/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1480449556
-SHA256 (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = d8059e72fad589ffb0f0cdac95587126c947c071188cfeb5c2b8e6fd989d7742
-SIZE (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = 80652
-SHA256 (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.x86_64.rpm) = 668543cbe7d320c097b893acdf692a38745096590b58615eb67ea940374a2125
-SIZE (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.x86_64.rpm) = 78448
-SHA256 (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 1c09bb9d3eb76d17de44a027bb97381053fb94000567865ecc4569429afb4c57
-SIZE (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 469418
diff --git a/textproc/linux-c6-expat/pkg-plist.amd64 b/textproc/linux-c6-expat/pkg-plist.amd64
new file mode 100644
index 000000000000..e3f99ad6d44c
--- /dev/null
+++ b/textproc/linux-c6-expat/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/bin/xmlwf
+usr/lib/libexpat.so.1
+usr/lib/libexpat.so.1.5.2
+usr/lib64/libexpat.so.1
+usr/lib64/libexpat.so.1.5.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c6-expat/pkg-plist.i386 b/textproc/linux-c6-expat/pkg-plist.i386
index 41d3159035f0..9740c6e5153c 100644
--- a/textproc/linux-c6-expat/pkg-plist.i386
+++ b/textproc/linux-c6-expat/pkg-plist.i386
@@ -1,4 +1,6 @@
-lib/libexpat.so.1
-lib/libexpat.so.1.5.2
usr/bin/xmlwf
+usr/lib/libexpat.so.1
+usr/lib/libexpat.so.1.5.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c6-expat/pkg-plist.x86_64 b/textproc/linux-c6-expat/pkg-plist.x86_64
deleted file mode 100644
index ef3b44b92d95..000000000000
--- a/textproc/linux-c6-expat/pkg-plist.x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/libexpat.so.1
-lib/libexpat.so.1.5.2
-lib64/libexpat.so.1
-lib64/libexpat.so.1.5.2
-usr/bin/xmlwf
-usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c6-libxml2/Makefile b/textproc/linux-c6-libxml2/Makefile
index 7356e09579ff..a7a519b0040c 100644
--- a/textproc/linux-c6-libxml2/Makefile
+++ b/textproc/linux-c6-libxml2/Makefile
@@ -3,22 +3,16 @@
PORTNAME= libxml2
PORTVERSION= 2.7.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-f10-libxml2-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 21.el6_8.1
+USES= linux:c6
USE_LDCONFIG= yes
-
-PORTDOCS= AUTHORS ChangeLog.gz Copyright NEWS README TODO
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/textproc/linux-c6-libxml2/distinfo b/textproc/linux-c6-libxml2/distinfo
new file mode 100644
index 000000000000..0ffd381d13e3
--- /dev/null
+++ b/textproc/linux-c6-libxml2/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485623259
+SHA256 (centos/libxml2-2.7.6-21.el6_8.1.i686.rpm) = 56558f0128bbf150cf6d7a1c1ef3ce09564150a1e7cbc9680e4d6e3684b5888d
+SIZE (centos/libxml2-2.7.6-21.el6_8.1.i686.rpm) = 824456
+SHA256 (centos/libxml2-2.7.6-21.el6_8.1.x86_64.rpm) = ff0ee13d07fcec255c1787a03ba982346e7e79dd03112649707eba3154858e14
+SIZE (centos/libxml2-2.7.6-21.el6_8.1.x86_64.rpm) = 824428
+SHA256 (centos/libxml2-2.7.6-21.el6_8.1.src.rpm) = 224a4e6bfaa4eb5c88f476ebf836cafe674241c1d19ee9af835385cd82c5d89f
+SIZE (centos/libxml2-2.7.6-21.el6_8.1.src.rpm) = 4944442
diff --git a/textproc/linux-c6-libxml2/distinfo.i386 b/textproc/linux-c6-libxml2/distinfo.i386
deleted file mode 100644
index 3af14cc1daa5..000000000000
--- a/textproc/linux-c6-libxml2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466953671
-SHA256 (rpm/i686/centos/6.8/libxml2-2.7.6-21.el6_8.1.i686.rpm) = 56558f0128bbf150cf6d7a1c1ef3ce09564150a1e7cbc9680e4d6e3684b5888d
-SIZE (rpm/i686/centos/6.8/libxml2-2.7.6-21.el6_8.1.i686.rpm) = 824456
-SHA256 (rpm/i686/centos/6.8/libxml2-2.7.6-21.el6_8.1.src.rpm) = 224a4e6bfaa4eb5c88f476ebf836cafe674241c1d19ee9af835385cd82c5d89f
-SIZE (rpm/i686/centos/6.8/libxml2-2.7.6-21.el6_8.1.src.rpm) = 4944442
diff --git a/textproc/linux-c6-libxml2/distinfo.x86_64 b/textproc/linux-c6-libxml2/distinfo.x86_64
deleted file mode 100644
index e35547524169..000000000000
--- a/textproc/linux-c6-libxml2/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466953661
-SHA256 (rpm/x86_64/centos/6.8/libxml2-2.7.6-21.el6_8.1.x86_64.rpm) = ff0ee13d07fcec255c1787a03ba982346e7e79dd03112649707eba3154858e14
-SIZE (rpm/x86_64/centos/6.8/libxml2-2.7.6-21.el6_8.1.x86_64.rpm) = 824428
-SHA256 (rpm/x86_64/centos/6.8/libxml2-2.7.6-21.el6_8.1.i686.rpm) = 56558f0128bbf150cf6d7a1c1ef3ce09564150a1e7cbc9680e4d6e3684b5888d
-SIZE (rpm/x86_64/centos/6.8/libxml2-2.7.6-21.el6_8.1.i686.rpm) = 824456
-SHA256 (rpm/x86_64/centos/6.8/libxml2-2.7.6-21.el6_8.1.src.rpm) = 224a4e6bfaa4eb5c88f476ebf836cafe674241c1d19ee9af835385cd82c5d89f
-SIZE (rpm/x86_64/centos/6.8/libxml2-2.7.6-21.el6_8.1.src.rpm) = 4944442
diff --git a/textproc/linux-c6-libxml2/pkg-plist.x86_64 b/textproc/linux-c6-libxml2/pkg-plist.amd64
index fb5e604d4c7b..a2beb115d0ca 100644
--- a/textproc/linux-c6-libxml2/pkg-plist.x86_64
+++ b/textproc/linux-c6-libxml2/pkg-plist.amd64
@@ -4,6 +4,12 @@ usr/lib/libxml2.so.2
usr/lib/libxml2.so.2.7.6
usr/lib64/libxml2.so.2
usr/lib64/libxml2.so.2.7.6
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.gz
+%%PORTDOCS%%%%DOCSDIR%%/Copyright
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
usr/share/man/man1/xmlcatalog.1.gz
usr/share/man/man1/xmllint.1.gz
usr/share/man/man3/libxml.3.gz
diff --git a/textproc/linux-c6-libxml2/pkg-plist.i386 b/textproc/linux-c6-libxml2/pkg-plist.i386
index 2b88a78e0d52..7f6b3acaffc2 100644
--- a/textproc/linux-c6-libxml2/pkg-plist.i386
+++ b/textproc/linux-c6-libxml2/pkg-plist.i386
@@ -2,6 +2,12 @@ usr/bin/xmlcatalog
usr/bin/xmllint
usr/lib/libxml2.so.2
usr/lib/libxml2.so.2.7.6
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.gz
+%%PORTDOCS%%%%DOCSDIR%%/Copyright
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
usr/share/man/man1/xmlcatalog.1.gz
usr/share/man/man1/xmllint.1.gz
usr/share/man/man3/libxml.3.gz
diff --git a/textproc/linux-c7-aspell/Makefile b/textproc/linux-c7-aspell/Makefile
index fc74cf8abfaa..3827e2f35396 100644
--- a/textproc/linux-c7-aspell/Makefile
+++ b/textproc/linux-c7-aspell/Makefile
@@ -3,6 +3,7 @@
PORTNAME= aspell
PORTVERSION= 0.60.6.1
+PORTREVISION= 1
CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
@@ -10,13 +11,15 @@ COMMENT= Spelling checker with better logic than ispell (Linux CentOS ${LINUX_DI
LICENSE= LGPL21+
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 9.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/textproc/linux-c7-aspell/distinfo b/textproc/linux-c7-aspell/distinfo
new file mode 100644
index 000000000000..a0de078c6484
--- /dev/null
+++ b/textproc/linux-c7-aspell/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1482093222
+SHA256 (centos/aspell-0.60.6.1-9.el7.i686.rpm) = a14ec40910e3b300b32ca92c425ef82ba52ae6deec5462c9a453592e4aa55a77
+SIZE (centos/aspell-0.60.6.1-9.el7.i686.rpm) = 684648
+SHA256 (centos/aspell-0.60.6.1-9.el7.x86_64.rpm) = 881b41c9c1509b03b2dc1ad97c71ba0f830d75751297320728c5e05307f32fd3
+SIZE (centos/aspell-0.60.6.1-9.el7.x86_64.rpm) = 701952
+SHA256 (centos/aspell-0.60.6.1-9.el7.src.rpm) = 57962d3924beca2013037f7f455f994bb7f4542f32fd9a7f94ce42f5a415eeff
+SIZE (centos/aspell-0.60.6.1-9.el7.src.rpm) = 1886324
diff --git a/textproc/linux-c7-aspell/distinfo.i386 b/textproc/linux-c7-aspell/distinfo.i386
deleted file mode 100644
index 78a23eed6744..000000000000
--- a/textproc/linux-c7-aspell/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355734
-SHA256 (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.i686.rpm) = a14ec40910e3b300b32ca92c425ef82ba52ae6deec5462c9a453592e4aa55a77
-SIZE (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.i686.rpm) = 684648
-SHA256 (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.src.rpm) = 57962d3924beca2013037f7f455f994bb7f4542f32fd9a7f94ce42f5a415eeff
-SIZE (rpm/centos/7.2.1511/i386/aspell-0.60.6.1-9.el7.src.rpm) = 1886324
diff --git a/textproc/linux-c7-aspell/distinfo.x86_64 b/textproc/linux-c7-aspell/distinfo.x86_64
deleted file mode 100644
index 403c5ccf70ac..000000000000
--- a/textproc/linux-c7-aspell/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1473674625
-SHA256 (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.i686.rpm) = a14ec40910e3b300b32ca92c425ef82ba52ae6deec5462c9a453592e4aa55a77
-SIZE (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.i686.rpm) = 684648
-SHA256 (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.x86_64.rpm) = 881b41c9c1509b03b2dc1ad97c71ba0f830d75751297320728c5e05307f32fd3
-SIZE (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.x86_64.rpm) = 701952
-SHA256 (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.src.rpm) = 57962d3924beca2013037f7f455f994bb7f4542f32fd9a7f94ce42f5a415eeff
-SIZE (rpm/centos/7.2.1511/x86_64/aspell-0.60.6.1-9.el7.src.rpm) = 1886324
diff --git a/textproc/linux-c7-aspell/pkg-plist.x86_64 b/textproc/linux-c7-aspell/pkg-plist.amd64
index 50c126969833..ce2d4cb06c50 100644
--- a/textproc/linux-c7-aspell/pkg-plist.x86_64
+++ b/textproc/linux-c7-aspell/pkg-plist.amd64
@@ -179,36 +179,36 @@ usr/lib64/libpspell.so.15.1.5
%%PORTDOCS%%%%DOCSDIR%%/aspell-import
%%PORTDOCS%%%%DOCSDIR%%/aspell-import.1
usr/share/info/aspell.info.gz
-usr/share/locale/ast/LC_MESSAGES/aspell.mo
-usr/share/locale/be/LC_MESSAGES/aspell.mo
-usr/share/locale/ca/LC_MESSAGES/aspell.mo
-usr/share/locale/cs/LC_MESSAGES/aspell.mo
-usr/share/locale/da/LC_MESSAGES/aspell.mo
-usr/share/locale/de/LC_MESSAGES/aspell.mo
-usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
-usr/share/locale/es/LC_MESSAGES/aspell.mo
-usr/share/locale/fi/LC_MESSAGES/aspell.mo
-usr/share/locale/fr/LC_MESSAGES/aspell.mo
-usr/share/locale/ga/LC_MESSAGES/aspell.mo
-usr/share/locale/id/LC_MESSAGES/aspell.mo
-usr/share/locale/it/LC_MESSAGES/aspell.mo
-usr/share/locale/ja/LC_MESSAGES/aspell.mo
-usr/share/locale/mn/LC_MESSAGES/aspell.mo
-usr/share/locale/ms/LC_MESSAGES/aspell.mo
-usr/share/locale/nl/LC_MESSAGES/aspell.mo
-usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
-usr/share/locale/ro/LC_MESSAGES/aspell.mo
-usr/share/locale/ru/LC_MESSAGES/aspell.mo
-usr/share/locale/rw/LC_MESSAGES/aspell.mo
-usr/share/locale/sk/LC_MESSAGES/aspell.mo
-usr/share/locale/sl/LC_MESSAGES/aspell.mo
-usr/share/locale/sr/LC_MESSAGES/aspell.mo
-usr/share/locale/sv/LC_MESSAGES/aspell.mo
-usr/share/locale/tg/LC_MESSAGES/aspell.mo
-usr/share/locale/uk/LC_MESSAGES/aspell.mo
-usr/share/locale/vi/LC_MESSAGES/aspell.mo
-usr/share/locale/wa/LC_MESSAGES/aspell.mo
-usr/share/locale/zh_CN/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ast/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/be/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/mn/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/rw/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/tg/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/wa/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/aspell.mo
usr/share/man/man1/aspell.1.gz
usr/share/man/man1/prezip-bin.1.gz
usr/share/man/man1/run-with-aspell.1.gz
diff --git a/textproc/linux-c7-aspell/pkg-plist.i386 b/textproc/linux-c7-aspell/pkg-plist.i386
index 0235771be478..b68107081a41 100644
--- a/textproc/linux-c7-aspell/pkg-plist.i386
+++ b/textproc/linux-c7-aspell/pkg-plist.i386
@@ -96,36 +96,36 @@ usr/lib/libpspell.so.15.1.5
%%PORTDOCS%%%%DOCSDIR%%/aspell-import
%%PORTDOCS%%%%DOCSDIR%%/aspell-import.1
usr/share/info/aspell.info.gz
-usr/share/locale/ast/LC_MESSAGES/aspell.mo
-usr/share/locale/be/LC_MESSAGES/aspell.mo
-usr/share/locale/ca/LC_MESSAGES/aspell.mo
-usr/share/locale/cs/LC_MESSAGES/aspell.mo
-usr/share/locale/da/LC_MESSAGES/aspell.mo
-usr/share/locale/de/LC_MESSAGES/aspell.mo
-usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
-usr/share/locale/es/LC_MESSAGES/aspell.mo
-usr/share/locale/fi/LC_MESSAGES/aspell.mo
-usr/share/locale/fr/LC_MESSAGES/aspell.mo
-usr/share/locale/ga/LC_MESSAGES/aspell.mo
-usr/share/locale/id/LC_MESSAGES/aspell.mo
-usr/share/locale/it/LC_MESSAGES/aspell.mo
-usr/share/locale/ja/LC_MESSAGES/aspell.mo
-usr/share/locale/mn/LC_MESSAGES/aspell.mo
-usr/share/locale/ms/LC_MESSAGES/aspell.mo
-usr/share/locale/nl/LC_MESSAGES/aspell.mo
-usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
-usr/share/locale/ro/LC_MESSAGES/aspell.mo
-usr/share/locale/ru/LC_MESSAGES/aspell.mo
-usr/share/locale/rw/LC_MESSAGES/aspell.mo
-usr/share/locale/sk/LC_MESSAGES/aspell.mo
-usr/share/locale/sl/LC_MESSAGES/aspell.mo
-usr/share/locale/sr/LC_MESSAGES/aspell.mo
-usr/share/locale/sv/LC_MESSAGES/aspell.mo
-usr/share/locale/tg/LC_MESSAGES/aspell.mo
-usr/share/locale/uk/LC_MESSAGES/aspell.mo
-usr/share/locale/vi/LC_MESSAGES/aspell.mo
-usr/share/locale/wa/LC_MESSAGES/aspell.mo
-usr/share/locale/zh_CN/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ast/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/be/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/da/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ga/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/mn/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ms/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/rw/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sl/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/tg/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/wa/LC_MESSAGES/aspell.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/aspell.mo
usr/share/man/man1/aspell.1.gz
usr/share/man/man1/prezip-bin.1.gz
usr/share/man/man1/run-with-aspell.1.gz
diff --git a/textproc/linux-c7-expat/Makefile b/textproc/linux-c7-expat/Makefile
index ec223fdc8cb1..958712c37409 100644
--- a/textproc/linux-c7-expat/Makefile
+++ b/textproc/linux-c7-expat/Makefile
@@ -3,24 +3,20 @@
PORTNAME= expat
PORTVERSION= 2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc linux
-MASTER_SITES= CENTOS_LINUX/centos/${LINUX_DIST_VER}/cr/x86_64/Packages
-SRC_DISTFILES= # not available
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Binary port of Expat XML-parsing library (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= XML 1.0 parser written in C (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MIT
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
RPMVERSION= 10.el7_3
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PORTDOCS= COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
-
.include <bsd.port.mk>
diff --git a/textproc/linux-c7-expat/distinfo b/textproc/linux-c7-expat/distinfo
new file mode 100644
index 000000000000..5463c3285282
--- /dev/null
+++ b/textproc/linux-c7-expat/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1482083814
+SHA256 (centos/expat-2.1.0-10.el7_3.i686.rpm) = 4bd345282c20a2fce39d356dfb9f6d6affb4229867d30202028d06b17ab22c90
+SIZE (centos/expat-2.1.0-10.el7_3.i686.rpm) = 82272
+SHA256 (centos/expat-2.1.0-10.el7_3.x86_64.rpm) = 508d9ea80022d7a2fcc7718884b94bd3898d26092efa6f12214af55c6583c68d
+SIZE (centos/expat-2.1.0-10.el7_3.x86_64.rpm) = 82500
+SHA256 (centos/expat-2.1.0-10.el7_3.src.rpm) = b96dbad8d6f69b73d99f0479857fc22da3d928367606500d673e34ba6f53a3a7
+SIZE (centos/expat-2.1.0-10.el7_3.src.rpm) = 579992
diff --git a/textproc/linux-c7-expat/distinfo.i386 b/textproc/linux-c7-expat/distinfo.i386
deleted file mode 100644
index 38a714def58d..000000000000
--- a/textproc/linux-c7-expat/distinfo.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1480523756
-SHA256 (rpm/centos/7.2.1511/i386/expat-2.1.0-10.el7_3.i686.rpm) = 4bd345282c20a2fce39d356dfb9f6d6affb4229867d30202028d06b17ab22c90
-SIZE (rpm/centos/7.2.1511/i386/expat-2.1.0-10.el7_3.i686.rpm) = 82272
diff --git a/textproc/linux-c7-expat/distinfo.x86_64 b/textproc/linux-c7-expat/distinfo.x86_64
deleted file mode 100644
index 550fb397502d..000000000000
--- a/textproc/linux-c7-expat/distinfo.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1480523779
-SHA256 (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.i686.rpm) = 4bd345282c20a2fce39d356dfb9f6d6affb4229867d30202028d06b17ab22c90
-SIZE (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.i686.rpm) = 82272
-SHA256 (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.x86_64.rpm) = 508d9ea80022d7a2fcc7718884b94bd3898d26092efa6f12214af55c6583c68d
-SIZE (rpm/centos/7.2.1511/x86_64/expat-2.1.0-10.el7_3.x86_64.rpm) = 82500
diff --git a/textproc/linux-c7-expat/pkg-plist.x86_64 b/textproc/linux-c7-expat/pkg-plist.amd64
index 38cf85e67772..8c1e788add5d 100644
--- a/textproc/linux-c7-expat/pkg-plist.x86_64
+++ b/textproc/linux-c7-expat/pkg-plist.amd64
@@ -3,4 +3,6 @@ usr/lib/libexpat.so.1
usr/lib/libexpat.so.1.6.0
usr/lib64/libexpat.so.1
usr/lib64/libexpat.so.1.6.0
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c7-expat/pkg-plist.i386 b/textproc/linux-c7-expat/pkg-plist.i386
index 3e4cdb5452bb..aa1ba2539519 100644
--- a/textproc/linux-c7-expat/pkg-plist.i386
+++ b/textproc/linux-c7-expat/pkg-plist.i386
@@ -1,4 +1,6 @@
usr/bin/xmlwf
usr/lib/libexpat.so.1
usr/lib/libexpat.so.1.6.0
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c7-libxml2/Makefile b/textproc/linux-c7-libxml2/Makefile
index 84e22d76a743..be3580c9d024 100644
--- a/textproc/linux-c7-libxml2/Makefile
+++ b/textproc/linux-c7-libxml2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libxml2
PORTVERSION= 2.9.1
+PORTREVISION= 1
CATEGORIES= textproc linux
MAINTAINER= emulation@FreeBSD.org
@@ -10,14 +11,12 @@ COMMENT= Library providing XML and HTML support (Linux CentOS ${LINUX_DIST_VER})
LICENSE= MIT
-CONFLICTS= linux-f10-${PORTNAME}-[0-9]* linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-RPMVERSION= 5.el7_1.2
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+RPMVERSION= 6.el7_2.3
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PORTDOCS= AUTHORS Copyright NEWS README TODO
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/textproc/linux-c7-libxml2/distinfo b/textproc/linux-c7-libxml2/distinfo
new file mode 100644
index 000000000000..bc00b9631e57
--- /dev/null
+++ b/textproc/linux-c7-libxml2/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1482094261
+SHA256 (centos/libxml2-2.9.1-6.el7_2.3.i686.rpm) = 1ac92fe486fd71d4cc09beff30d5fb2170bedf62601379478ec445ac860bc632
+SIZE (centos/libxml2-2.9.1-6.el7_2.3.i686.rpm) = 669900
+SHA256 (centos/libxml2-2.9.1-6.el7_2.3.x86_64.rpm) = acece4f83c12cdc48b42063fee9bca8519dc312ec2f25d105de82005caeed6e5
+SIZE (centos/libxml2-2.9.1-6.el7_2.3.x86_64.rpm) = 684032
+SHA256 (centos/libxml2-2.9.1-6.el7_2.3.src.rpm) = 61fec50176f7992461600e8a0275e495acb53377b83acb0fe15d5d7b1beb6201
+SIZE (centos/libxml2-2.9.1-6.el7_2.3.src.rpm) = 5223350
diff --git a/textproc/linux-c7-libxml2/distinfo.i386 b/textproc/linux-c7-libxml2/distinfo.i386
deleted file mode 100644
index e081c97ba325..000000000000
--- a/textproc/linux-c7-libxml2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1473355761
-SHA256 (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.i686.rpm) = f5841ae5e2d69915dc0d36e4995ad90d774e3d039e9fa62d62a6b6a81d34985b
-SIZE (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.i686.rpm) = 665636
-SHA256 (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.src.rpm) = eb51332b570294aed98d55a4094a3518fb8d11328d586ec1271e20b04357383f
-SIZE (rpm/centos/7.2.1511/i386/libxml2-2.9.1-5.el7_1.2.src.rpm) = 5172567
diff --git a/textproc/linux-c7-libxml2/distinfo.x86_64 b/textproc/linux-c7-libxml2/distinfo.x86_64
deleted file mode 100644
index c9c154554d2f..000000000000
--- a/textproc/linux-c7-libxml2/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1473674629
-SHA256 (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.i686.rpm) = f5841ae5e2d69915dc0d36e4995ad90d774e3d039e9fa62d62a6b6a81d34985b
-SIZE (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.i686.rpm) = 665636
-SHA256 (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.x86_64.rpm) = 24267687b1f8cc1158db479a6e858c35b353de1c08c3a5bac143700e198b832c
-SIZE (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.x86_64.rpm) = 680004
-SHA256 (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.src.rpm) = eb51332b570294aed98d55a4094a3518fb8d11328d586ec1271e20b04357383f
-SIZE (rpm/centos/7.2.1511/x86_64/libxml2-2.9.1-5.el7_1.2.src.rpm) = 5172567
diff --git a/textproc/linux-c7-libxml2/pkg-plist.x86_64 b/textproc/linux-c7-libxml2/pkg-plist.amd64
index 6150a620d3d4..f9b3e384c413 100644
--- a/textproc/linux-c7-libxml2/pkg-plist.x86_64
+++ b/textproc/linux-c7-libxml2/pkg-plist.amd64
@@ -4,6 +4,11 @@ usr/lib/libxml2.so.2
usr/lib/libxml2.so.2.9.1
usr/lib64/libxml2.so.2
usr/lib64/libxml2.so.2.9.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Copyright
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
usr/share/man/man1/xmlcatalog.1.gz
usr/share/man/man1/xmllint.1.gz
usr/share/man/man3/libxml.3.gz
diff --git a/textproc/linux-c7-libxml2/pkg-plist.i386 b/textproc/linux-c7-libxml2/pkg-plist.i386
index 86dedeaae3f7..8dbc64e1a4df 100644
--- a/textproc/linux-c7-libxml2/pkg-plist.i386
+++ b/textproc/linux-c7-libxml2/pkg-plist.i386
@@ -2,6 +2,11 @@ usr/bin/xmlcatalog
usr/bin/xmllint
usr/lib/libxml2.so.2
usr/lib/libxml2.so.2.9.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/Copyright
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
usr/share/man/man1/xmlcatalog.1.gz
usr/share/man/man1/xmllint.1.gz
usr/share/man/man3/libxml.3.gz
diff --git a/textproc/linux-f10-aspell/Makefile b/textproc/linux-f10-aspell/Makefile
deleted file mode 100644
index 112fb8e02f9d..000000000000
--- a/textproc/linux-f10-aspell/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: bsam
-# $FreeBSD$
-
-PORTNAME= aspell
-PORTVERSION= 0.60.6
-PORTREVISION= 2
-CATEGORIES= textproc linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Spelling checker with better logic than ispell (Linux Fedora 10)
-
-LICENSE= LGPL21+
-
-USES= linux:f10
-USE_LINUX_RPM= yes
-
-RPMVERSION= 3.fc10
-USE_LDCONFIG= yes
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/textproc/linux-f10-aspell/distinfo.i386 b/textproc/linux-f10-aspell/distinfo.i386
deleted file mode 100644
index 17c1928def21..000000000000
--- a/textproc/linux-f10-aspell/distinfo.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (rpm/i386/fedora/10/aspell-0.60.6-3.fc10.i386.rpm) = 995d9134554ef0683405a46699966d6526bc4b32f5a6a8f166cac294d10d579b
-SIZE (rpm/i386/fedora/10/aspell-0.60.6-3.fc10.i386.rpm) = 963348
-SHA256 (rpm/i386/fedora/10/aspell-0.60.6-3.fc10.src.rpm) = 49924181dea2f871fb70b275e1a310a028f08e811a21a7e8fae1075d29b1127e
-SIZE (rpm/i386/fedora/10/aspell-0.60.6-3.fc10.src.rpm) = 1773586
diff --git a/textproc/linux-f10-aspell/pkg-plist b/textproc/linux-f10-aspell/pkg-plist
deleted file mode 100644
index fad795d4685a..000000000000
--- a/textproc/linux-f10-aspell/pkg-plist
+++ /dev/null
@@ -1,127 +0,0 @@
-@comment file listing
-usr/bin/aspell
-usr/bin/aspell-import
-usr/bin/ispell
-usr/bin/precat
-usr/bin/preunzip
-usr/bin/prezip
-usr/bin/prezip-bin
-usr/bin/run-with-aspell
-usr/bin/spell
-usr/bin/word-list-compress
-usr/lib/aspell-0.60/ccpp.amf
-usr/lib/aspell-0.60/comment.amf
-usr/lib/aspell-0.60/context-filter.info
-usr/lib/aspell-0.60/context-filter.so
-usr/lib/aspell-0.60/cp1250.cmap
-usr/lib/aspell-0.60/cp1250.cset
-usr/lib/aspell-0.60/cp1251.cmap
-usr/lib/aspell-0.60/cp1251.cset
-usr/lib/aspell-0.60/cp1252.cmap
-usr/lib/aspell-0.60/cp1252.cset
-usr/lib/aspell-0.60/cp1253.cmap
-usr/lib/aspell-0.60/cp1253.cset
-usr/lib/aspell-0.60/cp1254.cmap
-usr/lib/aspell-0.60/cp1254.cset
-usr/lib/aspell-0.60/cp1255.cmap
-usr/lib/aspell-0.60/cp1255.cset
-usr/lib/aspell-0.60/cp1256.cmap
-usr/lib/aspell-0.60/cp1256.cset
-usr/lib/aspell-0.60/cp1257.cmap
-usr/lib/aspell-0.60/cp1257.cset
-usr/lib/aspell-0.60/cp1258.cmap
-usr/lib/aspell-0.60/cp1258.cset
-usr/lib/aspell-0.60/dvorak.kbd
-usr/lib/aspell-0.60/email-filter.info
-usr/lib/aspell-0.60/email-filter.so
-usr/lib/aspell-0.60/email.amf
-usr/lib/aspell-0.60/html-filter.info
-usr/lib/aspell-0.60/html.amf
-usr/lib/aspell-0.60/iso-8859-1.cmap
-usr/lib/aspell-0.60/iso-8859-1.cset
-usr/lib/aspell-0.60/iso-8859-10.cmap
-usr/lib/aspell-0.60/iso-8859-10.cset
-usr/lib/aspell-0.60/iso-8859-11.cmap
-usr/lib/aspell-0.60/iso-8859-11.cset
-usr/lib/aspell-0.60/iso-8859-13.cmap
-usr/lib/aspell-0.60/iso-8859-13.cset
-usr/lib/aspell-0.60/iso-8859-14.cmap
-usr/lib/aspell-0.60/iso-8859-14.cset
-usr/lib/aspell-0.60/iso-8859-15.cmap
-usr/lib/aspell-0.60/iso-8859-15.cset
-usr/lib/aspell-0.60/iso-8859-16.cmap
-usr/lib/aspell-0.60/iso-8859-16.cset
-usr/lib/aspell-0.60/iso-8859-2.cmap
-usr/lib/aspell-0.60/iso-8859-2.cset
-usr/lib/aspell-0.60/iso-8859-3.cmap
-usr/lib/aspell-0.60/iso-8859-3.cset
-usr/lib/aspell-0.60/iso-8859-4.cmap
-usr/lib/aspell-0.60/iso-8859-4.cset
-usr/lib/aspell-0.60/iso-8859-5.cmap
-usr/lib/aspell-0.60/iso-8859-5.cset
-usr/lib/aspell-0.60/iso-8859-6.cmap
-usr/lib/aspell-0.60/iso-8859-6.cset
-usr/lib/aspell-0.60/iso-8859-7.cmap
-usr/lib/aspell-0.60/iso-8859-7.cset
-usr/lib/aspell-0.60/iso-8859-8.cmap
-usr/lib/aspell-0.60/iso-8859-8.cset
-usr/lib/aspell-0.60/iso-8859-9.cmap
-usr/lib/aspell-0.60/iso-8859-9.cset
-usr/lib/aspell-0.60/koi8-r.cmap
-usr/lib/aspell-0.60/koi8-r.cset
-usr/lib/aspell-0.60/koi8-u.cmap
-usr/lib/aspell-0.60/koi8-u.cset
-usr/lib/aspell-0.60/none.amf
-usr/lib/aspell-0.60/nroff-filter.info
-usr/lib/aspell-0.60/nroff-filter.so
-usr/lib/aspell-0.60/nroff.amf
-usr/lib/aspell-0.60/perl.amf
-usr/lib/aspell-0.60/sgml-filter.info
-usr/lib/aspell-0.60/sgml-filter.so
-usr/lib/aspell-0.60/sgml.amf
-usr/lib/aspell-0.60/split.kbd
-usr/lib/aspell-0.60/standard.kbd
-usr/lib/aspell-0.60/tex-filter.info
-usr/lib/aspell-0.60/tex-filter.so
-usr/lib/aspell-0.60/tex.amf
-usr/lib/aspell-0.60/texinfo-filter.info
-usr/lib/aspell-0.60/texinfo-filter.so
-usr/lib/aspell-0.60/texinfo.amf
-usr/lib/aspell-0.60/url.amf
-usr/lib/libaspell.so.15
-usr/lib/libaspell.so.15.1.4
-usr/lib/libpspell.so.15
-usr/lib/libpspell.so.15.1.4
-usr/share/doc/aspell-0.60.6/COPYING
-usr/share/doc/aspell-0.60.6/README
-usr/share/doc/aspell-0.60.6/TODO
-usr/share/info/aspell.info.gz
-usr/share/locale/be/LC_MESSAGES/aspell.mo
-usr/share/locale/ca/LC_MESSAGES/aspell.mo
-usr/share/locale/cs/LC_MESSAGES/aspell.mo
-usr/share/locale/da/LC_MESSAGES/aspell.mo
-usr/share/locale/de/LC_MESSAGES/aspell.mo
-usr/share/locale/en_GB/LC_MESSAGES/aspell.mo
-usr/share/locale/es/LC_MESSAGES/aspell.mo
-usr/share/locale/fr/LC_MESSAGES/aspell.mo
-usr/share/locale/ga/LC_MESSAGES/aspell.mo
-usr/share/locale/it/LC_MESSAGES/aspell.mo
-usr/share/locale/mn/LC_MESSAGES/aspell.mo
-usr/share/locale/nl/LC_MESSAGES/aspell.mo
-usr/share/locale/pt_BR/LC_MESSAGES/aspell.mo
-usr/share/locale/ro/LC_MESSAGES/aspell.mo
-usr/share/locale/ru/LC_MESSAGES/aspell.mo
-usr/share/locale/rw/LC_MESSAGES/aspell.mo
-usr/share/locale/sk/LC_MESSAGES/aspell.mo
-usr/share/locale/sl/LC_MESSAGES/aspell.mo
-usr/share/locale/sr/LC_MESSAGES/aspell.mo
-usr/share/locale/sv/LC_MESSAGES/aspell.mo
-usr/share/locale/tg/LC_MESSAGES/aspell.mo
-usr/share/locale/uk/LC_MESSAGES/aspell.mo
-usr/share/locale/vi/LC_MESSAGES/aspell.mo
-usr/share/locale/wa/LC_MESSAGES/aspell.mo
-usr/share/man/man1/aspell-import.1.gz
-usr/share/man/man1/aspell.1.gz
-usr/share/man/man1/prezip-bin.1.gz
-usr/share/man/man1/run-with-aspell.1.gz
-usr/share/man/man1/word-list-compress.1.gz
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
deleted file mode 100644
index 8fa4cfc15f73..000000000000
--- a/textproc/linux-f10-expat/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: bsam
-# $FreeBSD$
-
-PORTNAME= expat
-PORTVERSION= 2.0.1
-PORTREVISION= 1
-CATEGORIES= textproc linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Linux/i386 binary port of Expat XML-parsing library (Linux Fedora 10)
-
-CONFLICTS= linux-expat-[0-9]* linux-f8-expat-[0-9]*
-
-USES= linux:f10
-USE_LINUX_RPM= yes
-
-RPMVERSION= 5
-USE_LDCONFIG= yes
-
-PLIST_FILES= lib/libexpat.so.1 lib/libexpat.so.1.5.2 \
- usr/bin/xmlwf usr/share/man/man1/xmlwf.1.gz
-PORTDOCS= COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}2/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/textproc/linux-f10-expat/distinfo.i386 b/textproc/linux-f10-expat/distinfo.i386
deleted file mode 100644
index 72a05b0c372a..000000000000
--- a/textproc/linux-f10-expat/distinfo.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (rpm/i386/fedora/10/expat-2.0.1-5.i386.rpm) = 1a583a21620e9590cc2287fb69d5d9df6e6d5ca4305161be621caba6a8302eb4
-SIZE (rpm/i386/fedora/10/expat-2.0.1-5.i386.rpm) = 84975
-SHA256 (rpm/i386/fedora/10/expat-2.0.1-5.src.rpm) = 26eff74d146417c668cc7229e2db338291bdcff8365fe7d8e6447a73099e2679
-SIZE (rpm/i386/fedora/10/expat-2.0.1-5.src.rpm) = 453519
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
deleted file mode 100644
index 5d6a0f69339a..000000000000
--- a/textproc/linux-f10-libxml2/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: bsam
-# $FreeBSD$
-
-PORTNAME= libxml2
-PORTVERSION= 2.7.3
-PORTREVISION= 2
-CATEGORIES= textproc linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Library providing XML and HTML support (Linux Fedora 10)
-
-CONFLICTS= linux-libxml2-[0-9]* linux-f8-libxml2-[0-9]*
-
-USES= linux:f10
-USE_LINUX_RPM= yes
-
-RPMVERSION= 1.fc10
-USE_LDCONFIG= yes
-
-PLIST_FILES= usr/bin/xmlcatalog usr/bin/xmllint \
- usr/lib/libxml2.so.2 usr/lib/libxml2.so.${PORTVERSION} \
- usr/share/man/man1/xmlcatalog.1.gz \
- usr/share/man/man1/xmllint.1.gz usr/share/man/man3/libxml.3.gz
-PORTDOCS= AUTHORS ChangeLog.gz Copyright NEWS README TODO
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/textproc/linux-f10-libxml2/distinfo.i386 b/textproc/linux-f10-libxml2/distinfo.i386
deleted file mode 100644
index d4e45e718195..000000000000
--- a/textproc/linux-f10-libxml2/distinfo.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (rpm/i386/fedora/10/libxml2-2.7.3-1.fc10.i386.rpm) = b200309411d192a0ecc431f767585bdda64c93e5867d79b2a1a0d5d9f0f9140e
-SIZE (rpm/i386/fedora/10/libxml2-2.7.3-1.fc10.i386.rpm) = 879789
-SHA256 (rpm/i386/fedora/10/libxml2-2.7.3-1.fc10.src.rpm) = 7063904851612a9c4639a20befc32e0e601b45c716b8222ea154f100515b78bb
-SIZE (rpm/i386/fedora/10/libxml2-2.7.3-1.fc10.src.rpm) = 4769749
diff --git a/textproc/linux-f10-scim-gtk/Makefile b/textproc/linux-f10-scim-gtk/Makefile
deleted file mode 100644
index 64b9a6a26a8d..000000000000
--- a/textproc/linux-f10-scim-gtk/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: bsam
-# $FreeBSD$
-
-PORTNAME= scim-gtk
-PORTVERSION= 1.4.7
-PORTREVISION= 3
-CATEGORIES= textproc linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Smart Common Input Method platform, gtk module, (Linux Fedora 10)
-
-CONFLICTS= linux-scim-gtk-[0-9]*
-
-USES= linux:f10
-USE_LINUX_RPM= yes
-USE_LINUX= gtk2 scimlibs
-
-RPMVERSION= 35.fc10
-USE_LDCONFIG= yes
-SRC_DISTFILES= scim-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
-.include <bsd.port.mk>
diff --git a/textproc/linux-f10-scim-gtk/distinfo.i386 b/textproc/linux-f10-scim-gtk/distinfo.i386
deleted file mode 100644
index 822715c05667..000000000000
--- a/textproc/linux-f10-scim-gtk/distinfo.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (rpm/i386/fedora/10/scim-gtk-1.4.7-35.fc10.i386.rpm) = 24987b84a3a8cb03e3bd6d81de1cbac431e6b167231f186aa48ff42966442ba6
-SIZE (rpm/i386/fedora/10/scim-gtk-1.4.7-35.fc10.i386.rpm) = 78815
-SHA256 (rpm/i386/fedora/10/scim-1.4.7-35.fc10.src.rpm) = 5294c3627d9db4ac48652e7d764ccb6aa3e938154892b3a9740b7ea7274c75cb
-SIZE (rpm/i386/fedora/10/scim-1.4.7-35.fc10.src.rpm) = 3212096
diff --git a/textproc/linux-f10-scim-gtk/pkg-descr b/textproc/linux-f10-scim-gtk/pkg-descr
deleted file mode 100644
index 379ee36265d4..000000000000
--- a/textproc/linux-f10-scim-gtk/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Smart Common Input Method platform, in short SCIM, is a development platform
-to make Input Method developers live easier. It has very clear architecture
-and very simple programming interface.
-
-WWW: http://www.scim-im.org
diff --git a/textproc/linux-f10-scim-gtk/pkg-plist b/textproc/linux-f10-scim-gtk/pkg-plist
deleted file mode 100644
index 8f84724370d0..000000000000
--- a/textproc/linux-f10-scim-gtk/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/gtk-2.0/immodules/im-scim.so
-@postexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
-@postunexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
diff --git a/textproc/linux-f10-scim-libs/Makefile b/textproc/linux-f10-scim-libs/Makefile
deleted file mode 100644
index d4a3c433585e..000000000000
--- a/textproc/linux-f10-scim-libs/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: bsam
-# $FreeBSD$
-
-PORTNAME= scim-libs
-PORTVERSION= 1.4.7
-PORTREVISION= 3
-CATEGORIES= textproc linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Smart Common Input Method libraries (Linux Fedora 10)
-
-CONFLICTS= linux-scim-libs-[0-9]* linux-f8-scim-libs-[0-9]*
-
-USES= linux:f10
-USE_LINUX_RPM= yes
-USE_LINUX= gtk2
-
-RPMVERSION= 35.fc10
-USE_LDCONFIG= yes
-SRC_DISTFILES= scim-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
-
-DESCR= ${.CURDIR}/../scim/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/textproc/linux-f10-scim-libs/distinfo.i386 b/textproc/linux-f10-scim-libs/distinfo.i386
deleted file mode 100644
index d9883134c313..000000000000
--- a/textproc/linux-f10-scim-libs/distinfo.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (rpm/i386/fedora/10/scim-libs-1.4.7-35.fc10.i386.rpm) = f374cff408664b7cdf451de203cc27500714d845ad178d4a458ce6e0dac1aeaa
-SIZE (rpm/i386/fedora/10/scim-libs-1.4.7-35.fc10.i386.rpm) = 421291
-SHA256 (rpm/i386/fedora/10/scim-1.4.7-35.fc10.src.rpm) = 5294c3627d9db4ac48652e7d764ccb6aa3e938154892b3a9740b7ea7274c75cb
-SIZE (rpm/i386/fedora/10/scim-1.4.7-35.fc10.src.rpm) = 3212096
diff --git a/textproc/linux-f10-scim-libs/pkg-descr b/textproc/linux-f10-scim-libs/pkg-descr
deleted file mode 100644
index 379ee36265d4..000000000000
--- a/textproc/linux-f10-scim-libs/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Smart Common Input Method platform, in short SCIM, is a development platform
-to make Input Method developers live easier. It has very clear architecture
-and very simple programming interface.
-
-WWW: http://www.scim-im.org
diff --git a/textproc/linux-f10-scim-libs/pkg-plist b/textproc/linux-f10-scim-libs/pkg-plist
deleted file mode 100644
index 108fc96f8c7d..000000000000
--- a/textproc/linux-f10-scim-libs/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment file listing
-usr/lib/libscim-1.0.so.8
-usr/lib/libscim-1.0.so.8.2.3
-usr/lib/libscim-gtkutils-1.0.so.8
-usr/lib/libscim-gtkutils-1.0.so.8.2.3
-usr/lib/libscim-x11utils-1.0.so.8
-usr/lib/libscim-x11utils-1.0.so.8.2.3
-usr/lib/scim-1.0/1.4.0/Config/simple.so
-usr/lib/scim-1.0/1.4.0/Config/socket.so
-usr/lib/scim-1.0/1.4.0/IMEngine/socket.so
-@postexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
-@postunexec chroot %D /usr/bin/gtk-query-immodules-2.0-32 > %D/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
diff --git a/textproc/linuxdoc-tools/Makefile b/textproc/linuxdoc-tools/Makefile
index 97477a6a7adf..2e192cd4ae98 100644
--- a/textproc/linuxdoc-tools/Makefile
+++ b/textproc/linuxdoc-tools/Makefile
@@ -36,6 +36,5 @@ DOCS_BUILD_DEPENDS= bash:shells/bash
DOCS_USE= tex=latex:build tex=pdftex:build tex=dvipsk:build
DOCS_USES= makeinfo
DOCS_CONFIGURE_ENABLE= docs
-DOCS_MAKE_ENV= LANG=C
.include <bsd.port.mk>
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 596b33ed3542..74daed87b5f7 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -19,7 +19,7 @@ NO_BUILD= yes
NO_WRKSUBDIR= yes
INSTDIR= ${PREFIX}/share/sgml/linuxdoc
-ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog
+ISOCAT= ${LOCALBASE}/share/sgml/iso8879/catalog
do-install:
${MKDIR} ${STAGEDIR}${INSTDIR}
diff --git a/textproc/lowdown/Makefile b/textproc/lowdown/Makefile
new file mode 100644
index 000000000000..039bc25ab8b2
--- /dev/null
+++ b/textproc/lowdown/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= lowdown
+PORTVERSION= 0.1.6
+CATEGORIES= textproc
+MASTER_SITES= http://kristaps.bsd.lv/lowdown/snapshots/
+
+MAINTAINER= bapt@FreeBSD.org
+COMMENT= Simple Markdown translator
+
+LICENSE= ISCL
+
+PLIST_FILES= bin/lowdown \
+ include/lowdown.h \
+ lib/liblowdown.a \
+ man/man1/lowdown.1.gz
+
+.include <bsd.port.mk>
diff --git a/textproc/lowdown/distinfo b/textproc/lowdown/distinfo
new file mode 100644
index 000000000000..9594abdc6877
--- /dev/null
+++ b/textproc/lowdown/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1486391287
+SHA256 (lowdown-0.1.6.tar.gz) = 2e80ea5c6395c4a87fe1b46f97e71f3684bc9dfa5b9c841abeb577318dd0f9e0
+SIZE (lowdown-0.1.6.tar.gz) = 45787
diff --git a/textproc/lowdown/files/patch-Makefile b/textproc/lowdown/files/patch-Makefile
new file mode 100644
index 000000000000..21d9923e4c45
--- /dev/null
+++ b/textproc/lowdown/files/patch-Makefile
@@ -0,0 +1,19 @@
+--- Makefile.orig 2017-01-20 14:49:54 UTC
++++ Makefile
+@@ -21,7 +21,7 @@ LIBDIR = $(PREFIX)/lib
+ INCLUDEDIR = $(PREFIX)/include
+ MANDIR = $(PREFIX)/man
+ WWWDIR = /var/www/vhosts/kristaps.bsd.lv/htdocs/lowdown
+-HTMLS = archive.html index.html lowdown.1.html lowdown.3.html README.html
++HTMLS = archive.html index.html lowdown.1.html README.html
+ PDFS = index.pdf README.pdf
+ MDS = index.md README.md
+ CSSS = template.css mandoc.css
+@@ -54,7 +54,6 @@ install: all
+ install -m 0644 liblowdown.a $(DESTDIR)$(LIBDIR)
+ install -m 0644 lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ install -m 0644 lowdown.1 $(DESTDIR)$(MANDIR)/man1
+- install -m 0644 lowdown.3 $(DESTDIR)$(MANDIR)/man3
+
+ index.xml README.xml index.pdf README.pdf: lowdown
+
diff --git a/textproc/lowdown/files/patch-xmalloc.c b/textproc/lowdown/files/patch-xmalloc.c
new file mode 100644
index 000000000000..05ed2c31b167
--- /dev/null
+++ b/textproc/lowdown/files/patch-xmalloc.c
@@ -0,0 +1,20 @@
+--- xmalloc.c.orig 2017-01-20 14:49:54 UTC
++++ xmalloc.c
+@@ -14,6 +14,8 @@
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
++#include <sys/param.h>
++
+ #include <err.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+@@ -64,7 +66,7 @@ void *
+ xreallocarray(void *p, size_t nm, size_t sz)
+ {
+
+-#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version > 1100071)
+ if ((p = reallocarray(p, nm, sz)) == NULL)
+ err(EXIT_FAILURE, NULL);
+ #else
diff --git a/textproc/lowdown/pkg-descr b/textproc/lowdown/pkg-descr
new file mode 100644
index 000000000000..c15f0a2ba62a
--- /dev/null
+++ b/textproc/lowdown/pkg-descr
@@ -0,0 +1,7 @@
+lowdown is just another Markdown translator. It can output traditional HTML or
+a document for your troff type-setter of choice, such as groff(1), Heirloom
+troff, or even mandoc(1). lowdown doesn't require XSLT, Python, or even Perl -
+it's just clean, secure, open source C code with no dependencies. Its
+canonical documentation is the lowdown(1) manpage.
+
+WWW: http://kristaps.bsd.lv/lowdown/
diff --git a/textproc/luaexpat/Makefile b/textproc/luaexpat/Makefile
index 48afc0eeadfe..e840f4adc311 100644
--- a/textproc/luaexpat/Makefile
+++ b/textproc/luaexpat/Makefile
@@ -3,6 +3,7 @@
PORTNAME= luaexpat
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://matthewwild.co.uk/projects/luaexpat/ \
http://redundancy.redundancy.org/mirror/
diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile
index 1fab9bf9226b..bdaa113f5f6c 100644
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lucene++
PORTVERSION= 3.0.7
DISTVERSIONPREFIX= rel_
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MAINTAINER= arved@FreeBSD.org
diff --git a/textproc/miller/Makefile b/textproc/miller/Makefile
index a0c142da8ccb..1412541c0127 100644
--- a/textproc/miller/Makefile
+++ b/textproc/miller/Makefile
@@ -20,18 +20,8 @@ PLIST_FILES= bin/mlr man/man1/mlr.1.gz
BROKEN_aarch64= Fails to compile: undefined reference to .mcount
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
-BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex
-.endif
-
post-configure:
- ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
- ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
- ${REINPLACE_CMD} -e 's|flex|${LOCALBASE}/bin/flex|' \
- ${WRKSRC}/c/dsls/Makefile
-.endif
-
-.include <bsd.port.post.mk>
+ ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
+ ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
+
+.include <bsd.port.mk>
diff --git a/textproc/minixmlto/Makefile b/textproc/minixmlto/Makefile
index 83cad2b27900..016946fdef78 100644
--- a/textproc/minixmlto/Makefile
+++ b/textproc/minixmlto/Makefile
@@ -16,5 +16,6 @@ RUN_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \
USE_GITHUB= yes
GH_ACCOUNT= bapt
PLIST_FILES= bin/minixmlto
+MAKE_ARGS= PREFIX="${PREFIX}"
.include <bsd.port.mk>
diff --git a/textproc/modlogan/pkg-descr b/textproc/modlogan/pkg-descr
index 44e9935729db..ead861535b58 100644
--- a/textproc/modlogan/pkg-descr
+++ b/textproc/modlogan/pkg-descr
@@ -8,4 +8,4 @@ into your database. Or a Memo generator that posts the
monthly stats to your department mailing list for further
investigation.
-WWW: http://sourceforge.net/projects/modlogan
+WWW: https://sourceforge.net/projects/modlogan/
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index 9acee17338ed..1afb3a7e561b 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -3,7 +3,7 @@
PORTNAME= msort
PORTVERSION= 8.53
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://billposer.org/Software/Downloads/
@@ -28,7 +28,6 @@ MAKE_ENV+= INCLUDES="-I${LOCALBASE}/include"
GNU_CONFIGURE= yes
USES= gettext tk:wrapper,run
TEST_TARGET= test
-TEST_ENV= LC_ALL=C
PLIST_FILES= bin/msg bin/msort man/man1/msort.1.gz
diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index 7c8b51d0dda5..782423a60002 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -16,6 +16,7 @@ USE_GITHUB= yes
GH_ACCOUNT= fletcher:DEFAULT nddrylliog:greg
GH_PROJECT= MultiMarkdown-4 greg:greg
GH_TAGNAME= 98ecf13:greg
+GH_SUBDIR= greg:greg
ALL_TARGET= ${PORTNAME}
USES= gmake
@@ -27,25 +28,15 @@ HELPERS_DESC= Helper scripts (conflicts with emulators/mtools)
CHEAT_SHEET_GH_PROJECT= human-markdown-reference:cheat
CHEAT_SHEET_GH_TAGNAME= 199dae8:cheat
+CHEAT_SHEET_GH_SUBDIR= cheat-sheet:cheat
EXTRAS_GH_PROJECT= MMD-Support:support
EXTRAS_GH_TAGNAME= 685c95c:support
+EXTRAS_GH_SUBDIR= Support:support
HELPERS_CONFLICTS_INSTALL= mtools-*
OPTIONS_SUB= yes
-post-extract:
- @${RMDIR} ${WRKSRC}/greg
- @${MV} ${WRKSRC_greg} ${WRKSRC}/greg
-
-post-extract-CHEAT_SHEET-on:
- @${RMDIR} ${WRKSRC}/cheat-sheet
- @${MV} ${WRKSRC_cheat} ${WRKSRC}/cheat-sheet
-
-post-extract-EXTRAS-on:
- @${RMDIR} ${WRKSRC}/Support
- @${MV} ${WRKSRC_support} ${WRKSRC}/Support
-
post-patch:
@${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile
@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/*
diff --git a/textproc/mythes/Makefile b/textproc/mythes/Makefile
index 5f68a665351d..23dbc153b0fa 100644
--- a/textproc/mythes/Makefile
+++ b/textproc/mythes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mythes
PORTVERSION= 1.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/hunspell/MyThes/${PORTVERSION}/
DIST_SUBDIR= ${PORTNAME}
@@ -13,7 +13,7 @@ COMMENT= Simple thesaurus library
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell
+LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= libtool pathfix perl5 pkgconfig shebangfix
USE_LDCONFIG= yes
diff --git a/textproc/nunnimcax/pkg-descr b/textproc/nunnimcax/pkg-descr
index 2c22368a4a5f..3212508d17eb 100644
--- a/textproc/nunnimcax/pkg-descr
+++ b/textproc/nunnimcax/pkg-descr
@@ -7,4 +7,4 @@ parser to be used in environment with limited resources. A minimal
library with all symbols stripped away on FreeBSD has a size below
19 KByte.
-WWW: http://sourceforge.net/projects/nunnimcax/
+WWW: https://sourceforge.net/projects/nunnimcax/
diff --git a/textproc/ocaml-pxp/Makefile b/textproc/ocaml-pxp/Makefile
index 2510aae802be..fd1bc3934320 100644
--- a/textproc/ocaml-pxp/Makefile
+++ b/textproc/ocaml-pxp/Makefile
@@ -7,12 +7,14 @@ CATEGORIES= textproc
MASTER_SITES= http://download.camlcity.org/download/
PKGNAMEPREFIX= ocaml-
-MAINTAINER= johans@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Validating XML parser for OCaml
BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net
RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net
+BROKEN= does not build
+
OPTIONS_DEFINE= ULEX
OPTIONS_DEFAULT=ULEX
ULEX_DESC= Include UTF-8 lexical analyzer support
diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile
index 7447b66ae829..68109dd37c2d 100644
--- a/textproc/ocaml-text/Makefile
+++ b/textproc/ocaml-text/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.8
CATEGORIES= textproc
PKGNAMEPREFIX= ocaml-
-MAINTAINER= johans@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for dealing with text
USE_GITHUB= yes
diff --git a/textproc/opengrm-ngram/Makefile b/textproc/opengrm-ngram/Makefile
index 5518ea05d9ff..a6d3e4745282 100644
--- a/textproc/opengrm-ngram/Makefile
+++ b/textproc/opengrm-ngram/Makefile
@@ -13,8 +13,6 @@ LICENSE= APACHE20
LIB_DEPENDS= libfst.so:math/openfst
-BROKEN_FreeBSD_9= does not build
-
USES= compiler:c++11-lib libtool localbase
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 10e9f2ea1390..8a1777aecf28 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openjade
PORTVERSION= 1.3.3p1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.3.3
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-pre/}
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index f35c3d75a3b1..8a59071dd2ff 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= OpenSP
PORTVERSION= 1.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/openjade/${PORTNAME:tl}/${PORTVERSION}
diff --git a/textproc/p5-Algorithm-CheckDigits/Makefile b/textproc/p5-Algorithm-CheckDigits/Makefile
index 5391a6e2d644..3bb090b90e65 100644
--- a/textproc/p5-Algorithm-CheckDigits/Makefile
+++ b/textproc/p5-Algorithm-CheckDigits/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Algorithm-CheckDigits
PORTVERSION= 1.3.2
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
diff --git a/textproc/p5-BibTeX-Parser/Makefile b/textproc/p5-BibTeX-Parser/Makefile
index ee288c00a8e5..7ff55e34b348 100644
--- a/textproc/p5-BibTeX-Parser/Makefile
+++ b/textproc/p5-BibTeX-Parser/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= BibTeX-Parser
-PORTVERSION= 0.69
+PORTVERSION= 0.70
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CPAN:GERHARD
+MASTER_SITE_SUBDIR= CPAN:BORISV
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
@@ -13,9 +13,11 @@ COMMENT= Pure perl BibTeX parser
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
+LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= p5-LaTeX-ToUnicode>=0.02:textproc/p5-LaTeX-ToUnicode \
- p5-IO-String>0:devel/p5-IO-String
+BUILD_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
+ p5-LaTeX-ToUnicode>=0.02:textproc/p5-LaTeX-ToUnicode
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-BibTeX-Parser/distinfo b/textproc/p5-BibTeX-Parser/distinfo
index e6c0db3cf4ae..6c264ccb3d7f 100644
--- a/textproc/p5-BibTeX-Parser/distinfo
+++ b/textproc/p5-BibTeX-Parser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (BibTeX-Parser-0.69.tar.gz) = 989d341b6c625d240c54457e40a76d646d7243e2a5c0d0d19fe3ccb3a18742bf
-SIZE (BibTeX-Parser-0.69.tar.gz) = 24596
+TIMESTAMP = 1486271444
+SHA256 (BibTeX-Parser-0.70.tar.gz) = 39eccaad9cfc07ce5cb4512cca0288c7e3a31af78ff42a6bd7fb563b36073e7e
+SIZE (BibTeX-Parser-0.70.tar.gz) = 25260
diff --git a/textproc/p5-BibTeX-Parser/pkg-plist b/textproc/p5-BibTeX-Parser/pkg-plist
index fc1bd9640ca6..9c0a97423750 100644
--- a/textproc/p5-BibTeX-Parser/pkg-plist
+++ b/textproc/p5-BibTeX-Parser/pkg-plist
@@ -1,6 +1,6 @@
-%%PERL5_MAN3%%/BibTeX::Parser.3.gz
-%%PERL5_MAN3%%/BibTeX::Parser::Author.3.gz
-%%PERL5_MAN3%%/BibTeX::Parser::Entry.3.gz
%%SITE_PERL%%/BibTeX/Parser.pm
%%SITE_PERL%%/BibTeX/Parser/Author.pm
%%SITE_PERL%%/BibTeX/Parser/Entry.pm
+%%PERL5_MAN3%%/BibTeX::Parser.3.gz
+%%PERL5_MAN3%%/BibTeX::Parser::Author.3.gz
+%%PERL5_MAN3%%/BibTeX::Parser::Entry.3.gz
diff --git a/textproc/p5-CSS-Croco/Makefile b/textproc/p5-CSS-Croco/Makefile
index c6fffe4655fd..68e6ea47c548 100644
--- a/textproc/p5-CSS-Croco/Makefile
+++ b/textproc/p5-CSS-Croco/Makefile
@@ -3,7 +3,7 @@
PORTNAME= CSS-Croco
PORTVERSION= 0.09
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Data-Report/Makefile b/textproc/p5-Data-Report/Makefile
index 348ed7ddcd44..4ac1d11ef559 100644
--- a/textproc/p5-Data-Report/Makefile
+++ b/textproc/p5-Data-Report/Makefile
@@ -16,10 +16,10 @@ LICENSE_COMB= dual
COMMON_DEPENDS= p5-HTML-Parser>0:www/p5-HTML-Parser \
p5-Text-CSV_XS>0:textproc/p5-Text-CSV_XS
-BUILD_DEPENDS= p5-Module-Build>=0.28:devel/p5-Module-Build \
- ${COMMON_DEPENDS}
+BUILD_DEPENDS= ${COMMON_DEPENDS}
RUN_DEPENDS= ${COMMON_DEPENDS}
+NO_ARCH= yes
USES= perl5
USE_PERL5= modbuild
diff --git a/textproc/p5-EBook-Tools/Makefile b/textproc/p5-EBook-Tools/Makefile
index f3fecb13db3c..4031b7071220 100644
--- a/textproc/p5-EBook-Tools/Makefile
+++ b/textproc/p5-EBook-Tools/Makefile
@@ -3,6 +3,7 @@
PORTNAME= EBook-Tools
PORTVERSION= 0.5.4
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
index 9b7a56b8adc5..fa4f051d4957 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= HTML-FormatText-WithLinks-AndTables
-PORTVERSION= 0.06
-PORTREVISION= 1
+PORTVERSION= 0.07
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
-COMMENT= Perl5 module to convert HTML to text with tables in tact
+COMMENT= Perl5 module to convert HTML to text with tables intact
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
@@ -21,5 +20,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/distinfo b/textproc/p5-HTML-FormatText-WithLinks-AndTables/distinfo
index f6d0dfda13dd..d8352a0e8ce8 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/distinfo
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/distinfo
@@ -1,2 +1,3 @@
-SHA256 (HTML-FormatText-WithLinks-AndTables-0.06.tar.gz) = e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa
-SIZE (HTML-FormatText-WithLinks-AndTables-0.06.tar.gz) = 299894
+TIMESTAMP = 1481997260
+SHA256 (HTML-FormatText-WithLinks-AndTables-0.07.tar.gz) = 809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6
+SIZE (HTML-FormatText-WithLinks-AndTables-0.07.tar.gz) = 11934
diff --git a/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-descr b/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-descr
index fe147cf526cd..c6ddf2bd08df 100644
--- a/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-descr
+++ b/textproc/p5-HTML-FormatText-WithLinks-AndTables/pkg-descr
@@ -1,3 +1,9 @@
-Converts HTML to Text with tables in tact
+This module was inspired by HTML::FormatText::WithLinks which has proven to be
+a useful `lynx -dump` work-alike. The aim was to provide facility to take a
+simple HTML based email template, and to also convert it to text with the
+<TABLE> structure intact for inclusion as "multipart/alternative" content.
+Further, it will preserve both the formatting specified by the <TD> tag's
+"align" attribute, and will also preserve multiline text inside of a <TD>
+element provided it is broken using <BR/> tags.
WWW: http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
diff --git a/textproc/p5-LaTeX-Table/Makefile b/textproc/p5-LaTeX-Table/Makefile
index 360365a4f04c..d05c9d94860d 100644
--- a/textproc/p5-LaTeX-Table/Makefile
+++ b/textproc/p5-LaTeX-Table/Makefile
@@ -3,7 +3,7 @@
PORTNAME= LaTeX-Table
PORTVERSION= 1.0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Lingua-EN-Infinitive/Makefile b/textproc/p5-Lingua-EN-Infinitive/Makefile
index 37d2d2648c4c..bff83cb85cf3 100644
--- a/textproc/p5-Lingua-EN-Infinitive/Makefile
+++ b/textproc/p5-Lingua-EN-Infinitive/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Lingua-EN-Infinitive
-PORTVERSION= 1.11
-PORTREVISION= 1
+PORTVERSION= 1.14
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -11,6 +10,15 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Determine the infinitive form of a conjugated word
+LICENSE= ART10 GPLv1
+LICENSE_COMB= dual
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= p5-Moo>=2.003000:devel/p5-Moo \
+ p5-Type-Tiny>=1.000005:devel/p5-Type-Tiny
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+
+NO_ARCH= yes
USES= perl5 tar:tgz
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-EN-Infinitive/distinfo b/textproc/p5-Lingua-EN-Infinitive/distinfo
index 2cd4c0f67334..71880c4efaca 100644
--- a/textproc/p5-Lingua-EN-Infinitive/distinfo
+++ b/textproc/p5-Lingua-EN-Infinitive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Lingua-EN-Infinitive-1.11.tgz) = a828278853cd80f2fb745e9322f1553d27b4f9a16faa2b53860beff85d6ab25f
-SIZE (Lingua-EN-Infinitive-1.11.tgz) = 13898
+TIMESTAMP = 1484155869
+SHA256 (Lingua-EN-Infinitive-1.14.tgz) = 1f5735daf9f491994efa262dd676a3e70d894c7d84f99bad9c119c2b47f98349
+SIZE (Lingua-EN-Infinitive-1.14.tgz) = 21948
diff --git a/textproc/p5-Lingua-EN-Infinitive/pkg-plist b/textproc/p5-Lingua-EN-Infinitive/pkg-plist
index b7d6b353e549..b1791922eabd 100644
--- a/textproc/p5-Lingua-EN-Infinitive/pkg-plist
+++ b/textproc/p5-Lingua-EN-Infinitive/pkg-plist
@@ -1,2 +1,2 @@
-%%PERL5_MAN3%%/Lingua::EN::Infinitive.3.gz
%%SITE_PERL%%/Lingua/EN/Infinitive.pm
+%%PERL5_MAN3%%/Lingua::EN::Infinitive.3.gz
diff --git a/textproc/p5-Lingua-EN-MatchNames/Makefile b/textproc/p5-Lingua-EN-MatchNames/Makefile
index 9c61097367d3..8ec3edadecd6 100644
--- a/textproc/p5-Lingua-EN-MatchNames/Makefile
+++ b/textproc/p5-Lingua-EN-MatchNames/Makefile
@@ -22,11 +22,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+= p5-Text-Soundex>=0:textproc/p5-Text-Soundex
-RUN_DEPENDS+= p5-Text-Soundex>=0:textproc/p5-Text-Soundex
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Lingua-EN-Tagger/Makefile b/textproc/p5-Lingua-EN-Tagger/Makefile
index 3fcc20594e51..d2eca0b67127 100644
--- a/textproc/p5-Lingua-EN-Tagger/Makefile
+++ b/textproc/p5-Lingua-EN-Tagger/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Lingua-EN-Tagger
-PORTVERSION= 0.25
+PORTVERSION= 0.28
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -18,6 +18,7 @@ BUILD_DEPENDS= p5-HTML-Parser>=3.45:www/p5-HTML-Parser \
p5-Memoize-ExpireLRU>=0.55:devel/p5-Memoize-ExpireLRU
RUN_DEPENDS:= ${BUILD_DEPENDS}
+NO_ARCH= yes
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-Lingua-EN-Tagger/distinfo b/textproc/p5-Lingua-EN-Tagger/distinfo
index 853543ac9e2f..d8bb46689c23 100644
--- a/textproc/p5-Lingua-EN-Tagger/distinfo
+++ b/textproc/p5-Lingua-EN-Tagger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Lingua-EN-Tagger-0.25.tar.gz) = 49a3b072c6d85b3f4c086fa79b23a5d70bb413d714c279a12508218a7874de1a
-SIZE (Lingua-EN-Tagger-0.25.tar.gz) = 262812
+TIMESTAMP = 1482566227
+SHA256 (Lingua-EN-Tagger-0.28.tar.gz) = 0a33175de9d770021270855c064aaa7199c2c3c96a41fb1a28418783da10a2e6
+SIZE (Lingua-EN-Tagger-0.28.tar.gz) = 262942
diff --git a/textproc/p5-Lingua-EN-Tagger/files/patch-Makefile.PL b/textproc/p5-Lingua-EN-Tagger/files/patch-Makefile.PL
deleted file mode 100644
index 8e7d13b8aed7..000000000000
--- a/textproc/p5-Lingua-EN-Tagger/files/patch-Makefile.PL
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.PL.orig 2012-05-28 13:24:29 UTC
-+++ Makefile.PL
-@@ -59,7 +59,7 @@ sub _load_words {
- my ( $file ) = @_;
- my $fh = new FileHandle $file;
- while ( <$fh> ){
-- my ( $key, $data ) = m/^"?([^{"]+)"?: { (.*) }/;
-+ my ( $key, $data ) = m/^"?([^{"]+)"?: \{ (.*) }/;
- next unless $key and $data;
- my %tags = split /[:,]\s+/, $data;
- foreach( keys %tags ){
-@@ -73,7 +73,7 @@ sub _load_tags {
- my ( $file ) = @_;
- my $fh = new FileHandle $file;
- while ( <$fh> ){
-- my ( $key, $data ) = m/^"?([^{"]+)"?: { (.*) }/;
-+ my ( $key, $data ) = m/^"?([^{"]+)"?: \{ (.*) }/;
- next unless $key and $data;
- my %tags = split /[:,]\s+/, $data;
- foreach( keys %tags ){
diff --git a/textproc/p5-Lingua-Identify-CLD/Makefile b/textproc/p5-Lingua-Identify-CLD/Makefile
index c51457465ec7..47fb6e8969a2 100644
--- a/textproc/p5-Lingua-Identify-CLD/Makefile
+++ b/textproc/p5-Lingua-Identify-CLD/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Lingua-Identify-CLD
PORTVERSION= 0.09
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Marpa-HTML/Makefile b/textproc/p5-Marpa-HTML/Makefile
index 77ae47614a88..114d5c20e1fa 100644
--- a/textproc/p5-Marpa-HTML/Makefile
+++ b/textproc/p5-Marpa-HTML/Makefile
@@ -4,7 +4,7 @@
PORTNAME= Marpa-HTML
PORTVERSION= 0.112
DISTVERSIONSUFFIX= 000
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc lang perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:JKEGL
diff --git a/textproc/p5-PDF-API2/Makefile b/textproc/p5-PDF-API2/Makefile
index 0e11805accc9..75fc7a0d2c22 100644
--- a/textproc/p5-PDF-API2/Makefile
+++ b/textproc/p5-PDF-API2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= PDF-API2
-PORTVERSION= 2.030
+PORTVERSION= 2.031
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -11,12 +11,13 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Facilitates the creation and modification of PDF files
LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Font-TTF>=0:x11-fonts/p5-Font-TTF
RUN_DEPENDS:= ${BUILD_DEPENDS}
+NO_ARCH= yes
USES= perl5
USE_PERL5= configure
-NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/textproc/p5-PDF-API2/distinfo b/textproc/p5-PDF-API2/distinfo
index fd46e2ba2efe..ae1c3bb3ffc6 100644
--- a/textproc/p5-PDF-API2/distinfo
+++ b/textproc/p5-PDF-API2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476975030
-SHA256 (PDF-API2-2.030.tar.gz) = a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769
-SIZE (PDF-API2-2.030.tar.gz) = 3502793
+TIMESTAMP = 1485527139
+SHA256 (PDF-API2-2.031.tar.gz) = 6ea5d38f99dfb1e8acf57c9c7579659b3eee84944295a135f90e607e0a3f43e9
+SIZE (PDF-API2-2.031.tar.gz) = 3507672
diff --git a/textproc/p5-PDF-API2/pkg-plist b/textproc/p5-PDF-API2/pkg-plist
index ea5002ed3d76..88794357a47d 100644
--- a/textproc/p5-PDF-API2/pkg-plist
+++ b/textproc/p5-PDF-API2/pkg-plist
@@ -106,6 +106,7 @@
%%SITE_PERL%%/PDF/API2/Resource/XObject/Image/PNG.pm
%%SITE_PERL%%/PDF/API2/Resource/XObject/Image/PNM.pm
%%SITE_PERL%%/PDF/API2/Resource/XObject/Image/TIFF.pm
+%%SITE_PERL%%/PDF/API2/Resource/XObject/Image/TIFF/File.pm
%%SITE_PERL%%/PDF/API2/Resource/uniglyph.txt
%%SITE_PERL%%/PDF/API2/UniWrap.pm
%%SITE_PERL%%/PDF/API2/Util.pm
diff --git a/textproc/p5-Perl-Critic/Makefile b/textproc/p5-Perl-Critic/Makefile
index 1722235d2f5a..486d14d31460 100644
--- a/textproc/p5-Perl-Critic/Makefile
+++ b/textproc/p5-Perl-Critic/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Perl-Critic
PORTVERSION= 1.12.6
+PORTREVISION= 1
CATEGORIES= textproc devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Perl-Lint/Makefile b/textproc/p5-Perl-Lint/Makefile
index 81b246dfa4d0..822e68dcb04d 100644
--- a/textproc/p5-Perl-Lint/Makefile
+++ b/textproc/p5-Perl-Lint/Makefile
@@ -18,6 +18,7 @@ BUILD_DEPENDS= p5-B-Keywords>=0:devel/p5-B-Keywords \
p5-Email-Address>=0:mail/p5-Email-Address \
p5-List-Flatten>=0:devel/p5-List-Flatten \
p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+ p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
p5-Path-Tiny>=0.068:devel/p5-Path-Tiny \
p5-Regexp-Lexer>=0.05:devel/p5-Regexp-Lexer \
p5-String-CamelCase>=0:textproc/p5-String-CamelCase \
@@ -37,14 +38,4 @@ post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/eg/|} ${STAGEDIR}${EXAMPLESDIR}
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} >= 502000
-BUILD_DEPENDS+= p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
-RUN_DEPENDS+= p5-Module-Pluggable>=0:devel/p5-Module-Pluggable
-.else
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.41:lang/p5-Scalar-List-Utils
-RUN_DEPENDS+= p5-Scalar-List-Utils>=1.41:lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Pod-Autopod/Makefile b/textproc/p5-Pod-Autopod/Makefile
index d94651f580ba..6ffb88d33b88 100644
--- a/textproc/p5-Pod-Autopod/Makefile
+++ b/textproc/p5-Pod-Autopod/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Pod-Autopod
-PORTVERSION= 1.208
+PORTVERSION= 1.215
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Pod-Autopod/distinfo b/textproc/p5-Pod-Autopod/distinfo
index 0944b2660232..f57fbbb28b9d 100644
--- a/textproc/p5-Pod-Autopod/distinfo
+++ b/textproc/p5-Pod-Autopod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479554425
-SHA256 (Pod-Autopod-1.208.tar.gz) = 203ad9904a808a6df99a357be117cfd25947289c15832461984996e73095fca1
-SIZE (Pod-Autopod-1.208.tar.gz) = 31971
+TIMESTAMP = 1481467126
+SHA256 (Pod-Autopod-1.215.tar.gz) = 06fadbfbcd4e7a6d04f32a0ce768b70595a7d8ab8df788df89717f2f1096ba99
+SIZE (Pod-Autopod-1.215.tar.gz) = 32271
diff --git a/textproc/p5-Pod-Autopod/pkg-plist b/textproc/p5-Pod-Autopod/pkg-plist
index 2946e5939042..5d5283bd56b4 100644
--- a/textproc/p5-Pod-Autopod/pkg-plist
+++ b/textproc/p5-Pod-Autopod/pkg-plist
@@ -1,4 +1,4 @@
bin/autopod
%%SITE_PERL%%/Pod/Autopod.pm
-%%PERL5_MAN3%%/Pod::Autopod.3.gz
%%PERL5_MAN1%%/autopod.1.gz
+%%PERL5_MAN3%%/Pod::Autopod.3.gz
diff --git a/textproc/p5-Pod-Elemental/Makefile b/textproc/p5-Pod-Elemental/Makefile
index f004a189b421..502b5a422734 100644
--- a/textproc/p5-Pod-Elemental/Makefile
+++ b/textproc/p5-Pod-Elemental/Makefile
@@ -29,11 +29,4 @@ TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep \
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
-RUN_DEPENDS+= p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-Pod-Tree/Makefile b/textproc/p5-Pod-Tree/Makefile
index f831c5375117..73fc4753456f 100644
--- a/textproc/p5-Pod-Tree/Makefile
+++ b/textproc/p5-Pod-Tree/Makefile
@@ -30,10 +30,4 @@ post-patch:
@${REINPLACE_CMD} -e '/pod2html/d' ${WRKSRC}/MANIFEST
@${RM} ${WRKSRC}/t/pod2html.t
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 502000
-TEST_DEPENDS+= p5-Test-Simple>=1.001002:devel/p5-Test-Simple
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index 0e1e226a1a3c..aa5f2d252e70 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -25,7 +25,6 @@ DOCSUBDIR= / RDF RDF/Core RDF/Core/Enumerator RDF/Core/Model \
OPTIONS_DEFINE= DOCS
post-install:
- @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
.for DOCDIR in ${DOCSUBDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}/${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/doc/${DOCDIR}/*.html ${STAGEDIR}${DOCSDIR}/${DOCDIR}
diff --git a/textproc/p5-RDF-Trine/Makefile b/textproc/p5-RDF-Trine/Makefile
index 4874e1b6ef21..e3d9d77b1ef7 100644
--- a/textproc/p5-RDF-Trine/Makefile
+++ b/textproc/p5-RDF-Trine/Makefile
@@ -49,11 +49,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
USE_PERL5= configure
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+= p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
-RUN_DEPENDS+= p5-Scalar-List-Utils>=1.33:lang/p5-Scalar-List-Utils
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-SGMLSpm/Makefile b/textproc/p5-SGMLSpm/Makefile
index ca4568f69a59..1e81940d64e6 100644
--- a/textproc/p5-SGMLSpm/Makefile
+++ b/textproc/p5-SGMLSpm/Makefile
@@ -21,7 +21,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
SHEBANG_FILES= sgmlspl.pl \
- DOC/HTML/SGMLSpm/sample.pl \
+ DOC/sample.pl \
DOC/HTML/SGMLSpm/example.html
INSTALL_TARGET= install BINDIR=${STAGEDIR}${PREFIX}/bin \
diff --git a/textproc/p5-SVG/Makefile b/textproc/p5-SVG/Makefile
index f782ba78afa9..9c093080a924 100644
--- a/textproc/p5-SVG/Makefile
+++ b/textproc/p5-SVG/Makefile
@@ -23,7 +23,6 @@ NO_ARCH= yes
PORTEXAMPLES= *
post-install:
- @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/textproc/p5-Search-Saryer/Makefile b/textproc/p5-Search-Saryer/Makefile
index 7cca7202bb12..ece3892e3998 100644
--- a/textproc/p5-Search-Saryer/Makefile
+++ b/textproc/p5-Search-Saryer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Search-Saryer
PORTVERSION= 0.40
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc perl5
MASTER_SITES= http://namazu.org/~tsuchiya/perl/
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index d7d7452dbeb5..7d3ed9f890f2 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -26,7 +26,6 @@ NO_ARCH= yes
OPTIONS_DEFINE= EXAMPLES
post-install:
- @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/Excel
${INSTALL_DATA} ${WRKSRC}/sample/README ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_SCRIPT} ${WRKSRC}/sample/*.pl ${STAGEDIR}${EXAMPLESDIR}
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index c55edad63880..50054ce0d15a 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -29,13 +29,12 @@ DOS2UNIX_REGEX= "*.p[lm]"
SHEBANG_FILES= examples/*.pl
post-install:
- @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
@${MKDIR} ${STAGEDIR}${DOCSDIR}/tpj_images
${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/docs/images/* ${STAGEDIR}${DOCSDIR}/images
${INSTALL_DATA} ${WRKSRC}/docs/tpj_images/* ${STAGEDIR}${DOCSDIR}/tpj_images
- @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
+
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/README \
${WRKSRC}/examples/republic.png ${STAGEDIR}${EXAMPLESDIR}
diff --git a/textproc/p5-String-LCSS/Makefile b/textproc/p5-String-LCSS/Makefile
new file mode 100644
index 000000000000..e608262516e6
--- /dev/null
+++ b/textproc/p5-String-LCSS/Makefile
@@ -0,0 +1,16 @@
+# Created by: Dan Langille <dvl@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= String-LCSS
+PORTVERSION= 0.12
+CATEGORIES= textproc perl5
+MASTER_SITES= CPAN
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= dvl@FreeBSD.org
+COMMENT= Find The Longest Common Substring of Two Strings
+
+USES= perl5
+USE_PERL5= configure
+
+.include <bsd.port.mk>
diff --git a/textproc/p5-String-LCSS/distinfo b/textproc/p5-String-LCSS/distinfo
new file mode 100644
index 000000000000..d9ff41ef1df1
--- /dev/null
+++ b/textproc/p5-String-LCSS/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1481910782
+SHA256 (String-LCSS-0.12.tar.gz) = 049646e5881c0114998e589616ba9ffaeb59b1ce095d43158fd0fd6d8fe03b39
+SIZE (String-LCSS-0.12.tar.gz) = 2923
diff --git a/textproc/p5-String-LCSS/pkg-descr b/textproc/p5-String-LCSS/pkg-descr
new file mode 100644
index 000000000000..deb550708c72
--- /dev/null
+++ b/textproc/p5-String-LCSS/pkg-descr
@@ -0,0 +1,8 @@
+String::LCSS provides the function "lcss" to ferret out the longest common
+substring shared by two strings passed as arguments. undef is returned if
+the susbstring length is one char or less.
+
+When used in an array context, lcss will returns the indexi of the match root
+in the two args.
+
+WWW: http://search.cpan.org/dist/String-LCSS/
diff --git a/textproc/p5-String-LCSS/pkg-plist b/textproc/p5-String-LCSS/pkg-plist
new file mode 100644
index 000000000000..990b2bbeb5a4
--- /dev/null
+++ b/textproc/p5-String-LCSS/pkg-plist
@@ -0,0 +1,2 @@
+%%PERL5_MAN3%%/String::LCSS.3.gz
+%%SITE_PERL%%/String/LCSS.pm
diff --git a/textproc/p5-TOML-Parser/Makefile b/textproc/p5-TOML-Parser/Makefile
new file mode 100644
index 000000000000..daec95085214
--- /dev/null
+++ b/textproc/p5-TOML-Parser/Makefile
@@ -0,0 +1,26 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= TOML-Parser
+PORTVERSION= 0.08
+CATEGORIES= textproc perl5
+MASTER_SITES= CPAN
+MASTER_SITE_SUBDIR= CPAN:KARUPA
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Simple toml parser
+
+LICENSE= ART10 GPLv1
+LICENSE_COMB= dual
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BUILD_DEPENDS= p5-Types-Serialiser>=0:devel/p5-Types-Serialiser
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
+
+NO_ARCH= yes
+USE_PERL5= modbuildtiny
+USES= perl5
+
+.include <bsd.port.mk>
diff --git a/textproc/p5-TOML-Parser/distinfo b/textproc/p5-TOML-Parser/distinfo
new file mode 100644
index 000000000000..29d2996b11b3
--- /dev/null
+++ b/textproc/p5-TOML-Parser/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483254386
+SHA256 (TOML-Parser-0.08.tar.gz) = 28e8e46122e4233e456b2d6986c6e78ffb9fecb790d99490b739d7c03817c16d
+SIZE (TOML-Parser-0.08.tar.gz) = 21963
diff --git a/textproc/p5-TOML-Parser/pkg-descr b/textproc/p5-TOML-Parser/pkg-descr
new file mode 100644
index 000000000000..63a6b5fa7571
--- /dev/null
+++ b/textproc/p5-TOML-Parser/pkg-descr
@@ -0,0 +1,6 @@
+TOML::Parser is a simple toml parser. This data structure complies with the
+tests [1] in v0.4.0 specification.
+
+[1] https://github.com/toml-lang/toml/tree/v0.4.0/tests
+
+WWW: http://search.cpan.org/dist/TOML-Parser/
diff --git a/textproc/p5-TOML-Parser/pkg-plist b/textproc/p5-TOML-Parser/pkg-plist
new file mode 100644
index 000000000000..8d1e497f6284
--- /dev/null
+++ b/textproc/p5-TOML-Parser/pkg-plist
@@ -0,0 +1,8 @@
+%%SITE_PERL%%/TOML/Parser.pm
+%%SITE_PERL%%/TOML/Parser/Tokenizer.pm
+%%SITE_PERL%%/TOML/Parser/Tokenizer/Strict.pm
+%%SITE_PERL%%/TOML/Parser/Util.pm
+%%PERL5_MAN3%%/TOML::Parser.3.gz
+%%PERL5_MAN3%%/TOML::Parser::Tokenizer.3.gz
+%%PERL5_MAN3%%/TOML::Parser::Tokenizer::Strict.3.gz
+%%PERL5_MAN3%%/TOML::Parser::Util.3.gz
diff --git a/textproc/p5-TOML/Makefile b/textproc/p5-TOML/Makefile
index 25cbfce0fca4..af75d2f43312 100644
--- a/textproc/p5-TOML/Makefile
+++ b/textproc/p5-TOML/Makefile
@@ -2,19 +2,23 @@
# $FreeBSD$
PORTNAME= TOML
-PORTVERSION= 0.92
-PORTREVISION= 1
+PORTVERSION= 0.97
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= CPAN:DARREN
+MASTER_SITE_SUBDIR= CPAN:KARUPA
PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
-COMMENT= Parser for Tom's Obvious, Minimal Language (TOML)
+COMMENT= Parser for Tom's Obvious, Minimal Language (TOML) #'
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_PERL5= configure
+BUILD_DEPENDS= p5-TOML-Parser>=0.04:textproc/p5-TOML-Parser
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+
+NO_ARCH= yes
+USE_PERL5= modbuildtiny
USES= perl5
.include <bsd.port.mk>
diff --git a/textproc/p5-TOML/distinfo b/textproc/p5-TOML/distinfo
index 71553cc1041d..44052a025a8c 100644
--- a/textproc/p5-TOML/distinfo
+++ b/textproc/p5-TOML/distinfo
@@ -1,2 +1,3 @@
-SHA256 (TOML-0.92.tar.gz) = 1808984d17f34ab972bd595a5e86fc6c2593db9f6a6956474bcc3640d3c633ed
-SIZE (TOML-0.92.tar.gz) = 12734
+TIMESTAMP = 1483253107
+SHA256 (TOML-0.97.tar.gz) = 7fd5d02140ec0ca2abba1a7e8d0abc9be025404fc72516f0db4ea1fe2dd51c37
+SIZE (TOML-0.97.tar.gz) = 12492
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 76365ba990f9..2ff82a731228 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= Text-BibTeX
-PORTVERSION= 0.77
+PORTVERSION= 0.78
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-BibTeX/distinfo b/textproc/p5-Text-BibTeX/distinfo
index 03bb3d118405..9cb992ee2cb3 100644
--- a/textproc/p5-Text-BibTeX/distinfo
+++ b/textproc/p5-Text-BibTeX/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476029990
-SHA256 (Text-BibTeX-0.77.tar.gz) = 6459bb9d93ab5520959ce0ebd28cdf34dcf685774e40f377bcc39c3935ea6e4e
-SIZE (Text-BibTeX-0.77.tar.gz) = 295689
+TIMESTAMP = 1484155881
+SHA256 (Text-BibTeX-0.78.tar.gz) = 53036462b539ee7401eecb38d8fb78f8c6b724917890aa2a243ab176461adad1
+SIZE (Text-BibTeX-0.78.tar.gz) = 295794
diff --git a/textproc/p5-Text-Colorizer/Makefile b/textproc/p5-Text-Colorizer/Makefile
index 841f1efec3af..c98411bcca6e 100644
--- a/textproc/p5-Text-Colorizer/Makefile
+++ b/textproc/p5-Text-Colorizer/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Text-Colorizer
PORTVERSION= 0.02.2
+PORTREVISION= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:NKH
diff --git a/textproc/p5-Text-HikiDoc/Makefile b/textproc/p5-Text-HikiDoc/Makefile
index f0099a9328ef..2aae087a19d0 100644
--- a/textproc/p5-Text-HikiDoc/Makefile
+++ b/textproc/p5-Text-HikiDoc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Text-HikiDoc
-PORTVERSION= 1.022
+PORTVERSION= 1.023
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-HikiDoc/distinfo b/textproc/p5-Text-HikiDoc/distinfo
index bb808cea6b14..ffed425ee6fd 100644
--- a/textproc/p5-Text-HikiDoc/distinfo
+++ b/textproc/p5-Text-HikiDoc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480822068
-SHA256 (Text-HikiDoc-1.022.tar.gz) = a7a167d7bbf774ec1b3f87a3d2affd2ce5735b6817ba67772bad2ca482ef97a8
-SIZE (Text-HikiDoc-1.022.tar.gz) = 23025
+TIMESTAMP = 1481954131
+SHA256 (Text-HikiDoc-1.023.tar.gz) = 348e4c405ab13643644645ca376306218f2a68c6840974efb79395510b91e934
+SIZE (Text-HikiDoc-1.023.tar.gz) = 23012
diff --git a/textproc/p5-Text-Lorem/Makefile b/textproc/p5-Text-Lorem/Makefile
index 6729d6d5b9f9..252d29056f4b 100644
--- a/textproc/p5-Text-Lorem/Makefile
+++ b/textproc/p5-Text-Lorem/Makefile
@@ -3,7 +3,7 @@
PORTNAME= Text-Lorem
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-RecordParser/Makefile b/textproc/p5-Text-RecordParser/Makefile
index 8ff99328230e..02f4f70a7810 100644
--- a/textproc/p5-Text-RecordParser/Makefile
+++ b/textproc/p5-Text-RecordParser/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Text-RecordParser
PORTVERSION= 1.6.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-Reflow/Makefile b/textproc/p5-Text-Reflow/Makefile
index 78b8681c9fa9..f7dad5d06643 100644
--- a/textproc/p5-Text-Reflow/Makefile
+++ b/textproc/p5-Text-Reflow/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Text-Reflow
-PORTVERSION= 1.15
+PORTVERSION= 1.17
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-Reflow/distinfo b/textproc/p5-Text-Reflow/distinfo
index 74b1b6177f5b..d101b747c44e 100644
--- a/textproc/p5-Text-Reflow/distinfo
+++ b/textproc/p5-Text-Reflow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480439298
-SHA256 (Text-Reflow-1.15.tar.gz) = 33b13ec90c9ac463492f9db7c27ce0a92dd401f1035ecf78824adc55b833e32f
-SIZE (Text-Reflow-1.15.tar.gz) = 16124
+TIMESTAMP = 1481270315
+SHA256 (Text-Reflow-1.17.tar.gz) = 4bf2139ff617d6e59cc0e59cdecd7cb723ecfd28d5ac387afb553ffdc071b860
+SIZE (Text-Reflow-1.17.tar.gz) = 16651
diff --git a/textproc/p5-Text-Reflow/files/patch-Reflow.pm b/textproc/p5-Text-Reflow/files/patch-Reflow.pm
index 08332e5bb54b..bea1e756319c 100644
--- a/textproc/p5-Text-Reflow/files/patch-Reflow.pm
+++ b/textproc/p5-Text-Reflow/files/patch-Reflow.pm
@@ -1,5 +1,5 @@
---- Reflow.pm.orig 2009-02-07 14:24:01.000000000 +0000
-+++ Reflow.pm 2009-02-12 16:47:20.000000000 +0000
+--- Reflow.pm.orig 2009-02-07 14:24:01 UTC
++++ Reflow.pm
@@ -32,7 +32,7 @@
$Text::Reflow::VERSION = "1.06";
diff --git a/textproc/p5-Text-Sass/Makefile b/textproc/p5-Text-Sass/Makefile
index cb32ca2c4863..48db9eb5a884 100644
--- a/textproc/p5-Text-Sass/Makefile
+++ b/textproc/p5-Text-Sass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Text-Sass
PORTVERSION= 0.97
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RPETTETT
diff --git a/textproc/p5-UML-Class-Simple/Makefile b/textproc/p5-UML-Class-Simple/Makefile
index dba0c2a9ebbe..62b7d61a11df 100644
--- a/textproc/p5-UML-Class-Simple/Makefile
+++ b/textproc/p5-UML-Class-Simple/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= UML-Class-Simple
-PORTVERSION= 0.20
+PORTVERSION= 0.22
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -23,6 +23,7 @@ BUILD_DEPENDS= p5-Class-Inspector>=1.16:devel/p5-Class-Inspector \
dot:graphics/graphviz
RUN_DEPENDS:= ${BUILD_DEPENDS}
+NO_ARCH= yes
USES= perl5
USE_PERL5= configure
diff --git a/textproc/p5-UML-Class-Simple/distinfo b/textproc/p5-UML-Class-Simple/distinfo
index 2e54599962a2..9f4ea05216f9 100644
--- a/textproc/p5-UML-Class-Simple/distinfo
+++ b/textproc/p5-UML-Class-Simple/distinfo
@@ -1,2 +1,3 @@
-SHA256 (UML-Class-Simple-0.20.tar.gz) = aa9111d560ba52389fda66c5e8e0808ed61f0897f070eb61ce9eadf786f02d99
-SIZE (UML-Class-Simple-0.20.tar.gz) = 87337
+TIMESTAMP = 1482163569
+SHA256 (UML-Class-Simple-0.22.tar.gz) = 4375b5bf00023ac0a5cef76f9e29d0793e6e5e8360481dba003d3299d8965cd8
+SIZE (UML-Class-Simple-0.22.tar.gz) = 88426
diff --git a/textproc/p5-UML-Class-Simple/pkg-plist b/textproc/p5-UML-Class-Simple/pkg-plist
index 97066e406d9a..e316b7baf0d2 100644
--- a/textproc/p5-UML-Class-Simple/pkg-plist
+++ b/textproc/p5-UML-Class-Simple/pkg-plist
@@ -1,4 +1,4 @@
bin/umlclass.pl
%%SITE_PERL%%/UML/Class/Simple.pm
-%%PERL5_MAN3%%/UML::Class::Simple.3.gz
%%PERL5_MAN1%%/umlclass.pl.1.gz
+%%PERL5_MAN3%%/UML::Class::Simple.3.gz
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index 8820c610a276..35e79cb51ae3 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -3,6 +3,7 @@
PORTNAME= URI-Find
PORTVERSION= 20160806
+PORTREVISION= 1
CATEGORIES= textproc net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Unicode-LineBreak/Makefile b/textproc/p5-Unicode-LineBreak/Makefile
index 6c33f95c9bb6..e118ea25fe70 100644
--- a/textproc/p5-Unicode-LineBreak/Makefile
+++ b/textproc/p5-Unicode-LineBreak/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Unicode-LineBreak
-PORTVERSION= 2014.06
-PORTREVISION= 3
+PORTVERSION= 2016.003
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -34,8 +33,6 @@ THAI_LIB_DEPENDS= libthai.so:devel/libthai
THAI_CONFIGURE_OFF= --disable-libthai
post-install:
- ${CHMOD} u+w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/LineBreak/LineBreak.so
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/LineBreak/LineBreak.so
- ${CHMOD} u-w ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Unicode/LineBreak/LineBreak.so
.include <bsd.port.mk>
diff --git a/textproc/p5-Unicode-LineBreak/distinfo b/textproc/p5-Unicode-LineBreak/distinfo
index e2d013877f7d..c376ac3d2d47 100644
--- a/textproc/p5-Unicode-LineBreak/distinfo
+++ b/textproc/p5-Unicode-LineBreak/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Unicode-LineBreak-2014.06.tar.gz) = 5c06dfb5036bbcc1043b366df48fd3a993a6cfaa1c2c5b4efd2b0d87fec54f8d
-SIZE (Unicode-LineBreak-2014.06.tar.gz) = 299755
+TIMESTAMP = 1482335726
+SHA256 (Unicode-LineBreak-2016.003.tar.gz) = e64e2d990a8cc90f8a387866509c35a93c50b812f5a2e60f3d9deb947a71dc24
+SIZE (Unicode-LineBreak-2016.003.tar.gz) = 304042
diff --git a/textproc/p5-Unicode-Unihan/Makefile b/textproc/p5-Unicode-Unihan/Makefile
index ce1f4c6178a7..1ab3d989bcc3 100644
--- a/textproc/p5-Unicode-Unihan/Makefile
+++ b/textproc/p5-Unicode-Unihan/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= The Unihan Data Base 5.1.0
USES= perl5
diff --git a/textproc/p5-Validator-Custom/Makefile b/textproc/p5-Validator-Custom/Makefile
index 77ca8b3e06d6..560b22d0b99c 100644
--- a/textproc/p5-Validator-Custom/Makefile
+++ b/textproc/p5-Validator-Custom/Makefile
@@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= Validator-Custom
-PORTVERSION= 1.01
+PORTVERSION= 1.02.01
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:KIMOTO
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
PKGNAMEPREFIX= p5-
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/textproc/p5-Validator-Custom/distinfo b/textproc/p5-Validator-Custom/distinfo
index b9f9a4bf1452..5728f42b80b7 100644
--- a/textproc/p5-Validator-Custom/distinfo
+++ b/textproc/p5-Validator-Custom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Validator-Custom-1.01.tar.gz) = de0ea020c79ce73545a2ff4c89aaa2c96b76204a2dea46793a48c301494f7723
-SIZE (Validator-Custom-1.01.tar.gz) = 38943
+TIMESTAMP = 1483907949
+SHA256 (Validator-Custom-1.0201.tar.gz) = 8cf4e0d7529ad747992ca9159d7acd769884b5e97b4c6c72de637a79a241d81f
+SIZE (Validator-Custom-1.0201.tar.gz) = 38762
diff --git a/textproc/p5-XML-GDOME/Makefile b/textproc/p5-XML-GDOME/Makefile
index 2ac35634307b..56e1ed7e9c72 100644
--- a/textproc/p5-XML-GDOME/Makefile
+++ b/textproc/p5-XML-GDOME/Makefile
@@ -3,7 +3,7 @@
PORTNAME= XML-GDOME
PORTVERSION= 0.86
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-XML-MyXML/Makefile b/textproc/p5-XML-MyXML/Makefile
index af164d0af5a2..7d566390243d 100644
--- a/textproc/p5-XML-MyXML/Makefile
+++ b/textproc/p5-XML-MyXML/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= XML-MyXML
-PORTVERSION= 0.9404
+PORTVERSION= 0.9407
PORTEPOCH= 1
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
diff --git a/textproc/p5-XML-MyXML/distinfo b/textproc/p5-XML-MyXML/distinfo
index 485c8cc8daca..3d7a7832b93d 100644
--- a/textproc/p5-XML-MyXML/distinfo
+++ b/textproc/p5-XML-MyXML/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480855200
-SHA256 (XML-MyXML-0.9404.tar.gz) = d8cb6251701ad810092649c7a19f8c9913ac826c7569647b37f75f659d1e2490
-SIZE (XML-MyXML-0.9404.tar.gz) = 22368
+TIMESTAMP = 1484304113
+SHA256 (XML-MyXML-0.9407.tar.gz) = 8c058dea9048eb46c8fff3a3c4dae4f7f01911718583a6be08384a1278d16d6b
+SIZE (XML-MyXML-0.9407.tar.gz) = 23234
diff --git a/textproc/p5-XML-RSS-Parser/Makefile b/textproc/p5-XML-RSS-Parser/Makefile
index 42872fb16880..c55a272335ca 100644
--- a/textproc/p5-XML-RSS-Parser/Makefile
+++ b/textproc/p5-XML-RSS-Parser/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
-MAINTAINER= leeym@FreeBSD.org
+MAINTAINER= perl@FreeBSD.org
COMMENT= Liberal object-oriented parser for RSS feeds
RUN_DEPENDS= p5-XML-Elemental>=0:textproc/p5-XML-Elemental \
diff --git a/textproc/p5-XML-Rules/Makefile b/textproc/p5-XML-Rules/Makefile
index 960d4294d691..8d435c8f1bce 100644
--- a/textproc/p5-XML-Rules/Makefile
+++ b/textproc/p5-XML-Rules/Makefile
@@ -2,7 +2,7 @@
PORTNAME= XML-Rules
PORTVERSION= 1.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-XML-SAX-ExpatXS/Makefile b/textproc/p5-XML-SAX-ExpatXS/Makefile
index 8b5bd398540d..92e0bd93fcc1 100644
--- a/textproc/p5-XML-SAX-ExpatXS/Makefile
+++ b/textproc/p5-XML-SAX-ExpatXS/Makefile
@@ -3,7 +3,7 @@
PORTNAME= XML-SAX-ExpatXS
PORTVERSION= 1.33
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index ea330435d4fd..8fef01b668c0 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -25,7 +25,6 @@ regression-test: build
${MAKE} -C ${WRKSRC} test
post-install:
- @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index a2c96c84d246..30ab4638dec7 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -34,10 +34,9 @@ post-configure:
@${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile
post-install:
- @${ECHO_MSG} "===> Installing additional documentation for ${PKGNAME}"
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
- @${ECHO_MSG} "===> Installing examples for ${PKGNAME}"
+
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/textproc/pcrs/Makefile b/textproc/pcrs/Makefile
index f41eca405c8c..0fe0a140fd4a 100644
--- a/textproc/pcrs/Makefile
+++ b/textproc/pcrs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pcrs
PORTVERSION= 0.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= http://distfiles.master.finkmirrors.net/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index 8d126b4de5e1..313b102b9f8b 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pdfgrep
PORTVERSION= 1.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= https://pdfgrep.org/download/
diff --git a/textproc/pdftohtml/pkg-descr b/textproc/pdftohtml/pkg-descr
index c6208082907f..29027bf5aad8 100644
--- a/textproc/pdftohtml/pkg-descr
+++ b/textproc/pdftohtml/pkg-descr
@@ -3,4 +3,4 @@ formatted html, combined with png images.
The HTML generated uses frames to emulate the content listing from
the pdf.
-WWW: http://sourceforge.net/projects/pdftohtml/
+WWW: https://sourceforge.net/projects/pdftohtml/
diff --git a/textproc/pear-File_Fortune/pkg-descr b/textproc/pear-File_Fortune/pkg-descr
index 996a4ddd2374..eae591e3794e 100644
--- a/textproc/pear-File_Fortune/pkg-descr
+++ b/textproc/pear-File_Fortune/pkg-descr
@@ -6,4 +6,4 @@ native array, including updating and deleting items. All write operations will
produce a binary header file to allow compatibility with the fortune and
fortune-mod programs (as well as other fortune interfaces).
-WWW: http://pear.php.net/package/File_Fortune/
+WWW: https://pear.php.net/package/File_Fortune
diff --git a/textproc/pear-File_MARC/Makefile b/textproc/pear-File_MARC/Makefile
index 9b8d720a65b0..b567523948f5 100644
--- a/textproc/pear-File_MARC/Makefile
+++ b/textproc/pear-File_MARC/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= File_MARC
-PORTVERSION= 1.1.3
+PORTVERSION= 1.1.5
CATEGORIES= textproc pear
MAINTAINER= dbaio@bsd.com.br
diff --git a/textproc/pear-File_MARC/distinfo b/textproc/pear-File_MARC/distinfo
index b97d50034f63..a9969fe40c4f 100644
--- a/textproc/pear-File_MARC/distinfo
+++ b/textproc/pear-File_MARC/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472677005
-SHA256 (PEAR/File_MARC-1.1.3.tgz) = 981aca87d12d496867ee20880528d1661543e61ac3d5ed9c9a4afc0f32011eba
-SIZE (PEAR/File_MARC-1.1.3.tgz) = 94433
+TIMESTAMP = 1485252069
+SHA256 (PEAR/File_MARC-1.1.5.tgz) = 0074740afa4bd5dc3bed21de02cb7e9fe15887e0e3cd145a8b6adf2d73142ad0
+SIZE (PEAR/File_MARC-1.1.5.tgz) = 95515
diff --git a/textproc/pear-File_MARC/pkg-descr b/textproc/pear-File_MARC/pkg-descr
index 2a80e3516b79..764e6c8fa1f8 100644
--- a/textproc/pear-File_MARC/pkg-descr
+++ b/textproc/pear-File_MARC/pkg-descr
@@ -3,4 +3,4 @@ http://loc.gov/marc/. This package enables you to read existing MARC records
from a file, string, or (using the YAZ extension), from a Z39.50 source. You
can also use this package to create new MARC records.
-WWW: http://pear.php.net/package/File_MARC
+WWW: https://pear.php.net/package/File_MARC
diff --git a/textproc/pear-Horde_CssMinify/Makefile b/textproc/pear-Horde_CssMinify/Makefile
index 227ef3ca6e40..bac55b535d9a 100644
--- a/textproc/pear-Horde_CssMinify/Makefile
+++ b/textproc/pear-Horde_CssMinify/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Horde_CssMinify
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= textproc www pear
MAINTAINER= horde@FreeBSD.org
diff --git a/textproc/pear-Horde_CssMinify/distinfo b/textproc/pear-Horde_CssMinify/distinfo
index e14c39bb561f..2739ce8dff3d 100644
--- a/textproc/pear-Horde_CssMinify/distinfo
+++ b/textproc/pear-Horde_CssMinify/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Horde/Horde_CssMinify-1.0.2.tgz) = 73d156402ddd3b1e97678aa6b3e533a1603b70bee4c920f581c6a437f0afb6fe
-SIZE (Horde/Horde_CssMinify-1.0.2.tgz) = 11580
+TIMESTAMP = 1481937640
+SHA256 (Horde/Horde_CssMinify-1.0.3.tgz) = 6c4b94610fd2b9fa7c575cc068fa9d79b96e9f118b808ba8f6377273950e5851
+SIZE (Horde/Horde_CssMinify-1.0.3.tgz) = 11660
diff --git a/textproc/pear-Numbers_Roman/pkg-descr b/textproc/pear-Numbers_Roman/pkg-descr
index a0b760c85a3a..f9ed426632a4 100644
--- a/textproc/pear-Numbers_Roman/pkg-descr
+++ b/textproc/pear-Numbers_Roman/pkg-descr
@@ -3,4 +3,4 @@ from Roman numerals. It supports Roman numerals in both uppercase
and lowercase styles and conversion for and to numbers up to 5 999
999.
-WWW: http://pear.php.net/package/Numbers_Roman/
+WWW: https://pear.php.net/package/Numbers_Roman
diff --git a/textproc/pear-Numbers_Words/pkg-descr b/textproc/pear-Numbers_Words/pkg-descr
index 04d667f1481d..0fc316ce73d1 100644
--- a/textproc/pear-Numbers_Words/pkg-descr
+++ b/textproc/pear-Numbers_Words/pkg-descr
@@ -30,4 +30,4 @@ The following languages are supported:
* ru (Russian)
* sv (Swedish)
-WWW: http://pear.php.net/package/Numbers_Words
+WWW: https://pear.php.net/package/Numbers_Words
diff --git a/textproc/pear-Spreadsheet_Excel_Writer/pkg-descr b/textproc/pear-Spreadsheet_Excel_Writer/pkg-descr
index 38051c47537d..7df0bc528da0 100644
--- a/textproc/pear-Spreadsheet_Excel_Writer/pkg-descr
+++ b/textproc/pear-Spreadsheet_Excel_Writer/pkg-descr
@@ -5,4 +5,4 @@ spreadsheets without the need for COM objects. It supports formulas, images
the BIFF5 format (Excel 5.0), so functionality appeared in the latest Excel
versions is not yet available.
-WWW: http://pear.php.net/package/Spreadsheet_Excel_Writer
+WWW: https://pear.php.net/package/Spreadsheet_Excel_Writer
diff --git a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
index b17152332696..962a2392289d 100644
--- a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
+++ b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile
@@ -13,5 +13,6 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-
USES= pear
USE_PHP= mysql
+IGNORE_WITH_PHP=70 71
.include <bsd.port.mk>
diff --git a/textproc/pear-Structures_DataGrid_DataSource_RSS/pkg-descr b/textproc/pear-Structures_DataGrid_DataSource_RSS/pkg-descr
index 865c4bd6e3f5..80917e64873c 100644
--- a/textproc/pear-Structures_DataGrid_DataSource_RSS/pkg-descr
+++ b/textproc/pear-Structures_DataGrid_DataSource_RSS/pkg-descr
@@ -1,3 +1,3 @@
This is a DataSource driver for Structures_DataGrid using RSS files.
-WWW: http://pear.php.net/package/Structures_DataGrid_DataSource_RSS/
+WWW: https://pear.php.net/package/Structures_DataGrid_DataSource_RSS
diff --git a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
index d5d626ab3816..a8526abc5972 100644
--- a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
+++ b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile
@@ -13,5 +13,6 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear-
USES= pear
USE_PHP= mysql
+IGNORE_WITH_PHP=70 71
.include <bsd.port.mk>
diff --git a/textproc/pear-Structures_DataGrid_DataSource_XML/pkg-descr b/textproc/pear-Structures_DataGrid_DataSource_XML/pkg-descr
index f09455df8925..612ab2219261 100644
--- a/textproc/pear-Structures_DataGrid_DataSource_XML/pkg-descr
+++ b/textproc/pear-Structures_DataGrid_DataSource_XML/pkg-descr
@@ -1,3 +1,3 @@
This is a DataSource driver for Structures_DataGrid using XML files.
-WWW: http://pear.php.net/package/Structures_DataGrid_DataSource_RSS/
+WWW: https://pear.php.net/package/Structures_DataGrid_DataSource_RSS
diff --git a/textproc/pear-Structures_DataGrid_Renderer_CSV/pkg-descr b/textproc/pear-Structures_DataGrid_Renderer_CSV/pkg-descr
index 291c2d109b35..59ba5131035c 100644
--- a/textproc/pear-Structures_DataGrid_Renderer_CSV/pkg-descr
+++ b/textproc/pear-Structures_DataGrid_Renderer_CSV/pkg-descr
@@ -1,4 +1,4 @@
This is a Renderer driver for Structures_DataGrid that generates a CSV
string.
-WWW: http://pear.php.net/package/Structures_DataGrid_Renderer_CSV/
+WWW: https://pear.php.net/package/Structures_DataGrid_Renderer_CSV
diff --git a/textproc/pear-Structures_DataGrid_Renderer_XLS/pkg-descr b/textproc/pear-Structures_DataGrid_Renderer_XLS/pkg-descr
index ffad6869acd3..7b1401ce2108 100644
--- a/textproc/pear-Structures_DataGrid_Renderer_XLS/pkg-descr
+++ b/textproc/pear-Structures_DataGrid_Renderer_XLS/pkg-descr
@@ -1,4 +1,4 @@
This is a Renderer driver for Structures_DataGrid that generates a XLS
string.
-WWW: http://pear.php.net/package/Structures_DataGrid_Renderer_XLS/
+WWW: https://pear.php.net/package/Structures_DataGrid_Renderer_XLS
diff --git a/textproc/pear-Structures_DataGrid_Renderer_XML/pkg-descr b/textproc/pear-Structures_DataGrid_Renderer_XML/pkg-descr
index 0d399fb31f4a..b8d839fa126f 100644
--- a/textproc/pear-Structures_DataGrid_Renderer_XML/pkg-descr
+++ b/textproc/pear-Structures_DataGrid_Renderer_XML/pkg-descr
@@ -1,4 +1,4 @@
This is a Renderer driver for Structures_DataGrid that generates a XML
string.
-WWW: http://pear.php.net/package/Structures_DataGrid_Renderer_XML/
+WWW: https://pear.php.net/package/Structures_DataGrid_Renderer_XML
diff --git a/textproc/pear-Symfony_Component_Yaml/Makefile b/textproc/pear-Symfony_Component_Yaml/Makefile
index 0ddcfeec3849..02dcf3023c56 100644
--- a/textproc/pear-Symfony_Component_Yaml/Makefile
+++ b/textproc/pear-Symfony_Component_Yaml/Makefile
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= Yaml
-PORTVERSION= 2.1.2
+PORTVERSION= 2.4.4
CATEGORIES= textproc pear
MASTER_SITES= http://pear.symfony.com/get/
PKGNAMEPREFIX= pear-Symfony_Component_
DIST_SUBDIR= Symfony2
-MAINTAINER= gasol.wu@gmail.com
+MAINTAINER= joneum@bsdproject.de
COMMENT= Symfony2 Yaml Component
LICENSE= MIT
diff --git a/textproc/pear-Symfony_Component_Yaml/distinfo b/textproc/pear-Symfony_Component_Yaml/distinfo
index 5cec89e48d18..a3b402779079 100644
--- a/textproc/pear-Symfony_Component_Yaml/distinfo
+++ b/textproc/pear-Symfony_Component_Yaml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Symfony2/Yaml-2.1.2.tgz) = 645705003e24787429aad9e417d6a7461a8a5a1f4f530f317b75bf338b715cc2
-SIZE (Symfony2/Yaml-2.1.2.tgz) = 38429
+TIMESTAMP = 1478416228
+SHA256 (Symfony2/Yaml-2.4.4.tgz) = 3d114d1f6206df1e5c28393fd0a8c10c7765b8709c55475c489a89eab7fe41d8
+SIZE (Symfony2/Yaml-2.4.4.tgz) = 40486
diff --git a/textproc/pear-Text_Highlighter/pkg-descr b/textproc/pear-Text_Highlighter/pkg-descr
index 44de9178cef6..3556aa84ce93 100644
--- a/textproc/pear-Text_Highlighter/pkg-descr
+++ b/textproc/pear-Text_Highlighter/pkg-descr
@@ -14,4 +14,4 @@ to code a new class manually. Simply describe the rules
in XML file and use Text_Highlighter_Generator to create
a new class.
-WWW: http://pear.php.net/package/Text_Highlighter
+WWW: https://pear.php.net/package/Text_Highlighter
diff --git a/textproc/pear-Validate_ISPN/pkg-descr b/textproc/pear-Validate_ISPN/pkg-descr
index 3159532732a1..1942e714e8a4 100644
--- a/textproc/pear-Validate_ISPN/pkg-descr
+++ b/textproc/pear-Validate_ISPN/pkg-descr
@@ -9,4 +9,4 @@ This class provides methods to validate:
- UCC-12 (U.P.C.) ID number
- SSCC (Serial Shipping Container Code)
-WWW: http://pear.php.net/package/Validate_ISPN
+WWW: https://pear.php.net/package/Validate_ISPN
diff --git a/textproc/pear-XML_Beautifier/pkg-descr b/textproc/pear-XML_Beautifier/pkg-descr
index 56eadf025a26..a176f6230dd1 100644
--- a/textproc/pear-XML_Beautifier/pkg-descr
+++ b/textproc/pear-XML_Beautifier/pkg-descr
@@ -4,4 +4,4 @@ read.
You can influence the way your document is beautified with several options.
-WWW: http://pear.php.net/package/XML_Beautifier/
+WWW: https://pear.php.net/package/XML_Beautifier
diff --git a/textproc/pear-XML_DTD/pkg-descr b/textproc/pear-XML_DTD/pkg-descr
index 5b5e69ef4332..8f7ba391ba61 100644
--- a/textproc/pear-XML_DTD/pkg-descr
+++ b/textproc/pear-XML_DTD/pkg-descr
@@ -6,4 +6,4 @@ Currently supports most of the current XML spec, including entities,
elements and attributes. Some uncommon parts of the spec may still be
unsupported.
-WWW: http://pear.php.net/package/XML_DTD/
+WWW: https://pear.php.net/package/XML_DTD
diff --git a/textproc/pear-XML_Feed_Parser/pkg-descr b/textproc/pear-XML_Feed_Parser/pkg-descr
index f5aab0b5423e..4d4a18849332 100644
--- a/textproc/pear-XML_Feed_Parser/pkg-descr
+++ b/textproc/pear-XML_Feed_Parser/pkg-descr
@@ -2,4 +2,4 @@ XML_Feed_Parser is a parser for (the various) RSS and Atom format XML feeds.
It attempts to provide a somewhat unified API while still allowing access to
the full details of each feed type.
-WWW: http://pear.php.net/package/XML_Feed_Parser/
+WWW: https://pear.php.net/package/XML_Feed_Parser
diff --git a/textproc/pear-XML_HTMLSax/pkg-descr b/textproc/pear-XML_HTMLSax/pkg-descr
index 149758c488f9..4534d79022fb 100644
--- a/textproc/pear-XML_HTMLSax/pkg-descr
+++ b/textproc/pear-XML_HTMLSax/pkg-descr
@@ -9,4 +9,4 @@ handlers available from Expat except namespace and external entity handlers.
Provides methods for handling XML escapes as well as JSP/ASP opening and close
tags.
-WWW: http://pear.php.net/package/XML_HTMLSax/
+WWW: https://pear.php.net/package/XML_HTMLSax
diff --git a/textproc/pear-XML_Wddx/pkg-descr b/textproc/pear-XML_Wddx/pkg-descr
index 997465afec04..01260a152987 100644
--- a/textproc/pear-XML_Wddx/pkg-descr
+++ b/textproc/pear-XML_Wddx/pkg-descr
@@ -13,4 +13,4 @@ use wddx_deserialize if it is built in.
No support for recordsets is available at present in the PHP version of the
deserializer.
-WWW: http://pear.php.net/package/XML_Wddx/
+WWW: https://pear.php.net/package/XML_Wddx
diff --git a/textproc/pecl-cld/pkg-descr b/textproc/pecl-cld/pkg-descr
index fc36ac61c1a9..3afb34528c74 100644
--- a/textproc/pecl-cld/pkg-descr
+++ b/textproc/pecl-cld/pkg-descr
@@ -1,4 +1,4 @@
Exposes Chromium Compact Language Detector to PHP to find out what language a
text is
-WWW: http://pecl.php.net/package/cld
+WWW: https://pecl.php.net/package/cld
diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile
index 41da5b03b677..46f8195f99ed 100644
--- a/textproc/pecl-ctemplate/Makefile
+++ b/textproc/pecl-ctemplate/Makefile
@@ -13,14 +13,11 @@ COMMENT= PECL extension for ctemplate library
LIB_DEPENDS= libctemplate.so:textproc/google-ctemplate
-USES= php:ext tar:xz
+USES= php:ext localbase:ldflags
USE_GITHUB= yes
GH_ACCOUNT= vanillahsu
GH_PROJECT= pecl-ctemplate
-IGNORE_WITH_PHP= 70
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS}
+IGNORE_WITH_PHP= 70 71
CONFIGURE_ARGS= --with-cTemplate=${LOCALBASE}
diff --git a/textproc/pecl-doublemetaphone/Makefile b/textproc/pecl-doublemetaphone/Makefile
index b728199ffe1d..ef0e4f901638 100644
--- a/textproc/pecl-doublemetaphone/Makefile
+++ b/textproc/pecl-doublemetaphone/Makefile
@@ -9,14 +9,14 @@ MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= joneum@bsdproject.de
COMMENT= PECL extension which implements the Double Metaphone algorithm
LICENSE= PHP301
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= php:ext tar:tgz
-IGNORE_WITH_PHP= 70
+IGNORE_WITH_PHP= 70 71
CONFIGURE_ARGS= --enable-doublemetaphone
diff --git a/textproc/pecl-doublemetaphone/pkg-descr b/textproc/pecl-doublemetaphone/pkg-descr
index 641e5f89f030..90a1774499c6 100644
--- a/textproc/pecl-doublemetaphone/pkg-descr
+++ b/textproc/pecl-doublemetaphone/pkg-descr
@@ -1,4 +1,4 @@
The doublemetaphone extension provides an implementation of the Double Metaphone
algorithm.
-WWW: http://pecl.php.net/package/doublemetaphone
+WWW: https://pecl.php.net/package/doublemetaphone
diff --git a/textproc/pecl-stem/Makefile b/textproc/pecl-stem/Makefile
index 301d1c9998f3..d9fe2fb9a16c 100644
--- a/textproc/pecl-stem/Makefile
+++ b/textproc/pecl-stem/Makefile
@@ -9,14 +9,14 @@ MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= joneum@bsdproject.de
COMMENT= PECL extension which provides word stemming
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
USES= php:ext tar:tgz
-IGNORE_WITH_PHP= 70
+IGNORE_WITH_PHP= 70 71
post-configure:
echo "#define HAVE_XDL_ALLOCATOR_PRIV 1" >>${WRKSRC}/config.h
diff --git a/textproc/pecl-stem/pkg-descr b/textproc/pecl-stem/pkg-descr
index 895ed47e24ac..88a67aa999cc 100644
--- a/textproc/pecl-stem/pkg-descr
+++ b/textproc/pecl-stem/pkg-descr
@@ -2,4 +2,4 @@ This stem extension for PHP provides stemming capability for a variety of
languages using Dr. M.F. Porter's Snowball API, which can be found at:
http://snowball.tartarus.org
-WWW: http://pecl.php.net/package/stem/
+WWW: https://pecl.php.net/package/stem
diff --git a/textproc/pecl-syck/Makefile b/textproc/pecl-syck/Makefile
index 22ed9bde6a8e..817935b41430 100644
--- a/textproc/pecl-syck/Makefile
+++ b/textproc/pecl-syck/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= joneum@bsdproject.de
COMMENT= PECL extension which facilitates YAML parsing
LICENSE= PHP301
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libsyck.a:textproc/syck
USES= php:ext tar:tgz
USE_PHP= spl:build hash:build
-IGNORE_WITH_PHP= 70
+IGNORE_WITH_PHP= 70 71
CONFIGURE_ARGS= --enable-syck
diff --git a/textproc/pecl-syck/pkg-descr b/textproc/pecl-syck/pkg-descr
index 87c697825a97..1201919aa6f9 100644
--- a/textproc/pecl-syck/pkg-descr
+++ b/textproc/pecl-syck/pkg-descr
@@ -7,4 +7,4 @@ interaction with scripting languages. YAML is optimized for data
serialization, configuration settings, log files, Internet
messaging and filtering.
-WWW: http://pecl.php.net/package/syck/
+WWW: https://pecl.php.net/package/syck
diff --git a/textproc/pecl-wbxml/Makefile b/textproc/pecl-wbxml/Makefile
index bbcd4ccc8f56..1f2cc6bab660 100644
--- a/textproc/pecl-wbxml/Makefile
+++ b/textproc/pecl-wbxml/Makefile
@@ -18,7 +18,7 @@ USES= php:ext tar:tgz
CONFIGURE_ARGS= --with-wbxml=${LOCALBASE} \
--with-libexpat-dir=${LOCALBASE}
-IGNORE_WITH_PHP= 70
+IGNORE_WITH_PHP= 70 71
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config.m4
diff --git a/textproc/pecl-wbxml/pkg-descr b/textproc/pecl-wbxml/pkg-descr
index e3b62dfd80b3..4c931b44656e 100644
--- a/textproc/pecl-wbxml/pkg-descr
+++ b/textproc/pecl-wbxml/pkg-descr
@@ -1,4 +1,4 @@
This extension provides WBXML (Wireless Binary XML) conversion capabilities
using the libwbxml library, which can be found at https://libwbxml.opensync.org/
-WWW: http://pecl.php.net/package/WBXML/
+WWW: https://pecl.php.net/package/WBXML
diff --git a/textproc/pecl-xdiff/Makefile b/textproc/pecl-xdiff/Makefile
index 87735870526f..d7212209f2ce 100644
--- a/textproc/pecl-xdiff/Makefile
+++ b/textproc/pecl-xdiff/Makefile
@@ -1,4 +1,4 @@
-# Created by: Larry Rosenman <ler@lerctr.org>
+# Created by: Larry Rosenman <ler@FreeBSD.org>
# $FreeBSD$
PORTNAME= xdiff
@@ -19,7 +19,7 @@ LIB_DEPENDS= libxdiff.so:textproc/libxdiff
PORTSCOUT= limit:^1.*
USES= php:ext tar:tgz
-IGNORE_WITH_PHP= 70
+IGNORE_WITH_PHP= 70 71
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/textproc/pecl-xdiff/pkg-descr b/textproc/pecl-xdiff/pkg-descr
index d177ed34d5cd..38d28b79100e 100644
--- a/textproc/pecl-xdiff/pkg-descr
+++ b/textproc/pecl-xdiff/pkg-descr
@@ -1,4 +1,4 @@
pecl-xdiff is a php extension that creates and applies
patches to both text and binary files.
-WWW: http://pecl.php.net/package/xdiff/
+WWW: https://pecl.php.net/package/xdiff
diff --git a/textproc/pecl-xdiff2/pkg-descr b/textproc/pecl-xdiff2/pkg-descr
index 0676e10cff88..cffa96cf0eed 100644
--- a/textproc/pecl-xdiff2/pkg-descr
+++ b/textproc/pecl-xdiff2/pkg-descr
@@ -1,4 +1,4 @@
pecl-xdiff is a php extension that creates and applies
patches to both text and binary files.
-WWW: http://pecl.php.net/package/xdiff/
+WWW: https://pecl.php.net/package/xdiff
diff --git a/textproc/pecl-xslcache/Makefile b/textproc/pecl-xslcache/Makefile
index 1b49bc30155c..cdd8057a118f 100644
--- a/textproc/pecl-xslcache/Makefile
+++ b/textproc/pecl-xslcache/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= joneum@bsdproject.de
COMMENT= Caches the parsed XSL stylesheet between sessions
LICENSE= PHP301
diff --git a/textproc/pecl-yaml/Makefile b/textproc/pecl-yaml/Makefile
index 77c74fc9747f..5bce97f2254a 100644
--- a/textproc/pecl-yaml/Makefile
+++ b/textproc/pecl-yaml/Makefile
@@ -19,6 +19,6 @@ LIB_DEPENDS= libyaml.so:textproc/libyaml
PORTSCOUT= limit:^1.*
USES= php:ext tar:tgz
-IGNORE_WITH_PHP= 70
+IGNORE_WITH_PHP= 70 71
.include <bsd.port.mk>
diff --git a/textproc/pecl-yaml/pkg-descr b/textproc/pecl-yaml/pkg-descr
index 51cb90764bed..95b50998c015 100644
--- a/textproc/pecl-yaml/pkg-descr
+++ b/textproc/pecl-yaml/pkg-descr
@@ -2,4 +2,4 @@ pecl-yaml is a YAML-1.1 parser and emitter, it Support for
YAML 1.1 (YAML Ain't Markup Language) serialization using
the LibYAML library.
-WWW: http://pecl.php.net/package/yaml/
+WWW: https://pecl.php.net/package/yaml
diff --git a/textproc/php-mecab/Makefile b/textproc/php-mecab/Makefile
index 5a3e4ae1164a..66af20db3e3c 100644
--- a/textproc/php-mecab/Makefile
+++ b/textproc/php-mecab/Makefile
@@ -18,8 +18,8 @@ USE_GITHUB= yes
GH_ACCOUNT= rsky
WRKSRC_SUBDIR= mecab
-CONFIGURE_ARGS+= --with-mecab=${LOCALBASE}/bin/mecab-config
-USES= php:ext tar:tgz
+CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config
+USES= php:ext
PHP_MODNAME= mecab
.include <bsd.port.mk>
diff --git a/textproc/php71-ctype/Makefile b/textproc/php71-ctype/Makefile
new file mode 100644
index 000000000000..e49199b94ce7
--- /dev/null
+++ b/textproc/php71-ctype/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -ctype
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-dom/Makefile b/textproc/php71-dom/Makefile
new file mode 100644
index 000000000000..dd695bee8d85
--- /dev/null
+++ b/textproc/php71-dom/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -dom
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-enchant/Makefile b/textproc/php71-enchant/Makefile
new file mode 100644
index 000000000000..877eacc520c1
--- /dev/null
+++ b/textproc/php71-enchant/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -enchant
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-pspell/Makefile b/textproc/php71-pspell/Makefile
new file mode 100644
index 000000000000..88bbb59885b3
--- /dev/null
+++ b/textproc/php71-pspell/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -pspell
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-simplexml/Makefile b/textproc/php71-simplexml/Makefile
new file mode 100644
index 000000000000..de86001c09fc
--- /dev/null
+++ b/textproc/php71-simplexml/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -simplexml
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-simplexml/files/patch-config.m4 b/textproc/php71-simplexml/files/patch-config.m4
new file mode 100644
index 000000000000..4eeef697dc87
--- /dev/null
+++ b/textproc/php71-simplexml/files/patch-config.m4
@@ -0,0 +1,43 @@
+--- config.m4.orig 2014-05-14 10:14:22.929420181 +0000
++++ config.m4 2014-05-14 10:15:36.967414693 +0000
+@@ -4,6 +4,9 @@
+ PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
+ [ --disable-simplexml Disable SimpleXML support], yes)
+
++PHP_ARG_WITH(pcre-dir, pcre install prefix,
++[ --with-pcre-dir SimpleXML: pcre install prefix], no, no)
++
+ if test -z "$PHP_LIBXML_DIR"; then
+ PHP_ARG_WITH(libxml-dir, libxml2 install dir,
+ [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no)
+@@ -11,6 +14,30 @@
+
+ if test "$PHP_SIMPLEXML" != "no"; then
+
++ dnl This is PECL build, check if bundled PCRE library is used
++ old_CPPFLAGS=$CPPFLAGS
++ CPPFLAGS=$INCLUDES
++ AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++ ],[
++ PHP_PCRE_REGEX=yes
++ ],[
++ AC_EGREP_CPP(yes,[
++#include <main/php_config.h>
++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
++yes
++#endif
++ ],[
++ PHP_PCRE_REGEX=pecl
++ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
++ ],[
++ PHP_PCRE_REGEX=no
++ ])
++ ])
++
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
+ fi
diff --git a/textproc/php71-wddx/Makefile b/textproc/php71-wddx/Makefile
new file mode 100644
index 000000000000..7243bf74e5ab
--- /dev/null
+++ b/textproc/php71-wddx/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -wddx
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-wddx/files/patch-config.m4 b/textproc/php71-wddx/files/patch-config.m4
new file mode 100644
index 000000000000..08787003b8f9
--- /dev/null
+++ b/textproc/php71-wddx/files/patch-config.m4
@@ -0,0 +1,22 @@
+--- config.m4.orig Mon Jul 26 09:05:10 2004
++++ config.m4 Mon Jul 26 09:07:46 2004
+@@ -5,6 +5,9 @@
+ PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
+ [ --enable-wddx Enable WDDX support.])
+
++PHP_ARG_WITH(libxml-dir, libxml2 install dir,
++[ --with-libxml-dir=<DIR> WDDX: libxml2 install prefix], no, no)
++
+ if test "$PHP_WDDX" != "no"; then
+ if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then
+ AC_MSG_WARN(Activating XML)
+@@ -12,4 +15,9 @@
+ fi
+ AC_DEFINE(HAVE_WDDX, 1, [ ])
+ PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared)
++
++ PHP_SETUP_LIBXML(WDDX_SHARED_LIBADD, [
++ ], [
++ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
++ ])
+ fi
diff --git a/textproc/php71-wddx/files/patch-wddx.c b/textproc/php71-wddx/files/patch-wddx.c
new file mode 100644
index 000000000000..a8a6a79fe47f
--- /dev/null
+++ b/textproc/php71-wddx/files/patch-wddx.c
@@ -0,0 +1,40 @@
+--- wddx.c.orig Sun Jan 1 13:50:16 2006
++++ wddx.c Mon Jan 16 12:56:21 2006
+@@ -18,6 +18,10 @@
+
+ /* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */
+
++#ifdef HAVE_CONFIG_H
++# include "config.h"
++#endif
++
+ #include "php.h"
+
+ #if HAVE_WDDX
+@@ -223,7 +227,7 @@
+
+ #include "ext/session/php_session.h"
+
+-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++#if HAVE_PHP_SESSION
+ /* {{{ PS_SERIALIZER_ENCODE_FUNC
+ */
+ PS_SERIALIZER_ENCODE_FUNC(wddx)
+@@ -302,7 +306,7 @@
+ {
+ le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number);
+
+-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++#if HAVE_PHP_SESSION
+ php_session_register_serializer("wddx",
+ PS_SERIALIZER_ENCODE_NAME(wddx),
+ PS_SERIALIZER_DECODE_NAME(wddx));
+@@ -317,7 +321,7 @@
+ PHP_MINFO_FUNCTION(wddx)
+ {
+ php_info_print_table_start();
+-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
++#if HAVE_PHP_SESSION
+ php_info_print_table_header(2, "WDDX Support", "enabled" );
+ php_info_print_table_row(2, "WDDX Session Serializer", "enabled" );
+ #else
diff --git a/textproc/php71-xml/Makefile b/textproc/php71-xml/Makefile
new file mode 100644
index 000000000000..703803a865bc
--- /dev/null
+++ b/textproc/php71-xml/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -xml
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-xml/files/patch-compat.c b/textproc/php71-xml/files/patch-compat.c
new file mode 100644
index 000000000000..02125961b20c
--- /dev/null
+++ b/textproc/php71-xml/files/patch-compat.c
@@ -0,0 +1,13 @@
+--- compat.c.orig Tue Jul 20 10:55:02 2004
++++ compat.c Tue Jul 20 10:55:55 2004
+@@ -16,6 +16,10 @@
+ +----------------------------------------------------------------------+
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "php.h"
+ #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT)
+ #include "expat_compat.h"
diff --git a/textproc/php71-xmlreader/Makefile b/textproc/php71-xmlreader/Makefile
new file mode 100644
index 000000000000..087340030e85
--- /dev/null
+++ b/textproc/php71-xmlreader/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -xmlreader
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-xmlwriter/Makefile b/textproc/php71-xmlwriter/Makefile
new file mode 100644
index 000000000000..4284c734aa90
--- /dev/null
+++ b/textproc/php71-xmlwriter/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -xmlwriter
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-xsl/Makefile b/textproc/php71-xsl/Makefile
new file mode 100644
index 000000000000..00f0b650491f
--- /dev/null
+++ b/textproc/php71-xsl/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+CATEGORIES= textproc
+
+MASTERDIR= ${.CURDIR}/../../lang/php71
+
+PKGNAMESUFFIX= -xsl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php71-xsl/files/patch-php_xsl.h b/textproc/php71-xsl/files/patch-php_xsl.h
new file mode 100644
index 000000000000..9777187f8748
--- /dev/null
+++ b/textproc/php71-xsl/files/patch-php_xsl.h
@@ -0,0 +1,11 @@
+--- php_xsl.h.orig Sun Jan 1 13:50:17 2006
++++ php_xsl.h Tue Jan 17 16:23:10 2006
+@@ -43,7 +43,7 @@
+ #include <libexslt/exsltconfig.h>
+ #endif
+
+-#include "../dom/xml_common.h"
++#include "ext/dom/xml_common.h"
+ #include "xsl_fe.h"
+
+ #include <libxslt/extensions.h>
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index b09f432eeab1..8024ddc85296 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -3,7 +3,7 @@
PORTNAME= po4a
PORTVERSION= 0.45
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc perl5
MASTER_SITES= LOCAL/garga/po4a
diff --git a/textproc/pugixml/Makefile b/textproc/pugixml/Makefile
index 78663ac29bf4..10c999c5c349 100644
--- a/textproc/pugixml/Makefile
+++ b/textproc/pugixml/Makefile
@@ -2,6 +2,7 @@
PORTNAME= pugixml
PORTVERSION= 1.7
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= https://github.com/zeux/pugixml/releases/download/v${PORTVERSION}/
@@ -10,7 +11,9 @@ COMMENT= Light-weight, simple and fast XML parser for C++ with XPath support
LICENSE= MIT
-USES= cmake
+USES= cmake compiler:c++11-lang
CMAKE_SOURCE_PATH= ${WRKSRC}/scripts
+CXXFLAGS+= -std=c++11
+
.include <bsd.port.mk>
diff --git a/textproc/py-Chameleon/Makefile b/textproc/py-Chameleon/Makefile
index dde88dfd378f..ab79855c21df 100644
--- a/textproc/py-Chameleon/Makefile
+++ b/textproc/py-Chameleon/Makefile
@@ -2,12 +2,12 @@
# $FreeBSD$
PORTNAME= Chameleon
-PORTVERSION= 2.25
+PORTVERSION= 3.0
CATEGORIES= textproc www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= python@FreeBSD.org
COMMENT= Fast HTML/XML Template Compiler
LICENSE= BSD4CLAUSE
@@ -15,5 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= python
USE_PYTHON= autoplist distutils
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/textproc/py-Chameleon/distinfo b/textproc/py-Chameleon/distinfo
index 6f37aa5ea9e8..7156bbc4c2ab 100644
--- a/textproc/py-Chameleon/distinfo
+++ b/textproc/py-Chameleon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474945965
-SHA256 (Chameleon-2.25.tar.gz) = 6b2740e077626306c10a659bb9fe80d2eb8b6ceb89b521dfbed2f1432b2b496d
-SIZE (Chameleon-2.25.tar.gz) = 193965
+TIMESTAMP = 1481737394
+SHA256 (Chameleon-3.0.tar.gz) = b830b9c44578635caa73ae91f511013df7576304f6f1375f99a27bce5e2099d9
+SIZE (Chameleon-3.0.tar.gz) = 158668
diff --git a/textproc/py-Chameleon/pkg-descr b/textproc/py-Chameleon/pkg-descr
index 74e1ab5ceecc..ed5ffdc8d689 100644
--- a/textproc/py-Chameleon/pkg-descr
+++ b/textproc/py-Chameleon/pkg-descr
@@ -6,4 +6,4 @@ HTML markup or XML. The language used is page templates, originally a Zope
invention, but available here as a standalone library that you can use in any
script or application running Python.
-WWW: http://www.pagetemplates.org/
+WWW: https://github.com/malthe/chameleon
diff --git a/textproc/py-MarkupSafe/Makefile b/textproc/py-MarkupSafe/Makefile
index 6a556605f49d..5418a5b9c892 100644
--- a/textproc/py-MarkupSafe/Makefile
+++ b/textproc/py-MarkupSafe/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MarkupSafe
PORTVERSION= 0.23
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,4 +16,7 @@ LICENSE= BSD3CLAUSE
USE_PYTHON= autoplist concurrent distutils
USES= python
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/markupsafe/_speedups.so
+
.include <bsd.port.mk>
diff --git a/textproc/py-agate-dbf/Makefile b/textproc/py-agate-dbf/Makefile
index 80e0c1232427..8d652d73f78d 100644
--- a/textproc/py-agate-dbf/Makefile
+++ b/textproc/py-agate-dbf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= agate-dbf
-PORTVERSION= 0.1.0
+PORTVERSION= 0.2.0
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ COMMENT= Support reading dbf files for agate
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.2.2:textproc/py-agate \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \
${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread
USES= python
diff --git a/textproc/py-agate-dbf/distinfo b/textproc/py-agate-dbf/distinfo
index cc15ee01eb42..a42388be0606 100644
--- a/textproc/py-agate-dbf/distinfo
+++ b/textproc/py-agate-dbf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463409454
-SHA256 (agate-dbf-0.1.0.tar.gz) = ffd9bfc7c04fc3ce1c54522f41aeccba5a7f3cee951b26c8a0ab1348c940ff77
-SIZE (agate-dbf-0.1.0.tar.gz) = 2147
+TIMESTAMP = 1482233542
+SHA256 (agate-dbf-0.2.0.tar.gz) = 0666c1ad06cd4b2860351cebbd88bd4b05b2d1abd41b25cf91f8f6715035735e
+SIZE (agate-dbf-0.2.0.tar.gz) = 2059
diff --git a/textproc/py-agate-excel/Makefile b/textproc/py-agate-excel/Makefile
index 9808c2d61815..ffdc64ece8dd 100644
--- a/textproc/py-agate-excel/Makefile
+++ b/textproc/py-agate-excel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= agate-excel
-PORTVERSION= 0.1.0
+PORTVERSION= 0.2.0
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ COMMENT= Support reading Excel files for agate
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.2.2:textproc/py-agate \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \
${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd \
${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl
diff --git a/textproc/py-agate-excel/distinfo b/textproc/py-agate-excel/distinfo
index e7cc012ad622..178779bdd0ed 100644
--- a/textproc/py-agate-excel/distinfo
+++ b/textproc/py-agate-excel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463408146
-SHA256 (agate-excel-0.1.0.tar.gz) = 5341b08ffa6882b5b558d97b431ff122cd4c178fd5fb884a831f71ccef90fb23
-SIZE (agate-excel-0.1.0.tar.gz) = 3436
+TIMESTAMP = 1482233464
+SHA256 (agate-excel-0.2.0.tar.gz) = 5e75452fefe1ffe18fe695eeb08337c50eb3f0b74bfe108d5a85a2bb3ee806d2
+SIZE (agate-excel-0.2.0.tar.gz) = 3348
diff --git a/textproc/py-agate/Makefile b/textproc/py-agate/Makefile
index a6f370f7116f..734ac153f53d 100644
--- a/textproc/py-agate/Makefile
+++ b/textproc/py-agate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= agate
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.5
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-agate/distinfo b/textproc/py-agate/distinfo
index 84dc8826a7c7..698fe35f4b6e 100644
--- a/textproc/py-agate/distinfo
+++ b/textproc/py-agate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480168674
-SHA256 (agate-1.5.0.tar.gz) = f876dfdfd202c5e1ad7faf254cce7bb982cd70d29578106b8c96a9dd0264a45c
-SIZE (agate-1.5.0.tar.gz) = 50353
+TIMESTAMP = 1483108396
+SHA256 (agate-1.5.5.tar.gz) = 2861da5ef44a442a2225f0945a8ddce67ba4653622bf55b22f793a7b7fd95265
+SIZE (agate-1.5.5.tar.gz) = 51513
diff --git a/textproc/py-cloud_sptheme/Makefile b/textproc/py-cloud_sptheme/Makefile
index b44966ac0c5c..cf10fbfa4584 100644
--- a/textproc/py-cloud_sptheme/Makefile
+++ b/textproc/py-cloud_sptheme/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cloud_sptheme
-PORTVERSION= 1.7.1
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-cloud_sptheme/distinfo b/textproc/py-cloud_sptheme/distinfo
index aa10fbee050f..af6fd8429fa8 100644
--- a/textproc/py-cloud_sptheme/distinfo
+++ b/textproc/py-cloud_sptheme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473371879
-SHA256 (python/cloud_sptheme-1.7.1.tar.gz) = 7ea3b2da3dd4c12c8a1f859327d1bb5decae9aaa358a1a1cb2f4b772c955a97e
-SIZE (python/cloud_sptheme-1.7.1.tar.gz) = 103871
+TIMESTAMP = 1482479245
+SHA256 (python/cloud_sptheme-1.8.0.tar.gz) = 0deae6f4599031f84d30c4fe2d43f49667638c958419e40c3ad0a7a1ccc2d1b6
+SIZE (python/cloud_sptheme-1.8.0.tar.gz) = 116992
diff --git a/textproc/py-cloud_sptheme/files/patch-index__styling.py b/textproc/py-cloud_sptheme/files/patch-index__styling.py
deleted file mode 100644
index 43ead1289a61..000000000000
--- a/textproc/py-cloud_sptheme/files/patch-index__styling.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- cloud_sptheme/ext/index_styling.py.orig 2016-09-08 20:32:45 UTC
-+++ cloud_sptheme/ext/index_styling.py
-@@ -49,8 +49,9 @@ def mangle_index(app, pagename, template
- fmt = format_index_name
- for key, entries in ctx['genindexentries']:
- for idx, entry in enumerate(entries):
-- name, (links, subitems) = entry
-- entries[idx] = fmt(name), (links, subitems)
-+ name, data = entry
-+ entries[idx] = fmt(name), data
-+ subitems = data[1]
- for idx, entry in enumerate(subitems):
- name, links = entry
- subitems[idx] = fmt(name), links
diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile
index 471b432f6dc4..bb73283269ed 100644
--- a/textproc/py-creole/Makefile
+++ b/textproc/py-creole/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= creole
-PORTVERSION= 1.0.1
-PORTREVISION= 2
+PORTVERSION= 1.3.1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-creole/distinfo b/textproc/py-creole/distinfo
index 8f012a5833e6..e2c3c9df7fb6 100644
--- a/textproc/py-creole/distinfo
+++ b/textproc/py-creole/distinfo
@@ -1,2 +1,3 @@
-SHA256 (python-creole-1.0.1.tar.gz) = 8571838711474a2508046b079f8e76ff95debd91ac825687007626f772945f5e
-SIZE (python-creole-1.0.1.tar.gz) = 57293
+TIMESTAMP = 1482058977
+SHA256 (python-creole-1.3.1.tar.gz) = 3c22f7f815d1d08dbecb1e0c9f4aee081201c26e08cfadffad3966d33fb90d01
+SIZE (python-creole-1.3.1.tar.gz) = 75834
diff --git a/textproc/py-csvkit/Makefile b/textproc/py-csvkit/Makefile
index c1f9a1a7b487..f1f4d49e8956 100644
--- a/textproc/py-csvkit/Makefile
+++ b/textproc/py-csvkit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= csvkit
-PORTVERSION= 0.9.1
+PORTVERSION= 1.0.1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,13 +11,11 @@ COMMENT= Command line tools for working with CSV
LICENSE= MIT
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.1.0:textproc/py-agate-dbf \
- ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.1.0:textproc/py-agate-excel \
- ${PYTHON_PKGNAMEPREFIX}agate>=1.2.2:textproc/py-agate \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil \
- ${PYTHON_PKGNAMEPREFIX}dbf>0.94.003:databases/py-dbf \
- ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \
- ${PYTHON_PKGNAMEPREFIX}sqlalchemy09>=0.9.3:databases/py-sqlalchemy09
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate \
+ ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel \
+ ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf \
+ ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six
USES= python
USE_PYTHON= autoplist distutils
diff --git a/textproc/py-csvkit/distinfo b/textproc/py-csvkit/distinfo
index ac6291d364bf..59b90460278c 100644
--- a/textproc/py-csvkit/distinfo
+++ b/textproc/py-csvkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463399029
-SHA256 (csvkit-0.9.1.tar.gz) = 92f8b8647becb5cb1dccb3af92a13a4e85702d42ba465ce8447881fb38c9f93a
-SIZE (csvkit-0.9.1.tar.gz) = 34170
+TIMESTAMP = 1483129805
+SHA256 (csvkit-1.0.1.tar.gz) = 046bc6e71e6892b4d244f8702786354e28ca6002814d460d99659d6ad8e7bcd1
+SIZE (csvkit-1.0.1.tar.gz) = 5036770
diff --git a/textproc/py-csvkit/files/patch-csvkit.egg-info_requires.txt b/textproc/py-csvkit/files/patch-csvkit.egg-info_requires.txt
deleted file mode 100644
index 59f39ab4502b..000000000000
--- a/textproc/py-csvkit/files/patch-csvkit.egg-info_requires.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- csvkit.egg-info/requires.txt.orig 2015-03-31 02:06:59 UTC
-+++ csvkit.egg-info/requires.txt
-@@ -1,6 +1,6 @@
- xlrd>=0.7.1
- sqlalchemy>=0.6.6
--openpyxl==2.2.0-b1
-+openpyxl>=2.2.0-b1
- six>=1.6.1
--python-dateutil==2.2
--dbf==0.94.003
-+python-dateutil>=2.2
-+dbf>=0.94.003
diff --git a/textproc/py-csvkit/files/patch-setup.py b/textproc/py-csvkit/files/patch-setup.py
deleted file mode 100644
index dc0187089006..000000000000
--- a/textproc/py-csvkit/files/patch-setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- setup.py.orig 2015-03-31 01:07:39 UTC
-+++ setup.py
-@@ -6,9 +6,9 @@ from setuptools import setup
- install_requires = [
- 'xlrd>=0.7.1',
- 'sqlalchemy>=0.6.6',
-- 'openpyxl==2.2.0-b1',
-+ 'openpyxl>=2.2.0-b1',
- 'six>=1.6.1',
-- 'python-dateutil==2.2'
-+ 'python-dateutil>=2.2'
- ]
-
- if sys.version_info < (2, 7):
-@@ -17,7 +17,7 @@ if sys.version_info < (2, 7):
- install_requires.append('simplejson>=3.6.3')
-
- if sys.version_info[0] == 2:
-- install_requires.append('dbf==0.94.003')
-+ install_requires.append('dbf>=0.94.003')
-
- setup(
- name='csvkit',
diff --git a/textproc/py-csvkit/pkg-descr b/textproc/py-csvkit/pkg-descr
index 0eadbd21190c..c6a196416546 100644
--- a/textproc/py-csvkit/pkg-descr
+++ b/textproc/py-csvkit/pkg-descr
@@ -1,2 +1,4 @@
csvkit is a suite of command-line tools for converting to and working
with CSV, the king of tabular file formats.
+
+WWW: https://csvkit.readthedocs.io/
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index 910bc33d506c..c01a7eaf4b15 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= docutils
-PORTVERSION= 0.12
-PORTREVISION= 1
+PORTVERSION= 0.13.1
CATEGORIES= textproc python
MASTER_SITES= SF \
CHEESESHOP
@@ -17,6 +16,7 @@ LICENSE_COMB= multi
USES= python
USE_PYTHON= distutils concurrent autoplist
+NO_ARCH= yes
OPTIONS_DEFINE= PYGMENTS
PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments
diff --git a/textproc/py-docutils/distinfo b/textproc/py-docutils/distinfo
index 9a682396ac05..839faf488416 100644
--- a/textproc/py-docutils/distinfo
+++ b/textproc/py-docutils/distinfo
@@ -1,2 +1,3 @@
-SHA256 (docutils-0.12.tar.gz) = c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa
-SIZE (docutils-0.12.tar.gz) = 1618353
+TIMESTAMP = 1481373966
+SHA256 (docutils-0.13.1.tar.gz) = 718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be
+SIZE (docutils-0.13.1.tar.gz) = 1735216
diff --git a/textproc/py-elasticsearch-py/Makefile b/textproc/py-elasticsearch-py/Makefile
index 27459c27d1df..63970e2f2e5a 100644
--- a/textproc/py-elasticsearch-py/Makefile
+++ b/textproc/py-elasticsearch-py/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= elasticsearch-py
-PORTVERSION= 5.0.0
+PORTVERSION= 5.1.0
CATEGORIES= textproc python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-elasticsearch-py/distinfo b/textproc/py-elasticsearch-py/distinfo
index 569ffd277f54..ef85d4e1d1c1 100644
--- a/textproc/py-elasticsearch-py/distinfo
+++ b/textproc/py-elasticsearch-py/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477015903
-SHA256 (elasticsearch-elasticsearch-py-5.0.0_GH0.tar.gz) = 544d526b022f398e555df2c83e25728159bcadbddf016aea6f4a8db706945ae9
-SIZE (elasticsearch-elasticsearch-py-5.0.0_GH0.tar.gz) = 79615
+TIMESTAMP = 1484834874
+SHA256 (elasticsearch-elasticsearch-py-5.1.0_GH0.tar.gz) = 6d2c06607dd1c27842e25552878c2d45a345dc27946e8819588bcacedbe3c5f8
+SIZE (elasticsearch-elasticsearch-py-5.1.0_GH0.tar.gz) = 79933
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index f63c3373a7a4..003da642af21 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -2,20 +2,22 @@
# $FreeBSD$
PORTNAME= enchant
-PORTVERSION= 1.6.5
-PORTREVISION= 6
+PORTVERSION= 1.6.8
CATEGORIES= textproc devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= py${PORTNAME}-${PORTVERSION}
-MAINTAINER= nivit@FreeBSD.org
+MAINTAINER= thierry@FreeBSD.org
COMMENT= Spellchecking library for Python based on the Enchant library
+LICENSE= LGPL21
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
LIB_DEPENDS= libenchant.so:textproc/enchant
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= distutils
USE_WX= 3.0+
WX_COMPS= python:run
diff --git a/textproc/py-enchant/distinfo b/textproc/py-enchant/distinfo
index 0b7bf7d785b3..9e1086ec117b 100644
--- a/textproc/py-enchant/distinfo
+++ b/textproc/py-enchant/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pyenchant-1.6.5.tar.gz) = 623f332a9fbb70ae6c9c2d0d4e7f7bae5922d36ba0fe34be8e32df32ebbb4f84
-SIZE (pyenchant-1.6.5.tar.gz) = 62294
+TIMESTAMP = 1481232521
+SHA256 (pyenchant-1.6.8.tar.gz) = 7ead2ee74f1a4fc2a7199b3d6012eaaaceea03fbcadcb5df67d2f9d0d51f050a
+SIZE (pyenchant-1.6.8.tar.gz) = 63693
diff --git a/textproc/py-enchant/files/patch-setup.py b/textproc/py-enchant/files/patch-setup.py
deleted file mode 100644
index f92b30378260..000000000000
--- a/textproc/py-enchant/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py 2010-02-23 01:51:41.000000000 +0100
-+++ setup.py.port 2010-05-06 17:28:46.000000000 +0200
-@@ -6,8 +6,8 @@
- #
-
-
--import distribute_setup
--distribute_setup.use_setuptools()
-+#import distribute_setup
-+#distribute_setup.use_setuptools()
- from setuptools import setup, find_packages, Extension
-
- import sys
diff --git a/textproc/py-enchant/pkg-descr b/textproc/py-enchant/pkg-descr
index e07f299dc43e..b5354688fca0 100644
--- a/textproc/py-enchant/pkg-descr
+++ b/textproc/py-enchant/pkg-descr
@@ -5,4 +5,4 @@ of Enchant with the flexibility of Python and a nice 'Pythonic'
object-oriented interface. It also aims to provide some higher-level
functionality than is available in the C API.
-WWW: http://pyenchant.sourceforge.net/
+WWW: https://pypi.python.org/pypi/pyenchant
diff --git a/textproc/py-enchant/pkg-plist b/textproc/py-enchant/pkg-plist
new file mode 100644
index 000000000000..0a38c4a396b6
--- /dev/null
+++ b/textproc/py-enchant/pkg-plist
@@ -0,0 +1,47 @@
+%%PYTHON_SITELIBDIR%%/enchant/__init__.py
+%%PYTHON_SITELIBDIR%%/enchant/__init__.pyc
+%%PYTHON_SITELIBDIR%%/enchant/__init__.pyo
+%%PYTHON_SITELIBDIR%%/enchant/_enchant.py
+%%PYTHON_SITELIBDIR%%/enchant/_enchant.pyc
+%%PYTHON_SITELIBDIR%%/enchant/_enchant.pyo
+%%PYTHON_SITELIBDIR%%/enchant/checker/CmdLineChecker.py
+%%PYTHON_SITELIBDIR%%/enchant/checker/CmdLineChecker.pyc
+%%PYTHON_SITELIBDIR%%/enchant/checker/CmdLineChecker.pyo
+%%PYTHON_SITELIBDIR%%/enchant/checker/GtkSpellCheckerDialog.py
+%%PYTHON_SITELIBDIR%%/enchant/checker/GtkSpellCheckerDialog.pyc
+%%PYTHON_SITELIBDIR%%/enchant/checker/GtkSpellCheckerDialog.pyo
+%%PYTHON_SITELIBDIR%%/enchant/checker/__init__.py
+%%PYTHON_SITELIBDIR%%/enchant/checker/__init__.pyc
+%%PYTHON_SITELIBDIR%%/enchant/checker/__init__.pyo
+%%PYTHON_SITELIBDIR%%/enchant/checker/tests.py
+%%PYTHON_SITELIBDIR%%/enchant/checker/tests.pyc
+%%PYTHON_SITELIBDIR%%/enchant/checker/tests.pyo
+%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.py
+%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.pyc
+%%PYTHON_SITELIBDIR%%/enchant/checker/wxSpellCheckerDialog.pyo
+%%PYTHON_SITELIBDIR%%/enchant/errors.py
+%%PYTHON_SITELIBDIR%%/enchant/errors.pyc
+%%PYTHON_SITELIBDIR%%/enchant/errors.pyo
+%%PYTHON_SITELIBDIR%%/enchant/pypwl.py
+%%PYTHON_SITELIBDIR%%/enchant/pypwl.pyc
+%%PYTHON_SITELIBDIR%%/enchant/pypwl.pyo
+%%PYTHON_SITELIBDIR%%/enchant/tests.py
+%%PYTHON_SITELIBDIR%%/enchant/tests.pyc
+%%PYTHON_SITELIBDIR%%/enchant/tests.pyo
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/__init__.py
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/__init__.pyc
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/__init__.pyo
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/en.py
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/en.pyc
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/en.pyo
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/tests.py
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/tests.pyc
+%%PYTHON_SITELIBDIR%%/enchant/tokenize/tests.pyo
+%%PYTHON_SITELIBDIR%%/enchant/utils.py
+%%PYTHON_SITELIBDIR%%/enchant/utils.pyc
+%%PYTHON_SITELIBDIR%%/enchant/utils.pyo
+%%PYTHON_SITELIBDIR%%/pyenchant-1.6.8-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pyenchant-1.6.8-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pyenchant-1.6.8-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pyenchant-1.6.8-py%%PYTHON_VER%%.egg-info/eager_resources.txt
+%%PYTHON_SITELIBDIR%%/pyenchant-1.6.8-py%%PYTHON_VER%%.egg-info/top_level.txt
diff --git a/textproc/py-excelerator/pkg-descr b/textproc/py-excelerator/pkg-descr
index 300ef3eec951..68329b61549e 100644
--- a/textproc/py-excelerator/pkg-descr
+++ b/textproc/py-excelerator/pkg-descr
@@ -3,4 +3,4 @@ Excel 95+ files. It supports Unicode in Excel files, and can use a variety of
formatting features and printing options. It can dump Excel and OLE2 compound
files.
-WWW: http://sourceforge.net/projects/pyexcelerator
+WWW: https://sourceforge.net/projects/pyexcelerator/
diff --git a/textproc/py-hunspell/Makefile b/textproc/py-hunspell/Makefile
new file mode 100644
index 000000000000..0bd14252ac17
--- /dev/null
+++ b/textproc/py-hunspell/Makefile
@@ -0,0 +1,30 @@
+# Created by: Thierry Thomas <thierry@pompo.net>
+# $FreeBSD$
+
+PORTNAME= hunspell
+PORTVERSION= 0.4.1
+PORTREVISION= 1
+CATEGORIES= textproc devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= thierry@FreeBSD.org
+COMMENT= Python module for the Hunspell spellchecker engine
+
+LICENSE= LGPL3
+
+LIB_DEPENDS= libhunspell-${HSPLVER}.so:textproc/hunspell
+
+USES?= python
+USES+= localbase
+USE_PYTHON= distutils
+
+HSPLVER= 1.6
+PLIST_FILES= %%PYTHON_SITELIBDIR%%/hunspell.so
+
+pre-configure:
+ ${REINPLACE_CMD} -e "s|/usr/include|${LOCALBASE}/include|" \
+ -e "s|= \['hunspell|= ['hunspell-${HSPLVER}|" \
+ ${WRKSRC}/${PYSETUP}
+
+.include <bsd.port.mk>
diff --git a/textproc/py-hunspell/distinfo b/textproc/py-hunspell/distinfo
new file mode 100644
index 000000000000..a47bcb113284
--- /dev/null
+++ b/textproc/py-hunspell/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1482444080
+SHA256 (hunspell-0.4.1.tar.gz) = df8d2232488b0cb49afd64ac76bd2bb600b6dc85fca67b19db0baee602aa9691
+SIZE (hunspell-0.4.1.tar.gz) = 4428
diff --git a/textproc/py-hunspell/pkg-descr b/textproc/py-hunspell/pkg-descr
new file mode 100644
index 000000000000..12dc50854099
--- /dev/null
+++ b/textproc/py-hunspell/pkg-descr
@@ -0,0 +1,6 @@
+pyhunspell is a set of Python bindings for the Hunspell spellchecker engine. It
+lets developers load Hunspell dictionaries, check words, get suggestions, add
+new words, etc. It also provides some basic morphological analysis related
+methods.
+
+WWW: https://pypi.python.org/pypi/hunspell
diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 1b3b9e6bee25..859520a4e281 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= markdown2
-PORTVERSION= 2.3.1
+PORTVERSION= 2.3.2
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-markdown2/distinfo b/textproc/py-markdown2/distinfo
index b7571fa5916b..9ac5c1145dec 100644
--- a/textproc/py-markdown2/distinfo
+++ b/textproc/py-markdown2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (markdown2-2.3.1.zip) = 4463dd754e79e4afd490c21d81db67b85b488a0d0adf2fee2b99a69c4e67d80e
-SIZE (markdown2-2.3.1.zip) = 147881
+TIMESTAMP = 1480991561
+SHA256 (markdown2-2.3.2.zip) = dc6d5d3a0da4ea46e4bc8032ba3a2fc9fe908b68f93ae49595f8b7fc509b9c1a
+SIZE (markdown2-2.3.2.zip) = 155559
diff --git a/textproc/py-mwparserfromhell/Makefile b/textproc/py-mwparserfromhell/Makefile
index fffbeff8a13d..b0c90d511695 100644
--- a/textproc/py-mwparserfromhell/Makefile
+++ b/textproc/py-mwparserfromhell/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mwparserfromhell
-PORTVERSION= 0.4.3
+PORTVERSION= 0.4.4
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-mwparserfromhell/distinfo b/textproc/py-mwparserfromhell/distinfo
index eeaf23c6ad1c..1309ad416f5b 100644
--- a/textproc/py-mwparserfromhell/distinfo
+++ b/textproc/py-mwparserfromhell/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mwparserfromhell-0.4.3.tar.gz) = 1eb243e8c1cd84e7894aeda7abfc905acd6c560fc31c2009800a664a0318d91c
-SIZE (mwparserfromhell-0.4.3.tar.gz) = 117848
+TIMESTAMP = 1486000433
+SHA256 (mwparserfromhell-0.4.4.tar.gz) = e15079b832e47b076e811ee3cce391f7bf116fe8289a97ea1181577331e3e6b4
+SIZE (mwparserfromhell-0.4.4.tar.gz) = 118399
diff --git a/textproc/py-openpyxl/Makefile b/textproc/py-openpyxl/Makefile
index 64873adbf8c0..ef4b9ba7d644 100644
--- a/textproc/py-openpyxl/Makefile
+++ b/textproc/py-openpyxl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= openpyxl
-PORTVERSION= 2.4.1
+PORTVERSION= 2.4.2
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-openpyxl/distinfo b/textproc/py-openpyxl/distinfo
index 2baa3bb0e561..6dd34dbb63df 100644
--- a/textproc/py-openpyxl/distinfo
+++ b/textproc/py-openpyxl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480270684
-SHA256 (openpyxl-2.4.1.tar.gz) = 836e66578320e5871baa5a958c7acb7dcbc1b508989a675276b20ac2e1c08d82
-SIZE (openpyxl-2.4.1.tar.gz) = 154612
+TIMESTAMP = 1486200018
+SHA256 (openpyxl-2.4.2.tar.gz) = 2fe9ba182b687acf7e4660b39bd91d703c0bf934f8295c182d04ecd2345c6e26
+SIZE (openpyxl-2.4.2.tar.gz) = 177505
diff --git a/textproc/py-pandocfilters/Makefile b/textproc/py-pandocfilters/Makefile
new file mode 100644
index 000000000000..dec70132e1be
--- /dev/null
+++ b/textproc/py-pandocfilters/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= pandocfilters
+PORTVERSION= 1.4.1
+CATEGORIES= textproc python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= python@FreeBSD.org
+COMMENT= Utilities for writing pandoc filters in python
+
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USES= python
+USE_PYTHON= distutils autoplist
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/textproc/py-pandocfilters/distinfo b/textproc/py-pandocfilters/distinfo
new file mode 100644
index 000000000000..4f2c532a3365
--- /dev/null
+++ b/textproc/py-pandocfilters/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483908399
+SHA256 (pandocfilters-1.4.1.tar.gz) = ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd
+SIZE (pandocfilters-1.4.1.tar.gz) = 14265
diff --git a/textproc/py-pandocfilters/pkg-descr b/textproc/py-pandocfilters/pkg-descr
new file mode 100644
index 000000000000..002d32656262
--- /dev/null
+++ b/textproc/py-pandocfilters/pkg-descr
@@ -0,0 +1,3 @@
+Utilities for writing pandoc filters in python.
+
+WWW: https://github.com/jgm/pandocfilters
diff --git a/textproc/py-qrcode/Makefile b/textproc/py-qrcode/Makefile
index 29972c528297..7b7b6fb55400 100644
--- a/textproc/py-qrcode/Makefile
+++ b/textproc/py-qrcode/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qrcode
-PORTVERSION= 5.1
+PORTVERSION= 5.3
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-qrcode/distinfo b/textproc/py-qrcode/distinfo
index 3f689064db1e..146dbc25a2ca 100644
--- a/textproc/py-qrcode/distinfo
+++ b/textproc/py-qrcode/distinfo
@@ -1,2 +1,3 @@
-SHA256 (qrcode-5.1.tar.gz) = 33bdee5e834fc99eb538e1dad198a3a5b70d0a88845629cacf4c592be1ce7f6a
-SIZE (qrcode-5.1.tar.gz) = 22259
+TIMESTAMP = 1481271215
+SHA256 (qrcode-5.3.tar.gz) = 4115ccee832620df16b659d4653568331015c718a754855caf5930805d76924e
+SIZE (qrcode-5.3.tar.gz) = 24253
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index 55fecf1712bc..d68d02897f4f 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= rdflib
-PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTVERSION= 4.2.2
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-rdflib/distinfo b/textproc/py-rdflib/distinfo
index ac5a7c0f7143..0b2932bb1fbb 100644
--- a/textproc/py-rdflib/distinfo
+++ b/textproc/py-rdflib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rdflib-4.2.1.tar.gz) = eb02bd235606ef3b26e213da3e576557a6392ce103efd8c6c8ff1e08321608c8
-SIZE (rdflib-4.2.1.tar.gz) = 889467
+TIMESTAMP = 1485785797
+SHA256 (rdflib-4.2.2.tar.gz) = da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d
+SIZE (rdflib-4.2.2.tar.gz) = 905094
diff --git a/textproc/py-regex/Makefile b/textproc/py-regex/Makefile
index 5c76687a9577..57ee3ced91de 100644
--- a/textproc/py-regex/Makefile
+++ b/textproc/py-regex/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= regex
-PORTVERSION= 2016.07.21
+PORTVERSION= 2016.11.21
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-regex/distinfo b/textproc/py-regex/distinfo
index feccf7baab32..2a07ae5ff840 100644
--- a/textproc/py-regex/distinfo
+++ b/textproc/py-regex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470225773
-SHA256 (regex-2016.07.21.tar.gz) = c9c98972ccfccdc9e16b10b415a78c9b0adbadcc34078e4cfdb54507617214bb
-SIZE (regex-2016.07.21.tar.gz) = 598749
+TIMESTAMP = 1482835736
+SHA256 (regex-2016.11.21.tar.gz) = 245258012db0792838718c67fc33107f8b940196e29aa628341956d3d903ed1f
+SIZE (regex-2016.11.21.tar.gz) = 599308
diff --git a/textproc/py-rst2html5/Makefile b/textproc/py-rst2html5/Makefile
index ee404455576b..ab453e336e3f 100644
--- a/textproc/py-rst2html5/Makefile
+++ b/textproc/py-rst2html5/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rst2html5
-PORTVERSION= 1.8.2
+PORTVERSION= 1.9
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-rst2html5/distinfo b/textproc/py-rst2html5/distinfo
index 77eabd438c69..dd7385756821 100644
--- a/textproc/py-rst2html5/distinfo
+++ b/textproc/py-rst2html5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470939645
-SHA256 (rst2html5-1.8.2.tar.gz) = 4be60352fb7b066608d76872720ed0cfa8970c5ce3aaa01698524432096e8380
-SIZE (rst2html5-1.8.2.tar.gz) = 58608
+TIMESTAMP = 1482496918
+SHA256 (rst2html5-1.9.tar.gz) = c1fbe920358e9311144f8709f19353de9fd8ac4baab6beb2fdb41cdb1beb94e5
+SIZE (rst2html5-1.9.tar.gz) = 59848
diff --git a/textproc/py-scour/Makefile b/textproc/py-scour/Makefile
new file mode 100644
index 000000000000..ceac29530a52
--- /dev/null
+++ b/textproc/py-scour/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= scour
+PORTVERSION= 0.35
+PORTREVISION= 1
+CATEGORIES= textproc python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= avilla@FreeBSD.org
+COMMENT= SVG scrubber
+
+LICENSE= APACHE20
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six
+
+USES= python
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/textproc/py-scour/distinfo b/textproc/py-scour/distinfo
new file mode 100644
index 000000000000..d46280d7ef9b
--- /dev/null
+++ b/textproc/py-scour/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483620366
+SHA256 (scour-0.35.tar.gz) = 7b33a0fc7ed578e7d1fcf4f68eb4c38cd080c243ea57537840062d37cd0d3c8e
+SIZE (scour-0.35.tar.gz) = 44516
diff --git a/textproc/py-scour/pkg-descr b/textproc/py-scour/pkg-descr
new file mode 100644
index 000000000000..9c9296f56244
--- /dev/null
+++ b/textproc/py-scour/pkg-descr
@@ -0,0 +1,8 @@
+Scour is a Python tool that takes an SVG file and produces a cleaner
+and more concise file. It is intended to be used after exporting to
+SVG with a GUI editor, such as Inkscape or Adobe Illustrator.
+
+Scour was originally developed by Jeff "codedread" Schiller and Louis
+Simard. Development is now maintained by Tobias "oberstet" Oberstein.
+
+WWW: https://github.com/scour-project/scour
diff --git a/textproc/py-sparqlwrapper/Makefile b/textproc/py-sparqlwrapper/Makefile
index 537648563c3d..3979ef68100f 100644
--- a/textproc/py-sparqlwrapper/Makefile
+++ b/textproc/py-sparqlwrapper/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= sparqlwrapper
-PORTVERSION= 1.7.6
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-sparqlwrapper/distinfo b/textproc/py-sparqlwrapper/distinfo
index fb4b9f09995b..ce842f0ce19f 100644
--- a/textproc/py-sparqlwrapper/distinfo
+++ b/textproc/py-sparqlwrapper/distinfo
@@ -1,2 +1,3 @@
-SHA256 (SPARQLWrapper-1.7.6.tar.gz) = dccabec900eb9c97cb47834bd4b66ceaeb4d9ea11bae24a24fe734e9f48522f8
-SIZE (SPARQLWrapper-1.7.6.tar.gz) = 26597
+TIMESTAMP = 1482301449
+SHA256 (SPARQLWrapper-1.8.0.tar.gz) = 3b46d0f18ca0b65b8b965d6d1ae257b229388400b06e7dc19f0a51614dc1abde
+SIZE (SPARQLWrapper-1.8.0.tar.gz) = 28775
diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index a7f9a4814551..4880faf0a6c8 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sphinx
PORTVERSION= 1.4.8
+PORTEPOCH= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-tabletext/Makefile b/textproc/py-tabletext/Makefile
new file mode 100644
index 000000000000..c0573cac2cef
--- /dev/null
+++ b/textproc/py-tabletext/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= tabletext
+PORTVERSION= 0.1
+CATEGORIES= textproc python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= kmoore@FreeBSD.org
+COMMENT= Python library to pretty-print tabular data
+
+LICENSE= GPLv3
+
+USES= python
+USE_PYTHON= autoplist distutils
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/textproc/py-tabletext/distinfo b/textproc/py-tabletext/distinfo
new file mode 100644
index 000000000000..1c54f77aeb44
--- /dev/null
+++ b/textproc/py-tabletext/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1484154586
+SHA256 (tabletext-0.1.tar.gz) = 7fd53c6acb9641cf0b6641ff9675ce3818d4b0541b9e05e8219c90ffc8512337
+SIZE (tabletext-0.1.tar.gz) = 6125
diff --git a/textproc/py-tabletext/pkg-descr b/textproc/py-tabletext/pkg-descr
new file mode 100644
index 000000000000..d6b09461b61b
--- /dev/null
+++ b/textproc/py-tabletext/pkg-descr
@@ -0,0 +1,5 @@
+tabletext is a Python library to format (pretty-print) tabular data as
+text tables. Its goal is to be as simple as possible, while allowing
+optional customization of the output.
+
+WWW: https://pypi.python.org/pypi/tabletext
diff --git a/textproc/py-ucl/Makefile b/textproc/py-ucl/Makefile
index aff17e99556a..3d7fa241587b 100644
--- a/textproc/py-ucl/Makefile
+++ b/textproc/py-ucl/Makefile
@@ -20,6 +20,6 @@ USE_PYTHON= autoplist concurrent distutils
GH_ACCOUNT= vstakhov
GH_PROJECT= libucl
-WRKSRC= ${WRKDIR}/libucl-${PORTVERSION}/python
+WRKSRC_SUBDIR= python
.include <bsd.port.mk>
diff --git a/textproc/py-wstools/Makefile b/textproc/py-wstools/Makefile
index e81b3b3aa8ae..143685eecdc8 100644
--- a/textproc/py-wstools/Makefile
+++ b/textproc/py-wstools/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= wstools
-PORTVERSION= 0.4.4
+PORTVERSION= 0.4.5
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -10,8 +10,9 @@ MAINTAINER= rm@FreeBSD.org
COMMENT= WSDL parsing services for Python
LICENSE= BSD3CLAUSE
-LICENSE_FILE= ${WRKSRC}/docs/license.txt
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
NO_ARCH= yes
diff --git a/textproc/py-wstools/distinfo b/textproc/py-wstools/distinfo
index 0931804264f1..d2783aadc1fe 100644
--- a/textproc/py-wstools/distinfo
+++ b/textproc/py-wstools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469274489
-SHA256 (wstools-0.4.4.tar.gz) = 000cca12538e30547d4655ce84ef4977dabfc65a7b27d28e319695b78aa40126
-SIZE (wstools-0.4.4.tar.gz) = 53813
+TIMESTAMP = 1485035320
+SHA256 (wstools-0.4.5.tar.gz) = 499760d87d9bb62fb937669bb9acb2de8a6393dcce3c5fbd3bc693b4a7bdd4ba
+SIZE (wstools-0.4.5.tar.gz) = 201047
diff --git a/textproc/py-wstools/files/patch-setup.py b/textproc/py-wstools/files/patch-setup.py
deleted file mode 100644
index 69ccb5d7556c..000000000000
--- a/textproc/py-wstools/files/patch-setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-To be upstreamed: remove dependencies, not actually required to
-use the library.
-
---- setup.py.orig 2016-07-22 12:01:01 UTC
-+++ setup.py
-@@ -129,7 +129,8 @@ class PreRelease(Command):
- raise RuntimeError(
- "Current version of the package is equal or lower than the already published ones (PyPi). Increse version to be able to pass prerelease stage.")
-
--requires = ['autopep8', 'six', 'pep8', 'pytest-cov', 'pytest-pep8', 'setuptools', 'pytest', 'pytest-timeout']
-+requires = ['six', 'setuptools']
-+tests_requires = ['autopep8', 'six', 'pep8', 'pytest-cov', 'pytest-pep8', 'setuptools', 'pytest', 'pytest-timeout']
-
- setup(
- name=NAME,
-@@ -137,8 +138,7 @@ setup(
- cmdclass={'test': PyTest, 'release': Release, 'prerelease': PreRelease},
- packages=find_packages(exclude=['tests']),
- include_package_data=True,
-- tests_require=requires,
-- setup_requires=requires,
-+ tests_require=tests_requires,
- install_requires=requires,
-
- license='BSD',
diff --git a/textproc/py-xlsxwriter/Makefile b/textproc/py-xlsxwriter/Makefile
index 14e3d05b7e3f..f6b63fe49516 100644
--- a/textproc/py-xlsxwriter/Makefile
+++ b/textproc/py-xlsxwriter/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= XlsxWriter
-PORTVERSION= 0.9.3
+PORTVERSION= 0.9.6
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USES= python
-USE_PYTHON= distutils autoplist
+USE_PYTHON= concurrent distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py-xlsxwriter/distinfo b/textproc/py-xlsxwriter/distinfo
index 73ed00c38ba8..b66f566ee158 100644
--- a/textproc/py-xlsxwriter/distinfo
+++ b/textproc/py-xlsxwriter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468428710
-SHA256 (XlsxWriter-0.9.3.tar.gz) = 19d2b5c0dd4d5fc00e8d7f164795f50e885b20d1cc27a3d04d5c7fec3c4d57f6
-SIZE (XlsxWriter-0.9.3.tar.gz) = 235051
+TIMESTAMP = 1483796503
+SHA256 (XlsxWriter-0.9.6.tar.gz) = b51c00a1d6572ba35e8c06e0af8dd14c34977ef0b5022c3d85d5f1de9f1220c3
+SIZE (XlsxWriter-0.9.6.tar.gz) = 235751
diff --git a/textproc/py3-MarkupSafe/Makefile b/textproc/py3-MarkupSafe/Makefile
index 786917b6ed8d..f6768a8d8859 100644
--- a/textproc/py3-MarkupSafe/Makefile
+++ b/textproc/py3-MarkupSafe/Makefile
@@ -3,6 +3,7 @@
PORTNAME= MarkupSafe
PORTVERSION= 0.23
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,10 +12,10 @@ MAINTAINER= bofh@FreeBSD.org
COMMENT= Implements XML/HTML/XHTML Markup safe string for Python
LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= python:3
+USES= python:3.3+
USE_PYTHON= autoplist concurrent distutils
-INSTALL_TARGET= install-strip
post-install:
${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/markupsafe/_speedups.so
diff --git a/textproc/py3-asciinema/Makefile b/textproc/py3-asciinema/Makefile
index 0051d21ad0ec..dafe08cee2bf 100644
--- a/textproc/py3-asciinema/Makefile
+++ b/textproc/py3-asciinema/Makefile
@@ -2,6 +2,7 @@
PORTNAME= asciinema
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -9,10 +10,12 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= swills@FreeBSD.org
COMMENT= Tool for recording and sharing terminal sessions
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/${PYTHON_PKGNAMEPREFIX}requests \
+LICENSE= GPLv3+
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py3-requests \
ca_root_nss>=0:security/ca_root_nss
-USES= python:3
+USES= python:3.3+
USE_PYTHON= distutils autoplist
.include <bsd.port.mk>
diff --git a/textproc/py3-chardet/Makefile b/textproc/py3-chardet/Makefile
index e6d2962aa58e..83b2bb1fae25 100644
--- a/textproc/py3-chardet/Makefile
+++ b/textproc/py3-chardet/Makefile
@@ -3,6 +3,7 @@
PORTNAME= chardet
PORTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +14,8 @@ COMMENT= Universal encoding detector for Python 3
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= python:3
-USE_PYTHON= autoplist distutils
+USES= python:3.3+
+USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/textproc/py3-hunspell/Makefile b/textproc/py3-hunspell/Makefile
new file mode 100644
index 000000000000..52708394692f
--- /dev/null
+++ b/textproc/py3-hunspell/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+MASTERDIR= ${.CURDIR}/../py-hunspell
+
+USES= python:3.3+
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/py3-pager/Makefile b/textproc/py3-pager/Makefile
index 51f3cb944613..ff794b9fe525 100644
--- a/textproc/py3-pager/Makefile
+++ b/textproc/py3-pager/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pager
PORTVERSION= 3.3
+PORTREVISION= 1
CATEGORIES= textproc python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +13,7 @@ COMMENT= Terminal/console pager module
LICENSE= BSD3CLAUSE
-USES= python:3
+USES= python:3.3+
USE_PYTHON= autoplist concurrent distutils
-INSTALL_TARGET= install-strip
.include <bsd.port.mk>
diff --git a/textproc/qrcodegen/Makefile b/textproc/qrcodegen/Makefile
new file mode 100644
index 000000000000..7520d378cc12
--- /dev/null
+++ b/textproc/qrcodegen/Makefile
@@ -0,0 +1,44 @@
+# Created by: Lars Engels <lme@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= qrcodegen
+PORTVERSION= 1.14.2
+CATEGORIES= textproc java
+MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
+
+MAINTAINER= lme@FreeBSD.org
+COMMENT= GUI to generate QR codes
+
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+NO_ARCH= yes
+NO_BUILD= yes
+USES= zip:infozip
+USE_JAVA= yes
+JAVA_VERSION= 1.6+
+SUB_FILES= qrcodegen
+
+INSTALLFILES= FAQ.txt Installation.txt NOTICE QRCodeGen.jar Version.html
+
+DESKTOP_ENTRIES="Portable QR-Code Generator" \
+ "${COMMENT}" \
+ "" \
+ "qrcodegen" \
+ "Utility;2DGraphics;Java;" \
+ false
+
+do-extract:
+ @${RM} -r ${WRKDIR}
+ @${MKDIR} ${WRKSRC}
+ @${UNZIP_CMD} -q -j -d ${WRKSRC} ${DISTDIR}/${EXTRACT_ONLY}
+
+do-install:
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+.for i in ${INSTALLFILES}
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DATADIR}/
+.endfor
+ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+
+.include <bsd.port.mk>
diff --git a/textproc/qrcodegen/distinfo b/textproc/qrcodegen/distinfo
new file mode 100644
index 000000000000..eb49c5ef9bcc
--- /dev/null
+++ b/textproc/qrcodegen/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1481205035
+SHA256 (qrcodegen_1.14.2.zip) = 48144b8d2f309f4324a85fcd7261244581678fb438a0a49f3a84b8ffcf07b09b
+SIZE (qrcodegen_1.14.2.zip) = 697748
diff --git a/textproc/qrcodegen/files/qrcodegen.in b/textproc/qrcodegen/files/qrcodegen.in
new file mode 100644
index 000000000000..71cb66d6665f
--- /dev/null
+++ b/textproc/qrcodegen/files/qrcodegen.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cd %%DATADIR%%
+JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java \
+ -jar QRCodeGen.jar "$@"
+
diff --git a/textproc/qrcodegen/pkg-descr b/textproc/qrcodegen/pkg-descr
new file mode 100644
index 000000000000..be6bff8998ba
--- /dev/null
+++ b/textproc/qrcodegen/pkg-descr
@@ -0,0 +1,23 @@
+The 'Portable QR-Code Generator' is a free Java program which generates QR
+Codes from
+
+- WLAN credentials: SSID, network key and and network type
+ (WEP, WPA/WPA2, not encrypted)
+- VCard-Import
+ o Inlined images can optionally be removed to reduce the size of the
+ generated QR Code
+ o VCards up to version 3 (inclusive) are supported
+ o You can import the cards via drag&drop or by selecting them in a file
+ chooser dialog
+ o Supports a broad range of character encodings (ISO-8859-1, UTF-8, UTF-16,)
+ the actual number depends on the Java Virtual Machine you are using.
+- VCard generator
+- e-mail addresses
+- URLs
+- free text
+- geographic coordinates
+
+The QR Code can be printed, saved as BMP, GIF or PNG, or copied to clipboard to
+use in other applications.
+
+WWW: https://sites.google.com/site/qrcodeforwn/home/qr-code-generator-for-wireless-networks
diff --git a/textproc/qrcodegen/pkg-plist b/textproc/qrcodegen/pkg-plist
new file mode 100644
index 000000000000..82eb9d41d353
--- /dev/null
+++ b/textproc/qrcodegen/pkg-plist
@@ -0,0 +1,6 @@
+bin/qrcodegen
+%%DATADIR%%/FAQ.txt
+%%DATADIR%%/Installation.txt
+%%DATADIR%%/NOTICE
+%%DATADIR%%/QRCodeGen.jar
+%%DATADIR%%/Version.html
diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 4709138d8b7b..c85abe1b4f58 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qstardict
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://qstardict.ylsoftware.com/files/
diff --git a/textproc/rand/Makefile b/textproc/rand/Makefile
index e03211da94f1..b9c322dec56d 100644
--- a/textproc/rand/Makefile
+++ b/textproc/rand/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rand
PORTVERSION= 1.9
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://bzflag.bz/~erik/files/ \
http://elfga.com/~erik/files/
diff --git a/textproc/randlm/Makefile b/textproc/randlm/Makefile
index 2cd4728c5c1a..0c21e0f4e6c0 100644
--- a/textproc/randlm/Makefile
+++ b/textproc/randlm/Makefile
@@ -3,15 +3,13 @@
PORTNAME= randlm
PORTVERSION= 0.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}
MAINTAINER= demon@FreeBSD.org
COMMENT= A toolkit for building randomized language models
-BROKEN_powerpc64= Does not build
-
BUILD_DEPENDS= ${LOCALBASE}/include/google/sparse_hash_map:devel/sparsehash
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
RUN_DEPENDS= ${LOCALBASE}/include/google/sparse_hash_map:devel/sparsehash
@@ -26,6 +24,10 @@ CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
+BROKEN_aarch64= Fails to compile: invalid output constraint =a in asm
+BROKEN_armv6= Fails to compile: invalid output constraint =a in asm
+BROKEN_powerpc64= Does not build
+
post-patch:
cd ${WRKSRC}/hadoop && ${MV} strings.cpp strings.cc && ${MV} strings.h s.h
${REINPLACE_CMD} -e s#strings.h#s.h# ${WRKSRC}/hadoop/r_compute_ngram_counts.cpp ${WRKSRC}/hadoop/m_compute_ngram_counts_batch.cpp
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 7177769ba5e1..80b790ced78e 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= raptor
PORTVERSION= 1.4.21
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= SF/librdf/${PORTNAME}/${PORTVERSION} \
http://download.librdf.org/source/
diff --git a/textproc/rarian/pkg-plist b/textproc/rarian/pkg-plist
index 5610a17c28a9..5a9b050174ed 100644
--- a/textproc/rarian/pkg-plist
+++ b/textproc/rarian/pkg-plist
@@ -44,5 +44,5 @@ share/librarian/manual/rar-mdf.xhtml
share/librarian/manual/rar-skcompat.xhtml
share/librarian/rarian-sk-cl.xml
@dir /var/db/rarian
-@unexec rmdir /var/db/rarian/* 2>/dev/null || true
-@exec %%PREFIX%%/bin/rarian-sk-update || true
+@postunexec rmdir /var/db/rarian/* 2>/dev/null || true
+@postexec %%PREFIX%%/bin/rarian-sk-update || true
diff --git a/textproc/rnv/Makefile b/textproc/rnv/Makefile
index 1df91804a66d..3b0fe10291bb 100644
--- a/textproc/rnv/Makefile
+++ b/textproc/rnv/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rnv
PORTVERSION= 1.7.11
+PORTREVISION= 1
CATEGORIES= textproc devel
MASTER_SITES= SF/${PORTNAME}/Sources/${PORTVERSION}
diff --git a/textproc/rss2html/Makefile b/textproc/rss2html/Makefile
index 1b1415ca6441..d00a3044ffed 100644
--- a/textproc/rss2html/Makefile
+++ b/textproc/rss2html/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rss2html
PORTVERSION= 0.8.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://mirror.mcx2.org/
diff --git a/textproc/ruby-htmlrepair/Makefile b/textproc/ruby-htmlrepair/Makefile
deleted file mode 100644
index 8ba465e6fe67..000000000000
--- a/textproc/ruby-htmlrepair/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-# $FreeBSD$
-
-PORTNAME= htmlrepair
-PORTVERSION= 1.0.1
-CATEGORIES= textproc www ruby
-MASTER_SITES= http://www.moonwolf.com/ruby/archive/
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
-DIST_SUBDIR= ruby
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= Ruby library to repair unclosed tags in an HTML document
-
-RUN_DEPENDS= ${RUBY_SITELIBDIR}/htmlsplit.rb:textproc/ruby-htmlsplit
-
-PLIST_FILES= %%RUBY_SITELIBDIR%%/htmlrepair.rb
-USES= zip
-USE_RUBY= yes
-
-NO_BUILD= yes
-NO_WRKSUBDIR= yes
-
-do-install:
- ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/htmlrepair.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-htmlrepair/distinfo b/textproc/ruby-htmlrepair/distinfo
deleted file mode 100644
index e8ab7fb447aa..000000000000
--- a/textproc/ruby-htmlrepair/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/htmlrepair101.zip) = c703d7f6e19af7754a0d224ea87cf9d33ea67039180dc064a310514f867ba31c
-SIZE (ruby/htmlrepair101.zip) = 1217
diff --git a/textproc/ruby-htmlrepair/pkg-descr b/textproc/ruby-htmlrepair/pkg-descr
deleted file mode 100644
index 050a2789f049..000000000000
--- a/textproc/ruby-htmlrepair/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is htmlrepair.rb, a Ruby library to repair unclosed tags in an
-HTML document.
-
-It is used with htmlsplit.rb and adds a method "repair" to the
-HTMLSplit class.
-
-WWW: http://raa.ruby-lang.org/project/htmlrepair
diff --git a/textproc/ruby-htmlsplit/Makefile b/textproc/ruby-htmlsplit/Makefile
deleted file mode 100644
index a7202e011309..000000000000
--- a/textproc/ruby-htmlsplit/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-# $FreeBSD$
-
-PORTNAME= htmlsplit
-PORTVERSION= 1.0.2
-CATEGORIES= textproc www ruby
-MASTER_SITES= http://www.moonwolf.com/ruby/archive/
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
-DIST_SUBDIR= ruby
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= Ruby library to split an HTML document into tags and contents
-
-USES= zip
-USE_RUBY= yes
-
-NO_BUILD= yes
-NO_WRKSUBDIR= yes
-PLIST_FILES= %%RUBY_SITELIBDIR%%/htmlsplit.rb
-
-do-install:
- ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/
- ${INSTALL_DATA} ${WRKSRC}/htmlsplit.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-htmlsplit/distinfo b/textproc/ruby-htmlsplit/distinfo
deleted file mode 100644
index ed7cd73df0ff..000000000000
--- a/textproc/ruby-htmlsplit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/htmlsplit102.zip) = e2beff8676243972645c8662c8abcb254a852df44e914899e666cefebd4850a2
-SIZE (ruby/htmlsplit102.zip) = 4063
diff --git a/textproc/ruby-htmlsplit/pkg-descr b/textproc/ruby-htmlsplit/pkg-descr
deleted file mode 100644
index 31a40258cf9f..000000000000
--- a/textproc/ruby-htmlsplit/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is htmlsplit.rb, a Ruby library to split an HTML document into an
-array of tags and contents.
-
-WWW: http://raa.ruby-lang.org/project/htmlsplit
diff --git a/textproc/ruby-htree/Makefile b/textproc/ruby-htree/Makefile
index 1c58563184bd..2254cff3967e 100644
--- a/textproc/ruby-htree/Makefile
+++ b/textproc/ruby-htree/Makefile
@@ -26,7 +26,7 @@ PORTDOCS= *
do-build:
.if ${PORT_OPTIONS:MDOCS}
- cd ${BUILD_WRKSRC}; ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//} ${LIB_FILES}
+ cd ${BUILD_WRKSRC}; ${LOCALBASE}/bin/rdoc${RUBY_SUFFIX} ${LIB_FILES}
.endif
do-install:
diff --git a/textproc/ruby-rss.alt/Makefile b/textproc/ruby-rss.alt/Makefile
deleted file mode 100644
index e8172481afa4..000000000000
--- a/textproc/ruby-rss.alt/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-# $FreeBSD$
-
-PORTNAME= rss
-PORTVERSION= 0.2.6
-CATEGORIES= textproc ruby
-MASTER_SITES= http://www.cozmixng.org/~kou/download/
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-PKGNAMESUFFIX= .alt
-DIST_SUBDIR= ruby
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= Ruby library for handling RSS (alternative impl.)
-
-LICENSE= BSD2CLAUSE RUBY
-LICENSE_COMB= dual
-
-RUN_DEPENDS= ja-${RUBY_PKGNAMEPREFIX}uconv>=0:japanese/ruby-uconv
-
-BROKEN_RUBY22= yes
-BROKEN_RUBY23= yes
-
-CONFLICTS_INSTALL= ruby-rss-*
-
-OPTIONS_DEFINE= DOCS
-
-NO_ARCH= yes
-USE_RUBY= yes
-USE_RUBY_SETUP= yes
-
-DOCS_EN= README.en Tutorial.en
-DOCS_JA= README.ja Tutorial.ja
-
-post-install-DOCS-on:
- ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
- cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS_EN} ${STAGEDIR}${RUBY_MODDOCDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS_JA} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-rss.alt/distinfo b/textproc/ruby-rss.alt/distinfo
deleted file mode 100644
index d4b35f3c8b78..000000000000
--- a/textproc/ruby-rss.alt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/rss-0.2.6.tar.gz) = 5e234f96772f37b1d23fdb84743453220c52e5ab1b898de3b2f64818f84ecd7a
-SIZE (ruby/rss-0.2.6.tar.gz) = 264138
diff --git a/textproc/ruby-rss.alt/pkg-descr b/textproc/ruby-rss.alt/pkg-descr
deleted file mode 100644
index 2e7c0e148eae..000000000000
--- a/textproc/ruby-rss.alt/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This library can parse RSS (RDF Site Summary) 1.0 with validation (or
-non validation).
-
-This library can almost well parse RSS 0.9x/2.0 with non validation.
-
-This library contains a sample that expand [RAA:RWiki].
-
-* output recent changes as RSS 1.0.
-* collect RSS 1.0s and display those items sorted by updating time.
-* collect RSSs and display those items on each page.
-
-WWW: http://www.cozmixng.org/~rwiki/index.rb?cmd=view;name=RSS+Parser
diff --git a/textproc/ruby-rss.alt/pkg-plist b/textproc/ruby-rss.alt/pkg-plist
deleted file mode 100644
index d884c943987d..000000000000
--- a/textproc/ruby-rss.alt/pkg-plist
+++ /dev/null
@@ -1,47 +0,0 @@
-%%RUBY_SITELIBDIR%%/rss.rb
-%%RUBY_SITELIBDIR%%/rss/0.9.rb
-%%RUBY_SITELIBDIR%%/rss/1.0.rb
-%%RUBY_SITELIBDIR%%/rss/2.0.rb
-%%RUBY_SITELIBDIR%%/rss/atom.rb
-%%RUBY_SITELIBDIR%%/rss/content.rb
-%%RUBY_SITELIBDIR%%/rss/content/1.0.rb
-%%RUBY_SITELIBDIR%%/rss/content/2.0.rb
-%%RUBY_SITELIBDIR%%/rss/converter.rb
-%%RUBY_SITELIBDIR%%/rss/dublincore.rb
-%%RUBY_SITELIBDIR%%/rss/dublincore/1.0.rb
-%%RUBY_SITELIBDIR%%/rss/dublincore/2.0.rb
-%%RUBY_SITELIBDIR%%/rss/dublincore/atom.rb
-%%RUBY_SITELIBDIR%%/rss/image.rb
-%%RUBY_SITELIBDIR%%/rss/itunes.rb
-%%RUBY_SITELIBDIR%%/rss/maker.rb
-%%RUBY_SITELIBDIR%%/rss/maker/0.9.rb
-%%RUBY_SITELIBDIR%%/rss/maker/1.0.rb
-%%RUBY_SITELIBDIR%%/rss/maker/2.0.rb
-%%RUBY_SITELIBDIR%%/rss/maker/atom.rb
-%%RUBY_SITELIBDIR%%/rss/maker/base.rb
-%%RUBY_SITELIBDIR%%/rss/maker/content.rb
-%%RUBY_SITELIBDIR%%/rss/maker/dublincore.rb
-%%RUBY_SITELIBDIR%%/rss/maker/entry.rb
-%%RUBY_SITELIBDIR%%/rss/maker/feed.rb
-%%RUBY_SITELIBDIR%%/rss/maker/image.rb
-%%RUBY_SITELIBDIR%%/rss/maker/itunes.rb
-%%RUBY_SITELIBDIR%%/rss/maker/syndication.rb
-%%RUBY_SITELIBDIR%%/rss/maker/taxonomy.rb
-%%RUBY_SITELIBDIR%%/rss/maker/trackback.rb
-%%RUBY_SITELIBDIR%%/rss/maker/slash.rb
-%%RUBY_SITELIBDIR%%/rss/parser.rb
-%%RUBY_SITELIBDIR%%/rss/slash.rb
-%%RUBY_SITELIBDIR%%/rss/rexmlparser.rb
-%%RUBY_SITELIBDIR%%/rss/rss.rb
-%%RUBY_SITELIBDIR%%/rss/syndication.rb
-%%RUBY_SITELIBDIR%%/rss/taxonomy.rb
-%%RUBY_SITELIBDIR%%/rss/trackback.rb
-%%RUBY_SITELIBDIR%%/rss/utils.rb
-%%RUBY_SITELIBDIR%%/rss/xml-stylesheet.rb
-%%RUBY_SITELIBDIR%%/rss/xml.rb
-%%RUBY_SITELIBDIR%%/rss/xmlparser.rb
-%%RUBY_SITELIBDIR%%/rss/xmlscanner.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Tutorial.en
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Tutorial.ja
diff --git a/textproc/ruby-rss/Makefile b/textproc/ruby-rss/Makefile
deleted file mode 100644
index 8463f1c5c6ba..000000000000
--- a/textproc/ruby-rss/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-# $FreeBSD$
-
-PORTNAME= rss
-PORTVERSION= 0.9.1
-PORTREVISION= 2
-CATEGORIES= textproc ruby
-MASTER_SITES= http://www.chadfowler.com/ruby/rss/
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
-DIST_SUBDIR= ruby
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= Ruby library for parsing, creating, downloading, and caching RSS
-
-OPTIONS_DEFINE= DOCS EXAMPLES
-
-RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/xmlparser.so:textproc/ruby-xmlparser
-
-CONFLICTS= ruby-rss.alt-*
-
-USE_RUBY= yes
-USES= shebangfix
-
-NO_BUILD= yes
-INSTALL_TARGET= site-install
-
-SHEBANG_FILES= ${WRKSRC}/rssdrb.rb ${WRKSRC}/samples/rsstest.rb
-DOCS= ChangeLog README
-
-do-install:
- @${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
- ${INSTALL_DATA} ${WRKSRC}/rss*.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
- ${CHMOD} +x ${STAGEDIR}${RUBY_SITELIBDIR}/rssdrb.rb
- ${LN} -fs ${RUBY_SITELIBDIR}/rssdrb.rb ${STAGEDIR}${PREFIX}/sbin/
- ${LN} -fs rssdrb.rb ${STAGEDIR}${PREFIX}/sbin/rssdrb
- @${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
- @${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
-.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
-.endfor
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-rss/distinfo b/textproc/ruby-rss/distinfo
deleted file mode 100644
index 4143c1bd35f4..000000000000
--- a/textproc/ruby-rss/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/rss-ruby-0.9.1.tar.gz) = a7d7a6f542d79d203681022b70b17a274b5b20e17a0d77e5bc1382f8b80aeb36
-SIZE (ruby/rss-ruby-0.9.1.tar.gz) = 7043
diff --git a/textproc/ruby-rss/pkg-descr b/textproc/ruby-rss/pkg-descr
deleted file mode 100644
index 449f7ca9bf58..000000000000
--- a/textproc/ruby-rss/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a Ruby library for parsing, creating, downloading, and caching
-RSS (http://my.netscape.com/publish/help/mnn20/quickstart.html).
-
-WWW: http://www.chadfowler.com/index.cgi?mode=max&cat=ruby
diff --git a/textproc/ruby-rss/pkg-plist b/textproc/ruby-rss/pkg-plist
deleted file mode 100644
index 7db055affe78..000000000000
--- a/textproc/ruby-rss/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-sbin/rssdrb
-sbin/rssdrb.rb
-%%RUBY_SITELIBDIR%%/rss.rb
-%%RUBY_SITELIBDIR%%/rsscache.rb
-%%RUBY_SITELIBDIR%%/rssdrb.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/create.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/fromfile.rb
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/raa-rss-1.xml
-%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/rsstest.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff --git a/textproc/ruby-xml-configfile/Makefile b/textproc/ruby-xml-configfile/Makefile
deleted file mode 100644
index 3b8aa912c1b5..000000000000
--- a/textproc/ruby-xml-configfile/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-# $FreeBSD$
-
-PORTNAME= xml-configfile
-PORTVERSION= 0.9.7
-PORTREVISION= 1
-CATEGORIES= textproc devel ruby
-MASTER_SITES= http://www.cs.ualberta.ca/~schofiel/${PORTNAME}/downloads/
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR= ruby
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= Ruby module for easy handling of XML configuration files
-
-LICENSE= GPLv2 RUBY
-LICENSE_COMB= dual
-
-BROKEN_RUBY22= yes
-BROKEN_RUBY23= yes
-
-OPTIONS_DEFINE= DOCS
-
-NO_ARCH= yes
-USE_RUBY= yes
-USE_RUBY_SETUP= yes
-RUBY_SETUP= install.rb
-
-DOCS= CHANGES README TODO docs/index.html
-
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/
- cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-xml-configfile/distinfo b/textproc/ruby-xml-configfile/distinfo
deleted file mode 100644
index e3108ab4ecb0..000000000000
--- a/textproc/ruby-xml-configfile/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/xml-configfile-0.9.7.tar.gz) = b53fb5f5cce00226c348db0a3d65e3c7e5d6295d648a608971b18108d74048c8
-SIZE (ruby/xml-configfile-0.9.7.tar.gz) = 30794
diff --git a/textproc/ruby-xml-configfile/pkg-descr b/textproc/ruby-xml-configfile/pkg-descr
deleted file mode 100644
index 566b3cafe1aa..000000000000
--- a/textproc/ruby-xml-configfile/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ruby/xmlconfigfile is a Ruby module for easy handling of XML
-configuration files.
-
-WWW: http://www.cs.ualberta.ca/~schofiel/xml-configfile/xml-configfile.html
diff --git a/textproc/ruby-xml-configfile/pkg-plist b/textproc/ruby-xml-configfile/pkg-plist
deleted file mode 100644
index 26073718411a..000000000000
--- a/textproc/ruby-xml-configfile/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-%%RUBY_SITELIBDIR%%/xmlconfigfile.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/CHANGES
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
diff --git a/textproc/ruby-xmlscan/Makefile b/textproc/ruby-xmlscan/Makefile
deleted file mode 100644
index 62bfd745b13f..000000000000
--- a/textproc/ruby-xmlscan/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-# $FreeBSD$
-
-PORTNAME= xmlscan
-PORTVERSION= 0.2.3
-PORTREVISION= 1
-CATEGORIES= textproc ruby
-MASTER_SITES= http://www.blue.sky.or.jp/atelier/ruby/xmlscan/
-PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DIST_SUBDIR= ruby
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= High-performance non-validating XML parser written in 100% pure Ruby
-
-USE_RUBY= yes
-
-NO_ARCH= yes
-NO_BUILD= yes
-USES= shebangfix
-SHEBANG_FILES= samples/xmlbench.rb \
- samples/xmlconftest.rb
-
-DOCS_EN= ChangeLog \
- README \
- THANKS \
- doc/changes.* \
- doc/en/*
-DOCS_JA= doc/ja/*
-
-OPTIONS_DEFINE= DOCS
-
-do-install:
- ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
- ${CP} -R ${WRKSRC}/lib/xmlscan ${STAGEDIR}${RUBY_SITELIBDIR}/
- ${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
- ${CP} -R ${WRKSRC}/samples/* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
- ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
-.for f in ${DOCS_EN}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/
-.endfor
-.for f in ${DOCS_JA}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
-.endfor
-
-.include <bsd.port.mk>
diff --git a/textproc/ruby-xmlscan/distinfo b/textproc/ruby-xmlscan/distinfo
deleted file mode 100644
index eae2796f53ef..000000000000
--- a/textproc/ruby-xmlscan/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ruby/xmlscan-0.2.3.tar.gz) = 252278aebba9abe065396c7314ce14bc0aef3f415c54ba49afbaf0c8b89154c2
-SIZE (ruby/xmlscan-0.2.3.tar.gz) = 88414
diff --git a/textproc/ruby-xmlscan/pkg-descr b/textproc/ruby-xmlscan/pkg-descr
deleted file mode 100644
index e8d52f748f2a..000000000000
--- a/textproc/ruby-xmlscan/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Ruby/xmlscan is a high-performance non-validating XML parser written
-in 100% pure Ruby.
diff --git a/textproc/ruby-xmlscan/pkg-plist b/textproc/ruby-xmlscan/pkg-plist
deleted file mode 100644
index 9808871c1a09..000000000000
--- a/textproc/ruby-xmlscan/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-%%RUBY_SITELIBDIR%%/xmlscan/encoding.rb
-%%RUBY_SITELIBDIR%%/xmlscan/htmlscan.rb
-%%RUBY_SITELIBDIR%%/xmlscan/namespace.rb
-%%RUBY_SITELIBDIR%%/xmlscan/parser.rb
-%%RUBY_SITELIBDIR%%/xmlscan/scanner.rb
-%%RUBY_SITELIBDIR%%/xmlscan/version.rb
-%%RUBY_SITELIBDIR%%/xmlscan/visitor.rb
-%%RUBY_SITELIBDIR%%/xmlscan/xmlchar.rb
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/THANKS
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changes.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/changes.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/conformance.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/conformance.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/manual.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/manual.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/conformance.ja.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/conformance.ja.rd
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/manual.ja.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/manual.ja.rd
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/chibixml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/getxmlchar.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rexml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/chibixml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/nqxml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/rexml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/xmlparser.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/xmlscan-0.0.10.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/xmlscan-chibixml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/xmlscan-rexml.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/parser/xmlscan.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlbench/xmlbench-lib.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xmlconftest.rb
diff --git a/textproc/rubygem-actionpack-xml_parser/Makefile b/textproc/rubygem-actionpack-xml_parser/Makefile
index 8f82947b5919..c81011901dba 100644
--- a/textproc/rubygem-actionpack-xml_parser/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= actionpack-xml_parser
-PORTVERSION= 1.0.2
+PORTVERSION= 2.0.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-actionpack-xml_parser/distinfo b/textproc/rubygem-actionpack-xml_parser/distinfo
index 2c1642e5704f..9d6d8ce40dfa 100644
--- a/textproc/rubygem-actionpack-xml_parser/distinfo
+++ b/textproc/rubygem-actionpack-xml_parser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/actionpack-xml_parser-1.0.2.gem) = 6a3e2441711e3885d2fb6f6530049bb4672cf6ffb98c88dce9e8997e9a25559d
-SIZE (rubygem/actionpack-xml_parser-1.0.2.gem) = 6144
+TIMESTAMP = 1480754954
+SHA256 (rubygem/actionpack-xml_parser-2.0.0.gem) = 06111b35b279a54b1156bee13fae191377c84fe4f0207f01ddb13ac61168dad7
+SIZE (rubygem/actionpack-xml_parser-2.0.0.gem) = 6144
diff --git a/textproc/rubygem-actionpack-xml_parser/pkg-descr b/textproc/rubygem-actionpack-xml_parser/pkg-descr
index 95490a503174..08325bfbde70 100644
--- a/textproc/rubygem-actionpack-xml_parser/pkg-descr
+++ b/textproc/rubygem-actionpack-xml_parser/pkg-descr
@@ -1,5 +1,5 @@
actionpack-xml_parser is an XML parameters parser for Action Pack (removed from
core in Rails 4.0).
-WWW: http://www.rubyonrails.org/
+WWW: http://rubyonrails.org/
WWW: https://github.com/rails/actionpack-xml_parser
diff --git a/textproc/rubygem-actionpack-xml_parser1/Makefile b/textproc/rubygem-actionpack-xml_parser1/Makefile
new file mode 100644
index 000000000000..18f6fd8c287b
--- /dev/null
+++ b/textproc/rubygem-actionpack-xml_parser1/Makefile
@@ -0,0 +1,22 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= actionpack-xml_parser
+PORTVERSION= 1.0.2
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 1
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= XML parameters parser for Action Pack
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-actionpack-xml_parser1/distinfo b/textproc/rubygem-actionpack-xml_parser1/distinfo
new file mode 100644
index 000000000000..5c39bfa169f9
--- /dev/null
+++ b/textproc/rubygem-actionpack-xml_parser1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1484405847
+SHA256 (rubygem/actionpack-xml_parser-1.0.2.gem) = 6a3e2441711e3885d2fb6f6530049bb4672cf6ffb98c88dce9e8997e9a25559d
+SIZE (rubygem/actionpack-xml_parser-1.0.2.gem) = 6144
diff --git a/textproc/rubygem-actionpack-xml_parser1/pkg-descr b/textproc/rubygem-actionpack-xml_parser1/pkg-descr
new file mode 100644
index 000000000000..08325bfbde70
--- /dev/null
+++ b/textproc/rubygem-actionpack-xml_parser1/pkg-descr
@@ -0,0 +1,5 @@
+actionpack-xml_parser is an XML parameters parser for Action Pack (removed from
+core in Rails 4.0).
+
+WWW: http://rubyonrails.org/
+WWW: https://github.com/rails/actionpack-xml_parser
diff --git a/textproc/rubygem-asciidoctor/Makefile b/textproc/rubygem-asciidoctor/Makefile
index 9a11dce293ff..d7853e6a1d87 100644
--- a/textproc/rubygem-asciidoctor/Makefile
+++ b/textproc/rubygem-asciidoctor/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asciidoctor
-PORTVERSION= 1.5.4
+PORTVERSION= 1.5.5
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-asciidoctor/distinfo b/textproc/rubygem-asciidoctor/distinfo
index 3eaa52d25e96..30a9598f52d1 100644
--- a/textproc/rubygem-asciidoctor/distinfo
+++ b/textproc/rubygem-asciidoctor/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/asciidoctor-1.5.4.gem) = 0ca7c78528165b194b678a71f5bc600aafbee3dfa5bcd40c042e382d5d883477
-SIZE (rubygem/asciidoctor-1.5.4.gem) = 356864
+TIMESTAMP = 1482966762
+SHA256 (rubygem/asciidoctor-1.5.5.gem) = 87effa3de95919df880aab04c6c29c89255ce671abce361da476208734a5424e
+SIZE (rubygem/asciidoctor-1.5.5.gem) = 324096
diff --git a/textproc/rubygem-autoprefixer-rails/Makefile b/textproc/rubygem-autoprefixer-rails/Makefile
index f4f69ba7642e..a95f631281ef 100644
--- a/textproc/rubygem-autoprefixer-rails/Makefile
+++ b/textproc/rubygem-autoprefixer-rails/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= autoprefixer-rails
-PORTVERSION= 6.5.3
+PORTVERSION= 6.7.2
CATEGORIES= textproc ruby
MASTER_SITES= RG
diff --git a/textproc/rubygem-autoprefixer-rails/distinfo b/textproc/rubygem-autoprefixer-rails/distinfo
index 098ce2b4f418..5649bcd4fc89 100644
--- a/textproc/rubygem-autoprefixer-rails/distinfo
+++ b/textproc/rubygem-autoprefixer-rails/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480754959
-SHA256 (rubygem/autoprefixer-rails-6.5.3.gem) = 03a101b0f8c3e2ffdc342fe04802bafe1f9c506ade54772a5254dd80e2573c3e
-SIZE (rubygem/autoprefixer-rails-6.5.3.gem) = 333824
+TIMESTAMP = 1486036614
+SHA256 (rubygem/autoprefixer-rails-6.7.2.gem) = b889cd6a364018ebbbc7aebcef56435fdbf7df6421cbb8982497247b6a8e7cf1
+SIZE (rubygem/autoprefixer-rails-6.7.2.gem) = 343040
diff --git a/textproc/rubygem-css_parser/Makefile b/textproc/rubygem-css_parser/Makefile
index 6581c1175b36..07d5d2743cc9 100644
--- a/textproc/rubygem-css_parser/Makefile
+++ b/textproc/rubygem-css_parser/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= css_parser
-PORTVERSION= 1.4.7
+PORTVERSION= 1.4.8
CATEGORIES= textproc www rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-css_parser/distinfo b/textproc/rubygem-css_parser/distinfo
index 4c89ca75be1b..036b57038239 100644
--- a/textproc/rubygem-css_parser/distinfo
+++ b/textproc/rubygem-css_parser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480530667
-SHA256 (rubygem/css_parser-1.4.7.gem) = cfb7abad079555910509b421961ea6bad460a83e9808d31377a2f2507ef456e8
-SIZE (rubygem/css_parser-1.4.7.gem) = 17408
+TIMESTAMP = 1486141419
+SHA256 (rubygem/css_parser-1.4.8.gem) = 6e3069db0316657184e91178e90688e1a8409c537b2f6fce033a8110742b1bab
+SIZE (rubygem/css_parser-1.4.8.gem) = 17920
diff --git a/textproc/rubygem-diff-lcs/Makefile b/textproc/rubygem-diff-lcs/Makefile
index 4b278cbec0cc..5ed47157e4bf 100644
--- a/textproc/rubygem-diff-lcs/Makefile
+++ b/textproc/rubygem-diff-lcs/Makefile
@@ -2,24 +2,26 @@
# $FreeBSD$
PORTNAME= diff-lcs
-PORTVERSION= 1.2.5
-PORTREVISION= 1
+PORTVERSION= 1.3
CATEGORIES= textproc rubygems
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= LCS-based diff library for ruby
-LICENSE= ART20 GPLv2 GPLv3 MIT
+LICENSE= ART20 GPLv2+ MIT
LICENSE_COMB= dual
+LICENSE_FILE_ART20= ${WRKSRC}/docs/artistic.txt
+LICENSE_FILE_GPLv2= ${WRKSRC}/docs/COPYING.txt
+LICENSE_FILE_MIT= ${WRKSRC}/License.md
NO_ARCH= yes
-
USE_RUBY= yes
USES= gem shebangfix
-ruby_OLD_CMD= ruby
-SHEBANG_FILES= bin/htmldiff bin/ldiff
PLIST_FILES= bin/htmldiff bin/ldiff
+SHEBANG_FILES= bin/htmldiff bin/ldiff
+ruby_OLD_CMD= ruby
+
.include <bsd.port.mk>
diff --git a/textproc/rubygem-diff-lcs/distinfo b/textproc/rubygem-diff-lcs/distinfo
index 2d8fe35f6377..832e8288cfd8 100644
--- a/textproc/rubygem-diff-lcs/distinfo
+++ b/textproc/rubygem-diff-lcs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/diff-lcs-1.2.5.gem) = a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed
-SIZE (rubygem/diff-lcs-1.2.5.gem) = 49152
+TIMESTAMP = 1486254748
+SHA256 (rubygem/diff-lcs-1.3.gem) = ea7bf591567e391ef262a7c29edaf87c6205204afb5bb39dfa8f08f2e51282a3
+SIZE (rubygem/diff-lcs-1.3.gem) = 46080
diff --git a/textproc/rubygem-docdiff/Makefile b/textproc/rubygem-docdiff/Makefile
new file mode 100644
index 000000000000..e43187e82927
--- /dev/null
+++ b/textproc/rubygem-docdiff/Makefile
@@ -0,0 +1,20 @@
+# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= docdiff
+PORTVERSION= 0.5.0
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Compares two text files by word, by character, or by line
+
+LICENSE= BSD3CLAUSE
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+PLIST_FILES= bin/docdiff
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-docdiff/distinfo b/textproc/rubygem-docdiff/distinfo
new file mode 100644
index 000000000000..b05fdf032fa2
--- /dev/null
+++ b/textproc/rubygem-docdiff/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483308291
+SHA256 (rubygem/docdiff-0.5.0.gem) = 44510176e2bd635789975cde94cf822f2ddfad64cc76348ceaab9e8386633bb9
+SIZE (rubygem/docdiff-0.5.0.gem) = 203264
diff --git a/textproc/docdiff/pkg-descr b/textproc/rubygem-docdiff/pkg-descr
index 8f4d64054b09..69d4d4ae6a2f 100644
--- a/textproc/docdiff/pkg-descr
+++ b/textproc/rubygem-docdiff/pkg-descr
@@ -6,4 +6,4 @@ It supports several encodings and end-of-line characters, including ASCII (and
other single byte encodings such as ISO-8859-*), UTF-8, EUC-JP, Shift_JIS, CR,
LF, and CRLF.
-WWW: http://docdiff.sourceforge.net/
+WWW: https://github.com/hisashim/docdiff
diff --git a/textproc/rubygem-elasticsearch-api/Makefile b/textproc/rubygem-elasticsearch-api/Makefile
index 7046d116b279..f64031907cb8 100644
--- a/textproc/rubygem-elasticsearch-api/Makefile
+++ b/textproc/rubygem-elasticsearch-api/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= elasticsearch-api
-PORTVERSION= 1.0.17
+PORTVERSION= 5.0.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-elasticsearch-api/distinfo b/textproc/rubygem-elasticsearch-api/distinfo
index 38ac59f00f4c..f3ecb7561025 100644
--- a/textproc/rubygem-elasticsearch-api/distinfo
+++ b/textproc/rubygem-elasticsearch-api/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/elasticsearch-api-1.0.17.gem) = 5d1ec4e2c4e4d5b482aeb2facceb562fe7ad276192cb787575018daff2306b21
-SIZE (rubygem/elasticsearch-api-1.0.17.gem) = 77824
+TIMESTAMP = 1485066761
+SHA256 (rubygem/elasticsearch-api-5.0.1.gem) = dae7d32b83eb75373bbefbb24979fc083ad19d1493516da0833d554aac2a2861
+SIZE (rubygem/elasticsearch-api-5.0.1.gem) = 86528
diff --git a/textproc/rubygem-elasticsearch-transport/Makefile b/textproc/rubygem-elasticsearch-transport/Makefile
index 2372e198442e..20b1b16a5601 100644
--- a/textproc/rubygem-elasticsearch-transport/Makefile
+++ b/textproc/rubygem-elasticsearch-transport/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= elasticsearch-transport
-PORTVERSION= 1.0.17
+PORTVERSION= 5.0.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-elasticsearch-transport/distinfo b/textproc/rubygem-elasticsearch-transport/distinfo
index 3d59e1404831..5fbb2d2820ef 100644
--- a/textproc/rubygem-elasticsearch-transport/distinfo
+++ b/textproc/rubygem-elasticsearch-transport/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/elasticsearch-transport-1.0.17.gem) = 7f09b43dc0c87ecceac99923b68650af752b8b147a8ab9d41ff95b3a1e4a271f
-SIZE (rubygem/elasticsearch-transport-1.0.17.gem) = 36352
+TIMESTAMP = 1485069702
+SHA256 (rubygem/elasticsearch-transport-5.0.1.gem) = 97d82622dd0766959a86fbb63b5a139718ea53e12041d6fd5acec1d932953d87
+SIZE (rubygem/elasticsearch-transport-5.0.1.gem) = 36864
diff --git a/textproc/rubygem-elasticsearch/Makefile b/textproc/rubygem-elasticsearch/Makefile
index adbf60616100..395c9a93b73c 100644
--- a/textproc/rubygem-elasticsearch/Makefile
+++ b/textproc/rubygem-elasticsearch/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= elasticsearch
-PORTVERSION= 1.0.17
+PORTVERSION= 5.0.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-elasticsearch/distinfo b/textproc/rubygem-elasticsearch/distinfo
index a5acc4d86ce3..3354f7fae59d 100644
--- a/textproc/rubygem-elasticsearch/distinfo
+++ b/textproc/rubygem-elasticsearch/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/elasticsearch-1.0.17.gem) = 851be34a15c8fa5e4f38e94bba73266cfe343c557ab99c6be1c850934657fbbc
-SIZE (rubygem/elasticsearch-1.0.17.gem) = 8704
+TIMESTAMP = 1485069733
+SHA256 (rubygem/elasticsearch-5.0.1.gem) = 3383d8d240646c8a16eb5ff06a3c4a44c8be564741a426786b602f1fba582e1b
+SIZE (rubygem/elasticsearch-5.0.1.gem) = 8704
diff --git a/textproc/rubygem-gemoji/Makefile b/textproc/rubygem-gemoji/Makefile
index a689e134debc..c0b2b4cd4c8a 100644
--- a/textproc/rubygem-gemoji/Makefile
+++ b/textproc/rubygem-gemoji/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= gemoji
-PORTVERSION= 2.1.0
+PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -14,5 +15,6 @@ NO_ARCH= yes
USE_RUBY= yes
USES= gem
+PLIST_FILES= bin/gemoji
.include <bsd.port.mk>
diff --git a/textproc/rubygem-gemoji/distinfo b/textproc/rubygem-gemoji/distinfo
index eaf4c57786e8..c8532917af22 100644
--- a/textproc/rubygem-gemoji/distinfo
+++ b/textproc/rubygem-gemoji/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/gemoji-2.1.0.gem) = dcacc532537b6244a9ea104a8e7e7ce883a8302843aeef861798b34cc3357958
-SIZE (rubygem/gemoji-2.1.0.gem) = 3934720
+TIMESTAMP = 1482967740
+SHA256 (rubygem/gemoji-3.0.0.gem) = 4d98f098a56b9f6cc41b94fc52010032a0f030fdd809a735b2baae2eecc505c1
+SIZE (rubygem/gemoji-3.0.0.gem) = 72192
diff --git a/textproc/rubygem-github-linguist/Makefile b/textproc/rubygem-github-linguist/Makefile
index 406fb01eecff..16ee59ab9b38 100644
--- a/textproc/rubygem-github-linguist/Makefile
+++ b/textproc/rubygem-github-linguist/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= github-linguist
-PORTVERSION= 4.8.5
+PORTVERSION= 5.0.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-github-linguist/distinfo b/textproc/rubygem-github-linguist/distinfo
index fe0d369f19b6..bd290ffcd59c 100644
--- a/textproc/rubygem-github-linguist/distinfo
+++ b/textproc/rubygem-github-linguist/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/github-linguist-4.8.5.gem) = 3b592380c3950b5317466cd56020b7449d51fc8984e5d28443a93a2842da90b4
-SIZE (rubygem/github-linguist-4.8.5.gem) = 1664000
+TIMESTAMP = 1482967874
+SHA256 (rubygem/github-linguist-5.0.0.gem) = 9ae0ea83660962b5a18b2c3f29aca2903c2774dde4392ab147a18255d21b54d4
+SIZE (rubygem/github-linguist-5.0.0.gem) = 1966592
diff --git a/textproc/rubygem-github-markdown/Makefile b/textproc/rubygem-github-markdown/Makefile
index 12ff50dcbeb8..d15dd1d38b5f 100644
--- a/textproc/rubygem-github-markdown/Makefile
+++ b/textproc/rubygem-github-markdown/Makefile
@@ -9,6 +9,7 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Self-contained Markdown parser for GitHub
DEPRECATED= This gem is not maintained and not supported by upstream
+EXPIRATION_DATE= 2017-03-01
USE_RUBY= yes
USES= gem
diff --git a/textproc/rubygem-github-markup/Makefile b/textproc/rubygem-github-markup/Makefile
index ed10dddcc8f7..660c6b44507c 100644
--- a/textproc/rubygem-github-markup/Makefile
+++ b/textproc/rubygem-github-markup/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= github-markup
-PORTVERSION= 1.4.0
-PORTREVISION= 1
+PORTVERSION= 1.4.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-github-markup/distinfo b/textproc/rubygem-github-markup/distinfo
index 3ea474c687ec..0b7c70e37a18 100644
--- a/textproc/rubygem-github-markup/distinfo
+++ b/textproc/rubygem-github-markup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/github-markup-1.4.0.gem) = 9f94f7a5d0db019989a910f5dac002cab7702c0208a1a683007c8d0997ddcb10
-SIZE (rubygem/github-markup-1.4.0.gem) = 25600
+TIMESTAMP = 1485968761
+SHA256 (rubygem/github-markup-1.4.1.gem) = 6bf489faf6494bbcaf8eb1859b4f8002b07fdc291b3a3bbc08e0ea60504bf77b
+SIZE (rubygem/github-markup-1.4.1.gem) = 26624
diff --git a/textproc/rubygem-gitlab-markup/Makefile b/textproc/rubygem-gitlab-markup/Makefile
index 61e87cfabbd5..9d22ea79af66 100644
--- a/textproc/rubygem-gitlab-markup/Makefile
+++ b/textproc/rubygem-gitlab-markup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitlab-markup
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-gitlab-markup/distinfo b/textproc/rubygem-gitlab-markup/distinfo
index 3ef59c30fb88..53fd20d736c2 100644
--- a/textproc/rubygem-gitlab-markup/distinfo
+++ b/textproc/rubygem-gitlab-markup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479911001
-SHA256 (rubygem/gitlab-markup-1.5.0.gem) = aa08db65b296102e216ae36fb065e095a762ed865e7422769f3ef20630b9bc7b
-SIZE (rubygem/gitlab-markup-1.5.0.gem) = 26624
+TIMESTAMP = 1484060147
+SHA256 (rubygem/gitlab-markup-1.5.1.gem) = c25e77c15b5493e5c98dd41ce1c2d166c67d01318001b7cfb625aab5f73f55a9
+SIZE (rubygem/gitlab-markup-1.5.1.gem) = 26624
diff --git a/textproc/rubygem-html-pipeline/Makefile b/textproc/rubygem-html-pipeline/Makefile
index 38dd38460759..0de41cbcb477 100644
--- a/textproc/rubygem-html-pipeline/Makefile
+++ b/textproc/rubygem-html-pipeline/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= html-pipeline
-PORTVERSION= 2.4.1
+PORTVERSION= 2.5.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-html-pipeline/distinfo b/textproc/rubygem-html-pipeline/distinfo
index 738b059e5df3..b0635d20fc44 100644
--- a/textproc/rubygem-html-pipeline/distinfo
+++ b/textproc/rubygem-html-pipeline/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/html-pipeline-2.4.1.gem) = a039c61aca7e5e4cef75380b726285490eac680b905ef857cbd0d24a98b666c9
-SIZE (rubygem/html-pipeline-2.4.1.gem) = 38400
+TIMESTAMP = 1484432571
+SHA256 (rubygem/html-pipeline-2.5.0.gem) = c70a339b5a4bd806341106a4ecf32feb89ac3b6f7521dc0a5374462fc38cdfe6
+SIZE (rubygem/html-pipeline-2.5.0.gem) = 28672
diff --git a/textproc/rubygem-htmlentities/pkg-descr b/textproc/rubygem-htmlentities/pkg-descr
index 3a67e78be9fe..afd27bf070ad 100644
--- a/textproc/rubygem-htmlentities/pkg-descr
+++ b/textproc/rubygem-htmlentities/pkg-descr
@@ -2,4 +2,4 @@ HTMLEntities is a simple library to facilitate encoding and decoding of
named (&yacute; and so on) or numerical (&#123; or &#x12a;) entities
in HTML and XHTML documents.
-WWW: http://rubygems.org/gems/htmlentities/
+WWW: https://rubygems.org/gems/htmlentities
diff --git a/textproc/rubygem-ini/pkg-descr b/textproc/rubygem-ini/pkg-descr
index 58f302b81e39..06e65453bf44 100644
--- a/textproc/rubygem-ini/pkg-descr
+++ b/textproc/rubygem-ini/pkg-descr
@@ -5,4 +5,4 @@ gem has one goal: make INI file, structure, and stream manipulation
as fast, safe, and simple as possible. We take a modal approach
with a pluggable parser class.
-WWW: http://rubygems.org/gems/ini/
+WWW: https://rubygems.org/gems/ini
diff --git a/textproc/rubygem-itextomml/Makefile b/textproc/rubygem-itextomml/Makefile
index 15f01d4c8fb7..0fcafe41d0e3 100644
--- a/textproc/rubygem-itextomml/Makefile
+++ b/textproc/rubygem-itextomml/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= itextomml
-PORTVERSION= 1.5.2
+PORTVERSION= 1.5.5
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-itextomml/distinfo b/textproc/rubygem-itextomml/distinfo
index 42042b5373f1..ae3c8fd91c37 100644
--- a/textproc/rubygem-itextomml/distinfo
+++ b/textproc/rubygem-itextomml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/itextomml-1.5.2.gem) = 2fb0a794f5e8628aeae0d098ee67c010ae6793e162785b72baac60890922bcfa
-SIZE (rubygem/itextomml-1.5.2.gem) = 124928
+TIMESTAMP = 1482971568
+SHA256 (rubygem/itextomml-1.5.5.gem) = 3449404701e505900059da5d756db26fbc2e7c1aea5358380ddd532e14a304bb
+SIZE (rubygem/itextomml-1.5.5.gem) = 124416
diff --git a/textproc/rubygem-jekyll-assets/Makefile b/textproc/rubygem-jekyll-assets/Makefile
index 1348ab165624..148a3cd69848 100644
--- a/textproc/rubygem-jekyll-assets/Makefile
+++ b/textproc/rubygem-jekyll-assets/Makefile
@@ -3,6 +3,7 @@
PORTNAME= jekyll-assets
PORTVERSION= 2.2.8
+PORTREVISION= 1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-jekyll-assets/files/patch-gemspec b/textproc/rubygem-jekyll-assets/files/patch-gemspec
new file mode 100644
index 000000000000..808bfbd07b0d
--- /dev/null
+++ b/textproc/rubygem-jekyll-assets/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- jekyll-assets.gemspec.orig 2017-01-01 00:10:29 UTC
++++ jekyll-assets.gemspec
+@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q<rack>.freeze, ["< 2", "> 1"])
+- s.add_runtime_dependency(%q<sprockets>.freeze, ["< 3.7", "~> 3.3"])
++ s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 3.3"])
+ s.add_runtime_dependency(%q<fastimage>.freeze, [">= 1.8", "~> 2.0"])
+ s.add_runtime_dependency(%q<jekyll>.freeze, [">= 3.0", "~> 3.1"])
+ s.add_runtime_dependency(%q<pathutil>.freeze, [">= 0.8"])
diff --git a/textproc/rubygem-jekyll-redirect-from/Makefile b/textproc/rubygem-jekyll-redirect-from/Makefile
index bb4cbe6863a7..18f95cabcd35 100644
--- a/textproc/rubygem-jekyll-redirect-from/Makefile
+++ b/textproc/rubygem-jekyll-redirect-from/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jekyll-redirect-from
-PORTVERSION= 0.11.0
+PORTVERSION= 0.12.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -11,7 +11,7 @@ COMMENT= Handles redirection URLs for jekyll pages and posts
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-RUN_DEPENDS= rubygem-jekyll>=2.0:www/rubygem-jekyll
+RUN_DEPENDS= rubygem-jekyll>=3.3:www/rubygem-jekyll
NO_ARCH= yes
USE_RUBY= yes
diff --git a/textproc/rubygem-jekyll-redirect-from/distinfo b/textproc/rubygem-jekyll-redirect-from/distinfo
index aec80ffe67e5..8e67082ff6f3 100644
--- a/textproc/rubygem-jekyll-redirect-from/distinfo
+++ b/textproc/rubygem-jekyll-redirect-from/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480761469
-SHA256 (rubygem/jekyll-redirect-from-0.11.0.gem) = 57bad2818953df482194f5d0ec0cfaac324c10dea37d1ee340a7c943a5ce05e9
-SIZE (rubygem/jekyll-redirect-from-0.11.0.gem) = 13824
+TIMESTAMP = 1484304138
+SHA256 (rubygem/jekyll-redirect-from-0.12.1.gem) = c299b7592eba5cab4588cb98c01b4270c4c469a93255cfe8b14a3261dd27b80c
+SIZE (rubygem/jekyll-redirect-from-0.12.1.gem) = 14848
diff --git a/textproc/rubygem-jekyll-sitemap/Makefile b/textproc/rubygem-jekyll-sitemap/Makefile
index 2afc8187b04c..7b03b777587b 100644
--- a/textproc/rubygem-jekyll-sitemap/Makefile
+++ b/textproc/rubygem-jekyll-sitemap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jekyll-sitemap
-PORTVERSION= 0.10.0
+PORTVERSION= 1.0.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -11,6 +11,8 @@ COMMENT= Automatically generate a sitemap.xml for Jekyll sites
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
+RUN_DEPENDS= rubygem-jekyll>=3.3:www/rubygem-jekyll
+
NO_ARCH= yes
USE_RUBY= yes
USES= gem
diff --git a/textproc/rubygem-jekyll-sitemap/distinfo b/textproc/rubygem-jekyll-sitemap/distinfo
index 66112778c481..1b174b70a027 100644
--- a/textproc/rubygem-jekyll-sitemap/distinfo
+++ b/textproc/rubygem-jekyll-sitemap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/jekyll-sitemap-0.10.0.gem) = 21b680f2cee0bf85d840c841d2052b2f5e11cca043d0c211e15428f9e1f7e0e9
-SIZE (rubygem/jekyll-sitemap-0.10.0.gem) = 68608
+TIMESTAMP = 1483728147
+SHA256 (rubygem/jekyll-sitemap-1.0.0.gem) = 5a23b7a5f01e484028c9084ce3417357cacf6fe0f5b47726e1f27d9668ae8fc4
+SIZE (rubygem/jekyll-sitemap-1.0.0.gem) = 70144
diff --git a/textproc/rubygem-jemoji/Makefile b/textproc/rubygem-jemoji/Makefile
index d0287a209290..ecfbc9838b83 100644
--- a/textproc/rubygem-jemoji/Makefile
+++ b/textproc/rubygem-jemoji/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jemoji
-PORTVERSION= 0.7.0
+PORTVERSION= 0.8.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -11,7 +11,7 @@ COMMENT= GitHub-flavored emoji plugin for Jekyll
LICENSE= MIT
RUN_DEPENDS= rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
- rubygem-gemoji>=2.0:textproc/rubygem-gemoji \
+ rubygem-gemoji>=3.0:textproc/rubygem-gemoji \
rubygem-html-pipeline>=2.2:textproc/rubygem-html-pipeline \
rubygem-jekyll>=3.0:www/rubygem-jekyll
diff --git a/textproc/rubygem-jemoji/distinfo b/textproc/rubygem-jemoji/distinfo
index 30108d6a2aa3..4df6ba5104a9 100644
--- a/textproc/rubygem-jemoji/distinfo
+++ b/textproc/rubygem-jemoji/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480761175
-SHA256 (rubygem/jemoji-0.7.0.gem) = f86a19c8941808e4eaf4e2a3e8df638cc1d4103203da6b6c6d1aefa822c6dd8f
-SIZE (rubygem/jemoji-0.7.0.gem) = 5632
+TIMESTAMP = 1486254754
+SHA256 (rubygem/jemoji-0.8.0.gem) = 6be9ef2ab720c19682d2a3a2d6366e9ac2e1283dffa197bb114ec81c305c70f5
+SIZE (rubygem/jemoji-0.8.0.gem) = 5632
diff --git a/textproc/rubygem-kramdown/Makefile b/textproc/rubygem-kramdown/Makefile
index f692880271ff..6fbaf2d90bd5 100644
--- a/textproc/rubygem-kramdown/Makefile
+++ b/textproc/rubygem-kramdown/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= kramdown
-PORTVERSION= 1.11.1
+PORTVERSION= 1.13.2
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-kramdown/distinfo b/textproc/rubygem-kramdown/distinfo
index 4f092b71173b..deba0081d769 100644
--- a/textproc/rubygem-kramdown/distinfo
+++ b/textproc/rubygem-kramdown/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/kramdown-1.11.1.gem) = 01ff61ffc439e3d24e38c14e647bb12ab8ee67454fa7f0a47d5c4a7840e49216
-SIZE (rubygem/kramdown-1.11.1.gem) = 241152
+TIMESTAMP = 1483885861
+SHA256 (rubygem/kramdown-1.13.2.gem) = 2d11a7f9a9ec8dcf84e54af0a98b141a50a102b78e99b64e799f100c08c351c7
+SIZE (rubygem/kramdown-1.13.2.gem) = 249856
diff --git a/textproc/rubygem-kramdown/pkg-descr b/textproc/rubygem-kramdown/pkg-descr
index df2dc825e640..76a5411a058f 100644
--- a/textproc/rubygem-kramdown/pkg-descr
+++ b/textproc/rubygem-kramdown/pkg-descr
@@ -1,4 +1,4 @@
kramdown is yet-another-markdown-parser but fast, pure Ruby, using a strict
syntax definition and supporting several common extensions.
-WWW: http://kramdown.gettalong.org/
+WWW: https://kramdown.gettalong.org/
diff --git a/textproc/rubygem-libxml-ruby/Makefile b/textproc/rubygem-libxml-ruby/Makefile
index 102b707c525e..9b9b70d791a5 100644
--- a/textproc/rubygem-libxml-ruby/Makefile
+++ b/textproc/rubygem-libxml-ruby/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libxml-ruby
-PORTVERSION= 2.8.0
+PORTVERSION= 2.9.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-libxml-ruby/distinfo b/textproc/rubygem-libxml-ruby/distinfo
index f8c49e2ce77b..abc688389434 100644
--- a/textproc/rubygem-libxml-ruby/distinfo
+++ b/textproc/rubygem-libxml-ruby/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/libxml-ruby-2.8.0.gem) = 0bd2780afaaf944d38786999d929a4fd37eb30922c404301b86dee94c9c512b6
-SIZE (rubygem/libxml-ruby-2.8.0.gem) = 261120
+TIMESTAMP = 1482977820
+SHA256 (rubygem/libxml-ruby-2.9.0.gem) = e25a6278aaca2376ec0cc9e93a034a25d95af1102590abdbfce786d5c6612ddf
+SIZE (rubygem/libxml-ruby-2.9.0.gem) = 262144
diff --git a/textproc/rubygem-liquid/Makefile b/textproc/rubygem-liquid/Makefile
index 94594f717277..6b1b69651dc6 100644
--- a/textproc/rubygem-liquid/Makefile
+++ b/textproc/rubygem-liquid/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= liquid
-PORTVERSION= 3.0.6
+PORTVERSION= 4.0.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -10,7 +10,7 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Library for rendering safe templates
LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
diff --git a/textproc/rubygem-liquid/distinfo b/textproc/rubygem-liquid/distinfo
index 71b0c8d8f7eb..dba9010db0a3 100644
--- a/textproc/rubygem-liquid/distinfo
+++ b/textproc/rubygem-liquid/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/liquid-3.0.6.gem) = 823deffde39a649b6befa1526a3767aa7bc22259ffc455becc92547fc6b3770c
-SIZE (rubygem/liquid-3.0.6.gem) = 65024
+TIMESTAMP = 1482977926
+SHA256 (rubygem/liquid-4.0.0.gem) = 5ef4c157436096e6dac49f8b1edc0eb6c8f3b55fc8ffed5d1949a5ca9f04ca9d
+SIZE (rubygem/liquid-4.0.0.gem) = 71168
diff --git a/textproc/rubygem-liquid2/Makefile b/textproc/rubygem-liquid2/Makefile
index d71c8ad31d4e..7967add54b3d 100644
--- a/textproc/rubygem-liquid2/Makefile
+++ b/textproc/rubygem-liquid2/Makefile
@@ -13,8 +13,10 @@ COMMENT= Library for rendering safe templates
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
-NO_ARCH= yes
+DEPRECATED= Use textproc/rubygem-liquid instead
+EXPIRATION_DATE=2017-02-28
+NO_ARCH= yes
USE_RUBY= yes
USES= gem
diff --git a/textproc/rubygem-liquid3/Makefile b/textproc/rubygem-liquid3/Makefile
new file mode 100644
index 000000000000..5d6363de22e7
--- /dev/null
+++ b/textproc/rubygem-liquid3/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= liquid
+PORTVERSION= 3.0.6
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 3
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Library for rendering safe templates
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+NO_ARCH= yes
+
+USE_RUBY= yes
+USES= gem
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-liquid3/distinfo b/textproc/rubygem-liquid3/distinfo
new file mode 100644
index 000000000000..c0cdf595ad66
--- /dev/null
+++ b/textproc/rubygem-liquid3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483006705
+SHA256 (rubygem/liquid-3.0.6.gem) = 823deffde39a649b6befa1526a3767aa7bc22259ffc455becc92547fc6b3770c
+SIZE (rubygem/liquid-3.0.6.gem) = 65024
diff --git a/textproc/rubygem-liquid3/pkg-descr b/textproc/rubygem-liquid3/pkg-descr
new file mode 100644
index 000000000000..2ef98bfeef3c
--- /dev/null
+++ b/textproc/rubygem-liquid3/pkg-descr
@@ -0,0 +1,4 @@
+Ruby library for rendering safe templates which cannot affect the
+security of the server they are rendered on.
+
+WWW: http://www.liquidmarkup.org
diff --git a/textproc/rubygem-loggability/Makefile b/textproc/rubygem-loggability/Makefile
index 2825de11ad42..e3f921978e5c 100644
--- a/textproc/rubygem-loggability/Makefile
+++ b/textproc/rubygem-loggability/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= loggability
-PORTVERSION= 0.11.0
+PORTVERSION= 0.14.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -12,7 +12,6 @@ COMMENT= Composable logging system built on the standard Logger library
LICENSE= BSD3CLAUSE
NO_ARCH= yes
-
USE_RUBY= yes
USES= gem
diff --git a/textproc/rubygem-loggability/distinfo b/textproc/rubygem-loggability/distinfo
index a34f1920e7c0..a57dec667d4a 100644
--- a/textproc/rubygem-loggability/distinfo
+++ b/textproc/rubygem-loggability/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/loggability-0.11.0.gem) = 9abecffcef1568bd1c4026c157f5bed79db2fb5157ace19f4e1d908fca82c746
-SIZE (rubygem/loggability-0.11.0.gem) = 33280
+TIMESTAMP = 1486481762
+SHA256 (rubygem/loggability-0.14.0.gem) = dda3b351365aac5c98568b954551d78dced55b717d8b364b8aea584862a42810
+SIZE (rubygem/loggability-0.14.0.gem) = 36352
diff --git a/textproc/rubygem-markaby/Makefile b/textproc/rubygem-markaby/Makefile
index 264d111f9679..097c398af64b 100644
--- a/textproc/rubygem-markaby/Makefile
+++ b/textproc/rubygem-markaby/Makefile
@@ -3,7 +3,7 @@
PORTNAME= markaby
PORTVERSION= 0.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ COMMENT= HTML Markup as Ruby
LICENSE= MIT
-RUN_DEPENDS= rubygem-builder32>=0:devel/rubygem-builder32
+RUN_DEPENDS= rubygem-builder>=0:devel/rubygem-builder
NO_ARCH= yes
USE_RUBY= yes
diff --git a/textproc/rubygem-multi_xml/Makefile b/textproc/rubygem-multi_xml/Makefile
index 2295b38ff1f3..a32385961e10 100644
--- a/textproc/rubygem-multi_xml/Makefile
+++ b/textproc/rubygem-multi_xml/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= multi_xml
-PORTVERSION= 0.5.5
+PORTVERSION= 0.6.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -10,6 +10,7 @@ MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Ruby library provide swappable XML backends
LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
OPTIONS_DEFINE= NOKOGIRI
NOKOGIRI_DESC= Nokogiri is a HTML, XML, SAX, and Reader parser
diff --git a/textproc/rubygem-multi_xml/distinfo b/textproc/rubygem-multi_xml/distinfo
index 41e41b065371..03108fd15a89 100644
--- a/textproc/rubygem-multi_xml/distinfo
+++ b/textproc/rubygem-multi_xml/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/multi_xml-0.5.5.gem) = 08936dc294586ee1d178217cce577febe26315d7880e01e4f8e97cf2753b1945
-SIZE (rubygem/multi_xml-0.5.5.gem) = 20992
+TIMESTAMP = 1481116604
+SHA256 (rubygem/multi_xml-0.6.0.gem) = d24393cf958adb226db884b976b007914a89c53ad88718e25679d7008823ad52
+SIZE (rubygem/multi_xml-0.6.0.gem) = 15360
diff --git a/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile
index 2bf52f50713b..1028cdc59efd 100644
--- a/textproc/rubygem-nokogiri/Makefile
+++ b/textproc/rubygem-nokogiri/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= nokogiri
-PORTVERSION= 1.6.8
+PORTVERSION= 1.7.0.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-nokogiri/distinfo b/textproc/rubygem-nokogiri/distinfo
index 9d9c6bda99ae..4406c9101ac2 100644
--- a/textproc/rubygem-nokogiri/distinfo
+++ b/textproc/rubygem-nokogiri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473686833
-SHA256 (rubygem/nokogiri-1.6.8.gem) = 37a4af5a4a8fb5a43991a38e51db64d6406b8d11fdaed57f8cf9454fea86f29e
-SIZE (rubygem/nokogiri-1.6.8.gem) = 9147392
+TIMESTAMP = 1483915450
+SHA256 (rubygem/nokogiri-1.7.0.1.gem) = 63d702f4e6684523f08f7d0fd48d9e42c95693207ba1aaef11b079eec083aa83
+SIZE (rubygem/nokogiri-1.7.0.1.gem) = 9147904
diff --git a/textproc/rubygem-nokogiri/files/patch-gemspec b/textproc/rubygem-nokogiri/files/patch-gemspec
index fcf8493931a7..6c153170cdc5 100644
--- a/textproc/rubygem-nokogiri/files/patch-gemspec
+++ b/textproc/rubygem-nokogiri/files/patch-gemspec
@@ -1,10 +1,10 @@
---- nokogiri.gemspec.orig 2016-09-12 13:46:38 UTC
-+++ nokogiri.gemspec
-@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
+--- nokogiri.gemspec.orig 2016-12-31 08:58:24.802552000 -0500
++++ nokogiri.gemspec 2016-12-31 08:59:23.202400000 -0500
+@@ -27,7 +27,6 @@
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<mini_portile2>.freeze, ["~> 2.1.0"])
- s.add_runtime_dependency(%q<pkg-config>.freeze, ["~> 1.1.7"])
- s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
s.add_development_dependency(%q<hoe-bundler>.freeze, ["~> 1.2.0"])
+ s.add_development_dependency(%q<hoe-debugging>.freeze, ["~> 1.2.1"])
+ s.add_development_dependency(%q<hoe-gemspec>.freeze, ["~> 1.0.0"])
diff --git a/textproc/rubygem-nokogiri14/Makefile b/textproc/rubygem-nokogiri14/Makefile
index c5bbb77982d0..4087e1bee61f 100644
--- a/textproc/rubygem-nokogiri14/Makefile
+++ b/textproc/rubygem-nokogiri14/Makefile
@@ -2,6 +2,7 @@
PORTNAME= nokogiri
PORTVERSION= 1.4.7
+PORTREVISION= 1
PKGNAMESUFFIX= 14
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -11,6 +12,9 @@ COMMENT= HTML, XML, SAX, and Reader parser
LICENSE= MIT
+DEPRECATED= Use textproc/rubygem-nokogiri instead
+EXPIRATION_DATE=2017-02-28
+
USE_RUBY= yes
USES= gem pkgconfig
USE_GNOME= libxml2 libxslt
diff --git a/textproc/rubygem-nokogumbo/Makefile b/textproc/rubygem-nokogumbo/Makefile
index 3590bf388ede..feef4e30ac60 100644
--- a/textproc/rubygem-nokogumbo/Makefile
+++ b/textproc/rubygem-nokogumbo/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nokogumbo
-PORTVERSION= 1.4.7
+PORTVERSION= 1.4.10
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= rubygem-nokogiri>=0:textproc/rubygem-nokogiri
+CFLAGS+= -I${LOCALBASE}/include/libxml2/libxml
+
USE_RUBY= yes
USES= gem pkgconfig
diff --git a/textproc/rubygem-nokogumbo/distinfo b/textproc/rubygem-nokogumbo/distinfo
index 46915018c189..8f0f399f0e1d 100644
--- a/textproc/rubygem-nokogumbo/distinfo
+++ b/textproc/rubygem-nokogumbo/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/nokogumbo-1.4.7.gem) = 39adb157eb8aaaef0f104cce973afad06d6fdc62b5bb65d37190dc6d8b285d79
-SIZE (rubygem/nokogumbo-1.4.7.gem) = 227328
+TIMESTAMP = 1483196137
+SHA256 (rubygem/nokogumbo-1.4.10.gem) = b6f1e152e05388dbab0b0a0ecc101a06ce41461e8ed3425f6e4ca1e6634147ea
+SIZE (rubygem/nokogumbo-1.4.10.gem) = 227840
diff --git a/textproc/rubygem-opml/pkg-descr b/textproc/rubygem-opml/pkg-descr
index 979424160ec6..2dea944b0066 100644
--- a/textproc/rubygem-opml/pkg-descr
+++ b/textproc/rubygem-opml/pkg-descr
@@ -1,3 +1,3 @@
A simple wrapper for parsing OPML files.
-WWW: http://rubygems.org/gems/opml/
+WWW: https://rubygems.org/gems/opml
diff --git a/textproc/rubygem-ox/Makefile b/textproc/rubygem-ox/Makefile
index bc40c85549ee..ee317c9ac845 100644
--- a/textproc/rubygem-ox/Makefile
+++ b/textproc/rubygem-ox/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ox
-PORTVERSION= 2.4.1
+PORTVERSION= 2.4.9
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-ox/distinfo b/textproc/rubygem-ox/distinfo
index 03b12b1401e6..7d5c5bf5a298 100644
--- a/textproc/rubygem-ox/distinfo
+++ b/textproc/rubygem-ox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463981473
-SHA256 (rubygem/ox-2.4.1.gem) = 759bb0af0482c51fd22e41f632661406a486973ae569c3b1290043fa33e536ee
-SIZE (rubygem/ox-2.4.1.gem) = 71680
+TIMESTAMP = 1485435501
+SHA256 (rubygem/ox-2.4.9.gem) = 6e23935784adcf2c865635d7fead9b499d766d146bf9e162d9e7601f73f4ad82
+SIZE (rubygem/ox-2.4.9.gem) = 73216
diff --git a/textproc/rubygem-pretty-xml/Makefile b/textproc/rubygem-pretty-xml/Makefile
index 7a70e7e0e28e..b8a6b58b53b4 100644
--- a/textproc/rubygem-pretty-xml/Makefile
+++ b/textproc/rubygem-pretty-xml/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pretty-xml
-PORTVERSION= 0.2.0
+PORTVERSION= 0.2.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-pretty-xml/distinfo b/textproc/rubygem-pretty-xml/distinfo
index 63d0bb63705d..9e44cff2d13c 100644
--- a/textproc/rubygem-pretty-xml/distinfo
+++ b/textproc/rubygem-pretty-xml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463675508
-SHA256 (rubygem/pretty-xml-0.2.0.gem) = 6d8e59649bbc225d33961fd2c0d2251a5cb7047b50992fe93de081f0193718b4
-SIZE (rubygem/pretty-xml-0.2.0.gem) = 9216
+TIMESTAMP = 1482980420
+SHA256 (rubygem/pretty-xml-0.2.1.gem) = 06e0a0916ac27b2a714a9787a7134153b56fd1a1747e6caef7454f2b3cce03d6
+SIZE (rubygem/pretty-xml-0.2.1.gem) = 9216
diff --git a/textproc/rubygem-rails-dom-testing/Makefile b/textproc/rubygem-rails-dom-testing/Makefile
index 0115c903bf51..038ea95aba63 100644
--- a/textproc/rubygem-rails-dom-testing/Makefile
+++ b/textproc/rubygem-rails-dom-testing/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rails-dom-testing
-PORTVERSION= 1.0.7
+PORTVERSION= 2.0.2
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -10,7 +10,7 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Analyse and compare DOMs using Nokogiri
LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
RUN_DEPENDS= rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \
rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
diff --git a/textproc/rubygem-rails-dom-testing/distinfo b/textproc/rubygem-rails-dom-testing/distinfo
index 5c70a7cfb0da..1f1e2b91b66c 100644
--- a/textproc/rubygem-rails-dom-testing/distinfo
+++ b/textproc/rubygem-rails-dom-testing/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/rails-dom-testing-1.0.7.gem) = 6813821425ff44ae3188162d0bae1a2ae08080fc1a584860bf78d50190a112ed
-SIZE (rubygem/rails-dom-testing-1.0.7.gem) = 17408
+TIMESTAMP = 1483229671
+SHA256 (rubygem/rails-dom-testing-2.0.2.gem) = 7b7a3813b3ae83d450a7d16a80d5f3f38585b5589a28084443fa9c1b492635d8
+SIZE (rubygem/rails-dom-testing-2.0.2.gem) = 14336
diff --git a/textproc/rubygem-rails-dom-testing1/Makefile b/textproc/rubygem-rails-dom-testing1/Makefile
new file mode 100644
index 000000000000..e9c913fafcfb
--- /dev/null
+++ b/textproc/rubygem-rails-dom-testing1/Makefile
@@ -0,0 +1,26 @@
+# Created by: Johannes Jost Meixner <xmj@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= rails-dom-testing
+PORTVERSION= 1.0.8
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 1
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Analyse and compare DOMs using Nokogiri
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \
+ rubygem-nokogiri>=1.6:textproc/rubygem-nokogiri \
+ rubygem-rails-deprecated_sanitizer>=1.0.1:devel/rubygem-rails-deprecated_sanitizer
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+PORTSCOUT= limit:^1\.
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-rails-dom-testing1/distinfo b/textproc/rubygem-rails-dom-testing1/distinfo
new file mode 100644
index 000000000000..e2edab58d70c
--- /dev/null
+++ b/textproc/rubygem-rails-dom-testing1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483397706
+SHA256 (rubygem/rails-dom-testing-1.0.8.gem) = 19dd4498c8e203b6c7747d0261d961354712e6f67bc74bdecf4060d8e5aac7db
+SIZE (rubygem/rails-dom-testing-1.0.8.gem) = 17408
diff --git a/textproc/rubygem-rails-dom-testing1/pkg-descr b/textproc/rubygem-rails-dom-testing1/pkg-descr
new file mode 100644
index 000000000000..c87a1ba37065
--- /dev/null
+++ b/textproc/rubygem-rails-dom-testing1/pkg-descr
@@ -0,0 +1,8 @@
+This gem is responsible for comparing HTML doms and asserting that DOM elements
+are present in Rails applications. Doms are compared via assert_dom_equal and
+assert_dom_not_equal. Elements are asserted via assert_select,
+assert_select_encoded, assert_select_email and a subset of the dom can be
+selected with css_select. The gem is developed for Rails 4.2 and above, and
+will not work on previous versions.
+
+WWW: https://github.com/rails/rails-dom-testing
diff --git a/textproc/rubygem-rdiscount/Makefile b/textproc/rubygem-rdiscount/Makefile
index df68afaff4b2..d2ffdab227f0 100644
--- a/textproc/rubygem-rdiscount/Makefile
+++ b/textproc/rubygem-rdiscount/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rdiscount
-PORTVERSION= 2.1.8
+PORTVERSION= 2.2.0.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-rdiscount/distinfo b/textproc/rubygem-rdiscount/distinfo
index f64384e8e2e4..501d5d7a81df 100644
--- a/textproc/rubygem-rdiscount/distinfo
+++ b/textproc/rubygem-rdiscount/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/rdiscount-2.1.8.gem) = 1b1c2b8e3c2afd2993efa14e28f992d8b755441b17f3e2c102cf719341f29e6d
-SIZE (rubygem/rdiscount-2.1.8.gem) = 67072
+TIMESTAMP = 1482980488
+SHA256 (rubygem/rdiscount-2.2.0.1.gem) = a34f55937c84f390f979808c7002fd24ab1e8b0172c916b0563d5f03e6983bab
+SIZE (rubygem/rdiscount-2.2.0.1.gem) = 68096
diff --git a/textproc/rubygem-redcarpet/Makefile b/textproc/rubygem-redcarpet/Makefile
index ff2c05a96cea..d66b3f770ccd 100644
--- a/textproc/rubygem-redcarpet/Makefile
+++ b/textproc/rubygem-redcarpet/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= redcarpet
-PORTVERSION= 3.3.4
+PORTVERSION= 3.4.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-redcarpet/distinfo b/textproc/rubygem-redcarpet/distinfo
index 6f8ec436f69d..2e1810f6b5e9 100644
--- a/textproc/rubygem-redcarpet/distinfo
+++ b/textproc/rubygem-redcarpet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/redcarpet-3.3.4.gem) = 6fbf59f8fa23f84497cfb9bd1601ec35fa32f400d9034bf861c15dbbc02d6813
-SIZE (rubygem/redcarpet-3.3.4.gem) = 60416
+TIMESTAMP = 1482980611
+SHA256 (rubygem/redcarpet-3.4.0.gem) = a7b10a67a2c11d7a1945caa7fbfc2e6c8fcbe4583ff355af9d499319a1f83841
+SIZE (rubygem/redcarpet-3.4.0.gem) = 61440
diff --git a/textproc/rubygem-rich/Makefile b/textproc/rubygem-rich/Makefile
index 469be2375e73..fab40466a256 100644
--- a/textproc/rubygem-rich/Makefile
+++ b/textproc/rubygem-rich/Makefile
@@ -3,6 +3,7 @@
PORTNAME= rich
PORTVERSION= 1.4.6
+PORTREVISION= 2
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -12,13 +13,13 @@ COMMENT= Opinionated WYSIWYG editor for Rails based on CKEditor
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
-RUN_DEPENDS= rubygem-jquery-rails>=0:www/rubygem-jquery-rails \
+RUN_DEPENDS= rubygem-jquery-rails4>=4.0:www/rubygem-jquery-rails4 \
rubygem-kaminari>=0:www/rubygem-kaminari \
rubygem-mime-types>=0:misc/rubygem-mime-types \
rubygem-paperclip>=0:devel/rubygem-paperclip \
rubygem-rack-raw-upload>=0:devel/rubygem-rack-raw-upload \
- rubygem-rails>=3.2.0:www/rubygem-rails \
- rubygem-sass-rails>=0:textproc/rubygem-sass-rails
+ rubygem-rails4>=4.0:www/rubygem-rails4 \
+ rubygem-sass-rails5>=0:textproc/rubygem-sass-rails5
NO_ARCH= yes
USE_RUBY= yes
diff --git a/textproc/rubygem-rouge1/Makefile b/textproc/rubygem-rouge1/Makefile
new file mode 100644
index 000000000000..6a90c6148fa3
--- /dev/null
+++ b/textproc/rubygem-rouge1/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME= rouge
+PORTVERSION= 1.11.1
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 1
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Simple, easy-to-extend drop-in replacement for pygments
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+NO_ARCH= yes
+
+USE_RUBY= yes
+USES= gem
+PLIST_FILES= bin/rougify${PKGNAMESUFFIX}
+
+post-install:
+ @${MV} ${STAGEDIR}/${PREFIX}/bin/rougify \
+ ${STAGEDIR}/${PREFIX}/bin/rougify${PKGNAMESUFFIX}
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-rouge1/distinfo b/textproc/rubygem-rouge1/distinfo
new file mode 100644
index 000000000000..4fb0d10a64b8
--- /dev/null
+++ b/textproc/rubygem-rouge1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483007123
+SHA256 (rubygem/rouge-1.11.1.gem) = 888974619e7c34d89baa34135bfa5fd7f9852ff2483c151229ccdad9d664558d
+SIZE (rubygem/rouge-1.11.1.gem) = 212480
diff --git a/textproc/rubygem-rouge1/pkg-descr b/textproc/rubygem-rouge1/pkg-descr
new file mode 100644
index 000000000000..fe4ca567acc7
--- /dev/null
+++ b/textproc/rubygem-rouge1/pkg-descr
@@ -0,0 +1,4 @@
+Rouge aims to a be a simple, easy-to-extend drop-in replacement for
+pygments.
+
+WWW: https://github.com/jneen/rouge
diff --git a/textproc/rubygem-rubypants/Makefile b/textproc/rubygem-rubypants/Makefile
index 2e4d8dcec9b3..59749f448f1b 100644
--- a/textproc/rubygem-rubypants/Makefile
+++ b/textproc/rubygem-rubypants/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rubypants
-PORTVERSION= 0.2.0
+PORTVERSION= 0.6.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-rubypants/distinfo b/textproc/rubygem-rubypants/distinfo
index 7ef3aaba425d..8cc69bb95a3c 100644
--- a/textproc/rubygem-rubypants/distinfo
+++ b/textproc/rubygem-rubypants/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/rubypants-0.2.0.gem) = f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee
-SIZE (rubygem/rubypants-0.2.0.gem) = 11264
+TIMESTAMP = 1483351094
+SHA256 (rubygem/rubypants-0.6.0.gem) = 503b4c24ba574a6a617e5133838f6d9ab49227bd102728a8f2930baba89ef876
+SIZE (rubygem/rubypants-0.6.0.gem) = 13824
diff --git a/textproc/rubygem-rugments/Makefile b/textproc/rubygem-rugments/Makefile
index 0d64cea7f7b8..7f0e057a0991 100644
--- a/textproc/rubygem-rugments/Makefile
+++ b/textproc/rubygem-rugments/Makefile
@@ -11,9 +11,7 @@ COMMENT= Simple, easy to extend drop in replacement for pygments
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-GEM_NAME= ${PORTNAME}-${DISTVERSION}
NO_ARCH= yes
-
USE_RUBY= yes
USES= gem
diff --git a/textproc/rubygem-sanitize/Makefile b/textproc/rubygem-sanitize/Makefile
index 3963f8482541..f4db81674b67 100644
--- a/textproc/rubygem-sanitize/Makefile
+++ b/textproc/rubygem-sanitize/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sanitize
-PORTVERSION= 4.0.1
+PORTVERSION= 4.4.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-sanitize/distinfo b/textproc/rubygem-sanitize/distinfo
index 6792b09f64a1..817da4b49d25 100644
--- a/textproc/rubygem-sanitize/distinfo
+++ b/textproc/rubygem-sanitize/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/sanitize-4.0.1.gem) = 7c9d325cd44120f74bb052389d4b464e3fcb9cd46e24b0ff59582c3196e52f1e
-SIZE (rubygem/sanitize-4.0.1.gem) = 38912
+TIMESTAMP = 1482981394
+SHA256 (rubygem/sanitize-4.4.0.gem) = 9637d81a9da65c235b601afbab05cd0d2eb58b08e7b7f1df213ca263de500bfe
+SIZE (rubygem/sanitize-4.4.0.gem) = 39936
diff --git a/textproc/rubygem-sass-rails/Makefile b/textproc/rubygem-sass-rails/Makefile
deleted file mode 100644
index 0fa3e3da461b..000000000000
--- a/textproc/rubygem-sass-rails/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= sass-rails
-PORTVERSION= 3.2.6
-PORTREVISION= 4
-CATEGORIES= textproc rubygems
-MASTER_SITES= RG
-
-MAINTAINER= ruby@FreeBSD.org
-COMMENT= Sass adapter for the Rails asset pipeline
-
-LICENSE= MIT
-LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
-
-RUN_DEPENDS= rubygem-railties>=3.2.0:www/rubygem-railties \
- rubygem-sass>=3.3.4:textproc/rubygem-sass \
- rubygem-tilt>=2.0.1:devel/rubygem-tilt
-
-NO_ARCH= yes
-USE_RUBY= yes
-USES= gem
-
-PORTSCOUT= limit:^3\.
-
-.include <bsd.port.mk>
diff --git a/textproc/rubygem-sass-rails/distinfo b/textproc/rubygem-sass-rails/distinfo
deleted file mode 100644
index 0504640a2d66..000000000000
--- a/textproc/rubygem-sass-rails/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/sass-rails-3.2.6.gem) = a8e5618ecbc88b1b1678d3f7ccf5639d70da8e421b599546c3cef5c9627f67ed
-SIZE (rubygem/sass-rails-3.2.6.gem) = 88576
diff --git a/textproc/rubygem-sass-rails/files/patch-gemspec b/textproc/rubygem-sass-rails/files/patch-gemspec
deleted file mode 100644
index e8ded649c0d0..000000000000
--- a/textproc/rubygem-sass-rails/files/patch-gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- sass-rails.gemspec.orig 2016-03-31 17:18:22 UTC
-+++ sass-rails.gemspec
-@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<sass>.freeze, [">= 3.1.10"])
- s.add_runtime_dependency(%q<railties>.freeze, ["~> 3.2.0"])
-- s.add_runtime_dependency(%q<tilt>.freeze, ["~> 1.3"])
-+ s.add_runtime_dependency(%q<tilt>.freeze, [">= 1.3"])
- else
- s.add_dependency(%q<sass>.freeze, [">= 3.1.10"])
- s.add_dependency(%q<railties>.freeze, ["~> 3.2.0"])
diff --git a/textproc/rubygem-sass-rails/pkg-descr b/textproc/rubygem-sass-rails/pkg-descr
deleted file mode 100644
index e4a6b809b4d8..000000000000
--- a/textproc/rubygem-sass-rails/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Sass adapter for the Rails asset pipeline.
-
-WWW: https://github.com/rails/sass-rails
diff --git a/textproc/rubygem-sass-rails4/Makefile b/textproc/rubygem-sass-rails4/Makefile
index a5dc92d4c53e..cef1d684f0f3 100644
--- a/textproc/rubygem-sass-rails4/Makefile
+++ b/textproc/rubygem-sass-rails4/Makefile
@@ -19,6 +19,9 @@ RUN_DEPENDS?= rubygem-railties4>=4.0.0:www/rubygem-railties4 \
rubygem-sprockets>=2.8:devel/rubygem-sprockets \
rubygem-sprockets-rails>=2.0:devel/rubygem-sprockets-rails
+DEPRECATED= Use textproc/rubygem-sass-rails5 instead
+EXPIRATION_DATE=2017-02-28
+
PORTSCOUT= limit:^4\.
NO_ARCH= yes
diff --git a/textproc/rubygem-sass-rails5/Makefile b/textproc/rubygem-sass-rails5/Makefile
index 1f0240fa9091..545d71e11f93 100644
--- a/textproc/rubygem-sass-rails5/Makefile
+++ b/textproc/rubygem-sass-rails5/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= sass-rails
-PORTVERSION= 5.0.4
-PORTREVISION= 1
+PORTVERSION= 5.0.6
CATEGORIES= textproc rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= 5
diff --git a/textproc/rubygem-sass-rails5/distinfo b/textproc/rubygem-sass-rails5/distinfo
index 890a023ce4d9..7c7b157cf446 100644
--- a/textproc/rubygem-sass-rails5/distinfo
+++ b/textproc/rubygem-sass-rails5/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/sass-rails-5.0.4.gem) = 4842e42d4d99e85a56e9da009fedea86fa9aa242bf62afbc129c90c4f729c3b8
-SIZE (rubygem/sass-rails-5.0.4.gem) = 10752
+TIMESTAMP = 1483217698
+SHA256 (rubygem/sass-rails-5.0.6.gem) = 8bb5d9ed4e83c7e1ad2b518daf13a266b995c40a5ac74bc2673633b420105146
+SIZE (rubygem/sass-rails-5.0.6.gem) = 10752
diff --git a/textproc/rubygem-sass/Makefile b/textproc/rubygem-sass/Makefile
index b09d665cfb3d..8edc549cb4bc 100644
--- a/textproc/rubygem-sass/Makefile
+++ b/textproc/rubygem-sass/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sass
-PORTVERSION= 3.4.22
+PORTVERSION= 3.4.23
CATEGORIES= textproc ruby
MASTER_SITES= RG
diff --git a/textproc/rubygem-sass/distinfo b/textproc/rubygem-sass/distinfo
index bba3f05b9530..c94d8c589115 100644
--- a/textproc/rubygem-sass/distinfo
+++ b/textproc/rubygem-sass/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/sass-3.4.22.gem) = 9e7bad9b3854e1913a6d30eb3bae69eca8dd61e55c63a92a78e14d67c4367236
-SIZE (rubygem/sass-3.4.22.gem) = 349184
+TIMESTAMP = 1483214136
+SHA256 (rubygem/sass-3.4.23.gem) = d973b62b710f07a755f8fb311e3b7d4f7577d4cd39f01bb40e95016387ad4435
+SIZE (rubygem/sass-3.4.23.gem) = 351232
diff --git a/textproc/rubygem-scss_lint/Makefile b/textproc/rubygem-scss_lint/Makefile
index cd20bef04abb..931803f2e85b 100644
--- a/textproc/rubygem-scss_lint/Makefile
+++ b/textproc/rubygem-scss_lint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= scss_lint
-PORTVERSION= 0.48.0
+PORTVERSION= 0.52.0
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
RUN_DEPENDS= rubygem-rake>=0.9:devel/rubygem-rake \
- rubygem-sass>=3.4.15:textproc/rubygem-sass
+ rubygem-sass>=3.4.20:textproc/rubygem-sass
NO_ARCH= yes
USE_RUBY= yes
diff --git a/textproc/rubygem-scss_lint/distinfo b/textproc/rubygem-scss_lint/distinfo
index b67c7c232403..b9854c510141 100644
--- a/textproc/rubygem-scss_lint/distinfo
+++ b/textproc/rubygem-scss_lint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/scss_lint-0.48.0.gem) = 603ecdc6fe3872b144288eddffaadd4c4a44e962cd894cc517a26b91f9ac0915
-SIZE (rubygem/scss_lint-0.48.0.gem) = 106496
+TIMESTAMP = 1483726145
+SHA256 (rubygem/scss_lint-0.52.0.gem) = cd1d9182baabeb073276ecca5d9ed0f9fd5f01d3e1b6eb8c03247226dfac5587
+SIZE (rubygem/scss_lint-0.52.0.gem) = 111104
diff --git a/textproc/rubygem-sixarm_ruby_unaccent/Makefile b/textproc/rubygem-sixarm_ruby_unaccent/Makefile
new file mode 100644
index 000000000000..f14ff47f5fa5
--- /dev/null
+++ b/textproc/rubygem-sixarm_ruby_unaccent/Makefile
@@ -0,0 +1,21 @@
+# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= sixarm_ruby_unaccent
+PORTVERSION= 1.1.1
+CATEGORIES= textproc rubygems
+MASTER_SITES= RG
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Replaces accented characters with unaccented characters
+
+# https://github.com/SixArm/sixarm_ruby_unaccent/blob/master/LICENSE.md
+# The most common or latest version of each license is chosen.
+LICENSE= AGPLv3 APACHE20 ART20 BSD3CLAUSE CC-BY-NC-SA-4.0 GPLv3 LGPL3 MIT RUBY
+LICENSE_COMB= dual
+
+NO_ARCH= yes
+USE_RUBY= yes
+USES= gem
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-sixarm_ruby_unaccent/distinfo b/textproc/rubygem-sixarm_ruby_unaccent/distinfo
new file mode 100644
index 000000000000..8226acf44d33
--- /dev/null
+++ b/textproc/rubygem-sixarm_ruby_unaccent/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1483530451
+SHA256 (rubygem/sixarm_ruby_unaccent-1.1.1.gem) = 79ac63103532bb649792d924baedeb11743e7735b812aa8aae98d68380836ee7
+SIZE (rubygem/sixarm_ruby_unaccent-1.1.1.gem) = 74752
diff --git a/textproc/rubygem-sixarm_ruby_unaccent/pkg-descr b/textproc/rubygem-sixarm_ruby_unaccent/pkg-descr
new file mode 100644
index 000000000000..604640c13cdf
--- /dev/null
+++ b/textproc/rubygem-sixarm_ruby_unaccent/pkg-descr
@@ -0,0 +1,3 @@
+Unaccent replaces a string's accented characters with unaccented characters.
+
+WWW: https://github.com/SixArm/sixarm_ruby_unaccent
diff --git a/textproc/rubygem-spreadsheet/Makefile b/textproc/rubygem-spreadsheet/Makefile
index ddcb1c36690a..af68ae9d1bc0 100644
--- a/textproc/rubygem-spreadsheet/Makefile
+++ b/textproc/rubygem-spreadsheet/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= spreadsheet
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.4
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-spreadsheet/distinfo b/textproc/rubygem-spreadsheet/distinfo
index b768d2e9f822..87d34204f62d 100644
--- a/textproc/rubygem-spreadsheet/distinfo
+++ b/textproc/rubygem-spreadsheet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/spreadsheet-1.1.2.gem) = a9e6c6986f246699bf27a18a6ff6ada03c1c34d71a4806c19a1ac3e89fc69baa
-SIZE (rubygem/spreadsheet-1.1.2.gem) = 4479488
+TIMESTAMP = 1482982016
+SHA256 (rubygem/spreadsheet-1.1.4.gem) = 0367b0a70b7c3025c0f86333e5a1ad765392698f47cfcfb8c123e70a5f062e16
+SIZE (rubygem/spreadsheet-1.1.4.gem) = 4480000
diff --git a/textproc/rubygem-syntax/Makefile b/textproc/rubygem-syntax/Makefile
index 948c0bb19ef2..18d1057340bc 100644
--- a/textproc/rubygem-syntax/Makefile
+++ b/textproc/rubygem-syntax/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= syntax
-PORTVERSION= 1.2.0
+PORTVERSION= 1.2.1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-syntax/distinfo b/textproc/rubygem-syntax/distinfo
index af9138df9ed0..16aefc2e9724 100644
--- a/textproc/rubygem-syntax/distinfo
+++ b/textproc/rubygem-syntax/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/syntax-1.2.0.gem) = d33e70c3553070f069ac2f0a46785f6e34000db8ef0a574dea63fc95cfd80c18
-SIZE (rubygem/syntax-1.2.0.gem) = 19968
+TIMESTAMP = 1482982563
+SHA256 (rubygem/syntax-1.2.1.gem) = f32136f078f38cfba830be3bcd4b545f0762f415b852fbcab719518ddacd6fe9
+SIZE (rubygem/syntax-1.2.1.gem) = 19968
diff --git a/textproc/rubygem-terminal-table/Makefile b/textproc/rubygem-terminal-table/Makefile
index 3296ee9052be..3401eeb4ab62 100644
--- a/textproc/rubygem-terminal-table/Makefile
+++ b/textproc/rubygem-terminal-table/Makefile
@@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= terminal-table
-PORTVERSION= 1.5.2
+PORTVERSION= 1.7.3
+PORTREVISION= 1
CATEGORIES= textproc rubygems
MASTER_SITES= RG
@@ -11,6 +12,8 @@ COMMENT= Simple, feature rich ASCII table generation library
LICENSE= MIT
+RUN_DEPENDS= rubygem-unicode-display_width>=1.1.1:devel/rubygem-unicode-display_width
+
NO_ARCH= yes
USE_RUBY= yes
USES= gem
diff --git a/textproc/rubygem-terminal-table/distinfo b/textproc/rubygem-terminal-table/distinfo
index e744a1b730a2..6e7e542a8af9 100644
--- a/textproc/rubygem-terminal-table/distinfo
+++ b/textproc/rubygem-terminal-table/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/terminal-table-1.5.2.gem) = 0e5d87e7c17b35e07b352ee2eee9049435321860295231e25a4f851c93f4d8e8
-SIZE (rubygem/terminal-table-1.5.2.gem) = 11776
+TIMESTAMP = 1482982901
+SHA256 (rubygem/terminal-table-1.7.3.gem) = f10d5ff88f5596dfeb45d2cdf1ad35b8b8e347f58bcc7307a270af44176885a5
+SIZE (rubygem/terminal-table-1.7.3.gem) = 13312
diff --git a/textproc/rubygem-tidy/pkg-descr b/textproc/rubygem-tidy/pkg-descr
index 62979d2ad766..3e8058c4bcd5 100644
--- a/textproc/rubygem-tidy/pkg-descr
+++ b/textproc/rubygem-tidy/pkg-descr
@@ -1,3 +1,3 @@
Ruby interface to HTML Tidy Library Project
-WWW: http://rubygems.org/gems/tidy/
+WWW: https://rubygems.org/gems/tidy
diff --git a/textproc/rubygem-twitter-text/Makefile b/textproc/rubygem-twitter-text/Makefile
index 39573eadf8cb..a40cbb7180c7 100644
--- a/textproc/rubygem-twitter-text/Makefile
+++ b/textproc/rubygem-twitter-text/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= twitter-text
-PORTVERSION= 1.13.0
+PORTVERSION= 1.14.5
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-twitter-text/distinfo b/textproc/rubygem-twitter-text/distinfo
index 7b0ab3314e23..15ebf142b7c0 100644
--- a/textproc/rubygem-twitter-text/distinfo
+++ b/textproc/rubygem-twitter-text/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/twitter-text-1.13.0.gem) = 11c44fabb6f3a3c298f614328ed6ae7f42e14c46d87c01191599b8e2d428205b
-SIZE (rubygem/twitter-text-1.13.0.gem) = 44544
+TIMESTAMP = 1485704936
+SHA256 (rubygem/twitter-text-1.14.5.gem) = 5e04dcddc13e71b75938c7219501c43ef122139b18686229d83ed4b93955e2d9
+SIZE (rubygem/twitter-text-1.14.5.gem) = 48128
diff --git a/textproc/rubygem-yard/Makefile b/textproc/rubygem-yard/Makefile
index d15f6a3b76f1..716f9368b80e 100644
--- a/textproc/rubygem-yard/Makefile
+++ b/textproc/rubygem-yard/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= yard
-PORTVERSION= 0.8.7.6
+PORTVERSION= 0.9.8
CATEGORIES= textproc devel rubygems
MASTER_SITES= RG
diff --git a/textproc/rubygem-yard/distinfo b/textproc/rubygem-yard/distinfo
index f2a47a259e42..b1bf3b0520fa 100644
--- a/textproc/rubygem-yard/distinfo
+++ b/textproc/rubygem-yard/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/yard-0.8.7.6.gem) = 3da10884b94fa25b7476f619b1d2cfb61290e10673965c545975630cd88a46b6
-SIZE (rubygem/yard-0.8.7.6.gem) = 571392
+TIMESTAMP = 1484406594
+SHA256 (rubygem/yard-0.9.8.gem) = 24f5d48afa50eaf587b4c28a62564dbf54d4f594631cad7904035ed5f38465cf
+SIZE (rubygem/yard-0.9.8.gem) = 616448
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index b8171cca3e59..ba7dd29dee13 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -10,11 +10,18 @@ MASTER_SITES= SF/sablotron/sablotron-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
-LICENSE= MPL GPLv2
+LICENSE= MPL GPLv2+
LICENSE_COMB= dual
LIB_DEPENDS= libexpat.so:textproc/expat2
+GNU_CONFIGURE= yes
+USES= gmake iconv libtool localbase:ldflags
+USE_LDCONFIG= yes
+LDFLAGS+= ${ICONV_LIB}
+
+PORTDOCS= *
+
OPTIONS_DEFINE= DEBUGGER DISABLE_META DOCS DOCUMENT_ERRORS DOM
DEBUGGER_DESC= Enable debugger
@@ -33,20 +40,15 @@ DOCS_USE= PERL5=build
DOM_CONFIGURE_ENABLE= dom
DOCUMENT_ERRORS_CONFIGURE_ENABLE= document-errors
-GNU_CONFIGURE= yes
-USES= gmake iconv libtool
-USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lexpat ${ICONV_LIB}
-
-PORTDOCS= *
-
post-patch-DOCS-off:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/apidoc//' ${WRKSRC}/doc/Makefile.in
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so
- cd ${WRKSRC} && ${COPYTREE_SHARE} "README README_JS RELEASE \
- doc/misc/DEBUGGER doc/misc/NOTES" ${STAGEDIR}${DOCSDIR}
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsablot.so
+
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} README README_JS RELEASE \
+ doc/misc/DEBUGGER doc/misc/NOTES ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/textproc/sablotron/files/patch-configure b/textproc/sablotron/files/patch-configure
index 977789d1c5c8..87f303e6c2d8 100644
--- a/textproc/sablotron/files/patch-configure
+++ b/textproc/sablotron/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig
+--- configure.orig 2005-06-07 15:29:14 UTC
+++ configure
-@@ -22091,14 +22091,13 @@
+@@ -22091,14 +22091,13 @@ fi
if test ! x$silent = xyes; then
exec 6>&1
fi
diff --git a/textproc/sablotron/pkg-descr b/textproc/sablotron/pkg-descr
index cdcacfe3581b..7b498e829963 100644
--- a/textproc/sablotron/pkg-descr
+++ b/textproc/sablotron/pkg-descr
@@ -4,4 +4,4 @@ by James Clark as an XML parser. Sablotron implements XSLT 1.0, XPath
Original creator of Sablotron is Ginger Alliance Ltd; Czech Republic.
-WWW: http://sourceforge.net/projects/sablotron/
+WWW: https://sourceforge.net/projects/sablotron/
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index aa6bab7f4389..8e813bc058ed 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sary
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://sary.sourceforge.net/
diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile
index a54e434b047c..d7d7fd1bcd15 100644
--- a/textproc/scew/Makefile
+++ b/textproc/scew/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scew
PORTVERSION= 1.1.7
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SAVANNAH/${PORTNAME}/
@@ -32,7 +32,7 @@ post-install:
.endfor
.ifdef MAINTAINER_MODE
-LIB_DEPENDS+= libcheck.so:devel/libcheck
+LIB_DEPENDS+= libcheck.so:devel/check
regression-test: build
${MAKE_CMD} -C ${WRKSRC}/tests check
.endif
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index e9d5a1edc185..1787c4698f22 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -3,7 +3,7 @@
PORTNAME= scim-input-pad
PORTVERSION= 0.1.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= SF/scim/${PORTNAME}/0.1.3/ \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index e9da6621373a..3b41bd6b75e9 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sdcv
PORTVERSION= 0.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= SF
@@ -22,12 +22,6 @@ SUB_FILES= pkg-message
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-BROKEN= does not build on < 10.x: error expanding embedded variable
-.endif
-
post-patch:
.for i in doc/sdcv.1 src/sdcv.cpp
@${REINPLACE_CMD} -e \
@@ -41,4 +35,4 @@ post-patch:
@${REINPLACE_CMD} '/AM_GNU_GETTEXT_VERSION/s/0\.14\.1/0.19.1/' \
${WRKSRC}/configure.ac
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index a37f21589a88..6af714759fb5 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sigil
PORTVERSION= 0.9.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
@@ -13,7 +13,7 @@ LICENSE= GPLv3+
LIB_DEPENDS= libminizip.so:archivers/minizip \
libpcre.so:devel/pcre \
- libhunspell-1.5.so:textproc/hunspell
+ libhunspell-1.6.so:textproc/hunspell
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml
USE_GITHUB= yes
@@ -32,7 +32,7 @@ CMAKE_ARGS= -DUSE_SYSTEM_LIBS:BOOL=1 \
-DINSTALL_BUNDLED_DICTS:BOOL=0
USE_LDCONFIG= ${PREFIX}/lib/sigil
-# Upstream uses pkg-config output to pass libhunspell-1.5.so and
+# Upstream uses pkg-config output to pass libhunspell-1.6.so and
# libpcre16.so to the linker. pkg-config output does not include full
# paths, so add a workaround to keep the port linking for now.
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile
index 4837b6364f17..afbc388d18cb 100644
--- a/textproc/sk-mythes/Makefile
+++ b/textproc/sk-mythes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mythes
-PORTVERSION= 2016.11.27
+PORTVERSION= 2017.01.15
CATEGORIES= textproc
MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/
PKGNAMEPREFIX= sk-
diff --git a/textproc/sk-mythes/distinfo b/textproc/sk-mythes/distinfo
index 6b557dbba901..4269c372b366 100644
--- a/textproc/sk-mythes/distinfo
+++ b/textproc/sk-mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480353442
-SHA256 (mythes/OOo-Thesaurus2-sk_SK-20161127.zip) = 16791a6190c3524a02cbc4c4992429edfe9ff2285ecaac92a65869286b841438
-SIZE (mythes/OOo-Thesaurus2-sk_SK-20161127.zip) = 239397
+TIMESTAMP = 1484576829
+SHA256 (mythes/OOo-Thesaurus2-sk_SK-20170115.zip) = 32466c665643a11ece6004d875c15656d0c6d5990a5ed3c6348af308e8468a5b
+SIZE (mythes/OOo-Thesaurus2-sk_SK-20170115.zip) = 239397
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 982cf5444d2b..8f3f6ea4a05a 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -3,7 +3,7 @@
PORTNAME= source-highlight
PORTVERSION= 3.1.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= GNU/src-highlite
diff --git a/textproc/spellutils/Makefile b/textproc/spellutils/Makefile
index 1720aa70acc8..b019bd611cac 100644
--- a/textproc/spellutils/Makefile
+++ b/textproc/spellutils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spellutils
PORTVERSION= 0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.sourcefiles.org/Utilities/Text_Utilities/
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index 9275ee9bf3a0..9941ffaf09cc 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sphinxsearch
PORTVERSION= 2.2.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= textproc databases
MASTER_SITES= http://sphinxsearch.com/files/ \
diff --git a/textproc/spiff/Makefile b/textproc/spiff/Makefile
index f03528d882a9..65382333f1f8 100644
--- a/textproc/spiff/Makefile
+++ b/textproc/spiff/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= spiff
-PORTVERSION= 1.0.6
+PORTVERSION= 1.0.8
DISTVERSIONPREFIX= v
CATEGORIES= textproc
@@ -23,15 +23,12 @@ STRIP= # stripping can break go binaries
OPTIONS_DEFINE= DOCS
post-patch:
+ @cd ${WRKSRC} ; ${MV} ${WRKSRC}/vendor ${WRKSRC}/src
@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
- ${MV} .gitignore .travis.yml Godeps LICENSE Makefile README.md \
+ ${MV} .gitignore LICENSE Makefile README.md \
compare dynaml examples flow init_test.go scripts spiff.go \
spiff_test.go yaml \
src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
- @${MV} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/Godeps/_workspace/src/github.com/${GH_ACCOUNT}/candiedyaml \
- ${WRKSRC}/src/github.com/${GH_ACCOUNT}
- @${MV} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/Godeps/_workspace/src/github.com/codegangsta \
- ${WRKSRC}/src/github.com
do-build:
@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
diff --git a/textproc/spiff/distinfo b/textproc/spiff/distinfo
index 9d82f1f6c698..647e30b83920 100644
--- a/textproc/spiff/distinfo
+++ b/textproc/spiff/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cloudfoundry-incubator-spiff-v1.0.6_GH0.tar.gz) = b63437485708b4df5e2515276bb0080b565959f7d82799d85e16e20323fb9617
-SIZE (cloudfoundry-incubator-spiff-v1.0.6_GH0.tar.gz) = 280939
+TIMESTAMP = 1483973846
+SHA256 (cloudfoundry-incubator-spiff-v1.0.8_GH0.tar.gz) = a778fb6cbb6b0a294fa59088025e91f58a941473b998e1a1ff7f6322c8c136c4
+SIZE (cloudfoundry-incubator-spiff-v1.0.8_GH0.tar.gz) = 281482
diff --git a/textproc/splitpatch/Makefile b/textproc/splitpatch/Makefile
new file mode 100644
index 000000000000..2d1e509ad65c
--- /dev/null
+++ b/textproc/splitpatch/Makefile
@@ -0,0 +1,33 @@
+# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= splitpatch
+PORTVERSION= 1.0.2016122801
+CATEGORIES= textproc
+
+MAINTAINER= ehaupt@FreeBSD.org
+COMMENT= Utility to split a diff patch into separate sections
+
+LICENSE= GPLv2+
+
+USES= gmake perl5
+USE_PERL5= build
+USE_RUBY= yes
+NO_ARCH= yes
+
+USE_GITHUB= yes
+GH_ACCOUNT= jaalto
+GH_TAGNAME= 13c5941
+
+PLIST_FILES= bin/splitpatch man/man1/splitpatch.1.gz
+
+MAKE_JOBS_UNSAFE=yes
+
+do-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.rb \
+ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+ ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 \
+ ${STAGEDIR}${MANPREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/textproc/splitpatch/distinfo b/textproc/splitpatch/distinfo
new file mode 100644
index 000000000000..7333cf83ff00
--- /dev/null
+++ b/textproc/splitpatch/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1482940118
+SHA256 (jaalto-splitpatch-1.0.2016122801-13c5941_GH0.tar.gz) = d07e1c00794eefa2f3c2b7f204f4fbdfcbe1afcff595a88fbd3fce7b925584d9
+SIZE (jaalto-splitpatch-1.0.2016122801-13c5941_GH0.tar.gz) = 4798
diff --git a/textproc/splitpatch/files/patch-man_pod2man.mk b/textproc/splitpatch/files/patch-man_pod2man.mk
new file mode 100644
index 000000000000..4dabb2a0d3a6
--- /dev/null
+++ b/textproc/splitpatch/files/patch-man_pod2man.mk
@@ -0,0 +1,33 @@
+--- man/pod2man.mk.orig 2016-08-15 17:36:10 UTC
++++ man/pod2man.mk
+@@ -36,7 +36,6 @@ RELEASE ?= $(PACKAGE)
+
+ # Optional variables to set
+ MANSECT ?= 1
+-PODCENTER ?= $$(date "+%Y-%m-%d")
+
+ # Directories
+ MANSRC =
+@@ -46,7 +45,6 @@ MANPOD = $(MANSRC)$(PACKAGE).$(MANSECT)
+ MANPAGE = $(MANDEST)$(PACKAGE).$(MANSECT)
+
+ POD2MAN = pod2man
+-POD2MAN_FLAGS = --utf8
+
+ makeman: $(MANPAGE)
+
+@@ -54,12 +52,9 @@ $(MANPAGE): $(MANPOD)
+ # make target - create manual page from a *.pod page
+ podchecker $(MANPOD)
+ LC_ALL=C $(POD2MAN) $(POD2MAN_FLAGS) \
+- --center="$(PODCENTER)" \
++ --center=" " \
+ --name="$(PACKAGE)" \
+ --section="$(MANSECT)" \
+ --release="$(RELEASE)" \
+ $(MANPOD) \
+- > $(MANPAGE) && \
+- rm -f pod*.tmp
+-
+-# End of of Makefile part
++ > $(MANPAGE)
diff --git a/textproc/splitpatch/pkg-descr b/textproc/splitpatch/pkg-descr
new file mode 100644
index 000000000000..c08dfcd91157
--- /dev/null
+++ b/textproc/splitpatch/pkg-descr
@@ -0,0 +1,5 @@
+A utility to split a diff patch into separate sections. It also features
+splitting a patch file by hunks instead of the default by file. This is very
+useful for merging patches that fail to apply by only some hunks.
+
+WWW: https://github.com/benjsc/splitpatch
diff --git a/textproc/srilm/Makefile b/textproc/srilm/Makefile
index 4c0f062997d9..cb82cd004577 100644
--- a/textproc/srilm/Makefile
+++ b/textproc/srilm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= srilm
PORTVERSION= 1.5.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
DISTNAME= srilm
EXTRACT_SUFX?= .tgz
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index b35a158a2a28..77ec09e7626e 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -43,9 +43,6 @@ post-patch:
-e '/as_fn_error.*gnome-doc-utils/d' \
-e '/DEP_MODULES=/s/"$$/ gmodule-2.0"/' \
${WRKSRC}/dict/configure
- @${REINPLACE_CMD} \
- -e '/^DEP_MODULES=/s/zlib//' \
- ${WRKSRC}/lib/configure
post-patch-GNOME-off:
${REINPLACE_CMD} -e '/^SUBDIRS/s,help,,' ${WRKSRC}/dict/Makefile.in
diff --git a/textproc/supercat/Makefile b/textproc/supercat/Makefile
index 39f6f318cf3c..86721db0f065 100644
--- a/textproc/supercat/Makefile
+++ b/textproc/supercat/Makefile
@@ -2,19 +2,14 @@
# $FreeBSD$
PORTNAME= supercat
-PORTVERSION= 0.5.5
-PORTREVISION= 1
+PORTVERSION= 0.5.6
CATEGORIES= textproc
MASTER_SITES= http://supercat.nosredna.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Regexp-based text colorizer with ASCII/HTML output
+CONFIGURE_ARGS= --with-system-directory=${ETCDIR}
GNU_CONFIGURE= yes
-PORT_VERBS= ${PORTNAME} spc
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/etc/supercat|${ETCDIR}|' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|c:C:dDhmnrt:vS|&Rw|' ${WRKSRC}/src/spc.c
.include <bsd.port.mk>
diff --git a/textproc/supercat/distinfo b/textproc/supercat/distinfo
index c0afb42c4058..49533f160db7 100644
--- a/textproc/supercat/distinfo
+++ b/textproc/supercat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (supercat-0.5.5.tar.gz) = c49bd0b72509a166fb8686c999169b2c970595bc565d0b0379a01323657c01bf
-SIZE (supercat-0.5.5.tar.gz) = 103545
+TIMESTAMP = 1483361449
+SHA256 (supercat-0.5.6.tar.gz) = 0b2052237acc7754094caca4ed85f7e9fa55139f801de2f210c328ead7a33211
+SIZE (supercat-0.5.6.tar.gz) = 150193
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index 23ad3d7ca125..a37bb8c64935 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= TclExpat
PORTVERSION= 1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc tcl
#MASTER_SITES= http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}/sources/
diff --git a/textproc/te-hunspell/Makefile b/textproc/te-hunspell/Makefile
index 44ac453894a0..2042ac85fa75 100644
--- a/textproc/te-hunspell/Makefile
+++ b/textproc/te-hunspell/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hunspell
DISTVERSION= 0.01-2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc
MASTER_SITES= GNU/aspell/dict/te
PKGNAMEPREFIX= te-
@@ -26,7 +26,7 @@ PLIST_FILES= %%DATADIR%%/te_IN.aff \
do-build:
@cd ${WRKSRC}; \
${LOCALBASE}/bin/prezip-bin -d < te.cwl > te.txt; \
- ${SETENV} LANG=te_IN.utf8 ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN
+ ${SETENV} LANG=te_IN.utf8 LC_ALL=te_IN.utf8 ${LOCALBASE}/bin/wordlist2hunspell te.txt te_IN
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}/
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index 74933b821e86..540be34b6fa9 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -3,7 +3,7 @@
PORTNAME= teckit
PORTVERSION= 2.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc converters
MASTER_SITES= http://scripts.sil.org/svn-view/teckit/TAGS/ \
http://anthesphoria.net/FreeBSD/ports/distfiles/
diff --git a/textproc/templates_parser/Makefile b/textproc/templates_parser/Makefile
index 7eee4a491faf..0fe334e55c45 100644
--- a/textproc/templates_parser/Makefile
+++ b/textproc/templates_parser/Makefile
@@ -8,13 +8,14 @@ CATEGORIES= textproc
MAINTAINER= marino@FreeBSD.org
COMMENT= Web page template engine module for the Ada Web Server
-LICENSE= GPLv3
+LICENSE= GPLv3+
+LICENSE_FILE= ${WRKSRC}/COPYING3
BUILD_DEPENDS= gprbuild:devel/gprbuild \
xmlada>=4.4:textproc/xmlada
RUN_DEPENDS= xmlada>=4.4:textproc/xmlada
-USES= ada:run gmake tar:bzip2
+USES= ada:run gmake
USE_GITHUB= yes
GH_ACCOUNT= AdaCore
GH_PROJECT= templates-parser
@@ -22,7 +23,7 @@ GH_TAGNAME= 1d62939
DESTINC= ${STAGEDIR}${PREFIX}/include/templates_parser
PLIST_SUB= LIBVER=${PORTVERSION:R}
-MAKE_ARGS+= PROCESSORS=${MAKE_JOBS_NUMBER} \
+MAKE_ARGS= PROCESSORS=${MAKE_JOBS_NUMBER} \
ENABLE_SHARED=true \
HOST=${CONFIGURE_TARGET} \
TARGET=${CONFIGURE_TARGET} \
diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 6b99d0e88728..98271e47df9f 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -11,6 +11,7 @@ COMMENT= Code-searching tool similar to ack but faster
LICENSE= APACHE20
LIB_DEPENDS= libpcre.so:devel/pcre
+TEST_DEPENDS= cram:devel/cram
USE_GITHUB= yes
GH_ACCOUNT= ggreer
@@ -21,6 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= LZMA_LIBS=-llzma
CONFIGURE_ARGS+=LZMA_CFLAGS=-I/usr/include
USES= autoreconf pkgconfig
+TEST_TARGET= test
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
diff --git a/textproc/tinyxml/pkg-descr b/textproc/tinyxml/pkg-descr
index 9db4a9a248a7..40d66730462f 100644
--- a/textproc/tinyxml/pkg-descr
+++ b/textproc/tinyxml/pkg-descr
@@ -1,4 +1,4 @@
TinyXml is a simple, small, C++ XML parser that can be easily
integrating into other programs.
-WWW: http://sourceforge.net/projects/tinyxml/
+WWW: https://sourceforge.net/projects/tinyxml/
diff --git a/textproc/tkdiff/pkg-descr b/textproc/tkdiff/pkg-descr
index 69ac70bc9a88..037eb5757c60 100644
--- a/textproc/tkdiff/pkg-descr
+++ b/textproc/tkdiff/pkg-descr
@@ -1,3 +1,3 @@
tkdiff is a fronted for Unix's diff based on Tcl/Tk.
-WWW: http://sourceforge.net/projects/tkdiff/
+WWW: https://sourceforge.net/projects/tkdiff/
diff --git a/textproc/txt2html/Makefile b/textproc/txt2html/Makefile
index 92b57911c8cc..2edb53a5a3ea 100644
--- a/textproc/txt2html/Makefile
+++ b/textproc/txt2html/Makefile
@@ -3,7 +3,7 @@
PORTNAME= txt2html
PORTVERSION= 2.51
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/textproc/uncrustify/Makefile b/textproc/uncrustify/Makefile
index 97136782eb6c..606a4f5daff9 100644
--- a/textproc/uncrustify/Makefile
+++ b/textproc/uncrustify/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_WRKSUBDIR= yes
USES= cmake:outsource
-CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man
TEST_TARGET= test
PORTDOCS= *
diff --git a/textproc/utf8proc/Makefile b/textproc/utf8proc/Makefile
index 1f2a39658cbf..0bdee35f9b58 100644
--- a/textproc/utf8proc/Makefile
+++ b/textproc/utf8proc/Makefile
@@ -2,33 +2,36 @@
# $FreeBSD$
PORTNAME= utf8proc
-PORTVERSION= 1.3.1
+PORTVERSION= 2.1.0
DISTVERSIONPREFIX= v
CATEGORIES= textproc devel
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= hrs@FreeBSD.org
COMMENT= UTF-8 processing library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
+USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= JuliaLang
-
-USES= gmake
USE_LDCONFIG= yes
MAKE_ARGS= prefix=${PREFIX}
-
+PLIST_FILES= include/utf8proc.h \
+ lib/libutf8proc.a \
+ lib/libutf8proc.so \
+ lib/libutf8proc.so.2 \
+ lib/libutf8proc.so.${PORTVERSION}
PORTDOCS= NEWS.md README.md
OPTIONS_DEFINE= DOCS
post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libutf8proc.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libutf8proc.so
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
- ${STAGEDIR}${DOCSDIR})
+ cd ${WRKSRC} && \
+ ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/textproc/utf8proc/distinfo b/textproc/utf8proc/distinfo
index bab85f918917..d14658d4c0ad 100644
--- a/textproc/utf8proc/distinfo
+++ b/textproc/utf8proc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (JuliaLang-utf8proc-v1.3.1_GH0.tar.gz) = 83b60fe21fd8a017b8ad469515873893c8e911a5bef336a427594d398b5688cc
-SIZE (JuliaLang-utf8proc-v1.3.1_GH0.tar.gz) = 144874
+TIMESTAMP = 1482911401
+SHA256 (JuliaLang-utf8proc-v2.1.0_GH0.tar.gz) = 25ccc5619ac400f9eaf24aafaae5b625afa1961e140b8dd6072b393267833260
+SIZE (JuliaLang-utf8proc-v2.1.0_GH0.tar.gz) = 151842
diff --git a/textproc/utf8proc/pkg-plist b/textproc/utf8proc/pkg-plist
deleted file mode 100644
index 9c4d800d5b50..000000000000
--- a/textproc/utf8proc/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/utf8proc.h
-lib/libutf8proc.a
-lib/libutf8proc.so
-lib/libutf8proc.so.1
-lib/libutf8proc.so.1.3.1
diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index bf30f898a6a6..576123ce542c 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -3,10 +3,11 @@
PORTNAME= wdiff
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= GNU
-MAINTAINER= sanpei@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Display word differences between text files
LICENSE= GPLv3
diff --git a/textproc/weka/Makefile b/textproc/weka/Makefile
index 3b70bfc56a0e..b26151f7ecfa 100644
--- a/textproc/weka/Makefile
+++ b/textproc/weka/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= weka
-DISTVERSION= 3-8-0
-PORTREVISION= 1
+DISTVERSION= 3-8-1
CATEGORIES= textproc java
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-3-8/${PORTVERSION}
diff --git a/textproc/weka/distinfo b/textproc/weka/distinfo
index 18f2fe38acba..eae9fed966fa 100644
--- a/textproc/weka/distinfo
+++ b/textproc/weka/distinfo
@@ -1,2 +1,3 @@
-SHA256 (weka-3-8-0.zip) = 2586298688059a025e2810b1ffc73f4fb3cf81ebf2183d8d19b0763d33857f61
-SIZE (weka-3-8-0.zip) = 50550487
+TIMESTAMP = 1482153727
+SHA256 (weka-3-8-1.zip) = b3f242984e9b8abdfdaaef184fca883fa213778cfe0ba1c0bd3ab2d0c851c19a
+SIZE (weka-3-8-1.zip) = 50918319
diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile
index 7191e629b91c..ec4eb4182033 100644
--- a/textproc/wv/Makefile
+++ b/textproc/wv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wv
PORTVERSION= 1.2.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= http://www.abisource.com/downloads/wv/${PORTVERSION}/
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index eecfb608f027..b3f17c089652 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wv2
PORTVERSION= 0.4.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= SF/wvware/
diff --git a/textproc/xerces-c3/pkg-descr b/textproc/xerces-c3/pkg-descr
index 2b324423e488..1d6472c543ae 100644
--- a/textproc/xerces-c3/pkg-descr
+++ b/textproc/xerces-c3/pkg-descr
@@ -1,5 +1,14 @@
-Xerces-C++ is a validating XML parser from the Apache XML Project.
-It provides a shared library to parse, generate, mainpulate and
-validate XML documents from within your own application.
+Xerces-C++ is a validating XML parser written in a portable subset of C++.
+Xerces-C++ makes it easy to give your application the ability to read and write
+XML data. A shared library is provided for parsing, generating, manipulating,
+and validating XML documents using the DOM, SAX, and SAX2 APIs.
-WWW: http://xml.apache.org/xerces-c/
+Xerces-C++ is faithful to the XML 1.0 recommendation and many associated
+standards.
+
+The parser provides high performance, modularity, and scalability. Source code,
+samples and API documentation are provided with the parser. For portability,
+care has been taken to make minimal use of templates, no RTTI, and minimal use
+of #ifdefs.
+
+WWW: https://xerces.apache.org/xerces-c/
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index 2b7ab2d554db..7dad188ab1d9 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmlppm
PORTVERSION= 0.98.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
http://www.cs.cornell.edu/People/jcheney/xmlppm/
diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile
index ed458ec6f460..811640514ab9 100644
--- a/textproc/xmlroff/Makefile
+++ b/textproc/xmlroff/Makefile
@@ -22,7 +22,7 @@ USE_GNOME= libgnomeprint libartlgpl2 pango glib20 \
libxslt libxml2 gdkpixbuf2
GH_ACCOUNT= xmlroff
GH_PROJECT= xmlroff
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
+WRKSRC_SUBDIR= ${PORTNAME}
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
INSTALL_TARGET= install-strip
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index edc96c408c13..528d1c7048b0 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmlwrapp
PORTVERSION= 0.7.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= SF
diff --git a/textproc/xslide.el/Makefile b/textproc/xslide.el/Makefile
index d7d73ed6a78f..0230c8b25772 100644
--- a/textproc/xslide.el/Makefile
+++ b/textproc/xslide.el/Makefile
@@ -11,8 +11,11 @@ DISTNAME= xslide-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Emacs major mode for editing XSL stylesheets
-NO_BUILD= yes
+LICENSE= GPLv2+
+
PORTDOCS= README.TXT TODO NEWS ChangeLog
+NO_BUILD= yes
+NO_ARCH= yes
ELISPDIR= ${PREFIX}/share/emacs/site-lisp
XELISPDIR= ${PREFIX}/lib/xemacs/site-lisp
@@ -26,6 +29,8 @@ xslide-initial.xsl xslide-process.el
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${ELISPDIR}
${LN} -sf ${ELISPDIR}/${f} ${STAGEDIR}${XELISPDIR}
.endfor
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/xsv/Makefile b/textproc/xsv/Makefile
index e256ba2b711b..1dcea42ead18 100644
--- a/textproc/xsv/Makefile
+++ b/textproc/xsv/Makefile
@@ -11,26 +11,25 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= XML Schema Validator
LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml
USES= python
USE_PYTHON= distutils autoplist
-USE_LDCONFIG= yes
+NO_ARCH= yes
PORTDOCS= pc-shrinkwrap xsv-status.xml xsv-status.html
PORTEXAMPLES= triv.xml triv.xsd tiny.xml tiny.xsd
-OPTIONS_DEFINE= DOCS EXAMPLES
-
-.include <bsd.port.pre.mk>
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+= -fPIC
-.endif
+OPTIONS_DEFINE= DOCS EXAMPLES
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${EXAMPLESDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/xsv/files/patch-setup.py b/textproc/xsv/files/patch-setup.py
index c5e14c6d98ed..305ee3281674 100644
--- a/textproc/xsv/files/patch-setup.py
+++ b/textproc/xsv/files/patch-setup.py
@@ -1,6 +1,6 @@
---- ./setup.py.orig 2008-01-18 13:17:40.000000000 +0100
-+++ ./setup.py 2014-03-23 02:06:18.690868591 +0100
-@@ -16,20 +16,10 @@
+--- setup.py.orig 2008-01-18 12:17:40 UTC
++++ setup.py
+@@ -16,20 +16,10 @@ class smart_install_data(install_data):
self.install_dir = getattr(install_cmd, 'install_lib')
return install_data.run(self)
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index b56e7dbd2650..b2dacb28a4b1 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -22,17 +22,6 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS
-.include <bsd.port.pre.mk>
-
-# base flex(1) v2.5.4 is not sufficient
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000033
-BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:textproc/flex
-
-post-patch:
- @${REINPLACE_CMD} -e 's!flex!${LOCALBASE}/bin/&!' \
- ${BUILD_WRKSRC}/xxdiff.pro
-.endif
-
pre-build:
@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} QMAKE=${QMAKE} \
${MAKE_CMD} -f Makefile.bootstrap ${MAKE_ARGS} Makefile)
@@ -44,4 +33,4 @@ do-install-DOCS-on:
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS} ! -name Makefile" \
${STAGEDIR}/${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/yaml-mode.el/Makefile b/textproc/yaml-mode.el/Makefile
index 2f4fea23be13..594ff51848e0 100644
--- a/textproc/yaml-mode.el/Makefile
+++ b/textproc/yaml-mode.el/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= yaml-mode.el
-PORTVERSION= 0.0.12
+PORTVERSION= 0.0.13
DISTVERSIONPREFIX= v
CATEGORIES= textproc elisp
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
@@ -10,7 +10,8 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yasu@utahime.org
COMMENT= Simple major mode to edit YAML file for Emacsen
-LICENSE= GPLv2
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_GITHUB= yes
GH_ACCOUNT= yoshiki
@@ -18,17 +19,17 @@ GH_PROJECT= yaml-mode
USE_EMACS= yes
-MAKE_ENV+= LISPDIR=${LISPDIR}
+MAKE_ENV= LISPDIR=${LISPDIR}
LISPDIR= ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
OPTIONS_DEFINE= DOCS
pre-install:
- ${MKDIR} ${LISPDIR}
+ @${MKDIR} ${LISPDIR}
-post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for file in Changes README
${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
diff --git a/textproc/yaml-mode.el/distinfo b/textproc/yaml-mode.el/distinfo
index fae16f6fac07..cc0daa36a9ce 100644
--- a/textproc/yaml-mode.el/distinfo
+++ b/textproc/yaml-mode.el/distinfo
@@ -1,2 +1,3 @@
-SHA256 (yoshiki-yaml-mode-v0.0.12_GH0.tar.gz) = f294ed0e2f77081c2e77fd9bd9b496346d5812b240613c5c9aee2dc6abfa5ca1
-SIZE (yoshiki-yaml-mode-v0.0.12_GH0.tar.gz) = 6968
+TIMESTAMP = 1478354804
+SHA256 (yoshiki-yaml-mode-v0.0.13_GH0.tar.gz) = c547b1ec62e6b39fd3e95e28b8d3918958d4f00391c471485532dbc6cc3dcab8
+SIZE (yoshiki-yaml-mode-v0.0.13_GH0.tar.gz) = 14446
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index 7659142acad4..163a3747b275 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zorba
PORTVERSION= 2.7.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= textproc
MASTER_SITES= https://launchpadlibrarian.net/119058962/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
@@ -22,10 +22,11 @@ RUN_DEPENDS= fop:textproc/fop
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS
+OPTIONS_DEFINE= PHP PYTHON RUBY JAVA DOCS DOXYGEN
OPTIONS_SUB= yes
-DOCS_BUILD_DEPENDS+= doxygen:devel/doxygen
+DOXYGEN_BUILD_DEPENDS+= doxygen:devel/doxygen
+DOXYGEN_IMPLIES= DOCS
PHP_CMAKE_BOOL= WITH_PHP5
PYTHON_CMAKE_BOOL= WITH_PYTHON
RUBY_CMAKE_BOOL= WITH_RUBY
@@ -101,6 +102,9 @@ post-patch:
post-install:
${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
+.if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN}
+ cd ${STAGEDIR}${DOCSDIR} && rmdir c/html code/html code cxx/html zorba/html
+.endif
test: build
cd ${BUILD_WRKSRC} && ${MAKE} test
diff --git a/textproc/zorba/pkg-descr b/textproc/zorba/pkg-descr
index 9ca0b612f1d5..37d11f39aad1 100644
--- a/textproc/zorba/pkg-descr
+++ b/textproc/zorba/pkg-descr
@@ -6,4 +6,4 @@ or smartphones. Zorba can be accessed through APIs from C, C++, Ruby, Python,
Java, and PHP. Zorba runs on most platforms and is available under the Apache
license v2.
-WWW: http://www.zorba-xquery.com/
+WWW: http://www.zorba.io/
diff --git a/textproc/zorba/pkg-plist b/textproc/zorba/pkg-plist
index e1d8291468f8..7a139a26f4cf 100644
--- a/textproc/zorba/pkg-plist
+++ b/textproc/zorba/pkg-plist
@@ -113,17 +113,17 @@ lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
%%PORTDOCS%%%%DOCSDIR%%/c/examples/csequences.c
%%PORTDOCS%%%%DOCSDIR%%/c/examples/cserialization.c
%%PORTDOCS%%%%DOCSDIR%%/c/examples/csimple.c
-%%PORTDOCS%%%%DOCSDIR%%/c/html/documentation.png
-%%PORTDOCS%%%%DOCSDIR%%/c/html/download.png
-%%PORTDOCS%%%%DOCSDIR%%/c/html/modules.png
-%%PORTDOCS%%%%DOCSDIR%%/c/html/noisepattern.png
-%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/c/html/rtab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/c/html/terminal.png
-%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/code/html/rtab_r.gif
+%%DOXYGEN%%%%DOCSDIR%%/c/html/documentation.png
+%%DOXYGEN%%%%DOCSDIR%%/c/html/download.png
+%%DOXYGEN%%%%DOCSDIR%%/c/html/modules.png
+%%DOXYGEN%%%%DOCSDIR%%/c/html/noisepattern.png
+%%DOXYGEN%%%%DOCSDIR%%/c/html/rtab_b.gif
+%%DOXYGEN%%%%DOCSDIR%%/c/html/rtab_l.gif
+%%DOXYGEN%%%%DOCSDIR%%/c/html/rtab_r.gif
+%%DOXYGEN%%%%DOCSDIR%%/c/html/terminal.png
+%%DOXYGEN%%%%DOCSDIR%%/code/html/rtab_b.gif
+%%DOXYGEN%%%%DOCSDIR%%/code/html/rtab_l.gif
+%%DOXYGEN%%%%DOCSDIR%%/code/html/rtab_r.gif
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/Makefile
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/binary.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/callback.cpp
@@ -141,14 +141,14 @@ lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/serialization.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/simple.cpp
%%PORTDOCS%%%%DOCSDIR%%/cxx/examples/uri_resolvers.cpp
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/documentation.png
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/download.png
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/modules.png
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/noisepattern.png
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/rtab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/cxx/html/terminal.png
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/documentation.png
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/download.png
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/modules.png
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/noisepattern.png
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/rtab_b.gif
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/rtab_l.gif
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/rtab_r.gif
+%%DOXYGEN%%%%DOCSDIR%%/cxx/html/terminal.png
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/generator/xqdoc-html.xq
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/generator/xqdoc-xml.xq
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/images/External.gif
@@ -189,34 +189,34 @@ lib/zorba/core/%%FULLVERSION%%/org/expath/ns/libfile_2.0.so
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.functx.com_index.html
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions.html
%%PORTDOCS%%%%DOCSDIR%%/xqdoc/requisites/templates/www.w3.org_2005_xpath-functions_math.html
-%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_b.gif
-%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_r.gif
-%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/xqj/html/rtab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/JSONforXQuery.html
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/W3C-WD.css
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/XQueryforJSON.html
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/documentation.png
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/download.png
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/modules.png
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/noisepattern.png
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/rtab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/scripting_spec.html
-%%PORTDOCS%%%%DOCSDIR%%/zorba/html/terminal.png
-%%PORTDOCS%%%%DOCSDIR%%/zorba/xqdoc/Makefile
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_b.gif
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_r.gif
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/html/rtab_l.gif
+%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/xqj/html/rtab_b.gif
+%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/xqj/html/rtab_r.gif
+%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/xqj/html/rtab_l.gif
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/JSONforXQuery.html
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/W3C-WD.css
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/XQueryforJSON.html
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/documentation.png
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/download.png
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/modules.png
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/noisepattern.png
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/rtab_b.gif
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/rtab_l.gif
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/rtab_r.gif
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/scripting_spec.html
+%%DOXYGEN%%%%DOCSDIR%%/zorba/html/terminal.png
+%%DOXYGEN%%%%DOCSDIR%%/zorba/xqdoc/Makefile
+%%PYTHON%%%%DOXYGEN%%%%DOCSDIR%%/python/html/rtab_b.gif
+%%PYTHON%%%%DOXYGEN%%%%DOCSDIR%%/python/html/rtab_r.gif
+%%PYTHON%%%%DOXYGEN%%%%DOCSDIR%%/python/html/rtab_l.gif
%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/python_test.py
%%RUBY%%share/ruby/zorba_api.so
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_b.gif
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_l.gif
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/html/rtab_r.gif
+%%RUBY%%%%DOXYGEN%%%%DOCSDIR%%/ruby/html/rtab_b.gif
+%%RUBY%%%%DOXYGEN%%%%DOCSDIR%%/ruby/html/rtab_l.gif
+%%RUBY%%%%DOXYGEN%%%%DOCSDIR%%/ruby/html/rtab_r.gif
%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/ruby_test.rb
-%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_b.gif
-%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_l.gif
-%%JAVA%%%%PORTDOCS%%%%DOCSDIR%%/java/html/rtab_r.gif
+%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/java/html/rtab_b.gif
+%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/java/html/rtab_l.gif
+%%JAVA%%%%DOXYGEN%%%%DOCSDIR%%/java/html/rtab_r.gif
%%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index.xq
%%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index_0.0.xq
%%DATADIR%%/uris/core/%%FULLVERSION%%/com/functx/www/index_0.xq
diff --git a/textproc/zxing-cpp/Makefile b/textproc/zxing-cpp/Makefile
new file mode 100644
index 000000000000..bb15a44a31d0
--- /dev/null
+++ b/textproc/zxing-cpp/Makefile
@@ -0,0 +1,21 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME= zxing-cpp
+PORTVERSION= 0.20161114
+DISTVERSIONPREFIX= v
+CATEGORIES= textproc
+
+MAINTAINER= yuri@rawbw.com
+COMMENT= ZXing C++ Library for QR code recognition
+
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USE_GITHUB= yes
+GH_ACCOUNT= glassechidna
+GH_TAGNAME= 97e9c5c
+
+USES= cmake:outsource gmake iconv
+
+.include <bsd.port.mk>
diff --git a/textproc/zxing-cpp/distinfo b/textproc/zxing-cpp/distinfo
new file mode 100644
index 000000000000..74e1bdedb42f
--- /dev/null
+++ b/textproc/zxing-cpp/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1479160657
+SHA256 (glassechidna-zxing-cpp-v0.20161114-97e9c5c_GH0.tar.gz) = 5084329c0d3a045b2c1e416c42e8f52bf4b1afea5d44cb9442b8af12a19cba05
+SIZE (glassechidna-zxing-cpp-v0.20161114-97e9c5c_GH0.tar.gz) = 307807
diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp b/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp
new file mode 100644
index 000000000000..59ca7b777c9f
--- /dev/null
+++ b/textproc/zxing-cpp/files/patch-core_src_zxing_DecodeHints.cpp
@@ -0,0 +1,11 @@
+--- core/src/zxing/DecodeHints.cpp.orig 2016-11-10 14:45:28 UTC
++++ core/src/zxing/DecodeHints.cpp
+@@ -29,7 +29,7 @@ using zxing::DecodeHints;
+ // VC++
+ using zxing::BarcodeFormat;
+
+-// const DecodeHintType DecodeHints::CHARACTER_SET;
++const DecodeHintType DecodeHints::CHARACTER_SET;
+
+ const DecodeHints DecodeHints::PRODUCT_HINT(
+ UPC_A_HINT |
diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp b/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp
new file mode 100644
index 000000000000..7ea729463064
--- /dev/null
+++ b/textproc/zxing-cpp/files/patch-core_src_zxing_oned_OneDReader.cpp
@@ -0,0 +1,10 @@
+--- core/src/zxing/oned/OneDReader.cpp.orig 2016-11-10 14:45:28 UTC
++++ core/src/zxing/oned/OneDReader.cpp
+@@ -21,6 +21,7 @@
+ #include <zxing/oned/OneDResultPoint.h>
+ #include <zxing/NotFoundException.h>
+ #include <math.h>
++#include <float.h>
+ #include <limits.h>
+ #include <algorithm>
+
diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp b/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp
new file mode 100644
index 000000000000..3b5cad6c226f
--- /dev/null
+++ b/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.cpp
@@ -0,0 +1,14 @@
+--- core/src/zxing/pdf417/detector/LinesSampler.cpp.orig 2016-11-10 14:45:28 UTC
++++ core/src/zxing/pdf417/detector/LinesSampler.cpp
+@@ -75,6 +75,11 @@ VoteResult getValueWithMaxVotes(map<int,
+
+ }
+
++const int LinesSampler::MODULES_IN_SYMBOL = 17;
++const int LinesSampler::BARS_IN_SYMBOL = 8;
++const int LinesSampler::POSSIBLE_SYMBOLS = 2787;
++const int LinesSampler::BARCODE_START_OFFSET = 2;
++
+ vector<float> LinesSampler::init_ratios_table() {
+ // Pre-computes and outputs the symbol ratio table.
+ vector<vector<float> > table (BitMatrixParser::SYMBOL_TABLE_LENGTH);
diff --git a/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h b/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h
new file mode 100644
index 000000000000..221ef74afe8f
--- /dev/null
+++ b/textproc/zxing-cpp/files/patch-core_src_zxing_pdf417_detector_LinesSampler.h
@@ -0,0 +1,19 @@
+--- core/src/zxing/pdf417/detector/LinesSampler.h.orig 2016-11-14 22:55:07 UTC
++++ core/src/zxing/pdf417/detector/LinesSampler.h
+@@ -28,12 +28,12 @@ namespace detector {
+
+ class LinesSampler {
+ protected:
+- static const int MODULES_IN_SYMBOL = 17;
+- static const int BARS_IN_SYMBOL = 8;
+- static const int POSSIBLE_SYMBOLS = 2787;
++ static const int MODULES_IN_SYMBOL;
++ static const int BARS_IN_SYMBOL;
++ static const int POSSIBLE_SYMBOLS;
+ static const std::vector<float> RATIOS_TABLE;
+ static std::vector<float> init_ratios_table();
+- static const int BARCODE_START_OFFSET = 2;
++ static const int BARCODE_START_OFFSET;
+
+ Ref<BitMatrix> linesMatrix_;
+ int symbolsPerLine_;
diff --git a/textproc/zxing-cpp/pkg-descr b/textproc/zxing-cpp/pkg-descr
new file mode 100644
index 000000000000..1b20f9720af3
--- /dev/null
+++ b/textproc/zxing-cpp/pkg-descr
@@ -0,0 +1,3 @@
+The fork of C++ version of ZXing library (https://github.com/zxing/zxing).
+
+WWW: https://github.com/glassechidna/zxing-cpp
diff --git a/textproc/zxing-cpp/pkg-plist b/textproc/zxing-cpp/pkg-plist
new file mode 100644
index 000000000000..ac1762747232
--- /dev/null
+++ b/textproc/zxing-cpp/pkg-plist
@@ -0,0 +1,104 @@
+bin/zxing
+include/zxing/BarcodeFormat.h
+include/zxing/Binarizer.h
+include/zxing/BinaryBitmap.h
+include/zxing/ChecksumException.h
+include/zxing/DecodeHints.h
+include/zxing/Exception.h
+include/zxing/FormatException.h
+include/zxing/IllegalStateException.h
+include/zxing/InvertedLuminanceSource.h
+include/zxing/LuminanceSource.h
+include/zxing/MultiFormatReader.h
+include/zxing/NotFoundException.h
+include/zxing/Reader.h
+include/zxing/ReaderException.h
+include/zxing/Result.h
+include/zxing/ResultPoint.h
+include/zxing/ResultPointCallback.h
+include/zxing/ZXing.h
+include/zxing/aztec/AztecDetectorResult.h
+include/zxing/aztec/AztecReader.h
+include/zxing/aztec/decoder/Decoder.h
+include/zxing/aztec/detector/Detector.h
+include/zxing/common/Array.h
+include/zxing/common/BitArray.h
+include/zxing/common/BitMatrix.h
+include/zxing/common/BitSource.h
+include/zxing/common/CharacterSetECI.h
+include/zxing/common/Counted.h
+include/zxing/common/DecoderResult.h
+include/zxing/common/DetectorResult.h
+include/zxing/common/GlobalHistogramBinarizer.h
+include/zxing/common/GreyscaleLuminanceSource.h
+include/zxing/common/GreyscaleRotatedLuminanceSource.h
+include/zxing/common/GridSampler.h
+include/zxing/common/HybridBinarizer.h
+include/zxing/common/IllegalArgumentException.h
+include/zxing/common/PerspectiveTransform.h
+include/zxing/common/Point.h
+include/zxing/common/Str.h
+include/zxing/common/StringUtils.h
+include/zxing/common/detector/JavaMath.h
+include/zxing/common/detector/MathUtils.h
+include/zxing/common/detector/MonochromeRectangleDetector.h
+include/zxing/common/detector/WhiteRectangleDetector.h
+include/zxing/common/reedsolomon/GenericGF.h
+include/zxing/common/reedsolomon/GenericGFPoly.h
+include/zxing/common/reedsolomon/ReedSolomonDecoder.h
+include/zxing/common/reedsolomon/ReedSolomonException.h
+include/zxing/datamatrix/DataMatrixReader.h
+include/zxing/datamatrix/Version.h
+include/zxing/datamatrix/decoder/BitMatrixParser.h
+include/zxing/datamatrix/decoder/DataBlock.h
+include/zxing/datamatrix/decoder/DecodedBitStreamParser.h
+include/zxing/datamatrix/decoder/Decoder.h
+include/zxing/datamatrix/detector/CornerPoint.h
+include/zxing/datamatrix/detector/Detector.h
+include/zxing/datamatrix/detector/DetectorException.h
+include/zxing/multi/ByQuadrantReader.h
+include/zxing/multi/GenericMultipleBarcodeReader.h
+include/zxing/multi/MultipleBarcodeReader.h
+include/zxing/multi/qrcode/QRCodeMultiReader.h
+include/zxing/multi/qrcode/detector/MultiDetector.h
+include/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h
+include/zxing/oned/CodaBarReader.h
+include/zxing/oned/Code128Reader.h
+include/zxing/oned/Code39Reader.h
+include/zxing/oned/Code93Reader.h
+include/zxing/oned/EAN13Reader.h
+include/zxing/oned/EAN8Reader.h
+include/zxing/oned/ITFReader.h
+include/zxing/oned/MultiFormatOneDReader.h
+include/zxing/oned/MultiFormatUPCEANReader.h
+include/zxing/oned/OneDReader.h
+include/zxing/oned/OneDResultPoint.h
+include/zxing/oned/UPCAReader.h
+include/zxing/oned/UPCEANReader.h
+include/zxing/oned/UPCEReader.h
+include/zxing/pdf417/PDF417Reader.h
+include/zxing/pdf417/decoder/BitMatrixParser.h
+include/zxing/pdf417/decoder/DecodedBitStreamParser.h
+include/zxing/pdf417/decoder/Decoder.h
+include/zxing/pdf417/decoder/ec/ErrorCorrection.h
+include/zxing/pdf417/decoder/ec/ModulusGF.h
+include/zxing/pdf417/decoder/ec/ModulusPoly.h
+include/zxing/pdf417/detector/Detector.h
+include/zxing/pdf417/detector/LinesSampler.h
+include/zxing/qrcode/ErrorCorrectionLevel.h
+include/zxing/qrcode/FormatInformation.h
+include/zxing/qrcode/QRCodeReader.h
+include/zxing/qrcode/Version.h
+include/zxing/qrcode/decoder/BitMatrixParser.h
+include/zxing/qrcode/decoder/DataBlock.h
+include/zxing/qrcode/decoder/DataMask.h
+include/zxing/qrcode/decoder/DecodedBitStreamParser.h
+include/zxing/qrcode/decoder/Decoder.h
+include/zxing/qrcode/decoder/Mode.h
+include/zxing/qrcode/detector/AlignmentPattern.h
+include/zxing/qrcode/detector/AlignmentPatternFinder.h
+include/zxing/qrcode/detector/Detector.h
+include/zxing/qrcode/detector/FinderPattern.h
+include/zxing/qrcode/detector/FinderPatternFinder.h
+include/zxing/qrcode/detector/FinderPatternInfo.h
+lib/libzxing.a