<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32ecfcd2120048a420db78f4bcc25ad9648ec02a">https://github.com/macports/macports-ports/commit/32ecfcd2120048a420db78f4bcc25ad9648ec02a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 32ecfcd2120048a420db78f4bcc25ad9648ec02a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Dec 26 12:30:28 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> opendx: change behavior of variant no_java to java
</span>---
science/opendx/Portfile | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opendx/Portfile b/science/opendx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 99f6f9e..50a5ae3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opendx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opendx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup deprecated 1.0
</span>
name opendx
version 4.4.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span> categories science
license Permissive
# "IBM PUBLIC LICENSE", http://opendx.org/dlSource.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,9 @@ autoreconf.args -fvi
</span> configure.pre_args-replace \
--prefix=${prefix} \
--prefix=${prefix}/libexec/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --without-javadx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
foreach bin [glob -tails -directory ${destroot}${prefix}/libexec/${name}/bin *] {
ln -s ${prefix}/libexec/${name}/bin/${bin} ${destroot}${prefix}/bin/${bin}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,28 +78,25 @@ if {${os.platform} eq "darwin" && ${os.major} >= 9} {
</span> configure.cppflags-append -D_UINT64 -D_UINT32 -D_UINT16 -D_UINT8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant no_java description "disable java support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:cosmoplayer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:opendx-java40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-jni-path=/System/Library/Frameworks/JavaVM.frameworks/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-java40jar-path=${prefix}/share/java/java40.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-cosmojar-path=${prefix}/share/java/npcosmop211.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-javadx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant java description "enable java support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:cosmoplayer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opendx-java40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-javadx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-jni-path=/System/Library/Frameworks/JavaVM.framework/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-java40jar-path=${prefix}/share/java/java40.jar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-cosmojar-path=${prefix}/share/java/npcosmop211.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The configure.env variables are to make sure we use Apple's preinstalled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # java; the kaffe port will not work to build JavaDX.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.javac /usr/bin/javac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append JAVA_HOME=/Library/Java/Home \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVA=/usr/bin/java \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVAH=/usr/bin/javah \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ JAVAP=/usr/bin/javap
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The configure.env variables are to make sure we use Apple's preinstalled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# java; the kaffe port will not work to build JavaDX.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.javac /usr/bin/javac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append JAVA_HOME=/Library/Java/Home \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA=/usr/bin/java \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVAH=/usr/bin/javah \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVAP=/usr/bin/javap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-jni-path=/System/Library/Frameworks/JavaVM.framework/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-java40jar-path=${prefix}/share/java/java40.jar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-cosmojar-path=${prefix}/share/java/npcosmop211.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +java
</span>
post-destroot {
set fixers [ exec find ${destroot}${prefix} -type f | xargs grep -l /usr/lpp ]
</pre><pre style='margin:0'>
</pre>