From owner-cvs-ports@FreeBSD.ORG Tue Jun 16 16:03:57 2009 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE3771065672; Tue, 16 Jun 2009 16:03:57 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from EXHUB015-3.exch015.msoutlookonline.net (exhub015-3.exch015.msoutlookonline.net [207.5.72.95]) by mx1.freebsd.org (Postfix) with ESMTP id A53908FC16; Tue, 16 Jun 2009 16:03:57 +0000 (UTC) (envelope-from pgollucci@p6m7g8.com) Received: from philip.hq.rws (76.161.175.34) by smtpx15.msoutlookonline.net (207.5.72.103) with Microsoft SMTP Server (TLS) id 8.1.358.0; Tue, 16 Jun 2009 09:03:57 -0700 Message-ID: <4A37C26A.6000200@p6m7g8.com> Date: Tue, 16 Jun 2009 12:03:54 -0400 From: "Philip M. Gollucci" Organization: P6 Web Application User-Agent: Thunderbird 2.0.0.21 (X11/20090403) MIME-Version: 1.0 To: Renato Botelho References: <200906161123.n5GBNTpv037912@repoman.freebsd.org> In-Reply-To: <200906161123.n5GBNTpv037912@repoman.freebsd.org> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/net/rubygem-geoip Makefile ports/net/ruby-net-geoip Makefile X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 16:03:58 -0000 Oops, sorry, I meant they are the same thing, we only need one. Renato Botelho wrote: > garga 2009-06-16 11:23:29 UTC > > FreeBSD ports repository > > Modified files: > net/rubygem-geoip Makefile > net/ruby-net-geoip Makefile > Log: > Set CONFLICTS between rubygem-geoip and ruby-net-geoip > > Reported by: pgollucci > > Revision Changes Path > 1.16 +2 -0 ports/net/ruby-net-geoip/Makefile > 1.2 +2 -0 ports/net/rubygem-geoip/Makefile > > http://cvsweb.FreeBSD.org/ports/net/ruby-net-geoip/Makefile.diff?r1=1.15&r2=1.16&f=h > | --- ports/net/ruby-net-geoip/Makefile 2007/07/22 19:53:51 1.15 > | +++ ports/net/ruby-net-geoip/Makefile 2009/06/16 11:23:29 1.16 > | @@ -2,7 +2,7 @@ > | # Date created: 2002-10-08 > | # Whom: Sean Chittenden > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/ruby-net-geoip/Makefile,v 1.15 2007/07/22 19:53:51 laszlof Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/ruby-net-geoip/Makefile,v 1.16 2009/06/16 11:23:29 garga Exp $ > | # > | > | PORTNAME= net-geoip > | @@ -23,6 +23,8 @@ USE_RUBY= yes > | USE_RUBY_EXTCONF= yes > | INSTALL_TARGET= site-install > | > | +CONFLICTS= rubygem-geoip-[0-9]* > | + > | DOCS= README > | > | post-install: > http://cvsweb.FreeBSD.org/ports/net/rubygem-geoip/Makefile.diff?r1=1.1&r2=1.2&f=h > | --- ports/net/rubygem-geoip/Makefile 2009/06/15 20:47:57 1.1 > | +++ ports/net/rubygem-geoip/Makefile 2009/06/16 11:23:29 1.2 > | @@ -2,7 +2,7 @@ > | # Date created: 2009-06-15 > | # Whom: Renato Botelho > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/rubygem-geoip/Makefile,v 1.1 2009/06/15 20:47:57 garga Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/net/rubygem-geoip/Makefile,v 1.2 2009/06/16 11:23:29 garga Exp $ > | # > | > | PORTNAME= geoip > | @@ -15,6 +15,8 @@ COMMENT= Geoip implementation for rubyge > | > | RUN_DEPENDS= geoiplookup:${PORTSDIR}/net/GeoIP > | > | +CONFLICTS= ruby-net-geoip-[0-9]* > | + > | USE_RUBY= yes > | USE_RUBYGEMS= yes > | RUBYGEM_AUTOPLIST= yes -- ------------------------------------------------------------------------ 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354 Consultant - P6M7G8 Inc. http://p6m7g8.net Senior Sys Admin - RideCharge, Inc. http://ridecharge.com Contractor - PositiveEnergyUSA http://positiveenergyusa.com ASF Member - Apache Software Foundation http://apache.org FreeBSD Committer - FreeBSD Foundation http://freebsd.org Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching.