Rename rubygem port to match the rules.

If a port depends on rails it should have a suffix for the rails version.
This suffix should be separated from a old version like 1-rails4 instead of 1.

20 files changed, 25 insertions, 15 deletions

diff --git a/MOVED b/MOVED
index 9e4edd0edb13..4de69f8cad07 100644
--- a/MOVED
+++ b/MOVED
@@ -14452,3 +14452,8 @@ x11-toolkits/py-kiwi-gtk||2020-03-01|Has expired: Old, uses EOLed python27
 x11-toolkits/py-vte||2020-03-01|Has expired: Old, uses EOLed python27
 irc/gseen.mod||2020-03-01|Removed, unmaintained and does not build with irc/eggdrop
 irc/eggdrop16|irc/eggdrop|2020-03-01|Has expired: Outdated, use irc/eggdrop instead
+mail/rubygem-roadie-rails|mail/rubygem-roadie-rails-rails4|2020-03-02|Renamed to match rubygem name convention
+mail/rubygem-roadie-rails52|mail/rubygem-roadie-rails-rails52|2020-03-02|Renamed to match rubygem name convention
+textproc/rubygem-actionpack-xml_parser|textproc/rubygem-actionpack-xml_parser-rails5|2020-03-02|Renamed to match rubygem name convention
+textproc/rubygem-actionpack-xml_parser1|textproc/rubygem-actionpack-xml_parser1-rails4|2020-03-02|Renamed to match rubygem name convention
+textproc/rubygem-actionpack-xml_parser52|textproc/rubygem-actionpack-xml_parser-rails52|2020-03-02|Renamed to match rubygem name convention
diff --git a/mail/Makefile b/mail/Makefile
index 7e0a05d23ded..146e676049f7 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -599,8 +599,8 @@
     SUBDIR += rubygem-premailer-rails-rails60
     SUBDIR += rubygem-rmail
     SUBDIR += rubygem-roadie
-    SUBDIR += rubygem-roadie-rails
-    SUBDIR += rubygem-roadie-rails52
+    SUBDIR += rubygem-roadie-rails-rails4
+    SUBDIR += rubygem-roadie-rails-rails52
     SUBDIR += rubygem-roadie3
     SUBDIR += rubygem-ruby-qmail
     SUBDIR += rubygem-tmail
diff --git a/mail/rubygem-roadie-rails/Makefile b/mail/rubygem-roadie-rails-rails4/Makefile
index cc6da38bce1f..d1f8c896fdd2 100644
--- a/mail/rubygem-roadie-rails/Makefile
+++ b/mail/rubygem-roadie-rails-rails4/Makefile
@@ -3,8 +3,10 @@
 PORTNAME=	roadie-rails
 PORTVERSION=	1.3.0
 PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails4
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications
diff --git a/mail/rubygem-roadie-rails/distinfo b/mail/rubygem-roadie-rails-rails4/distinfo
index cfb495006c8e..cfb495006c8e 100644
--- a/mail/rubygem-roadie-rails/distinfo
+++ b/mail/rubygem-roadie-rails-rails4/distinfo
diff --git a/mail/rubygem-roadie-rails/pkg-descr b/mail/rubygem-roadie-rails-rails4/pkg-descr
index 6b7698d8afd5..6b7698d8afd5 100644
--- a/mail/rubygem-roadie-rails/pkg-descr
+++ b/mail/rubygem-roadie-rails-rails4/pkg-descr
diff --git a/mail/rubygem-roadie-rails52/Makefile b/mail/rubygem-roadie-rails-rails52/Makefile
index d565a912377d..3cbff48bca75 100644
--- a/mail/rubygem-roadie-rails52/Makefile
+++ b/mail/rubygem-roadie-rails-rails52/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	1.3.0
 PORTREVISION=	1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
-PKGNAMESUFFIX=	52
+PKGNAMESUFFIX=	-rails52
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications
diff --git a/mail/rubygem-roadie-rails52/distinfo b/mail/rubygem-roadie-rails-rails52/distinfo
index cfb495006c8e..cfb495006c8e 100644
--- a/mail/rubygem-roadie-rails52/distinfo
+++ b/mail/rubygem-roadie-rails-rails52/distinfo
diff --git a/mail/rubygem-roadie-rails52/pkg-descr b/mail/rubygem-roadie-rails-rails52/pkg-descr
index 6b7698d8afd5..6b7698d8afd5 100644
--- a/mail/rubygem-roadie-rails52/pkg-descr
+++ b/mail/rubygem-roadie-rails-rails52/pkg-descr
diff --git a/textproc/Makefile b/textproc/Makefile
index 15491ba26fd9..3be8454b1215 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1464,9 +1464,9 @@
     SUBDIR += ruby-rdtool
     SUBDIR += ruby-rttool
     SUBDIR += ruby-xmlparser
-    SUBDIR += rubygem-actionpack-xml_parser
-    SUBDIR += rubygem-actionpack-xml_parser1
-    SUBDIR += rubygem-actionpack-xml_parser52
+    SUBDIR += rubygem-actionpack-xml_parser-rails5
+    SUBDIR += rubygem-actionpack-xml_parser-rails52
+    SUBDIR += rubygem-actionpack-xml_parser1-rails4
     SUBDIR += rubygem-actiontext60
     SUBDIR += rubygem-albino
     SUBDIR += rubygem-amatch
