<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/448fedc6b488012c7e9878669e2170b9dd02359b">https://github.com/macports/macports-ports/commit/448fedc6b488012c7e9878669e2170b9dd02359b</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 448fedc jruby-devel: mark obsolete, replace with jruby
</span>448fedc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 448fedc6b488012c7e9878669e2170b9dd02359b
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Tue May 21 08:28:50 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> jruby-devel: mark obsolete, replace with jruby
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The jruby port is less outdated than jruby-devel;
</span><span style='display:block; white-space:pre;color:#404040;'> neither port has been updated in the past 6 years.
</span>---
lang/jruby-devel/Portfile | 103 ++-------------------
.../files/patch-bin-jruby-bash-expr-regex.diff | 11 ---
.../files/patch-bin-jruby-sh-expr-regex.diff | 11 ---
lang/jruby/Portfile | 4 +-
4 files changed, 7 insertions(+), 122 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jruby-devel/Portfile b/lang/jruby-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cdc91e..10ef5d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jruby-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jruby-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +1,14 @@
</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:#e0ffe0;'>+PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 2020-05-21
</span>
name jruby-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by jruby
</span> version 1.7.0.RC2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lang ruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ciserlohn @ci42}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description JRuby is an 100% pure-Java implementation of the Ruby \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- programming language.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description JRuby provides a complete set of core "builtin" classes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and syntax for the Ruby language, as well as most of the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ruby Standard Libraries. The standard libraries are mostly \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ruby's own complement of .rb files, but a few that depend \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on C language-based extensions have been reimplemented.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts jruby
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://jruby.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://jruby.org.s3.amazonaws.com/downloads/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname jruby-src-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir jruby-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 884b17ef595159c2e4c84cb355b0ec61f215ee6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b6d35ff087843f4c835b49897c7e1cc8f76fb8f0e45b38b408fe9d1eb337edf7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:apache-ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib bin:java:kaffe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.asroot yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant apidocs description "include API documentation" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target-append apidocs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant nailgun description "include Nailgun support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target-append build-ng
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/java/${name}/tool/nailgun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/tool/nailgun/ng ${destroot}${prefix}/share/java/${name}/tool/nailgun
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant default_ruby description "build without j prefix" {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create the target java directory exists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/java/${name}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Copy over the needed elements of our directory tree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset apidocs] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/docs ${destroot}${prefix}/share/java/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove extraneous .bat, .exe and .dll files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory ${destroot}${prefix}/share/java/${name}/bin *.bat] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory ${destroot}${prefix}/share/java/${name}/bin *.exe] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f [glob -directory ${destroot}${prefix}/share/java/${name}/bin *.dll] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete $f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jruby_prefix ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![variant_isset default_ruby] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jruby_prefix "j"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { jruby jirb jrubyc jirb_swing } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regsub {^j} $f $jruby_prefix dest
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${dest} != ${f} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/java/${name}/bin/${f} ${destroot}${prefix}/bin/${dest}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/java/${name}/bin/${f} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { ast gem rdoc ri testrb } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share/java/${name}/bin/${f} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/bin/${jruby_prefix}${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}download
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex jruby-src-(\\d+(?:\\.\\d+)*).tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories lang ruby
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff b/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1ce6af..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jruby-devel/files/patch-bin-jruby-bash-expr-regex.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/jruby.bash.orig 2012-09-07 14:22:01.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/jruby.bash 2012-09-08 01:10:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ls=`ls -ld "$PRG"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link=`expr "$ls" : '.*-> \(.*\)$'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if expr "$link" : '.*/.*' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if expr "$link" : '/' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if expr "$link" : '\/' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="$link"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="`dirname ${PRG}`/${link}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff b/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cc9bd4d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jruby-devel/files/patch-bin-jruby-sh-expr-regex.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- bin/jruby.sh.orig 2012-09-07 14:22:01.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ bin/jruby.sh 2012-09-08 01:10:44.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ls=`ls -ld "$PRG"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- link=`expr "$ls" : '.*-> \(.*\)$'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if expr "$link" : '.*/.*' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if expr "$link" : '/' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if expr "$link" : '\/' > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="$link"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PRG="`dirname ${PRG}`/${link}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jruby/Portfile b/lang/jruby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b075cb..aa8f215 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jruby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +16,7 @@ long_description JRuby provides a complete set of core "builtin" classes \
</span> Ruby Standard Libraries. The standard libraries are mostly \
Ruby's own complement of .rb files, but a few that depend \
on C language-based extensions have been reimplemented.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts jruby-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage http://jruby.org/
master_sites http://jruby.org.s3.amazonaws.com/downloads/${version}/
</pre><pre style='margin:0'>
</pre>