From owner-svn-ports-head@FreeBSD.ORG  Thu Apr  2 20:39:02 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1C86678A;
 Thu,  2 Apr 2015 20:39:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0794286;
 Thu,  2 Apr 2015 20:39:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t32Kd1iH079537;
 Thu, 2 Apr 2015 20:39:01 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t32Kd1AQ079536;
 Thu, 2 Apr 2015 20:39:01 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201504022039.t32Kd1AQ079536@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Thu, 2 Apr 2015 20:39:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r383067 - head/devel/rubygem-sprockets22
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Apr 2015 20:39:02 -0000

Author: swills
Date: Thu Apr  2 20:39:00 2015
New Revision: 383067
URL: https://svnweb.freebsd.org/changeset/ports/383067

Log:
  devel/rubygem-sprockets22: remove conflict with latest sprockets, it is not needed

Modified:
  head/devel/rubygem-sprockets22/Makefile

Modified: head/devel/rubygem-sprockets22/Makefile
==============================================================================
--- head/devel/rubygem-sprockets22/Makefile	Thu Apr  2 20:35:49 2015	(r383066)
+++ head/devel/rubygem-sprockets22/Makefile	Thu Apr  2 20:39:00 2015	(r383067)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	rubygem-hike>=1.2:${PORTSDI
 		rubygem-rack>=1.0:${PORTSDIR}/www/rubygem-rack \
 		rubygem-tilt1>=1.1:${PORTSDIR}/devel/rubygem-tilt1
 
-CONFLICTS_INSTALL=	rubygem-sprockets211-[0-9]* rubygem-sprockets-[0-9]*
+CONFLICTS_INSTALL=	rubygem-sprockets211-[0-9]*
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes