Simple update to 1.7.6, fixes a few bugs. One of our patches was
accepted upstream. Only other port change is adding maven as
a TDEP, since it is required for running the tests.
Tested on i386, compiles fine on amd64. Will be committing in a few
days unless I hear objections.
Thanks,
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 15 Oct 2013 02:36:21 -0000 1.39
+++ Makefile 22 Oct 2013 19:22:57 -0000
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = pure-Java implementation of the Ruby language
-V = 1.7.5
+V = 1.7.6
DISTNAME = jruby-bin-${V}
PKGNAME = jruby-${V}
CATEGORIES = lang lang/ruby
@@ -100,7 +100,8 @@ ANT_TEST_CMD = ${SETENV} ${MAKE_ENV} HOM
PATH=${JAVA_HOME}/bin:${PATH} \
ANT_OPTS="-Xms512m -Xmx512m" \
${LOCALBASE}/bin/ant
-TEST_DEPENDS = devel/ruby-rspec/rspec,jruby
+TEST_DEPENDS = devel/ruby-rspec/rspec,jruby \
+ devel/maven
# Tests run: 363, Failures: 7, Errors: 11, Skipped: 0
do-test:
-cd ${WRKSRC} && ${ANT_TEST_CMD} test
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo 15 Oct 2013 02:36:21 -0000 1.21
+++ distinfo 22 Oct 2013 19:17:36 -0000
@@ -1,10 +1,10 @@
SHA256 (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) =
xK/m48Z/YA+fg4yFJqcRxceFnT0F98y255Ju9eSE7b0=
SHA256 (jnr-posix.20130822.tar.gz) =
kXV0idWCYw/iRsDSwJdvAL3IjU9L/gEvuD9b9Rt2UYk=
-SHA256 (jruby-bin-1.7.5.tar.gz) = nr0ILPnylpfHblA+ALedMOPpuHBxr7iCPDuLAz9fVyM=
+SHA256 (jruby-bin-1.7.6.tar.gz) = FqZMVjGf7TTsh3zxUfJzXGBFer5sc9ncMsVszlKwzkU=
SHA256 (jruby-launcher-1.0.19-java.gem) =
Hgd9U6dYh1HV85FrIy5WUoy0nehO8sQD74QRhhJuqWI=
-SHA256 (jruby-src-1.7.5.tar.gz) = Gy+IFyovumWbBczP/yyvb9zVtKpWKZIhnpkk6M0xRFk=
+SHA256 (jruby-src-1.7.6.tar.gz) = 02irsUwxUrQPh9Z7C5eNYy5dAar9TTh627PLmQLDOv8=
SIZE (jnr-jffi-1.2.2-0-g4c196bb.tar.gz) = 1759433
SIZE (jnr-posix.20130822.tar.gz) = 141316
-SIZE (jruby-bin-1.7.5.tar.gz) = 19778892
+SIZE (jruby-bin-1.7.6.tar.gz) = 19991052
SIZE (jruby-launcher-1.0.19-java.gem) = 55296
-SIZE (jruby-src-1.7.5.tar.gz) = 12326503
+SIZE (jruby-src-1.7.6.tar.gz) = 12321839
Index: patches/patch-lib_ruby_shared_rubygems_package_rb
===================================================================
RCS file: patches/patch-lib_ruby_shared_rubygems_package_rb
diff -N patches/patch-lib_ruby_shared_rubygems_package_rb
--- patches/patch-lib_ruby_shared_rubygems_package_rb 15 Oct 2013 02:36:22
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-lib_ruby_shared_rubygems_package_rb,v 1.1 2013/10/15 02:36:22
jeremy Exp $
-
-Fix for rubygems not installing gem files starting with ".". rubygems
-bug #680.
-
---- lib/ruby/shared/rubygems/package.rb.orig Sat Oct 5 13:58:22 2013
-+++ lib/ruby/shared/rubygems/package.rb Thu Oct 10 10:42:10 2013
-@@ -339,13 +339,9 @@ EOM
- def extract_tar_gz io, destination_dir, pattern = "*" # :nodoc:
- open_tar_gz io do |tar|
- tar.each do |entry|
-- # Some entries start with "./" which fnmatch does not like, see github
-- # issue #644
-- full_name = entry.full_name.sub %r%\A\./%, ''
-+ next unless File.fnmatch pattern, entry.full_name, File::FNM_DOTMATCH
-
-- next unless File.fnmatch pattern, full_name
--
-- destination = install_location full_name, destination_dir
-+ destination = install_location entry.full_name, destination_dir
-
- FileUtils.rm_rf destination
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 15 Oct 2013 02:36:22 -0000 1.19
+++ pkg/PLIST 22 Oct 2013 19:19:25 -0000
@@ -19,6 +19,7 @@ jruby/lib/jni/${JFFI_ARCH}/libjffi-1.2.s
jruby/lib/jruby.jar
jruby/lib/ruby/
jruby/lib/ruby/1.8/
+jruby/lib/ruby/1.8/.document
jruby/lib/ruby/1.8/English.rb
jruby/lib/ruby/1.8/Env.rb
jruby/lib/ruby/1.8/README
@@ -34,6 +35,7 @@ jruby/lib/ruby/1.8/bigdecimal/util.rb
jruby/lib/ruby/1.8/cgi/
jruby/lib/ruby/1.8/cgi-lib.rb
jruby/lib/ruby/1.8/cgi.rb
+jruby/lib/ruby/1.8/cgi/.document
jruby/lib/ruby/1.8/cgi/session/
jruby/lib/ruby/1.8/cgi/session.rb
jruby/lib/ruby/1.8/cgi/session/pstore.rb
@@ -192,6 +194,7 @@ jruby/lib/ruby/1.8/rdoc/generators/templ
jruby/lib/ruby/1.8/rdoc/generators/template/xml/xml.rb
jruby/lib/ruby/1.8/rdoc/generators/xml_generator.rb
jruby/lib/ruby/1.8/rdoc/markup/
+jruby/lib/ruby/1.8/rdoc/markup/.document
jruby/lib/ruby/1.8/rdoc/markup/sample/
jruby/lib/ruby/1.8/rdoc/markup/sample/rdoc2latex.rb
jruby/lib/ruby/1.8/rdoc/markup/sample/sample.rb
@@ -576,6 +579,7 @@ jruby/lib/ruby/1.8/wsdl/xmlSchema/simple
jruby/lib/ruby/1.8/wsdl/xmlSchema/unique.rb
jruby/lib/ruby/1.8/wsdl/xmlSchema/xsd2ruby.rb
jruby/lib/ruby/1.8/xmlrpc/
+jruby/lib/ruby/1.8/xmlrpc/.document
jruby/lib/ruby/1.8/xmlrpc/README.txt
jruby/lib/ruby/1.8/xmlrpc/base64.rb
jruby/lib/ruby/1.8/xmlrpc/client.rb
@@ -795,6 +799,7 @@ jruby/lib/ruby/1.9/minitest/unit.rb
jruby/lib/ruby/1.9/monitor.rb
jruby/lib/ruby/1.9/mutex_m.rb
jruby/lib/ruby/1.9/net/
+jruby/lib/ruby/1.9/net/.document
jruby/lib/ruby/1.9/net/ftp.rb
jruby/lib/ruby/1.9/net/http.rb
jruby/lib/ruby/1.9/net/https.rb
@@ -884,6 +889,7 @@ jruby/lib/ruby/1.9/rake/version.rb
jruby/lib/ruby/1.9/rake/win32.rb
jruby/lib/ruby/1.9/rational.rb
jruby/lib/ruby/1.9/rbconfig/
+jruby/lib/ruby/1.9/rbconfig/.document
jruby/lib/ruby/1.9/rbconfig/datadir.rb
jruby/lib/ruby/1.9/rbconfig/obsolete.rb
jruby/lib/ruby/1.9/rdoc/
@@ -913,6 +919,7 @@ jruby/lib/ruby/1.9/rdoc/generator/markup
jruby/lib/ruby/1.9/rdoc/generator/ri.rb
jruby/lib/ruby/1.9/rdoc/generator/template/
jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/
+jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/.document
jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/_footer.rhtml
jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/_head.rhtml
jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
@@ -966,6 +973,7 @@ jruby/lib/ruby/1.9/rdoc/generator/templa
jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/servlet_root.rhtml
jruby/lib/ruby/1.9/rdoc/generator/template/darkfish/table_of_contents.rhtml
jruby/lib/ruby/1.9/rdoc/generator/template/json_index/
+jruby/lib/ruby/1.9/rdoc/generator/template/json_index/.document
jruby/lib/ruby/1.9/rdoc/generator/template/json_index/js/
jruby/lib/ruby/1.9/rdoc/generator/template/json_index/js/navigation.js
jruby/lib/ruby/1.9/rdoc/generator/template/json_index/js/searcher.js
@@ -1331,6 +1339,7 @@ jruby/lib/ruby/2.0/irb/init.rb
jruby/lib/ruby/2.0/irb/input-method.rb
jruby/lib/ruby/2.0/irb/inspector.rb
jruby/lib/ruby/2.0/irb/lc/
+jruby/lib/ruby/2.0/irb/lc/.document
jruby/lib/ruby/2.0/irb/lc/error.rb
jruby/lib/ruby/2.0/irb/lc/help-message
jruby/lib/ruby/2.0/irb/lc/ja/
@@ -1354,6 +1363,7 @@ jruby/lib/ruby/2.0/matrix.rb
jruby/lib/ruby/2.0/matrix/eigenvalue_decomposition.rb
jruby/lib/ruby/2.0/matrix/lup_decomposition.rb
jruby/lib/ruby/2.0/minitest/
+jruby/lib/ruby/2.0/minitest/.document
jruby/lib/ruby/2.0/minitest/README.txt
jruby/lib/ruby/2.0/minitest/autorun.rb
jruby/lib/ruby/2.0/minitest/benchmark.rb
@@ -1446,6 +1456,7 @@ jruby/lib/ruby/2.0/rake/gempackagetask.r
jruby/lib/ruby/2.0/rake/invocation_chain.rb
jruby/lib/ruby/2.0/rake/invocation_exception_mixin.rb
jruby/lib/ruby/2.0/rake/lib/
+jruby/lib/ruby/2.0/rake/lib/.document
jruby/lib/ruby/2.0/rake/lib/project.rake
jruby/lib/ruby/2.0/rake/loaders/
jruby/lib/ruby/2.0/rake/loaders/makefile.rb
@@ -1475,6 +1486,7 @@ jruby/lib/ruby/2.0/rake/trace_output.rb
jruby/lib/ruby/2.0/rake/version.rb
jruby/lib/ruby/2.0/rake/win32.rb
jruby/lib/ruby/2.0/rbconfig/
+jruby/lib/ruby/2.0/rbconfig/.document
jruby/lib/ruby/2.0/rbconfig/datadir.rb
jruby/lib/ruby/2.0/rbconfig/obsolete.rb
jruby/lib/ruby/2.0/rdoc/
@@ -1504,6 +1516,7 @@ jruby/lib/ruby/2.0/rdoc/generator/markup
jruby/lib/ruby/2.0/rdoc/generator/ri.rb
jruby/lib/ruby/2.0/rdoc/generator/template/
jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/
+jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/.document
jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/_footer.rhtml
jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/_head.rhtml
jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml
@@ -1557,6 +1570,7 @@ jruby/lib/ruby/2.0/rdoc/generator/templa
jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/servlet_root.rhtml
jruby/lib/ruby/2.0/rdoc/generator/template/darkfish/table_of_contents.rhtml
jruby/lib/ruby/2.0/rdoc/generator/template/json_index/
+jruby/lib/ruby/2.0/rdoc/generator/template/json_index/.document
jruby/lib/ruby/2.0/rdoc/generator/template/json_index/js/
jruby/lib/ruby/2.0/rdoc/generator/template/json_index/js/navigation.js
jruby/lib/ruby/2.0/rdoc/generator/template/json_index/js/searcher.js
@@ -2006,7 +2020,20 @@ jruby/lib/ruby/gems/1.8/gems/rake-${RAKE
jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/test/test_rake_win32.rb
jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/test/test_thread_history_display.rb
jruby/lib/ruby/gems/1.8/gems/rake-${RAKE_V}/test/test_trace_output.rb
+jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/
+jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/bin/
+jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/bin/rdoc
+jruby/lib/ruby/gems/1.8/gems/rdoc-4.0.1/bin/ri
jruby/lib/ruby/gems/1.8/specifications/
+jruby/lib/ruby/gems/1.8/specifications/default/
+jruby/lib/ruby/gems/1.8/specifications/default/bouncy-castle-java-1.5.0147.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/jruby-openssl-0.9.3.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/json-1.8.0-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/krypt-0.0.1.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/krypt-core-0.0.1-universal-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/krypt-provider-jdk-0.0.1.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/rake-${RAKE_V}.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/rdoc-4.0.1.gemspec
jruby/lib/ruby/gems/1.8/specifications/rake-${RAKE_V}.gemspec
jruby/lib/ruby/gems/shared
jruby/lib/ruby/shared/
@@ -2280,6 +2307,7 @@ jruby/lib/ruby/shared/rbconfig/
jruby/lib/ruby/shared/rbconfig/datadir.rb
jruby/lib/ruby/shared/readline/
jruby/lib/ruby/shared/readline.rb
+jruby/lib/ruby/shared/readline/.keep
jruby/lib/ruby/shared/readline/jline-2.11.jar
jruby/lib/ruby/shared/readline/readline.jar
jruby/lib/ruby/shared/ripper.jar
@@ -2408,7 +2436,10 @@ jruby/lib/ruby/shared/rubygems/spec_fetc
jruby/lib/ruby/shared/rubygems/specification.rb
jruby/lib/ruby/shared/rubygems/ssl_certs/
jruby/lib/ruby/shared/rubygems/ssl_certs/AddTrustExternalCARoot.pem
+jruby/lib/ruby/shared/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
jruby/lib/ruby/shared/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
+jruby/lib/ruby/shared/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
+jruby/lib/ruby/shared/rubygems/ssl_certs/GeoTrustGlobalCA.pem
jruby/lib/ruby/shared/rubygems/ssl_certs/GeoTrust_Global_CA.pem
jruby/lib/ruby/shared/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
jruby/lib/ruby/shared/rubygems/stub_specification.rb
