Date: Wed, 26 Jan 2022 10:43:27 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 02909341cfa4 - main - textproc/rubygem-nokogiri: update to 1.13.1 Message-ID: <202201261043.20QAhRMu015612@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=02909341cfa4bc6a30935c72339c5ef622195feb commit 02909341cfa4bc6a30935c72339c5ef622195feb Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2022-01-26 07:08:10 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2022-01-26 10:43:00 +0000 textproc/rubygem-nokogiri: update to 1.13.1 Required for gitlab-ce 14.7. Changelog: https://nokogiri.org/CHANGELOG.html --- textproc/rubygem-nokogiri/Makefile | 8 ++-- textproc/rubygem-nokogiri/distinfo | 6 +-- .../files/patch-ext_nokogiri_extconf.rb | 46 ---------------------- .../{patch-gemspec => patch-nokogiri.gemspec} | 10 ++--- 4 files changed, 13 insertions(+), 57 deletions(-) diff --git a/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile index d7010318209e..f853565f9eeb 100644 --- a/textproc/rubygem-nokogiri/Makefile +++ b/textproc/rubygem-nokogiri/Makefile @@ -1,5 +1,5 @@ PORTNAME= nokogiri -PORTVERSION= 1.11.7 +PORTVERSION= 1.13.1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -9,9 +9,11 @@ COMMENT= HTML, XML, SAX, and Reader parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${RUN_DEPENDS} +BUILD_DEPENDS= ${RUN_DEPENDS} \ + rubygem-mini_portile2>=2.7.0<2.8:devel/rubygem-mini_portile2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error + libgpg-error.so:security/libgpg-error \ + libxml2.so:textproc/libxml2 # Do not add mini_portile2 to RUN_DEPENDS. Read ext/nokogiri/extconf.rb # and https://lists.freebsd.org/pipermail/svn-ports-all/2019-March/209423.html RUN_DEPENDS= rubygem-pkg-config>=1.1.7:devel/rubygem-pkg-config \ diff --git a/textproc/rubygem-nokogiri/distinfo b/textproc/rubygem-nokogiri/distinfo index 0f15d01d5161..9aa480f8ab07 100644 --- a/textproc/rubygem-nokogiri/distinfo +++ b/textproc/rubygem-nokogiri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625258881 -SHA256 (rubygem/nokogiri-1.11.7.gem) = 4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef -SIZE (rubygem/nokogiri-1.11.7.gem) = 9353728 +TIMESTAMP = 1642778303 +SHA256 (rubygem/nokogiri-1.13.1.gem) = 2138bb8e1bd5f11c2dc57a6a7ed93ddce35825dae7d25262658d89a222571fff +SIZE (rubygem/nokogiri-1.13.1.gem) = 9598976 diff --git a/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb b/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb deleted file mode 100644 index c0070a9b7bf0..000000000000 --- a/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb +++ /dev/null @@ -1,46 +0,0 @@ ---- ext/nokogiri/extconf.rb.orig 2021-01-21 20:37:43 UTC -+++ ext/nokogiri/extconf.rb -@@ -819,6 +819,43 @@ unless using_system_libraries? - end - end - -+$INSTALLFILES = [ -+ ['html_document.h', '$(archdir)'], -+ ['html_element_description.h', '$(archdir)'], -+ ['html_entity_lookup.h', '$(archdir)'], -+ ['html_sax_parser_context.h', '$(archdir)'], -+ ['html_sax_push_parser.h', '$(archdir)'], -+ ['nokogiri.h', '$(archdir)'], -+ ['xml_attr.h', '$(archdir)'], -+ ['xml_attribute_decl.h', '$(archdir)'], -+ ['xml_cdata.h', '$(archdir)'], -+ ['xml_comment.h', '$(archdir)'], -+ ['xml_document.h', '$(archdir)'], -+ ['xml_document_fragment.h', '$(archdir)'], -+ ['xml_dtd.h', '$(archdir)'], -+ ['xml_element_content.h', '$(archdir)'], -+ ['xml_element_decl.h', '$(archdir)'], -+ ['xml_encoding_handler.h', '$(archdir)'], -+ ['xml_entity_decl.h', '$(archdir)'], -+ ['xml_entity_reference.h', '$(archdir)'], -+ ['xml_io.h', '$(archdir)'], -+ ['xml_libxml2_hacks.h', '$(archdir)'], -+ ['xml_namespace.h', '$(archdir)'], -+ ['xml_node.h', '$(archdir)'], -+ ['xml_node_set.h', '$(archdir)'], -+ ['xml_processing_instruction.h', '$(archdir)'], -+ ['xml_reader.h', '$(archdir)'], -+ ['xml_relax_ng.h', '$(archdir)'], -+ ['xml_sax_parser.h', '$(archdir)'], -+ ['xml_sax_parser_context.h', '$(archdir)'], -+ ['xml_sax_push_parser.h', '$(archdir)'], -+ ['xml_schema.h', '$(archdir)'], -+ ['xml_syntax_error.h', '$(archdir)'], -+ ['xml_text.h', '$(archdir)'], -+ ['xml_xpath_context.h', '$(archdir)'], -+ ['xslt_stylesheet.h', '$(archdir)'], -+] -+ - create_makefile('nokogiri/nokogiri') - - if enable_config('clean', true) diff --git a/textproc/rubygem-nokogiri/files/patch-gemspec b/textproc/rubygem-nokogiri/files/patch-nokogiri.gemspec similarity index 65% rename from textproc/rubygem-nokogiri/files/patch-gemspec rename to textproc/rubygem-nokogiri/files/patch-nokogiri.gemspec index 43f56f9a0877..1d4bb8983267 100644 --- a/textproc/rubygem-nokogiri/files/patch-gemspec +++ b/textproc/rubygem-nokogiri/files/patch-nokogiri.gemspec @@ -1,10 +1,10 @@ ---- nokogiri.gemspec.orig 2021-01-21 20:37:44 UTC +--- nokogiri.gemspec.orig 2022-01-25 20:08:49 UTC +++ nokogiri.gemspec -@@ -29,7 +29,6 @@ Gem::Specification.new do |s| +@@ -28,7 +28,6 @@ Gem::Specification.new do |s| + s.specification_version = 4 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q<mini_portile2>.freeze, ["~> 2.7.0"]) s.add_runtime_dependency(%q<racc>.freeze, ["~> 1.4"]) -- s.add_runtime_dependency(%q<mini_portile2>.freeze, ["~> 2.5.0"]) s.add_development_dependency(%q<bundler>.freeze, ["~> 2.2"]) - s.add_development_dependency(%q<concourse>.freeze, ["~> 0.41"]) - s.add_development_dependency(%q<hoe-markdown>.freeze, ["~> 1.1"]) + s.add_development_dependency(%q<hoe-markdown>.freeze, ["~> 1.4"])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201261043.20QAhRMu015612>