From owner-cvs-ports@FreeBSD.ORG  Fri May 11 19:27:20 2012
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 E14351065674;
	Fri, 11 May 2012 19:27:20 +0000 (UTC)
	(envelope-from crees@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B4F288FC16;
	Fri, 11 May 2012 19:27:20 +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 q4BJRKeS042787;
	Fri, 11 May 2012 19:27:20 GMT
	(envelope-from crees@repoman.freebsd.org)
Received: (from crees@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q4BJRKL9042786;
	Fri, 11 May 2012 19:27:20 GMT (envelope-from crees)
Message-Id: <201205111927.q4BJRKL9042786@repoman.freebsd.org>
From: Chris Rees <crees@FreeBSD.org>
Date: Fri, 11 May 2012 19:27:20 +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/irc/ircd-ratbox Makefile
 ports/irc/ircd-ratbox-devel Makefile
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: Fri, 11 May 2012 19:27:21 -0000

crees       2012-05-11 19:27:20 UTC

  FreeBSD ports repository

  Modified files:
    irc/ircd-ratbox      Makefile 
    irc/ircd-ratbox-devel Makefile 
  Log:
  Register CONFLICTS with charybdis; both install files in same place
  
  PR:             ports/167556
  Approved by:    maintainer (moggie@elasticmind.net)
  
  Revision  Changes    Path
  1.28      +1 -1      ports/irc/ircd-ratbox-devel/Makefile
  1.21      +1 -1      ports/irc/ircd-ratbox/Makefile