This updates nokogiri to the latest version. Rails 4.2 is going to require nokogiri 1.6+ (well, at least the beta version does). Note that nokogiri 1.6+ is not supported on ruby 1.8, so before this goes in I'll make sure nokogiri is not built by default on ruby 1.8.
Changelog at https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc Tested on i386 and amd64. Will be committing later in the week unless I hear objections. Thanks, Jeremy Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 15 Jan 2014 02:13:58 -0000 1.21 +++ Makefile 23 Sep 2014 16:18:39 -0000 @@ -2,30 +2,27 @@ COMMENT= HTML, XML, SAX and Reader parser -DISTNAME= nokogiri-1.5.6 -REVISION = 2 +DISTNAME= nokogiri-1.6.3.1 CATEGORIES= textproc -HOMEPAGE= http://nokogiri.rubyforge.org/nokogiri +HOMEPAGE= http://nokogiri.org/ MAINTAINER = Jeremy Evans <jer...@openbsd.org> # BSD PERMIT_PACKAGE_CDROM= Yes -WANTLIB= xml2 exslt xslt z +WANTLIB= exslt gcrypt gpg-error xml2 xslt z LIB_DEPENDS= textproc/libxslt -BUILD_DEPENDS= ${MODRUBY_RAKE_DEPENDS} - MODULES= lang/ruby converters/libiconv CONFIGURE_STYLE= ruby gem ext +CONFIGURE_ARGS= --use-system-libraries -MODRUBY_TEST= rake -TEST_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-rdoc,${MODRUBY_FLAVOR}>=3.0.0 +TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} +MODRUBY_TEST= ruby +MODRUBY_TEST_TARGET= -I test -rnokogiri -e 'ARGV.each{|path| require path}' \ + ./test/test_*.rb ./test/*/test_*.rb .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 9 Jan 2013 17:39:57 -0000 1.7 +++ distinfo 23 Sep 2014 16:18:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (nokogiri-1.5.6.gem) = KKuZ7roicLM2+PlhLltK79xnOnMZrYdL9MYJIiaCZYg= -SIZE (nokogiri-1.5.6.gem) = 217600 +SHA256 (nokogiri-1.6.3.1.gem) = kXYaZUQ5QGtb7XGt9gktSYKeJjMrTA58iiOi5ihEJYU= +SIZE (nokogiri-1.6.3.1.gem) = 8755200 Index: patches/patch-Rakefile =================================================================== RCS file: patches/patch-Rakefile diff -N patches/patch-Rakefile --- patches/patch-Rakefile 9 Jan 2013 17:39:57 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-Rakefile,v 1.4 2013/01/09 17:39:57 jeremy Exp $ - -Allow regress tests to work. - ---- Rakefile.orig Wed Dec 31 16:00:00 1969 -+++ Rakefile Thu Dec 20 08:49:16 2012 -@@ -52,6 +52,7 @@ HOE = Hoe.spec 'nokogiri' do - ["racc", ">= 1.4.6"], - ["rexical", ">= 1.0.5"] - ] -+ self.extra_dev_deps = [] - - if java? - self.spec_extras = { :platform => 'java' } -@@ -88,6 +89,7 @@ else - mingw_available = true - begin - require 'tasks/cross_compile' -+ raise - rescue - mingw_available = false - end Index: patches/patch-_metadata =================================================================== RCS file: patches/patch-_metadata diff -N patches/patch-_metadata --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-_metadata 23 Sep 2014 16:07:16 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Don't runtime depend on mini_portile, it's only needed for compiling +the extension. + +--- .metadata.orig Tue Sep 23 09:06:12 2014 ++++ .metadata Tue Sep 23 09:06:20 2014 +@@ -21,7 +21,7 @@ dependencies: + - - '=' + - !ruby/object:Gem::Version + version: 0.6.0 +- type: :runtime ++ type: :development + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/ruby-nokogiri/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 11 Jan 2014 22:51:03 -0000 1.8 +++ pkg/PLIST 23 Sep 2014 15:42:46 -0000 @@ -3,10 +3,13 @@ ${GEM_BIN}/nokogiri${GEM_BIN_SUFFIX} ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ ${GEM_LIB}/gems/${DISTNAME}/.autotest +${GEM_LIB}/gems/${DISTNAME}/.editorconfig ${GEM_LIB}/gems/${DISTNAME}/.gemtest +${GEM_LIB}/gems/${DISTNAME}/.travis.yml ${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}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/Manifest.txt ${GEM_LIB}/gems/${DISTNAME}/README.ja.rdoc ${GEM_LIB}/gems/${DISTNAME}/README.rdoc @@ -17,6 +20,7 @@ ${GEM_LIB}/gems/${DISTNAME}/Y_U_NO_GEMSP ${GEM_LIB}/gems/${DISTNAME}/bin/ ${GEM_LIB}/gems/${DISTNAME}/bin/nokogiri ${GEM_LIB}/gems/${DISTNAME}/build_all +${GEM_LIB}/gems/${DISTNAME}/dependencies.yml ${GEM_LIB}/gems/${DISTNAME}/lib/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri/ ${GEM_LIB}/gems/${DISTNAME}/lib/nokogiri.rb @@ -94,7 +98,6 @@ ${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}/tasks/ -${GEM_LIB}/gems/${DISTNAME}/tasks/cross_compile.rb ${GEM_LIB}/gems/${DISTNAME}/tasks/nokogiri.org.rb ${GEM_LIB}/gems/${DISTNAME}/tasks/test.rb ${GEM_LIB}/gems/${DISTNAME}/test/ @@ -109,8 +112,10 @@ ${GEM_LIB}/gems/${DISTNAME}/test/files/ ${GEM_LIB}/gems/${DISTNAME}/test/files/2ch.html ${GEM_LIB}/gems/${DISTNAME}/test/files/address_book.rlx ${GEM_LIB}/gems/${DISTNAME}/test/files/address_book.xml +${GEM_LIB}/gems/${DISTNAME}/test/files/atom.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/bar/ ${GEM_LIB}/gems/${DISTNAME}/test/files/bar/bar.xsd +${GEM_LIB}/gems/${DISTNAME}/test/files/bogus.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/dont_hurt_em_why.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/encoding.html ${GEM_LIB}/gems/${DISTNAME}/test/files/encoding.xhtml @@ -122,8 +127,15 @@ ${GEM_LIB}/gems/${DISTNAME}/test/files/m ${GEM_LIB}/gems/${DISTNAME}/test/files/noencoding.html ${GEM_LIB}/gems/${DISTNAME}/test/files/po.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/po.xsd +${GEM_LIB}/gems/${DISTNAME}/test/files/saml/ +${GEM_LIB}/gems/${DISTNAME}/test/files/saml/saml20assertion_schema.xsd +${GEM_LIB}/gems/${DISTNAME}/test/files/saml/saml20protocol_schema.xsd +${GEM_LIB}/gems/${DISTNAME}/test/files/saml/xenc_schema.xsd +${GEM_LIB}/gems/${DISTNAME}/test/files/saml/xmldsig_schema.xsd ${GEM_LIB}/gems/${DISTNAME}/test/files/shift_jis.html ${GEM_LIB}/gems/${DISTNAME}/test/files/shift_jis.xml +${GEM_LIB}/gems/${DISTNAME}/test/files/shift_jis_no_charset.html +${GEM_LIB}/gems/${DISTNAME}/test/files/slow-xpath.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/snuggles.xml ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.dtd ${GEM_LIB}/gems/${DISTNAME}/test/files/staff.xml @@ -149,6 +161,14 @@ ${GEM_LIB}/gems/${DISTNAME}/test/html/te ${GEM_LIB}/gems/${DISTNAME}/test/html/test_named_characters.rb ${GEM_LIB}/gems/${DISTNAME}/test/html/test_node.rb ${GEM_LIB}/gems/${DISTNAME}/test/html/test_node_encoding.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/ +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_additional_namespaces_in_builder_doc.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_namespaces_aliased_default.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_namespaces_in_builder_doc.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_namespaces_in_cloned_doc.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_namespaces_in_created_doc.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_namespaces_in_parsed_doc.rb +${GEM_LIB}/gems/${DISTNAME}/test/namespaces/test_namespaces_preservation.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_convert_xpath.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_css_cache.rb ${GEM_LIB}/gems/${DISTNAME}/test/test_encoding_handler.rb
