<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8f085f9ec85a72cfd9014a9f3e341bed60d1f7cb">https://github.com/macports/macports-ports/commit/8f085f9ec85a72cfd9014a9f3e341bed60d1f7cb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8f085f9ec85a72cfd9014a9f3e341bed60d1f7cb
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Thu Oct 7 11:26:24 2021 +0900
<span style='display:block; white-space:pre;color:#404040;'> OmegaT{,-latest}: prevent icon flicker at launch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Stop generating launch scripts at destroot time
</span>---
aqua/OmegaT/Portfile | 32 ++++++++++++++------------------
aqua/OmegaT/files/OmegaT_app_bin | 7 +++++++
aqua/OmegaT/files/OmegaT_cli_bin | 4 ++++
3 files changed, 25 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/OmegaT/Portfile b/aqua/OmegaT/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08a1973b57b..33ced0ad80e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/OmegaT/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/OmegaT/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup java 1.0
</span> name OmegaT
set name_lower [string tolower ${name}]
version 4.3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories aqua textproc java
license GPL-3
maintainers {amake @amake} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ checksums rmd160 5145713e2bc6a6fd82bb6e9f8c410a7c49fb7a7f \
</span>
subport ${name}-latest {
version 5.6.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> set flavor Latest
set version_suff _Beta
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,30 +68,26 @@ destroot {
</span> copy ${worksrcpath} ${destroot}/${target_dir}
# CLI wrapper script
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cli_script ${destroot}${prefix}/bin/${name_lower}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open $cli_script w]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp "exec java -Xdock:name=${name} \\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp " -jar ${target_dir}/${name}.jar \"\$@\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $fp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${cli_script}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cli_bin ${destroot}${prefix}/bin/${name_lower}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${filespath}/${name}_cli_bin ${cli_bin}
</span>
# .app bundle
set app ${destroot}${applications_dir}/${name}.app
xinstall -d ${app}/Contents/MacOS
xinstall -d ${app}/Contents/Resources
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xinstall -m 0644 ${filespath}/Info.plist ${app}/Contents/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${filespath}/${name}.icns ${app}/Contents/Resources/
</span> reinplace "s|@@VERSION@@|${version}|g" ${app}/Contents/Info.plist
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${app}/Contents/MacOS/${name} w]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp "JAVA_HOME=\$(/usr/libexec/java_home -v ${java.version})"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp "exec \$JAVA_HOME/bin/java \\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp " -Xdock:name=${name} \\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $fp " -jar ${target_dir}/${name}.jar \"$@\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $fp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${app}/Contents/MacOS/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${filespath}/${name}.icns ${app}/Contents/Resources/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_bin ${app}/Contents/MacOS/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${filespath}/${name}_app_bin ${app_bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@JAVA_VERSION@@|${java.version}|g" ${app_bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@ICON@@|${applications_dir}/${name}.app/Contents/Resources/${name}.icns|g" ${app_bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@JAR@@|${target_dir}/${name}.jar|g" ${app_bin} ${cli_bin}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@NAME@@|${name}|g" ${app_bin} ${cli_bin}
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/OmegaT/files/OmegaT_app_bin b/aqua/OmegaT/files/OmegaT_app_bin
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cba0a4289db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/OmegaT/files/OmegaT_app_bin
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+JAVA_HOME=$(/usr/libexec/java_home -v @@JAVA_VERSION@@)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec "$JAVA_HOME/bin/java" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Xdock:name=@@NAME@@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Xdock:icon=@@ICON@@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -jar @@JAR@@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/OmegaT/files/OmegaT_cli_bin b/aqua/OmegaT/files/OmegaT_cli_bin
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..78779395b45
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/OmegaT/files/OmegaT_cli_bin
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec java -Xdock:name=@@NAME@@ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -jar @@JAR@@ "$@"
</span></pre><pre style='margin:0'>
</pre>