svn commit: r368255 - in head/www: rubygem-railties rubygem-railties4

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Mon Sep 15 08:47:28 2014
New Revision: 368255
URL: http://svnweb.freebsd.org/changeset/ports/368255
QAT: https://qat.redports.org/buildarchive/r368255/

Log:
  - Mark CONFLICTS_INSTALL between www/rubygem-railties and www/rubygem-railties4

Modified:
  head/www/rubygem-railties/Makefile
  head/www/rubygem-railties4/Makefile

Modified: head/www/rubygem-railties/Makefile
==============================================================================
--- head/www/rubygem-railties/Makefile	Mon Sep 15 08:03:49 2014	(r368254)
+++ head/www/rubygem-railties/Makefile	Mon Sep 15 08:47:28 2014	(r368255)
@@ -17,6 +17,8 @@ RUN_DEPENDS=	rubygem-actionpack>=${PORTV
 		rubygem-rack-ssl>=1.3.2:${PORTSDIR}/www/rubygem-rack-ssl \
 		rubygem-rake>=0:${PORTSDIR}/devel/rubygem-rake
 
+CONFLICTS_INSTALL=	rubygem-railties4-[0-9]*
+
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RUBYGEMS=	yes

Modified: head/www/rubygem-railties4/Makefile
==============================================================================
--- head/www/rubygem-railties4/Makefile	Mon Sep 15 08:03:49 2014	(r368254)
+++ head/www/rubygem-railties4/Makefile	Mon Sep 15 08:47:28 2014	(r368255)
@@ -16,6 +16,8 @@ RUN_DEPENDS=	rubygem-actionpack4>=${PORT
 		rubygem-activesupport4>=${PORTVERSION}:${PORTSDIR}/devel/rubygem-activesupport4 \
 		rubygem-thor>=0.18.1:${PORTSDIR}/devel/rubygem-thor
 
+CONFLICTS_INSTALL=	rubygem-railties-[0-9]*
+
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RUBYGEMS=	yes