<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4cf0a7151feefa0bb06454bba715c3d93d81bb65">https://github.com/macports/macports-ports/commit/4cf0a7151feefa0bb06454bba715c3d93d81bb65</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4cf0a7151feefa0bb06454bba715c3d93d81bb65
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Aug 29 08:48:39 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> buildbot: Update to 2.8.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This buildbot port replaces the buildbot-2 and py-buildbot ports.
</span>---
devel/buildbot-2/Portfile | 80 ------------
devel/buildbot/Portfile | 135 +++++++++++++++++++++
devel/buildbot/files/fieldMapping.patch | 15 +++
.../files/org.macports.buildmaster.template.plist | 0
python/py-buildbot/Portfile | 66 ----------
5 files changed, 150 insertions(+), 146 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/buildbot-2/Portfile b/devel/buildbot-2/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 623e8c6dc57..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/buildbot-2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name buildbot-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} {rajdeep @rajdeepbharati} {mojca @mojca} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description buildmaster for buildbot continuous integration system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Buildbot is a system to automate the compile/test \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cycle of most software projects to validate code \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- changes. This port provides version ${version} of the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master part of the system. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Legacy version is available under buildbot-0.8. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This version will soon be renamed to just 'buildbot'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://buildbot.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites pypi:b/buildbot/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname buildbot-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir py-buildbot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 edfb622a98b00cadd7baf2a758663471cc795f5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65b72b00620446a8731c82a344be46c1e0ef56ed81d0b26672aa9b36bff8b965 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3181035
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py${python.version}-buildbot \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-www \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-console-view \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-grid-view \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-buildbot-waterfall-view
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set sharedir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set plistfile org.macports.buildmaster.template.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}/macports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/${plistfile} ${worksrcpath}/macports/${plistfile}
</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;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/macports/${plistfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|@PYTHONVER@|${python.branch}|g" ${worksrcpath}/macports/${plistfile}
</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;'>-build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} README.rst COPYING CREDITS NEWS UPGRADING \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${sharedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/macports/${plistfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${sharedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/buildbot-${python.branch} ${destroot}${prefix}/bin/buildbot
</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;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://pypi.org/pypi/buildbot/json
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {"version":"([^"]+)"[,\}]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-An example launchd plist file is available in ${sharedir}. After you have\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-created your build master, copy the plist to /Library/LaunchDaemons (as root)\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-and edit the UserName and WorkingDirectory fields as needed. Then instruct\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-launchd to run it with:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo launchctl load -w /Library/LaunchDaemons/your.plist.name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/buildbot/Portfile b/devel/buildbot/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..59529058bce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/buildbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,135 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name buildbot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 be1854e6dd2aa1931a0b81a89a3e6fff9278c0f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c98da72de0e597b2e16248b2120d7afaa81bfbf3e3dfe802e99b7bca780403a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3134144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} {rajdeep @rajdeepbharati} {mojca @mojca} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description buildmaster for Buildbot continuous integration system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Buildbot is a system to automate the compile/test \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cycle of most software projects to validate code \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ changes. This port provides the master part of the system. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ The legacy version is available in the buildbot-0.8 port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://buildbot.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:py${python.version}-autobahn \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-jwt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sqlalchemy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sqlalchemy-migrate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-treq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-twisted \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-txaio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-zopeinterface
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append port:py${python.version}-boto3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-enchant \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-flake8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-isort \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-lz4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-mock \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-treq \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-txrequests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${python.version}-moto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${python.version}-pyjade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:py${python.version}-setuptools-trial \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set sharedir ${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set plistfile org.macports.buildmaster.template.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${worksrcpath}/macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/${plistfile} ${worksrcpath}/macports/${plistfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fieldMapping.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/macports/${plistfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|@PYTHONVER@|${python.branch}|g" ${worksrcpath}/macports/${plistfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# currently defunct due to missing dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} README.rst COPYING CREDITS NEWS UPGRADING \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${sharedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/macports/${plistfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${sharedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant console requires www description {Include console view web UI plugin} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-buildbot-console-view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant grid requires www description {Include grid view web UI plugin} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-buildbot-grid-view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant waterfall requires www description {Include waterfall view web UI plugin} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-buildbot-waterfall-view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant www description {Include web UI server} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-buildbot-www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +console +grid +waterfall +www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+An example launchd plist file is available in ${sharedir}. After you have\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+created your build master, copy the plist to /Library/LaunchDaemons (as root)\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and edit the UserName and WorkingDirectory fields as needed. Then instruct\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+launchd to run it with:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo launchctl load -w /Library/LaunchDaemons/your.plist.name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# These obsolete subports can be removed after August 2021.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set old_subports {buildbot-2 py-buildbot py38-buildbot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach old_subport ${old_subports} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${old_subport} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach old_subport ${old_subports} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active ${old_subport}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_version [lindex ${installed} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${installed_version} 2.8.3] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite ${old_subport} {} [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/buildbot/files/fieldMapping.patch b/devel/buildbot/files/fieldMapping.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8a6c43e2256
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/buildbot/files/fieldMapping.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix bad fieldMapping in change data endpoint. This resulted in 100% CPU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+usage for large installs as the data was filtered manually by Python.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/buildbot/buildbot/pull/5505
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- buildbot/data/changes.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ buildbot/data/changes.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@ def _fixChange(self, change):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ del change['sourcestampid']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fieldMapping = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'changeid': 'changes.id',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'changeid': 'changes.changeid',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/buildbot-2/files/org.macports.buildmaster.template.plist b/devel/buildbot/files/org.macports.buildmaster.template.plist
</span>similarity index 100%
rename from devel/buildbot-2/files/org.macports.buildmaster.template.plist
rename to devel/buildbot/files/org.macports.buildmaster.template.plist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-buildbot/Portfile b/python/py-buildbot/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9585274737f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-buildbot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,66 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name py-buildbot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} {rajdeep @rajdeepbharati} {mojca @mojca} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The Continuous Integration Framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description The Buildbot is a system to automate the compile/test \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cycle required by most software projects to validate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- code changes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://buildbot.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 65b72b00620446a8731c82a344be46c1e0ef56ed81d0b26672aa9b36bff8b965 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 edfb622a98b00cadd7baf2a758663471cc795f5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3181035
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-autobahn \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-dateutil \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jinja2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-jwt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sqlalchemy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sqlalchemy-migrate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-treq \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-twisted \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-txaio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-yaml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-zopeinterface
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_test-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-boto3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-enchant \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-flake8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-isort \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-lz4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-mock \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pylint \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-treq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port:py${python.version}-moto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port:py${python.version}-pyjade \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port:py${python.version}-setuptools-trial \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # port:py${python.version}-txrequests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # currently defunct due to missing dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>