lang/jruby: update to 9.1.15.0

3 files changed, 10 insertions, 20 deletions

diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 2ccc83dbb378..f8ef997ee443 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jruby
-PORTVERSION=	9.1.10.0
+PORTVERSION=	9.1.15.0
 DISTVERSIONPREFIX=	bin-
 CATEGORIES=	lang ruby java
 MASTER_SITES=	http://jruby.org.s3.amazonaws.com/downloads/${PORTVERSION}/
@@ -54,12 +54,11 @@ post-patch:
 	@${REINPLACE_CMD} -i "" ${REPLACE_LIST_TEMP} ${WRKSRC}/bin/jruby
 
 do-install:
-	${MKDIR} ${STAGEDIR}${JRUBY_HOME}/bin
-	${MKDIR} ${STAGEDIR}${JRUBY_HOME}/lib
+	${MKDIR} ${STAGEDIR}${JRUBY_HOME}/bin ${STAGEDIR}${JRUBY_HOME}/lib
 	(cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${JRUBY_HOME}/bin/)
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${JRUBY_HOME}/lib)
 .for f in jruby jirb jgem
-	${LN} -sf ${JRUBY_HOME}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
+	${RLN} ${STAGEDIR}${JRUBY_HOME}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${FIND} ${STAGEDIR}${JRUBY_HOME}/lib/jni/x86_64-FreeBSD -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 
diff --git a/lang/jruby/distinfo b/lang/jruby/distinfo
index b08585f132d6..0a752bdedea0 100644
--- a/lang/jruby/distinfo
+++ b/lang/jruby/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495820615
-SHA256 (jruby-bin-9.1.10.0.tar.gz) = 93ec6b55fa0d5b37e9f8131f76adc01efa82bebcef8df3e0de49e83dad3ee958
-SIZE (jruby-bin-9.1.10.0.tar.gz) = 20860578
+TIMESTAMP = 1514146084
+SHA256 (jruby-bin-9.1.15.0.tar.gz) = 4a0d9305867ed327a8cf4f7ff8a65c7ff62094a495ec85463d0792656762469e
+SIZE (jruby-bin-9.1.15.0.tar.gz) = 21043786
diff --git a/lang/jruby/pkg-plist b/lang/jruby/pkg-plist
index 6cc98cf23dc8..fe74928e3a09 100644
--- a/lang/jruby/pkg-plist
+++ b/lang/jruby/pkg-plist
@@ -23,8 +23,8 @@ bin/jruby
 %%JRUBY_HOME%%/lib/ruby/gems/shared/gems/rdoc-4.2.0/bin/ri
 %%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/did_you_mean-1.0.1.gemspec
 %%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/jar-dependencies-0.3.10.gemspec
-%%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/jruby-openssl-0.9.20-java.gemspec
-%%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/jruby-readline-1.1.1-java.gemspec
+%%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/jruby-openssl-0.9.21-java.gemspec
+%%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/jruby-readline-1.2.0-java.gemspec
 %%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/json-1.8.3-java.gemspec
 %%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/minitest-5.4.1.gemspec
 %%JRUBY_HOME%%/lib/ruby/gems/shared/specifications/default/net-telnet-0.1.1.gemspec
@@ -226,8 +226,6 @@ bin/jruby
 %%JRUBY_HOME%%/lib/ruby/stdlib/jars/setup.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/jars/version.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/java/inspect.rb
-%%JRUBY_HOME%%/lib/ruby/stdlib/jline/jline/2.11/jline-2.11.jar
-%%JRUBY_HOME%%/lib/ruby/stdlib/jline/jline/maven-metadata-local.xml
 %%JRUBY_HOME%%/lib/ruby/stdlib/jopenssl.jar
 %%JRUBY_HOME%%/lib/ruby/stdlib/jopenssl/load.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/jopenssl/version.rb
@@ -926,12 +924,12 @@ bin/jruby
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/resolver/stats.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/resolver/vendor_set.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/resolver/vendor_specification.rb
+%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/safe_yaml.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/security.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/security/policies.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/security/policy.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/security/signer.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/security/trust_dir.rb
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/security_option.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/server.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/source.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/source/git.rb
@@ -945,16 +943,8 @@ bin/jruby
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/source_specific_file.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/spec_fetcher.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/specification.rb
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/AddTrustExternalCARoot.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/GeoTrustGlobalCA.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRoot.pem
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
-%%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot-2048.pem
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/stub_specification.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/rubygems/syck_hack.rb
@@ -986,6 +976,7 @@ bin/jruby
 %%JRUBY_HOME%%/lib/ruby/stdlib/socket.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/sync.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/syslog.rb
+%%JRUBY_HOME%%/lib/ruby/stdlib/syslog/logger.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/tempfile.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/test-unit.rb
 %%JRUBY_HOME%%/lib/ruby/stdlib/test/unit.rb