<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d082765d0ae9c5b6ae5dd506a56919fda8ad4fb8">https://github.com/macports/macports-ports/commit/d082765d0ae9c5b6ae5dd506a56919fda8ad4fb8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d082765d0ae universal-ctags: update to 5.9.20221002.0
</span>d082765d0ae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d082765d0ae9c5b6ae5dd506a56919fda8ad4fb8
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Mon Oct 3 15:37:50 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> universal-ctags: update to 5.9.20221002.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I've also fixed usage of rst2man (patch was backported to upstream), and
</span><span style='display:block; white-space:pre;color:#404040;'> added a missed library dependency against PCRE2.
</span>---
devel/universal-ctags/Portfile | 31 +++++++++++-------------
devel/universal-ctags/files/docutils.patch | 38 ++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/universal-ctags/Portfile b/devel/universal-ctags/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7da9042fb6e..8e7afcdbe27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/universal-ctags/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/universal-ctags/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup universal-ctags ctags 5.9.20220911.0 p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup universal-ctags ctags 5.9.20221002.0 p
</span> name universal-ctags
epoch 1
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,21 +24,9 @@ long_description \
</span>
homepage https://ctags.io
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 322388c3fe4379bb65c25c4f3978f8363f425455 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fde860e93b01ea89e6da20bc1c52c23dffb4916578c0063405fba155d228c141 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2953936
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/bin/rst2man.py]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set files [glob -directory ${prefix}/bin "rst2man-*.py"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f $files {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[regexp {rst2man-.*\.py} $f result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|rst2man3.py|${result}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5d48f5230cf95ae2f8438625c8f125ac88a5fe3b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d8bfbe47ca74b57bf05a743ac318dbfcb31a62085af601f0b4e957a948046d6e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2958952
</span>
# LegacySupport is needed for strnlen before 10.7
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +41,7 @@ depends_build port:autoconf \
</span> port:libtool
depends_lib port:jansson \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span> port:libyaml
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,5 +68,13 @@ variant libxml2 description {Extra support for XML based languages} {
</span> }
variant manpages description {Enable documentation} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:py-docutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles docutils.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python_version}-docutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-rst2man=${prefix}/bin/rst2man-${python_branch}.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-rst2html=${prefix}/bin/rst2html-${python_branch}.py
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/universal-ctags/files/docutils.patch b/devel/universal-ctags/files/docutils.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..16ca1c2ba64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/universal-ctags/files/docutils.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit b57c299c0249e9d783c7b8e1436cf953fcc92be3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: Kirill A. Korinsky <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon Oct 3 15:04:33 2022 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Introduce `--with-rst2man` and `--with-rst2html`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The idea is quite simple: let allow the user who builds it to suggest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which `rst2man` and `rst2html` should be used, instead of guessing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ I've also extended the guess list to python 3.10.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c5eb1c5dd..5cea58b86 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -363,9 +363,20 @@ AM_CONDITIONAL([RUN_TXT2CSTR], [test "${perl_found}" = "yes"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can be installed using pip ("pip install docutils"). On some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # systems, rst2man and rst2html are actually installed as rst2man.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and rst2html.py - create a symlink of that's the case.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROGS(RST2MAN, [rst2man rst2man.py rst2man-3 rst2man-3.6 rst2man-3.7 rst2man-3.8 rst2man-3.9], [no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Also, allow to define path as "--with-rst2man" and "--with-rst2html".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([rst2man],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [RST2MAN="$withval"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_PATH_PROGS(RST2MAN,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [rst2man rst2man.py rst2man-3 rst2man-3.6 rst2man-3.7 rst2man-3.8 rst2man-3.9, rst2man-3.10],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [no])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([HAVE_RST2MAN], [test "x$RST2MAN" != "xno"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_PATH_PROGS(RST2HTML, [rst2html rst2html.py rst2html-3 rst2html-3.6 rst2html-3.7 rst2html-3.8 rst2html-3.9], [no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_ARG_WITH([rst2html],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [RST2HTML="$withval"],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_PATH_PROGS(RST2HTML,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [rst2html rst2html.py rst2html-3 rst2html-3.6 rst2html-3.7 rst2html-3.8 rst2html-3.9, rst2html-3.10],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [no])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([HAVE_RST2HTML], [test "x$RST2HTML" != "xno"])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rst2pdf is a separate tool and can also be installed via pip (e.g.,
</span></pre><pre style='margin:0'>
</pre>