textproc/nokogiri111: make 1.11.x available and use it if required

9 files changed, 121 insertions, 3 deletions

diff --git a/devel/rubygem-cms_scanner/Makefile b/devel/rubygem-cms_scanner/Makefile
index 1d504f85f2ed..decc8dc406ae 100644
--- a/devel/rubygem-cms_scanner/Makefile
+++ b/devel/rubygem-cms_scanner/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cms_scanner
 PORTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -9,7 +10,7 @@ COMMENT=	Framework to provide an easy way to implement CMS Scanners
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-get_process_mem>=0.2.5<0.3:devel/rubygem-get_process_mem \
-		rubygem-nokogiri>=1.11.0<1.12:textproc/rubygem-nokogiri \
+		rubygem-nokogiri111>=1.11.0<1.12:textproc/rubygem-nokogiri111 \
 		rubygem-opt_parse_validator>=1.8.3<1.10:devel/rubygem-opt_parse_validator \
 		rubygem-public_suffix>=4.0.3<4.1:dns/rubygem-public_suffix \
 		rubygem-ruby-progressbar>=1.10.0<1.12:devel/rubygem-ruby-progressbar \
diff --git a/textproc/Makefile b/textproc/Makefile
index a1e0d9993d2d..a308ac49000c 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1703,6 +1703,7 @@
     SUBDIR += rubygem-minima
     SUBDIR += rubygem-multi_xml
     SUBDIR += rubygem-nokogiri
+    SUBDIR += rubygem-nokogiri111
     SUBDIR += rubygem-nokogiri-diff
     SUBDIR += rubygem-nokogumbo
     SUBDIR += rubygem-octopress-escape-code
