This is a simple bugfix update to nokogiri, detailed changes available at: https://github.com/tenderlove/nokogiri/blob/master/CHANGELOG.rdoc
Portwise, only changes besides the version bump are a new dependency on rdoc, and slight changing of the Rakefile patch. Tested on i386 and amd64. Will be committing next week unless I hear objections. Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile 16 Sep 2011 11:41:42 -0000 1.13 +++ Makefile 1 Jun 2012 21:30:55 -0000 @@ -2,8 +2,7 @@ COMMENT= HTML, XML, SAX and Reader parser -DISTNAME= nokogiri-1.5.0 -REVISION= 0 +DISTNAME= nokogiri-1.5.3 CATEGORIES= textproc HOMEPAGE= http://nokogiri.rubyforge.org/nokogiri @@ -28,6 +27,7 @@ CONFIGURE_STYLE= ruby gem ext MODRUBY_REGRESS= rake REGRESS_DEPENDS = devel/ruby-rake-compiler,${MODRUBY_FLAVOR}>=0.7.9 \ devel/ruby-minitest,${MODRUBY_FLAVOR}>=2.2.2 \ - devel/ruby-hoe,${MODRUBY_FLAVOR}>=2.8.0 + devel/ruby-hoe,${MODRUBY_FLAVOR}>=2.8.0 \ + devel/ruby-rdoc,${MODRUBY_FLAVOR}>=3.0.0 .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 27 Jul 2011 18:17:09 -0000 1.4 +++ distinfo 1 Jun 2012 21:15:44 -0000 @@ -1,5 +1,5 @@ -MD5 (nokogiri-1.5.0.gem) = ka7wwNkSVU8Kv72CZmoFBA== -RMD160 (nokogiri-1.5.0.gem) = q09vlwT3GJntuBXwM+T3BWBlOzw= -SHA1 (nokogiri-1.5.0.gem) = yC8hCkW3xrh8aB55op5qCOyMbXE= -SHA256 (nokogiri-1.5.0.gem) = R62viJHcnqbztYQ1z1z6ussEOQBk7qFznIomZ4A568U= -SIZE (nokogiri-1.5.0.gem) = 187904 +MD5 (nokogiri-1.5.3.gem) = Nrfv7IgI6hH0PyPeSZPELQ== +RMD160 (nokogiri-1.5.3.gem) = cbtJF8KKu2096+BNsM6gZ8jpvHY= +SHA1 (nokogiri-1.5.3.gem) = KDH5/k2Orda5TxZPWPWh6FjSptQ= +SHA256 (nokogiri-1.5.3.gem) = bfIHh2WhAUsQvizwJSZIqktGJzmhGNx4ZKg8K04rjn8= +SIZE (nokogiri-1.5.3.gem) = 205824 Index: patches/patch-Rakefile =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/patches/patch-Rakefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-Rakefile --- patches/patch-Rakefile 27 Jul 2011 18:17:09 -0000 1.1 +++ patches/patch-Rakefile 1 Jun 2012 21:17:55 -0000 @@ -2,43 +2,33 @@ $OpenBSD: patch-Rakefile,v 1.1 2011/07/2 Allow regress tests to work. ---- Rakefile.orig Fri Jul 1 13:10:50 2011 -+++ Rakefile Fri Jul 1 13:15:01 2011 -@@ -40,15 +40,6 @@ HOE = Hoe.spec 'nokogiri' do +--- Rakefile.orig Wed Dec 31 16:00:00 1969 ++++ Rakefile Fri Jun 1 14:17:42 2012 +@@ -37,18 +37,6 @@ HOE = Hoe.spec 'nokogiri' do + GENERATED_TOKENIZER ] - self.extra_dev_deps += [ +- self.extra_dev_deps += [ +- ["hoe-bundler", ">= 1.1"], +- ["hoe-debugging", ">= 1.0.3"], +- ["hoe-gemspec", ">= 1.0"], +- ["hoe-git", ">= 1.4"], +- ["mini_portile", ">= 0.2.2"], +- ["minitest", "~> 2.2.2"], - ["racc", ">= 1.4.6"], +- ["rake-compiler", "= 0.8.0"], - ["rexical", ">= 1.0.5"], -- ["rake-compiler", ">= 0.7.9"], -- ["minitest", "~> 2.2.2"], -- ["mini_portile", ">= 0.2.2"], -- ["hoe-debugging", ">= 0"], -- ["hoe-git", ">= 0"], -- ["hoe-gemspec", ">= 0"], -- ["hoe-bundler", ">= 0"] - ] - +- ] +- if java? -@@ -83,7 +74,6 @@ if java? - HOE.spec.files += ['lib/nokogiri/nokogiri.jar'] - end + self.spec_extras = { :platform => 'java' } + else +@@ -83,7 +71,7 @@ if java? else -- require 'tasks/cross_compile' - require "rake/extensiontask" - - HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} } -@@ -91,13 +81,6 @@ else - Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext| - ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact) - ext.config_options << ENV['EXTOPTS'] -- ext.cross_compile = true -- ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"] -- ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}" -- ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes[:libxml2].path, 'lib')}" -- ext.cross_config_options << "--with-iconv-dir=#{$recipes[:libiconv].path}" -- ext.cross_config_options << "--with-xslt-dir=#{$recipes[:libxslt].path}" -- ext.cross_config_options << "--with-zlib-dir=#{CROSS_DIR}" + mingw_available = true + begin +- require 'tasks/cross_compile' ++ raise + rescue + mingw_available = false end - end - Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/pkg/PLIST,v retrieving revision 1.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 27 Jul 2011 18:17:09 -0000 1.5 +++ pkg/PLIST 1 Jun 2012 21:20:42 -0000 @@ -6,12 +6,17 @@ ${GEM_LIB}/gems/${DISTNAME}/.autotest ${GEM_LIB}/gems/${DISTNAME}/.gemtest ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.ja.rdoc ${GEM_LIB}/gems/${DISTNAME}/CHANGELOG.rdoc +${GEM_LIB}/gems/${DISTNAME}/C_CODING_STYLE.rdoc ${GEM_LIB}/gems/${DISTNAME}/Manifest.txt ${GEM_LIB}/gems/${DISTNAME}/README.ja.rdoc ${GEM_LIB}/gems/${DISTNAME}/README.rdoc +${GEM_LIB}/gems/${DISTNAME}/ROADMAP.md ${GEM_LIB}/gems/${DISTNAME}/Rakefile +${GEM_LIB}/gems/${DISTNAME}/STANDARD_RESPONSES.md +${GEM_LIB}/gems/${DISTNAME}/Y_U_NO_GEMSPEC.md ${GEM_LIB}/gems/${DISTNAME}/bin/ ${GEM_LIB}/gems/${DISTNAME}/bin/nokogiri +${GEM_LIB}/gems/${DISTNAME}/build_all ${GEM_LIB}/gems/${DISTNAME}/ext/ ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/ ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/Makefile @@ -29,6 +34,9 @@ ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/html_sax_parser_context.c ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/html_sax_parser_context.h ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/html_sax_parser_context.o +${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/html_sax_push_parser.c +${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/html_sax_push_parser.h +${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/html_sax_push_parser.o ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/mkmf.log ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/nokogiri.c ${GEM_LIB}/gems/${DISTNAME}/ext/nokogiri/nokogiri.h @@ -144,6 +152,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/parser.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/parser_context.rb +${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/html/sax/push_parser.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/nokogiri.so ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/syntax_error.rb ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/version.rb @@ -193,7 +202,6 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri ${GEM_LIB}/gems/${DISTNAME}/lib/xsd/ ${GEM_LIB}/gems/${DISTNAME}/lib/xsd/xmlparser/ ${GEM_LIB}/gems/${DISTNAME}/lib/xsd/xmlparser/nokogiri.rb -${GEM_LIB}/gems/${DISTNAME}/nokogiri_help_responses.md ${GEM_LIB}/gems/${DISTNAME}/tasks/ ${GEM_LIB}/gems/${DISTNAME}/tasks/cross_compile.rb ${GEM_LIB}/gems/${DISTNAME}/tasks/nokogiri.org.rb @@ -230,7 +238,9 @@ ${GEM_LIB}/gems/${DISTNAME}/test/files/s ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.xslt ${GEM_LIB}/gems/${DISTNAME}/test/files/tlm.html +${GEM_LIB}/gems/${DISTNAME}/test/files/to_be_xincluded.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/valid_bar.xml +${GEM_LIB}/gems/${DISTNAME}/test/files/xinclude.xml ${GEM_LIB}/gems/${DISTNAME}/test/helper.rb ${GEM_LIB}/gems/${DISTNAME}/test/html/ ${GEM_LIB}/gems/${DISTNAME}/test/html/sax/ @@ -263,6 +273,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/xml/sax ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_attr.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_attribute_decl.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_builder.rb +${GEM_LIB}/gems/${DISTNAME}/test/xml/test_c14n.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_cdata.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_comment.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_document.rb @@ -278,6 +289,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/xml/tes ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_node.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_node_attributes.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_node_encoding.rb +${GEM_LIB}/gems/${DISTNAME}/test/xml/test_node_inheritance.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_node_reparenting.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_node_set.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_parse_options.rb @@ -288,8 +300,10 @@ ${GEM_LIB}/gems/${DISTNAME}/test/xml/tes ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_syntax_error.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_text.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_unparented_node.rb +${GEM_LIB}/gems/${DISTNAME}/test/xml/test_xinclude.rb ${GEM_LIB}/gems/${DISTNAME}/test/xml/test_xpath.rb ${GEM_LIB}/gems/${DISTNAME}/test/xslt/ ${GEM_LIB}/gems/${DISTNAME}/test/xslt/test_custom_functions.rb ${GEM_LIB}/gems/${DISTNAME}/test/xslt/test_exception_handling.rb +${GEM_LIB}/gems/${DISTNAME}/test_all ${GEM_LIB}/specifications/${DISTNAME}.gemspec
