<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/af2b9fe954e742b14354929c41a1ba900f64d7fc">https://github.com/macports/macports-ports/commit/af2b9fe954e742b14354929c41a1ba900f64d7fc</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 af2b9fe954e jython: minor improvements
</span>af2b9fe954e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af2b9fe954e742b14354929c41a1ba900f64d7fc
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Oct 4 16:13:15 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> jython: minor improvements
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> +installer variant: relax Java version requirement
</span><span style='display:block; white-space:pre;color:#404040;'> following 2.7.2 update
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Repair checksums for -installer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use HTTPS URLs
</span>---
lang/jython/Portfile | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jython/Portfile b/lang/jython/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1321b6b058a..36272dba8eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jython/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jython/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,13 +18,9 @@ long_description \
</span> language Python written in 100% Pure Java, and seamlessly integrated with \
the Java platform. It thus allows you to run Python on any Java platform.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.jython.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.jython.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Jython 2.7.1 is only compatible with Java 7/8, and is known to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# incompatible with Java 9+ (this will likely be resolved by Jython 2.7.2).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Since the Java portgroup doesn't support specifying a maximum Java version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# but supports specifying an exact version, only use Java 8 for now.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version 1.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# LTS Java to install if compatible Java not present
</span> java.fallback openjdk8
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +31,7 @@ python.default_version 27
</span> set jython_home ${prefix}/share/java/${name}
variant installer description {Use installer, rather than building from source} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://search.maven.org/remotecontent?filepath=org/python/jython-installer/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://search.maven.org/remotecontent?filepath=org/python/jython-installer/${version}
</span>
distfiles ${name}-installer-${version}.jar
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +41,8 @@ variant installer description {Use installer, rather than building from source}
</span>
extract.only
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.version 1.7+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd java
build.target -jar ${distpath}/${distfiles}
build.args -s -d ${destroot}${jython_home}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,9 +65,15 @@ if {![variant_isset installer]} {
</span> PortGroup github 1.0
github.setup jythontools jython ${version} v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 34c48eae181694b590ce500175e452b83fdab2b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 82a05fd72d8f681e99effa5dbfd148740ace444f226a3e479a5f3646f72af645 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 46102901
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 13ea84c24ffd0abbcf25a1b168d243ea6e57c86d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4938cc7079f48fa64e7558682b9bf9a62ebee16bbce698570007667945d08f60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 46106571
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove during next update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Jython built with JDK 9 or later won't run on Java 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/macports/macports-ports/pull/8425#discussion_r488342820
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.version 1.8
</span>
# Use Ant 1.10.x for Java 8 compatibility
depends_build-append \
</pre><pre style='margin:0'>
</pre>