diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -233,11 +233,7 @@ RUBY_MODNAME?= ${PORTNAME} # Commands -.if ${RUBY_VER} < 2.7 -RUBY_RDOC?= ${LOCALBASE}/bin/rdoc${RUBY_VER:S/.//} -.else RUBY_RDOC?= ${LOCALBASE}/bin/rdoc -.endif # Ports RUBY_BASE_PORT?= lang/ruby${RUBY_VER:S/.//} diff --git a/devel/rubygem-dry-configurable/Makefile b/devel/rubygem-dry-configurable/Makefile --- a/devel/rubygem-dry-configurable/Makefile +++ b/devel/rubygem-dry-configurable/Makefile @@ -11,8 +11,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_RUBY26= yes - RUN_DEPENDS= rubygem-concurrent-ruby>=1.0<2:devel/rubygem-concurrent-ruby \ rubygem-dry-core>=0.6<1:devel/rubygem-dry-core diff --git a/devel/rubygem-error_highlight/Makefile b/devel/rubygem-error_highlight/Makefile --- a/devel/rubygem-error_highlight/Makefile +++ b/devel/rubygem-error_highlight/Makefile @@ -12,7 +12,6 @@ LICENSE_COMB= dual LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE.txt -BROKEN_RUBY26= yes BROKEN_RUBY27= yes BROKEN_RUBY30= yes diff --git a/devel/rubygem-gem-compare/Makefile b/devel/rubygem-gem-compare/Makefile --- a/devel/rubygem-gem-compare/Makefile +++ b/devel/rubygem-gem-compare/Makefile @@ -9,7 +9,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_RUBY26= yes BROKEN_RUBY27= yes RUN_DEPENDS= rubygem-curb>=0:ftp/rubygem-curb \ diff --git a/devel/rubygem-irb/Makefile b/devel/rubygem-irb/Makefile --- a/devel/rubygem-irb/Makefile +++ b/devel/rubygem-irb/Makefile @@ -16,21 +16,11 @@ NO_ARCH= yes -.include - -.if ${RUBY_VER} >= 2.7 PLIST_FILES= bin/irb \ share/man/man1/irb.1.gz post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/man/irb.1 ${STAGEDIR}${PREFIX}/share/man/man1 -.elif ${RUBY_VER} == 2.6 -# WIP: irb wrapper script is installed by ruby port so far, see bug 241554, 237833 -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/irb -.else -IGNORE= ${PORTNAME} is included in ${RUBY_PORT} -.endif -.include +.include diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile --- a/devel/rubygem-rdoc/Makefile +++ b/devel/rubygem-rdoc/Makefile @@ -19,21 +19,10 @@ CPE_VENDOR= ruby-lang -.include - -.if ${RUBY_VER} >= 2.7 PLIST_FILES= bin/rdoc bin/ri share/man/man1/ri.1.gz post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/man/ri.1 ${STAGEDIR}${PREFIX}/share/man/man1 -.elif ${RUBY_VER} == 2.6 -# WIP: rdoc wrapper script is installed by ruby port so far, see bug 241554, 237833 -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri -.else -IGNORE= ${PORTNAME} is included in ${RUBY_PORT} -.endif - -.include +.include diff --git a/devel/rubygem-xdg/Makefile b/devel/rubygem-xdg/Makefile --- a/devel/rubygem-xdg/Makefile +++ b/devel/rubygem-xdg/Makefile @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.adoc LICENSE_PERMS= auto-accept dist-mirror pkg-mirror -BROKEN_RUBY26= yes BROKEN_RUBY27= yes BROKEN_RUBY30= yes diff --git a/devel/rubygem-xdg4/Makefile b/devel/rubygem-xdg4/Makefile --- a/devel/rubygem-xdg4/Makefile +++ b/devel/rubygem-xdg4/Makefile @@ -13,8 +13,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.adoc -BROKEN_RUBY26= yes - USES= gem USE_RUBY= yes diff --git a/devel/rubygem-xdg5/Makefile b/devel/rubygem-xdg5/Makefile --- a/devel/rubygem-xdg5/Makefile +++ b/devel/rubygem-xdg5/Makefile @@ -12,7 +12,6 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.adoc -BROKEN_RUBY26= yes BROKEN_RUBY27= yes USES= gem diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile --- a/mail/rubygem-tmail/Makefile +++ b/mail/rubygem-tmail/Makefile @@ -8,6 +8,9 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= RFC2822/MIME compliant mail manipulating library for Ruby +DEPRECATED= Broken with all supported versions of Ruby +EXPIRATION_DATE= 2022-06-30 + # Seems to be a dead project, last upgrade 2010-02-07 and homepage does not load anymore: # https://rubygems.org/gems/tmail, http://tmail.rubyforge.org/ BROKEN_RUBY27= yes diff --git a/security/ruby-bitwarden/Makefile b/security/ruby-bitwarden/Makefile --- a/security/ruby-bitwarden/Makefile +++ b/security/ruby-bitwarden/Makefile @@ -10,6 +10,9 @@ LICENSE= ISCL +DEPRECATED= Broken with all supported versions of Ruby +EXPIRATION_DATE= 2022-06-30 + # Port is not maintained anymore: # https://github.com/jcs/rubywarden BROKEN_RUBY27= yes diff --git a/www/rubygem-importmap-rails/Makefile b/www/rubygem-importmap-rails/Makefile --- a/www/rubygem-importmap-rails/Makefile +++ b/www/rubygem-importmap-rails/Makefile @@ -11,8 +11,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -BROKEN_RUBY26= yes - RUN_DEPENDS= rubygem-actionpack70>=6.0.0:www/rubygem-actionpack70 \ rubygem-railties70>=6.0.0:www/rubygem-railties70 diff --git a/www/rubygem-propshaft/Makefile b/www/rubygem-propshaft/Makefile --- a/www/rubygem-propshaft/Makefile +++ b/www/rubygem-propshaft/Makefile @@ -11,8 +11,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -BROKEN_RUBY26= yes - RUN_DEPENDS= rubygem-actionpack70>=7.0.0:www/rubygem-actionpack70 \ rubygem-activesupport70>=7.0.0:devel/rubygem-activesupport70 \ rubygem-rack>=0,3:www/rubygem-rack \