diff --git a/textproc/rubygem-actionpack-xml_parser/Makefile b/textproc/rubygem-actionpack-xml_parser-rails5/Makefile
index 481ddd703e75..c90118f762db 100644
--- a/textproc/rubygem-actionpack-xml_parser/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser-rails5/Makefile
@@ -3,8 +3,10 @@
 
 PORTNAME=	actionpack-xml_parser
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack
diff --git a/textproc/rubygem-actionpack-xml_parser/distinfo b/textproc/rubygem-actionpack-xml_parser-rails5/distinfo
index 54f81563630e..54f81563630e 100644
--- a/textproc/rubygem-actionpack-xml_parser/distinfo
+++ b/textproc/rubygem-actionpack-xml_parser-rails5/distinfo
diff --git a/textproc/rubygem-actionpack-xml_parser/pkg-descr b/textproc/rubygem-actionpack-xml_parser-rails5/pkg-descr
index 14e1b01992f9..14e1b01992f9 100644
--- a/textproc/rubygem-actionpack-xml_parser/pkg-descr
+++ b/textproc/rubygem-actionpack-xml_parser-rails5/pkg-descr
diff --git a/textproc/rubygem-actionpack-xml_parser52/Makefile b/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
index 7c053956a7f3..00049e04a4fc 100644
--- a/textproc/rubygem-actionpack-xml_parser52/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	actionpack-xml_parser
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
-PKGNAMESUFFIX=	52
+PKGNAMESUFFIX=	-rails52
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack
diff --git a/textproc/rubygem-actionpack-xml_parser52/distinfo b/textproc/rubygem-actionpack-xml_parser-rails52/distinfo
index 54f81563630e..54f81563630e 100644
--- a/textproc/rubygem-actionpack-xml_parser52/distinfo
+++ b/textproc/rubygem-actionpack-xml_parser-rails52/distinfo
diff --git a/textproc/rubygem-actionpack-xml_parser1/pkg-descr b/textproc/rubygem-actionpack-xml_parser-rails52/pkg-descr
index 14e1b01992f9..14e1b01992f9 100644
--- a/textproc/rubygem-actionpack-xml_parser1/pkg-descr
+++ b/textproc/rubygem-actionpack-xml_parser-rails52/pkg-descr
diff --git a/textproc/rubygem-actionpack-xml_parser1/Makefile b/textproc/rubygem-actionpack-xml_parser1-rails4/Makefile
index 9321cac7c86c..f66e891947a7 100644
--- a/textproc/rubygem-actionpack-xml_parser1/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser1-rails4/Makefile
@@ -3,9 +3,10 @@
 
 PORTNAME=	actionpack-xml_parser
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
-PKGNAMESUFFIX=	1
+PKGNAMESUFFIX=	1-rails4
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack
diff --git a/textproc/rubygem-actionpack-xml_parser1/distinfo b/textproc/rubygem-actionpack-xml_parser1-rails4/distinfo
index 5c39bfa169f9..5c39bfa169f9 100644
--- a/textproc/rubygem-actionpack-xml_parser1/distinfo
+++ b/textproc/rubygem-actionpack-xml_parser1-rails4/distinfo
diff --git a/textproc/rubygem-actionpack-xml_parser52/pkg-descr b/textproc/rubygem-actionpack-xml_parser1-rails4/pkg-descr
index 14e1b01992f9..14e1b01992f9 100644
--- a/textproc/rubygem-actionpack-xml_parser52/pkg-descr
+++ b/textproc/rubygem-actionpack-xml_parser1-rails4/pkg-descr
diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 3b0c721b6e52..b969d475f3f5 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	3.4.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 
@@ -24,9 +24,9 @@ RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
 		rubygem-mime-types>=3.0:misc/rubygem-mime-types \
 		rubygem-protected_attributes>=0:devel/rubygem-protected_attributes \
-		rubygem-actionpack-xml_parser1>=0:textproc/rubygem-actionpack-xml_parser1 \
+		rubygem-actionpack-xml_parser1-rails4>=0:textproc/rubygem-actionpack-xml_parser1-rails4 \
 		rubygem-roadie3>=3.2.1<4:mail/rubygem-roadie3 \
-		rubygem-roadie-rails>=1.1.1:mail/rubygem-roadie-rails \
+		rubygem-roadie-rails-rails4>=1.1.1:mail/rubygem-roadie-rails-rails4 \
 		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
 		rubygem-mail>=2.6.4:mail/rubygem-mail \
 		rubygem-nokogiri18>=1.8.1:textproc/rubygem-nokogiri18 \
diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile
index 0091fc2ace7f..cfe79a7ba064 100644
--- a/www/redmine4/Makefile
+++ b/www/redmine4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	redmine
 PORTVERSION=	4.0.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.redmine.org/releases/
 PKGNAMESUFFIX=	4
@@ -13,15 +14,13 @@ COMMENT=	Flexible project management web application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
-BROKEN=		conflicting dependencies
-
 RUN_DEPENDS=	rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \
 		rubygem-rails52>=5.2.4.1:www/rubygem-rails52 \
 		rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \
 		rubygem-request_store>=1.0.5:devel/rubygem-request_store \
 		rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \
-		rubygem-actionpack-xml_parser52>=0:textproc/rubygem-actionpack-xml_parser52 \
-		rubygem-roadie-rails52>=1.3.0:mail/rubygem-roadie-rails52 \
+		rubygem-actionpack-xml_parser-rails52>=0:textproc/rubygem-actionpack-xml_parser-rails52 \
+		rubygem-roadie-rails-rails52>=1.3.0:mail/rubygem-roadie-rails-rails52 \
 		rubygem-mimemagic>=0:misc/rubygem-mimemagic \
 		rubygem-mail>=2.7.1:mail/rubygem-mail \
 		rubygem-nokogiri>=1.10.0:textproc/rubygem-nokogiri \