From owner-svn-ports-head@FreeBSD.ORG Thu Aug 29 12:47:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9D88A866; Thu, 29 Aug 2013 12:47:32 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A9042430; Thu, 29 Aug 2013 12:47:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7TClWjB013680; Thu, 29 Aug 2013 12:47:32 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7TClW0Z013679; Thu, 29 Aug 2013 12:47:32 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201308291247.r7TClW0Z013679@svn.freebsd.org> From: Bryan Drewery Date: Thu, 29 Aug 2013 12:47:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325588 - head/devel/bzr-grep 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Aug 2013 12:47:32 -0000 Author: bdrewery Date: Thu Aug 29 12:47:31 2013 New Revision: 325588 URL: http://svnweb.freebsd.org/changeset/ports/325588 Log: - Mark BROKEN ===> Registering installation for bzr-grep-0.4.0_2 Installing bzr-grep-0.4.0_2...pkg-static: bzr-grep-0.4.0_2 conflicts with bzr-2.6.0 (installs files into the same place). Problematic file: /usr/local/lib/python2.7/site-packages/bzrlib/plugins/grep/__init__.py With hat: portmgr Modified: head/devel/bzr-grep/Makefile Modified: head/devel/bzr-grep/Makefile ============================================================================== --- head/devel/bzr-grep/Makefile Thu Aug 29 12:46:55 2013 (r325587) +++ head/devel/bzr-grep/Makefile Thu Aug 29 12:47:31 2013 (r325588) @@ -1,9 +1,5 @@ -# Ports collection makefile for: bzr-grep -# Date created: 9 Jun 2010 -# Whom: Carlo Strub -# +# Created by: Carlo Strub # $FreeBSD$ -# PORTNAME= bzr-grep PORTVERSION= 0.4.0 @@ -15,6 +11,8 @@ MASTER_SITES= http://launchpadlibrarian. MAINTAINER= cs@FreeBSD.org COMMENT= Bazaar plugin to grep files +BROKEN= conflicts with dependency bzr + BUILD_DEPENDS= bzr:${PORTSDIR}/devel/bzr RUN_DEPENDS= bzr:${PORTSDIR}/devel/bzr