<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/fbdfa94e9170cfe7a1c6e958f9f0ff7b08302431">https://github.com/macports/macports-ports/commit/fbdfa94e9170cfe7a1c6e958f9f0ff7b08302431</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fbdfa94e9170cfe7a1c6e958f9f0ff7b08302431
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 24 00:50:10 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> terminator: Update to 1.0
</span>---
sysutils/terminator/Portfile | 61 +++++++++++++------------------
sysutils/terminator/files/run_tests.patch | 11 ++++++
2 files changed, 37 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/terminator/Portfile b/sysutils/terminator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54c82a38f1f..6ff50a19ce4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/terminator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/terminator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,19 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span> PortGroup python 1.0
name terminator
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.98
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 95f5a822bc36d57a8162666fe597f05611953bb3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 88aa09e96591c4fd7ff2765617acee6c9bae9c188db2590652a8aba53bbbdadd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 881675
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,50 +22,35 @@ description multiple terminal emulator
</span> long_description ${name} lets you open multiple terminal emulators in \
a single window.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gnometerminator.blogspot.com/p/introduction.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://launchpad.net/terminator/trunk/${version}/+download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cddb24240b74fba3eb6694d9d4aaff11329a14b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0a6d8c9ffe36d67e60968fbf2752c521e5d498ceda42ef171ad3e966c02f26c1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gnometerminator.blogspot.com/p/introduction.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://launchpad.net/terminator/trunk/${version}/+download
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python26] && ![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages/gtk-2.0/vtemodule.so]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant_set python27
</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;'>-variant python26 conflicts python27 description {Use Python 2.6} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python26]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 26
</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;'>-variant python27 conflicts python26 description {Use Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 27
</span>
depends_build-append port:intltool
depends_lib-append port:vte-gtk2-compat \
port:hicolor-icon-theme \
port:py${python.version}-keybinder \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-notify-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-notify-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-psutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants port:vte-gtk2-compat python${python.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles run_tests.patch
</span>
post-patch {
reinplace -E "s|^#!/usr/bin/env python|#!${python.bin}|" ${worksrcpath}/${name}
<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;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${python.pkgd}/gtk-2.0/vtemodule.so]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "To install ${name} with the +python${python.version} variant, vte must be installed with the +python${python.version} variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible vte installation"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|@PYTHON@|${python.bin}|g" ${worksrcpath}/run_tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse item [list ${worksrcpath}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${item}] eq {.py}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E -q "s|^#!/usr/bin/(env )?python|#!${python.bin}|" ${item}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
foreach manpage {man1/terminator.1 man5/terminator_config.5} {
ln -s ${python.prefix}/share/man/${manpage} ${destroot}${prefix}/share/man/${manpage}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +58,7 @@ post-destroot {
</span>
set docdir ${destroot}${prefix}/share/doc/${name}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> COPYING \
ChangeLog \
README \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,5 +66,5 @@ post-destroot {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://launchpad.net/terminator/+download
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://launchpad.net/terminator/+download
</span> livecheck.regex /${name}\[-_\](\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/terminator/files/run_tests.patch b/sysutils/terminator/files/run_tests.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9d4d9e0f7e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/terminator/files/run_tests.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- run_tests.orig 2016-11-22 21:25:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ run_tests 2022-03-24 00:02:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file_type=$(file -b $t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${file_type} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *[Pp]ython*) python ${t} ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *[Pp]ython*) @PYTHON@ ${t} ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *Bourne*) bash ${t} ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *bash*) bash ${t} ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *perl*) perl ${t} ;;
</span></pre><pre style='margin:0'>
</pre>