Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Mar 2018 10:06:16 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r464671 - in head/www: rubygem-unicorn rubygem-unicorn51
Message-ID:  <201803161006.w2GA6GVO008391@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Fri Mar 16 10:06:15 2018
New Revision: 464671
URL: https://svnweb.freebsd.org/changeset/ports/464671

Log:
  Fix typo in CONFLICTS_INSTALL in www/rubygem-unicorn51
  Add corresponding CONFLICTS_INSTALL in www/rubygem-unicorn
  Pet portlint
  
  Approved by:	portmgr (blanket)

Modified:
  head/www/rubygem-unicorn/Makefile
  head/www/rubygem-unicorn51/Makefile

Modified: head/www/rubygem-unicorn/Makefile
==============================================================================
--- head/www/rubygem-unicorn/Makefile	Fri Mar 16 09:56:45 2018	(r464670)
+++ head/www/rubygem-unicorn/Makefile	Fri Mar 16 10:06:15 2018	(r464671)
@@ -17,8 +17,10 @@ LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-kgio>=2.6:devel/rubygem-kgio \
 		rubygem-raindrops>=0.7:www/rubygem-raindrops
 
-USE_RUBY=	yes
+CONFLICTS_INSTALL=	rubygem-unicorn51
+
 USES=		gem shebangfix
+USE_RUBY=	yes
 
 PLIST_FILES=	bin/unicorn bin/unicorn_rails
 

Modified: head/www/rubygem-unicorn51/Makefile
==============================================================================
--- head/www/rubygem-unicorn51/Makefile	Fri Mar 16 09:56:45 2018	(r464670)
+++ head/www/rubygem-unicorn51/Makefile	Fri Mar 16 10:06:15 2018	(r464671)
@@ -20,7 +20,7 @@ RUN_DEPENDS=	rubygem-kgio>=2.6:devel/rubygem-kgio \
 USES=		gem shebangfix
 USE_RUBY=	yes
 
-CONFLICT_INSTALL=	rubygems-unicorn
+CONFLICTS_INSTALL=	rubygem-unicorn
 PORTSCOUT=	limit:^5\.1
 
 PLIST_FILES=	bin/unicorn bin/unicorn_rails



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803161006.w2GA6GVO008391>