From nobody Wed Jan 26 10:43:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C29571983CA2; Wed, 26 Jan 2022 10:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JkL0v4J5pz58YX; Wed, 26 Jan 2022 10:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643193807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uJQUQb3ZlrgZcc8s59u2iMf5E9U1sL//z+FqoCPtx8Y=; b=ulijhKFidv4bQhaMAHYuqHkJTTkPXCePSCHcAKForFOHp+MtrS535dtUaTspwMgr+SeM2I 5N/sFJGcd8EEnzGZe2ZdYfIUM27dns6Mw8Q9GdpYlZBDGue/sMTkONV6sVQ6EnIcRV+XEj 9PMz9PhssRVLsi6meCIQutGfhU/lglP0U+17Z4Tm6VywP2F88x4W3sGyQzjLE18JVwtFuy yHtYYGFewh2CZBim8KSMMDH9xP8aTfK2m0VhUujI95payKuDo9MHZjufguuZyntR+GGr6b RIBNzGWDxg5in7pacyrMvQbG8NloXm7oAUJHGQgcpGWmGPZSPo4uytN2t+5iEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67C501BEA6; Wed, 26 Jan 2022 10:43:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QAhRm4015613; Wed, 26 Jan 2022 10:43:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QAhRMu015612; Wed, 26 Jan 2022 10:43:27 GMT (envelope-from git) Date: Wed, 26 Jan 2022 10:43:27 GMT Message-Id: <202201261043.20QAhRMu015612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 02909341cfa4 - main - textproc/rubygem-nokogiri: update to 1.13.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02909341cfa4bc6a30935c72339c5ef622195feb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643193807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uJQUQb3ZlrgZcc8s59u2iMf5E9U1sL//z+FqoCPtx8Y=; b=c7vv1EbKeceJDzfRgO9dqdmP/iWute/0eLUXhjj9/sC+GdFly2hMtN74gdmXia9MdIGfwv Om/EY/L5LcyxdGuxBiweIuKVka6Dh9SXrdhcNZuybXkBI19xJ21T4BqoZw9B7gmhiDO1Az YtTCHiAEIK3fRkl/T1gAwufdXuM90vSkzs/SppUA/DqG7wNsn+8R96yruPYUilOxQXX9Gp MYKMh5SHr70LDP/UuSYa/AT26ISgtzD/wRvcYsXapY9ViXJKRJKELGto9B+A1RdvmUcYG5 0P4eHDKqdir2nYZ3862S4T7WEU5kVeEtgWRTuLpeS8AdMbzm1lLN3qvU+VyoRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643193807; a=rsa-sha256; cv=none; b=mb9EErvrl2NcQKJIy5+URfV2iHIYNrd4wYae6naS9UisGprUSoViqfeKg37RxwpAGQkKqF +/LyDlB1PCha6amcyBHiRiZbsWAvSpnhlQAlTc5aJ5s46NSOic9Sv/j0iqqq0Ngg7DHTua onHvdWLfZGYw4NDosIBZ+rf5lFKw2WPH2PfjnnCelHA896Qbt65H8nkWrsOlKzj0xHXWHH 1J7EaX/LXkr1dZKotM07Wll0CuCFsCTtGOWOcO9GdSemCGvDgWswrYitrSQR4C6j9j7SZj AuU0j9PUqyQWMBcau3LRrqUD4QDfSwDgNxYT603bYI2+nmP+qzZ6fKLACmehLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=02909341cfa4bc6a30935c72339c5ef622195feb commit 02909341cfa4bc6a30935c72339c5ef622195feb Author: Matthias Fechner AuthorDate: 2022-01-26 07:08:10 +0000 Commit: Matthias Fechner 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.freeze, ["~> 2.7.0"]) s.add_runtime_dependency(%q.freeze, ["~> 1.4"]) -- s.add_runtime_dependency(%q.freeze, ["~> 2.5.0"]) s.add_development_dependency(%q.freeze, ["~> 2.2"]) - s.add_development_dependency(%q.freeze, ["~> 0.41"]) - s.add_development_dependency(%q.freeze, ["~> 1.1"]) + s.add_development_dependency(%q.freeze, ["~> 1.4"])