<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/d466c0e18ba69dba627377cf34f664c81a552225">https://github.com/macports/macports-ports/commit/d466c0e18ba69dba627377cf34f664c81a552225</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 d466c0e18ba AppleCommander: Update to 1.9.0
</span>d466c0e18ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d466c0e18ba69dba627377cf34f664c81a552225
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Wed Nov 1 19:27:47 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> AppleCommander: Update to 1.9.0
</span>---
emulators/AppleCommander/Portfile | 41 +++++++++++++++++++++--------------
emulators/AppleCommander/files/ac.in | 13 ++++++++++-
emulators/AppleCommander/files/acx.in | 13 ++++++++++-
emulators/AppleCommander/files/gui.in | 13 ++++++++++-
4 files changed, 61 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/Portfile b/emulators/AppleCommander/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce66166a068..7bfa98ce571 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/AppleCommander/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/AppleCommander/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</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:#ffe0e0;'>-PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.1
</span> PortGroup github 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AppleCommander AppleCommander 1.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AppleCommander AppleCommander 1.9.0
</span> revision 0
set gradle_version 7.3.1
java.version 11+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,13 +32,13 @@ github.tarball_from archive
</span> set main_distfile ${distfiles}
set gradle_distfile gradle-${gradle_version}-bin.zip
extract.only ${main_distfile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites-append https://services.gradle.org/distributions/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append ${gradle_distfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites-append https://services.gradle.org/distributions/:gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append ${gradle_distfile}:gradle
</span>
checksums ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4d00c0afd81d730a6cb0c293dd6c16f964fdea74 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66def97b3f6c3b6caf1e4a30580f81b2d44ec78781542a4c170b4cecf0e187e6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6627193 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 836569f8f8d835fa2a6b5dd473ca9bbf98bdff5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9047e79af4de04f65e958ee6db46ca6134ae29a30857525214a15f68362a0640 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6744978 \
</span> ${gradle_distfile} \
rmd160 e32e691e3eec2132e2b4f2b2ba19f9f8b7f2b14f \
sha256 9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,23 +52,24 @@ set gradle_home ${workpath}/gradle
</span> set swt_arch [string map [list arm64 aarch64] ${configure.build_arch}]
set dirs [list cli-ac cli-acx gui-swt-macosx-${swt_arch}]
set jars [list ac acx macosx-${swt_arch}]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set guiwrapper gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cliwrappers [list ac acx]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wrappers [concat ${cliwrappers} ${guiwrapper}]
</span>
post-extract {
# Upstream documentation shows how to create shell wrappers for the
# jars but the build system doesn't make them so we do it ourselves.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/ac.in ${workpath}/ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/acx.in ${workpath}/acx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/gui.in ${workpath}/gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${wrappers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/${f}.in ${workpath}/${f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set javadir ${prefix}/share/java/applecommander
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles gradle-wrapper.properties.patch
post-patch {
reinplace -W ${workpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|@JAVADIR@|${javadir}|g;s|@SWT_ARCH@|${swt_arch}|g;s|@VERSION@|${version}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac acx gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@SWT_ARCH@|${swt_arch}|g;s|@VERSION@|${version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}${wrappers}
</span> reinplace "s|@DISTPATH@|[percent_encode ${distpath}]|g" \
${build.dir}/gradle/wrapper/gradle-wrapper.properties
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,10 +93,15 @@ build.target {*}[lmap dir ${dirs} {expr {":app:${dir}:build"}}]
</span> # part of the build system has been neglected (was not converted from
# ant to gradle) and does not appear to be usable at this time.
# https://github.com/AppleCommander/AppleCommander/issues/112
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable ${workpath}/gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable ${workpath}/${guiwrapper}
</span> app.icon ${build.dir}/mac/AppleCommander.icns
app.identifier io.github.${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set appdir ${applications_dir}/${app.name}.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set contentsdir ${appdir}/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set javadir ${contentsdir}/Java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set macosdir ${contentsdir}/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
# Upstream suggests installing the CLI programs as "ac" and "acx".
# There is already an "ac" program included in macOS:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +111,10 @@ destroot {
</span> # program "acx" and at that time the Homebrew formula changed the
# old CLI program to "ac" and repurposed "applecommander" to launch
# the GUI (which had previously been "applecommander-gui").
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${workpath} ac acx ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f ${cliwrappers} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall ${workpath}/${f} ${destroot}${macosdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${macosdir}/${f} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> # Retain the old "applecommander" name as an alias.
ln -s ac ${destroot}${prefix}/bin/applecommander
xinstall -d ${destroot}${javadir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/files/ac.in b/emulators/AppleCommander/files/ac.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 49642529f38..ebdfaf4c091 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/AppleCommander/files/ac.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/AppleCommander/files/ac.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,14 @@
</span> #!/bin/sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-exec java -jar "@JAVADIR@/AppleCommander-ac-@VERSION@.jar" "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macosdir() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script="$0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${script%/*}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while [ -L "$script" ]; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script=$(readlink "$script")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $script in */*) cd "${script%/*}";; esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pwd -P
</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;'>+javadir="$(macosdir)/../Java"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec java -jar "$javadir/AppleCommander-ac-@VERSION@.jar" "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/files/acx.in b/emulators/AppleCommander/files/acx.in
</span><span style='display:block; white-space:pre;color:#808080;'>index e787ff2cccb..d37e7ea1c12 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/AppleCommander/files/acx.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/AppleCommander/files/acx.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,14 @@
</span> #!/bin/sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-exec java -jar "@JAVADIR@/AppleCommander-acx-@VERSION@.jar" "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macosdir() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script="$0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${script%/*}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while [ -L "$script" ]; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script=$(readlink "$script")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $script in */*) cd "${script%/*}";; esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pwd -P
</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;'>+javadir="$(macosdir)/../Java"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec java -jar "$javadir/AppleCommander-acx-@VERSION@.jar" "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/files/gui.in b/emulators/AppleCommander/files/gui.in
</span><span style='display:block; white-space:pre;color:#808080;'>index bc831693323..dedeb3f5b86 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/AppleCommander/files/gui.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/AppleCommander/files/gui.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,5 +4,16 @@ case $* in
</span> -psn*) set --;;
esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+macosdir() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script="$0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd "${script%/*}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while [ -L "$script" ]; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ script=$(readlink "$script")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $script in */*) cd "${script%/*}";; esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pwd -P
</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;'>+javadir="$(macosdir)/../Java"
</span> swt_arch="@SWT_ARCH@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-exec java -XstartOnFirstThread -jar "@JAVADIR@/AppleCommander-macosx-$swt_arch-@VERSION@.jar" "$@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec java -XstartOnFirstThread -jar "$javadir/AppleCommander-macosx-$swt_arch-@VERSION@.jar" "$@"
</span></pre><pre style='margin:0'>
</pre>