From owner-cvs-all@FreeBSD.ORG  Sat Jun 14 02:19:55 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BEACD106564A;
	Sat, 14 Jun 2008 02:19:55 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9834D8FC19;
	Sat, 14 Jun 2008 02:19:55 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5E2JtuO092823;
	Sat, 14 Jun 2008 02:19:55 GMT (envelope-from wxs@repoman.freebsd.org)
Received: (from wxs@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5E2JthI092822;
	Sat, 14 Jun 2008 02:19:55 GMT (envelope-from wxs)
Message-Id: <200806140219.m5E2JthI092822@repoman.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Sat, 14 Jun 2008 02:19:55 +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/databases/rrdtool Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Jun 2008 02:19:55 -0000

wxs         2008-06-14 02:19:55 UTC

  FreeBSD ports repository

  Modified files:
    databases/rrdtool    Makefile 
  Log:
  Add CONFLICTS on rrdtool-1.0* - they both install identical files.
  
  PR:             ports/124135
  Submitted by:   wxs
  Approved by:    maintainer timeout
  
  Revision  Changes    Path
  1.75      +3 -0      ports/databases/rrdtool/Makefile