From owner-cvs-ports@FreeBSD.ORG  Mon Sep 20 23:09:06 2010
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
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 B83BD1065672;
	Mon, 20 Sep 2010 23:09:06 +0000 (UTC)
	(envelope-from adamw@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8EA568FC12;
	Mon, 20 Sep 2010 23:09:06 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o8KN96mW080686;
	Mon, 20 Sep 2010 23:09:06 GMT
	(envelope-from adamw@repoman.freebsd.org)
Received: (from adamw@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o8KN96Pl080685;
	Mon, 20 Sep 2010 23:09:06 GMT (envelope-from adamw)
Message-Id: <201009202309.o8KN96Pl080685@repoman.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 20 Sep 2010 23:09:06 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/shells/bash-completion Makefile pkg-plist
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Sep 2010 23:09:06 -0000

adamw       2010-09-20 23:09:06 UTC

  FreeBSD ports repository

  Modified files:
    shells/bash-completion Makefile pkg-plist 
  Log:
  Now that shells/bash-completion-classic is in the tree, register a
  conflict with it. Also, remove the rsync-disable hack on amd64, and
  replace it with a simple BROKEN message.
  
  Note that shells/bash-completion-classic is currently an unedited
  repocopy, but I know ehaupt is working to get it up and running.
  
  Revision  Changes    Path
  1.22      +3 -6      ports/shells/bash-completion/Makefile
  1.5       +1 -1      ports/shells/bash-completion/pkg-plist