<pre style='margin:0'>
Vadim-Valdis Yudaev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d10478e85a95589c0f38955d8024f841ffa75d2a">https://github.com/macports/macports-ports/commit/d10478e85a95589c0f38955d8024f841ffa75d2a</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 d10478e85a9 dbeaver-community: Use OpenJDK from MacPorts
</span>d10478e85a9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d10478e85a95589c0f38955d8024f841ffa75d2a
</span>Author: Vadim-Valdis Yudaev <judaew@macports.org>
AuthorDate: Fri Dec 10 00:49:53 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> dbeaver-community: Use OpenJDK from MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closed: https://trac.macports.org/ticket/64170
</span>---
databases/dbeaver-community/Portfile | 15 ++++++++++++++-
databases/dbeaver-community/files/patch-java-path.diff | 11 +++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/dbeaver-community/Portfile b/databases/dbeaver-community/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc491cb2bae..209d0e19469 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/dbeaver-community/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/dbeaver-community/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span>
github.setup dbeaver dbeaver 21.3.0
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name dbeaver-community
categories databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,8 +50,21 @@ checksums dbeaver-ce-${version}-macosx.cocoa.x86_64${extract.suffix} \
</span> extract.mkdir yes
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:openjdk17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Since the user in any case needs to have OpenJDK to run this port, it is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# better to install OpenJDK from MacPorts, with which there is no issue like
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/64170
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-java-path.diff
</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 "s|@@JAVA_VERSION@@|openjdk17-temurin|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/DBeaver.app/Contents/Info.plist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {}
destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/DBeaver.app/Contents/Eclipse/jre
</span> copy ${worksrcpath}/DBeaver.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/dbeaver-community/files/patch-java-path.diff b/databases/dbeaver-community/files/patch-java-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..22fc1eb0009
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/dbeaver-community/files/patch-java-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- DBeaver.app/Contents/Info.plist.orig 2021-12-10 00:10:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ DBeaver.app/Contents/Info.plist 2021-12-10 00:10:48.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>Eclipse</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>-vm</string><string>/Library/Java/JavaVirtualMachines/@@JAVA_VERSION@@/Contents/Home/bin/java</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <!-- to use a specific Java version (instead of the platform's default) uncomment one of the following options:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>-vm</string><string>/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Commands/java</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>-vm</string><string>/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Commands/java</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>