<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/2452b422751b7d3d39b8e3c81abf26b3500d2dc4">https://github.com/macports/macports-ports/commit/2452b422751b7d3d39b8e3c81abf26b3500d2dc4</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 2452b422751 AppleCommander: Update to 1.8.0
</span>2452b422751 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2452b422751b7d3d39b8e3c81abf26b3500d2dc4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Oct 22 19:57:42 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> AppleCommander: Update to 1.8.0
</span>---
emulators/AppleCommander/Portfile | 88 ++++++++++++----------
emulators/AppleCommander/files/{cli.in => ac.in} | 2 +-
emulators/AppleCommander/files/acx.in | 3 +
.../files/gradle-wrapper.properties.patch | 11 +--
emulators/AppleCommander/files/gui.in | 9 ++-
5 files changed, 64 insertions(+), 49 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 fdef6fee24e..ca76f82a6fd 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;'>@@ -5,16 +5,16 @@ PortGroup app 1.0
</span> PortGroup github 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup AppleCommander AppleCommander 1-6-0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup AppleCommander AppleCommander 1.8.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gradle_version 5.6.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gradle_version 7.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version [string map {- .} ${github.version}]
</span> categories emulators
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span> maintainers {ryandesign @ryandesign} openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs arm64 x86_64
</span>
description GUI and CLI for manipulating Apple II disk images
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,39 +36,41 @@ master_sites-append https://services.gradle.org/distributions/
</span> distfiles-append ${gradle_distfile}
checksums ${main_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 149ee11f2e3f616fc514ce1497973d0f5f4e3c5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 246cdf31812a9034d1b8f1492d48560ef65e5a2cf13ee873522ded3980c5f627 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2637590 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4d00c0afd81d730a6cb0c293dd6c16f964fdea74 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 66def97b3f6c3b6caf1e4a30580f81b2d44ec78781542a4c170b4cecf0e187e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6627193 \
</span> ${gradle_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b1bb3127d1df4fa2abe8e7546e03f3fc5d74ef7b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 32fce6628848f799b0ad3205ae8db67d0d828c10ffe62b748a7c0d9f4a5d9ee0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 93890597
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e32e691e3eec2132e2b4f2b2ba19f9f8b7f2b14f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9afb3ca688fc12c761a0e9e4321e4d24e977a4a8916c8a768b1fe05ddb4d6b66 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 115766550
</span>
proc percent_encode {str} {
return [subst [regsub -all {[^a-zA-Z0-9/.~_-]} $str {%[format %02x [scan {&} %c]]}]]
}
set gradle_home ${workpath}/gradle
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set swt_arch [string map [list arm64 aarch64] ${configure.build_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dirs [list cli-ac cli-acx gui-swt-macosx-${swt_arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jars [list ac acx macosx-${swt_arch}]
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/cli.in ${workpath}/cli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Upstream documentation shows how to create shell wrappers for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # jars but the build system doesn't make them so we do it ourselves.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/ac.in ${workpath}/ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/acx.in ${workpath}/acx
</span> copy ${filespath}/gui.in ${workpath}/gui
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The jar names begin with the root directory name and end with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # version number so remove the version number from the directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # name so as not to be redundant.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath} ${build.dir}
</span> }
set javadir ${prefix}/share/java/applecommander
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.dir ${workpath}/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${patch.dir}
</span>
patchfiles gradle-wrapper.properties.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${workpath} "s|@JAVADIR@|${javadir}|g;s|@VERSION@|${version}|g" cli gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@DISTPATH@|[percent_encode ${distpath}]|g" ${build.dir}/gradle/wrapper/gradle-wrapper.properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${workpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@JAVADIR@|${javadir}|g;s|@SWT_ARCH@|${swt_arch}|g;s|@VERSION@|${version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac acx gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DISTPATH@|[percent_encode ${distpath}]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/gradle/wrapper/gradle-wrapper.properties
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,33 +79,37 @@ build.env "GRADLE_USER_HOME=${gradle_home}"
</span>
# This uses a local copy of a specific version of gradle. Ideally we
# should use the MacPorts gradle port but this build system is currently
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# incompatible with gradle 7 or later:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/AppleCommander/AppleCommander/issues/56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# incompatible with gradle 8 or later:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/AppleCommander/AppleCommander/pull/105
</span> build.cmd ./gradlew
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This builds all targets, including the Linux and Windows GUIs. Ideally
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# we should build only what we install but I don't know how to instruct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gradle to do that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target assemble
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The developer instructions show what java commands to run to start
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# either the GUI or the CLI and the distribution includes a macOS icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# file but if there is a way to tell the build system to create a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# wrapper script or application bundle I have not been able to determine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# how.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/AppleCommander/AppleCommander/blob/master/DEVELOPER.md#building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build only the modules we want (i.e. not the Linux and Windows GUIs).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target {*}[lmap dir ${dirs} {expr {":app:${dir}:build"}}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The developer instructions show what Java command to run to start the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GUI and the distribution includes a macOS icns file and other evidence
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that an application bundle could at one time be generated but that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# part of the build system has been neglected (was not converted from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ant to gradle) and does not appear to be usable at this time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/AppleCommander/AppleCommander/issues/112
</span> app.executable ${workpath}/gui
app.icon ${build.dir}/mac/AppleCommander.icns
app.identifier io.github.${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Upstream documentation suggests the program might be installed as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ac but there is already a system utility called ac. Homebrew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # installs it as applecommander instead so we follow that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Upstream suggests installing the CLI programs as "ac" and "acx".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is already an "ac" program included in macOS:
</span> # https://github.com/AppleCommander/AppleCommander/issues/57
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${workpath}/cli ${destroot}${prefix}/bin/applecommander
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so up to 1.7.0 Homebrew used to install it as "applecommander"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # instead and MacPorts did as well. 1.7.0 introduced a second CLI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # program "acx" and at that time the Homebrew formula changed the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # old CLI program to "ac" and repurposed "applecommander" to launch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the GUI (which had previously been "applecommander-gui").
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${workpath} ac acx ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Retain the old "applecommander" name as an alias.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ac ${destroot}${prefix}/bin/applecommander
</span> xinstall -d ${destroot}${javadir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${destroot.dir}/build/libs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name}-ac-${version}.jar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name}-macosx-${version}.jar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${destroot.dir}/app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[lmap dir ${dirs} jar ${jars} {expr {"${dir}/build/libs/${name}-${jar}-${version}.jar"}}] \
</span> ${destroot}${javadir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/files/cli.in b/emulators/AppleCommander/files/ac.in
</span>similarity index 84%
rename from emulators/AppleCommander/files/cli.in
rename to emulators/AppleCommander/files/ac.in
<span style='display:block; white-space:pre;color:#808080;'>index 333cafc3bf7..49642529f38 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/AppleCommander/files/cli.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,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span>
exec java -jar "@JAVADIR@/AppleCommander-ac-@VERSION@.jar" "$@"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/files/acx.in b/emulators/AppleCommander/files/acx.in
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e787ff2cccb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,3 @@
</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 -jar "@JAVADIR@/AppleCommander-acx-@VERSION@.jar" "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/AppleCommander/files/gradle-wrapper.properties.patch b/emulators/AppleCommander/files/gradle-wrapper.properties.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ef387b40a5..65c71a3969e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/AppleCommander/files/gradle-wrapper.properties.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/AppleCommander/files/gradle-wrapper.properties.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> Patch in a placeholder to "download" the gradle distfile from the place
where MacPorts has already downloaded it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- gradle/wrapper/gradle-wrapper.properties.orig 2020-01-20 14:52:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gradle/wrapper/gradle-wrapper.properties 2021-09-21 22:17:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,4 +2,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gradle/wrapper/gradle-wrapper.properties.orig 2022-05-23 14:21:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gradle/wrapper/gradle-wrapper.properties 2023-10-19 02:21:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distributionBase=GRADLE_USER_HOME
</span> distributionPath=wrapper/dists
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++distributionUrl=file\://@DISTPATH@/gradle-7.3.1-bin.zip
</span> zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
<span style='display:block; white-space:pre;background:#ffe0e0;'>--distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+distributionUrl=file\://@DISTPATH@/gradle-5.6.2-bin.zip
</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 1eb5fabef5d..bc831693323 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;'>@@ -1,3 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-exec java -XstartOnFirstThread -jar "@JAVADIR@/AppleCommander-macosx-@VERSION@.jar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+case $* in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -psn*) set --;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+swt_arch="@SWT_ARCH@"
</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>