svn commit: r527641 - in head: . mail mail/rubygem-roadie-rails mail/rubygem-roadie-rails-rails4 mail/rubygem-roadie-rails-rails52 mail/rubygem-roadie-rails52 textproc textproc/rubygem-actionpack-x...

Mon Mar 2 16:30:21 UTC 2020

Author: mfechner
Date: Mon Mar  2 16:30:18 2020
New Revision: 527641
URL: https://svnweb.freebsd.org/changeset/ports/527641

Log:
  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.

Added:
  head/mail/rubygem-roadie-rails-rails4/
     - copied from r527640, head/mail/rubygem-roadie-rails/
  head/mail/rubygem-roadie-rails-rails52/
     - copied from r527640, head/mail/rubygem-roadie-rails52/
  head/textproc/rubygem-actionpack-xml_parser-rails5/
     - copied from r527640, head/textproc/rubygem-actionpack-xml_parser/
  head/textproc/rubygem-actionpack-xml_parser-rails52/
     - copied from r527640, head/textproc/rubygem-actionpack-xml_parser52/
  head/textproc/rubygem-actionpack-xml_parser1-rails4/
     - copied from r527640, head/textproc/rubygem-actionpack-xml_parser1/
Deleted:
  head/mail/rubygem-roadie-rails/
  head/mail/rubygem-roadie-rails52/
  head/textproc/rubygem-actionpack-xml_parser/
  head/textproc/rubygem-actionpack-xml_parser1/
  head/textproc/rubygem-actionpack-xml_parser52/
Modified:
  head/MOVED
  head/mail/Makefile
  head/mail/rubygem-roadie-rails-rails4/Makefile
  head/mail/rubygem-roadie-rails-rails52/Makefile
  head/textproc/Makefile
  head/textproc/rubygem-actionpack-xml_parser-rails5/Makefile
  head/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
  head/textproc/rubygem-actionpack-xml_parser1-rails4/Makefile
  head/www/redmine/Makefile
  head/www/redmine4/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/MOVED	Mon Mar  2 16:30:18 2020	(r527641)
@@ -14452,3 +14452,8 @@ x11-toolkits/py-kiwi-gtk||2020-03-01|Has expired: Old,
 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

Modified: head/mail/Makefile
==============================================================================
--- head/mail/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/mail/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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

Modified: head/mail/rubygem-roadie-rails-rails4/Makefile
==============================================================================
--- head/mail/rubygem-roadie-rails/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/mail/rubygem-roadie-rails-rails4/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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 at FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications

Modified: head/mail/rubygem-roadie-rails-rails52/Makefile
==============================================================================
--- head/mail/rubygem-roadie-rails52/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/mail/rubygem-roadie-rails-rails52/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -5,7 +5,7 @@ PORTVERSION=	1.3.0
 PORTREVISION=	1
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
-PKGNAMESUFFIX=	52
+PKGNAMESUFFIX=	-rails52
 
 MAINTAINER=	mikael at FreeBSD.org
 COMMENT=	Helper for generating HTML mails in Rails applications

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/textproc/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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

Modified: head/textproc/rubygem-actionpack-xml_parser-rails5/Makefile
==============================================================================
--- head/textproc/rubygem-actionpack-xml_parser/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/textproc/rubygem-actionpack-xml_parser-rails5/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -3,8 +3,10 @@
 
 PORTNAME=	actionpack-xml_parser
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails5
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack

Modified: head/textproc/rubygem-actionpack-xml_parser-rails52/Makefile
==============================================================================
--- head/textproc/rubygem-actionpack-xml_parser52/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/textproc/rubygem-actionpack-xml_parser-rails52/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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 at FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack

Modified: head/textproc/rubygem-actionpack-xml_parser1-rails4/Makefile
==============================================================================
--- head/textproc/rubygem-actionpack-xml_parser1/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/textproc/rubygem-actionpack-xml_parser1-rails4/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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 at FreeBSD.org
 COMMENT=	XML parameters parser for Action Pack

Modified: head/www/redmine/Makefile
==============================================================================
--- head/www/redmine/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/www/redmine/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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-b
 		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 \

Modified: head/www/redmine4/Makefile
==============================================================================
--- head/www/redmine4/Makefile	Mon Mar  2 16:28:01 2020	(r527640)
+++ head/www/redmine4/Makefile	Mon Mar  2 16:30:18 2020	(r527641)
@@ -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 \