diff --git a/textproc/rubygem-nokogiri111/Makefile b/textproc/rubygem-nokogiri111/Makefile
new file mode 100644
index 000000000000..8eb75fe7eddd
--- /dev/null
+++ b/textproc/rubygem-nokogiri111/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	nokogiri
+PORTVERSION=	1.11.7
+CATEGORIES=	textproc rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	111
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	HTML, XML, SAX, and Reader parser
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
+LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error
+# 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  \
+		rubygem-racc>=1.4<2:devel/rubygem-racc
+
+USES=		cpe gem gnome pkgconfig gettext-runtime
+USE_GNOME=	libxml2 libxslt
+USE_RUBY=	yes
+
+CONFIGURE_ARGS=	--use-system-libraries
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/nokogiri
+	${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -name '*.o' -o -name '*.so' | ${XARGS} ${STRIP_CMD}
+	${RMDIR} ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ports/
+
+PORTSCOUT=	limit:^1\.11\.
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-nokogiri111/distinfo b/textproc/rubygem-nokogiri111/distinfo
new file mode 100644
index 000000000000..0f15d01d5161
--- /dev/null
+++ b/textproc/rubygem-nokogiri111/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1625258881
+SHA256 (rubygem/nokogiri-1.11.7.gem) = 4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef
+SIZE (rubygem/nokogiri-1.11.7.gem) = 9353728
diff --git a/textproc/rubygem-nokogiri111/files/patch-ext_nokogiri_extconf.rb b/textproc/rubygem-nokogiri111/files/patch-ext_nokogiri_extconf.rb
new file mode 100644
index 000000000000..fc3898d63696
--- /dev/null
+++ b/textproc/rubygem-nokogiri111/files/patch-ext_nokogiri_extconf.rb
@@ -0,0 +1,46 @@
+--- ext/nokogiri/extconf.rb.orig	2022-01-26 09:35:58 UTC
++++ ext/nokogiri/extconf.rb
+@@ -891,6 +891,43 @@ unless config_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 config_clean?
diff --git a/textproc/rubygem-nokogiri111/files/patch-gemspec b/textproc/rubygem-nokogiri111/files/patch-gemspec
new file mode 100644
index 000000000000..9e9fef8a0f60
--- /dev/null
+++ b/textproc/rubygem-nokogiri111/files/patch-gemspec
@@ -0,0 +1,22 @@
+--- nokogiri.gemspec.orig	2022-01-26 09:41:30 UTC
++++ nokogiri.gemspec
+@@ -13,10 +13,9 @@ Gem::Specification.new do |s|
+   s.date = "2021-06-02"
+   s.description = "Nokogiri (\u92F8) makes it easy and painless to work with XML and HTML from Ruby. It provides a\nsensible, easy-to-understand API for reading, writing, modifying, and querying documents. It is\nfast and standards-compliant by relying on native parsers like libxml2 (C) and xerces (Java).\n".freeze
+   s.email = "nokogiri-talk@googlegroups.com".freeze
+-  s.executables = ["nokogiri".freeze]
+   s.extensions = ["ext/nokogiri/extconf.rb".freeze]
+   s.extra_rdoc_files = ["ext/nokogiri/xml_dtd.c".freeze, "ext/nokogiri/xml_xpath_context.c".freeze, "ext/nokogiri/xml_attr.c".freeze, "ext/nokogiri/libxml2_backwards_compat.c".freeze, "ext/nokogiri/xml_comment.c".freeze, "ext/nokogiri/nokogiri.c".freeze, "ext/nokogiri/xml_sax_parser_context.c".freeze, "ext/nokogiri/xml_node_set.c".freeze, "ext/nokogiri/xml_reader.c".freeze, "ext/nokogiri/xml_cdata.c".freeze, "ext/nokogiri/xml_element_content.c".freeze, "ext/nokogiri/html_entity_lookup.c".freeze, "ext/nokogiri/xml_namespace.c".freeze, "ext/nokogiri/xml_document.c".freeze, "ext/nokogiri/xml_element_decl.c".freeze, "ext/nokogiri/xml_schema.c".freeze, "ext/nokogiri/html_document.c".freeze, "ext/nokogiri/xml_processing_instruction.c".freeze, "ext/nokogiri/xml_text.c".freeze, "ext/nokogiri/xml_syntax_error.c".freeze, "ext/nokogiri/xml_document_fragment.c".freeze, "ext/nokogiri/xml_sax_push_parser.c".freeze, "ext/nokogiri/xml_encoding_handler.c".freeze, "ext/nokogiri/html_sax_push_parser.c".freeze, "ext/nokogiri/xml_relax_ng.c".freeze, "ext/nokogiri/xml_entity_decl.c".freeze, "ext/nokogiri/test_global_handlers.c".freeze, "ext/nokogiri/xml_node.c".freeze, "ext/nokogiri/xml_entity_reference.c".freeze, "ext/nokogiri/xslt_stylesheet.c".freeze, "ext/nokogiri/html_sax_parser_context.c".freeze, "ext/nokogiri/xml_sax_parser.c".freeze, "ext/nokogiri/xml_attribute_decl.c".freeze, "ext/nokogiri/html_element_description.c".freeze, "README.md".freeze]
+-  s.files = ["Gemfile".freeze, "LICENSE-DEPENDENCIES.md".freeze, "LICENSE.md".freeze, "README.md".freeze, "bin/nokogiri".freeze, "dependencies.yml".freeze, "ext/nokogiri/depend".freeze, "ext/nokogiri/extconf.rb".freeze, "ext/nokogiri/html_document.c".freeze, "ext/nokogiri/html_element_description.c".freeze, "ext/nokogiri/html_entity_lookup.c".freeze, "ext/nokogiri/html_sax_parser_context.c".freeze, "ext/nokogiri/html_sax_push_parser.c".freeze, "ext/nokogiri/libxml2_backwards_compat.c".freeze, "ext/nokogiri/nokogiri.c".freeze, "ext/nokogiri/nokogiri.h".freeze, "ext/nokogiri/test_global_handlers.c".freeze, "ext/nokogiri/xml_attr.c".freeze, "ext/nokogiri/xml_attribute_decl.c".freeze, "ext/nokogiri/xml_cdata.c".freeze, "ext/nokogiri/xml_comment.c".freeze, "ext/nokogiri/xml_document.c".freeze, "ext/nokogiri/xml_document_fragment.c".freeze, "ext/nokogiri/xml_dtd.c".freeze, "ext/nokogiri/xml_element_content.c".freeze, "ext/nokogiri/xml_element_decl.c".freeze, "ext/nokogiri/xml_encoding_handler.c".freeze, "ext/nokogiri/xml_entity_decl.c".freeze, "ext/nokogiri/xml_entity_reference.c".freeze, "ext/nokogiri/xml_namespace.c".freeze, "ext/nokogiri/xml_node.c".freeze, "ext/nokogiri/xml_node_set.c".freeze, "ext/nokogiri/xml_processing_instruction.c".freeze, "ext/nokogiri/xml_reader.c".freeze, "ext/nokogiri/xml_relax_ng.c".freeze, "ext/nokogiri/xml_sax_parser.c".freeze, "ext/nokogiri/xml_sax_parser_context.c".freeze, "ext/nokogiri/xml_sax_push_parser.c".freeze, "ext/nokogiri/xml_schema.c".freeze, "ext/nokogiri/xml_syntax_error.c".freeze, "ext/nokogiri/xml_text.c".freeze, "ext/nokogiri/xml_xpath_context.c".freeze, "ext/nokogiri/xslt_stylesheet.c".freeze, "lib/nokogiri.rb".freeze, "lib/nokogiri/css.rb".freeze, "lib/nokogiri/css/node.rb".freeze, "lib/nokogiri/css/parser.rb".freeze, "lib/nokogiri/css/parser.y".freeze, "lib/nokogiri/css/parser_extras.rb".freeze, "lib/nokogiri/css/syntax_error.rb".freeze, "lib/nokogiri/css/tokenizer.rb".freeze, "lib/nokogiri/css/tokenizer.rex".freeze, "lib/nokogiri/css/xpath_visitor.rb".freeze, "lib/nokogiri/decorators/slop.rb".freeze, "lib/nokogiri/extension.rb".freeze, "lib/nokogiri/html.rb".freeze, "lib/nokogiri/html/builder.rb".freeze, "lib/nokogiri/html/document.rb".freeze, "lib/nokogiri/html/document_fragment.rb".freeze, "lib/nokogiri/html/element_description.rb".freeze, "lib/nokogiri/html/element_description_defaults.rb".freeze, "lib/nokogiri/html/entity_lookup.rb".freeze, "lib/nokogiri/html/sax/parser.rb".freeze, "lib/nokogiri/html/sax/parser_context.rb".freeze, "lib/nokogiri/html/sax/push_parser.rb".freeze, "lib/nokogiri/jruby/dependencies.rb".freeze, "lib/nokogiri/syntax_error.rb".freeze, "lib/nokogiri/version.rb".freeze, "lib/nokogiri/version/constant.rb".freeze, "lib/nokogiri/version/info.rb".freeze, "lib/nokogiri/xml.rb".freeze, "lib/nokogiri/xml/attr.rb".freeze, "lib/nokogiri/xml/attribute_decl.rb".freeze, "lib/nokogiri/xml/builder.rb".freeze, "lib/nokogiri/xml/cdata.rb".freeze, "lib/nokogiri/xml/character_data.rb".freeze, "lib/nokogiri/xml/document.rb".freeze, "lib/nokogiri/xml/document_fragment.rb".freeze, "lib/nokogiri/xml/dtd.rb".freeze, "lib/nokogiri/xml/element_content.rb".freeze, "lib/nokogiri/xml/element_decl.rb".freeze, "lib/nokogiri/xml/entity_decl.rb".freeze, "lib/nokogiri/xml/entity_reference.rb".freeze, "lib/nokogiri/xml/namespace.rb".freeze, "lib/nokogiri/xml/node.rb".freeze, "lib/nokogiri/xml/node/save_options.rb".freeze, "lib/nokogiri/xml/node_set.rb".freeze, "lib/nokogiri/xml/notation.rb".freeze, "lib/nokogiri/xml/parse_options.rb".freeze, "lib/nokogiri/xml/pp.rb".freeze, "lib/nokogiri/xml/pp/character_data.rb".freeze, "lib/nokogiri/xml/pp/node.rb".freeze, "lib/nokogiri/xml/processing_instruction.rb".freeze, "lib/nokogiri/xml/reader.rb".freeze, "lib/nokogiri/xml/relax_ng.rb".freeze, "lib/nokogiri/xml/sax.rb".freeze, "lib/nokogiri/xml/sax/document.rb".freeze, "lib/nokogiri/xml/sax/parser.rb".freeze, "lib/nokogiri/xml/sax/parser_context.rb".freeze, "lib/nokogiri/xml/sax/push_parser.rb".freeze, "lib/nokogiri/xml/schema.rb".freeze, "lib/nokogiri/xml/searchable.rb".freeze, "lib/nokogiri/xml/syntax_error.rb".freeze, "lib/nokogiri/xml/text.rb".freeze, "lib/nokogiri/xml/xpath.rb".freeze, "lib/nokogiri/xml/xpath/syntax_error.rb".freeze, "lib/nokogiri/xml/xpath_context.rb".freeze, "lib/nokogiri/xslt.rb".freeze, "lib/nokogiri/xslt/stylesheet.rb".freeze, "lib/xsd/xmlparser/nokogiri.rb".freeze, "patches/libxml2/0001-Remove-script-macro-support.patch".freeze, "patches/libxml2/0002-Update-entities-to-remove-handling-of-ssi.patch".freeze, "patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch".freeze, "patches/libxml2/0004-use-glibc-strlen.patch".freeze, "patches/libxml2/0005-avoid-isnan-isinf.patch".freeze, "patches/libxml2/0006-update-automake-files-for-arm64.patch".freeze, "patches/libxml2/0007-Fix-XPath-recursion-limit.patch".freeze, "patches/libxslt/0001-update-automake-files-for-arm64.patch".freeze, "patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch".freeze, "ports/archives/libxml2-2.9.12.tar.gz".freeze, "ports/archives/libxslt-1.1.34.tar.gz".freeze]
++  s.files = ["Gemfile".freeze, "LICENSE-DEPENDENCIES.md".freeze, "LICENSE.md".freeze, "README.md".freeze, "dependencies.yml".freeze, "ext/nokogiri/depend".freeze, "ext/nokogiri/extconf.rb".freeze, "ext/nokogiri/html_document.c".freeze, "ext/nokogiri/html_element_description.c".freeze, "ext/nokogiri/html_entity_lookup.c".freeze, "ext/nokogiri/html_sax_parser_context.c".freeze, "ext/nokogiri/html_sax_push_parser.c".freeze, "ext/nokogiri/libxml2_backwards_compat.c".freeze, "ext/nokogiri/nokogiri.c".freeze, "ext/nokogiri/nokogiri.h".freeze, "ext/nokogiri/test_global_handlers.c".freeze, "ext/nokogiri/xml_attr.c".freeze, "ext/nokogiri/xml_attribute_decl.c".freeze, "ext/nokogiri/xml_cdata.c".freeze, "ext/nokogiri/xml_comment.c".freeze, "ext/nokogiri/xml_document.c".freeze, "ext/nokogiri/xml_document_fragment.c".freeze, "ext/nokogiri/xml_dtd.c".freeze, "ext/nokogiri/xml_element_content.c".freeze, "ext/nokogiri/xml_element_decl.c".freeze, "ext/nokogiri/xml_encoding_handler.c".freeze, "ext/nokogiri/xml_entity_decl.c".freeze, "ext/nokogiri/xml_entity_reference.c".freeze, "ext/nokogiri/xml_namespace.c".freeze, "ext/nokogiri/xml_node.c".freeze, "ext/nokogiri/xml_node_set.c".freeze, "ext/nokogiri/xml_processing_instruction.c".freeze, "ext/nokogiri/xml_reader.c".freeze, "ext/nokogiri/xml_relax_ng.c".freeze, "ext/nokogiri/xml_sax_parser.c".freeze, "ext/nokogiri/xml_sax_parser_context.c".freeze, "ext/nokogiri/xml_sax_push_parser.c".freeze, "ext/nokogiri/xml_schema.c".freeze, "ext/nokogiri/xml_syntax_error.c".freeze, "ext/nokogiri/xml_text.c".freeze, "ext/nokogiri/xml_xpath_context.c".freeze, "ext/nokogiri/xslt_stylesheet.c".freeze, "lib/nokogiri.rb".freeze, "lib/nokogiri/css.rb".freeze, "lib/nokogiri/css/node.rb".freeze, "lib/nokogiri/css/parser.rb".freeze, "lib/nokogiri/css/parser.y".freeze, "lib/nokogiri/css/parser_extras.rb".freeze, "lib/nokogiri/css/syntax_error.rb".freeze, "lib/nokogiri/css/tokenizer.rb".freeze, "lib/nokogiri/css/tokenizer.rex".freeze, "lib/nokogiri/css/xpath_visitor.rb".freeze, "lib/nokogiri/decorators/slop.rb".freeze, "lib/nokogiri/extension.rb".freeze, "lib/nokogiri/html.rb".freeze, "lib/nokogiri/html/builder.rb".freeze, "lib/nokogiri/html/document.rb".freeze, "lib/nokogiri/html/document_fragment.rb".freeze, "lib/nokogiri/html/element_description.rb".freeze, "lib/nokogiri/html/element_description_defaults.rb".freeze, "lib/nokogiri/html/entity_lookup.rb".freeze, "lib/nokogiri/html/sax/parser.rb".freeze, "lib/nokogiri/html/sax/parser_context.rb".freeze, "lib/nokogiri/html/sax/push_parser.rb".freeze, "lib/nokogiri/jruby/dependencies.rb".freeze, "lib/nokogiri/syntax_error.rb".freeze, "lib/nokogiri/version.rb".freeze, "lib/nokogiri/version/constant.rb".freeze, "lib/nokogiri/version/info.rb".freeze, "lib/nokogiri/xml.rb".freeze, "lib/nokogiri/xml/attr.rb".freeze, "lib/nokogiri/xml/attribute_decl.rb".freeze, "lib/nokogiri/xml/builder.rb".freeze, "lib/nokogiri/xml/cdata.rb".freeze, "lib/nokogiri/xml/character_data.rb".freeze, "lib/nokogiri/xml/document.rb".freeze, "lib/nokogiri/xml/document_fragment.rb".freeze, "lib/nokogiri/xml/dtd.rb".freeze, "lib/nokogiri/xml/element_content.rb".freeze, "lib/nokogiri/xml/element_decl.rb".freeze, "lib/nokogiri/xml/entity_decl.rb".freeze, "lib/nokogiri/xml/entity_reference.rb".freeze, "lib/nokogiri/xml/namespace.rb".freeze, "lib/nokogiri/xml/node.rb".freeze, "lib/nokogiri/xml/node/save_options.rb".freeze, "lib/nokogiri/xml/node_set.rb".freeze, "lib/nokogiri/xml/notation.rb".freeze, "lib/nokogiri/xml/parse_options.rb".freeze, "lib/nokogiri/xml/pp.rb".freeze, "lib/nokogiri/xml/pp/character_data.rb".freeze, "lib/nokogiri/xml/pp/node.rb".freeze, "lib/nokogiri/xml/processing_instruction.rb".freeze, "lib/nokogiri/xml/reader.rb".freeze, "lib/nokogiri/xml/relax_ng.rb".freeze, "lib/nokogiri/xml/sax.rb".freeze, "lib/nokogiri/xml/sax/document.rb".freeze, "lib/nokogiri/xml/sax/parser.rb".freeze, "lib/nokogiri/xml/sax/parser_context.rb".freeze, "lib/nokogiri/xml/sax/push_parser.rb".freeze, "lib/nokogiri/xml/schema.rb".freeze, "lib/nokogiri/xml/searchable.rb".freeze, "lib/nokogiri/xml/syntax_error.rb".freeze, "lib/nokogiri/xml/text.rb".freeze, "lib/nokogiri/xml/xpath.rb".freeze, "lib/nokogiri/xml/xpath/syntax_error.rb".freeze, "lib/nokogiri/xml/xpath_context.rb".freeze, "lib/nokogiri/xslt.rb".freeze, "lib/nokogiri/xslt/stylesheet.rb".freeze, "lib/xsd/xmlparser/nokogiri.rb".freeze, "patches/libxml2/0001-Remove-script-macro-support.patch".freeze, "patches/libxml2/0002-Update-entities-to-remove-handling-of-ssi.patch".freeze, "patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch".freeze, "patches/libxml2/0004-use-glibc-strlen.patch".freeze, "patches/libxml2/0005-avoid-isnan-isinf.patch".freeze, "patches/libxml2/0006-update-automake-files-for-arm64.patch".freeze, "patches/libxml2/0007-Fix-XPath-recursion-limit.patch".freeze, "patches/libxslt/0001-update-automake-files-for-arm64.patch".freeze, "patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch".freeze, "ports/archives/libxml2-2.9.12.tar.gz".freeze, "ports/archives/libxslt-1.1.34.tar.gz".freeze]
+   s.homepage = "https://nokogiri.org".freeze
+   s.licenses = ["MIT".freeze]
+   s.rdoc_options = ["--main".freeze, "README.md".freeze]
+@@ -29,7 +28,6 @@ Gem::Specification.new do |s|
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       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.4"])
diff --git a/textproc/rubygem-nokogiri111/pkg-descr b/textproc/rubygem-nokogiri111/pkg-descr
new file mode 100644
index 000000000000..924c426e28f6
--- /dev/null
+++ b/textproc/rubygem-nokogiri111/pkg-descr
@@ -0,0 +1,9 @@
+* XPath support for document searching
+* CSS3 selector support for document searching
+* XML/HTML builder
+* Drop in replacement for Hpricot (though not bug for bug)
+
+Nokogiri parses and searches XML/HTML very quickly, and also has
+correctly implemented CSS3 selector support as well as XPath support.
+
+WWW: https://nokogiri.org/
diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile
index dc45d0e7d5d9..b9b8220738e8 100644
--- a/www/redmine4/Makefile
+++ b/www/redmine4/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	redmine
 PORTVERSION=	4.1.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	4
@@ -21,7 +22,7 @@ RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-roadie-rails-rails52>=2.1.0:mail/rubygem-roadie-rails-rails52 \
 		rubygem-mail>=2.7.1:mail/rubygem-mail \
 		rubygem-csv>=3.1.1:devel/rubygem-csv \
-		rubygem-nokogiri>=1.11.0:textproc/rubygem-nokogiri \
+		rubygem-nokogiri111>=1.11.0:textproc/rubygem-nokogiri111 \
 		rubygem-i18n>=0.7:devel/rubygem-i18n \
 		rubygem-rbpdf>=1.19.6:print/rubygem-rbpdf \
 		rubygem-net-ldap>=0.16:net/rubygem-net-ldap \
diff --git a/www/redmine42/Makefile b/www/redmine42/Makefile
index 889c127d2e71..59bf1d3b1d05 100644
--- a/www/redmine42/Makefile
+++ b/www/redmine42/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	redmine
 PORTVERSION=	4.2.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	42
@@ -19,7 +20,7 @@ RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-roadie-rails-rails52>=2.1.0:mail/rubygem-roadie-rails-rails52 \
 		rubygem-mail>=2.7.1:mail/rubygem-mail \
 		rubygem-csv>=3.1.1:devel/rubygem-csv \
-		rubygem-nokogiri>=1.11.0:textproc/rubygem-nokogiri \
+		rubygem-nokogiri111>=1.11.0:textproc/rubygem-nokogiri111 \
 		rubygem-i18n>=0.7:devel/rubygem-i18n \
 		rubygem-rbpdf>=1.19.6:print/rubygem-rbpdf \
 		rubygem-net-ldap>=0.16:net/rubygem-net-ldap \