From owner-cvs-all@FreeBSD.ORG  Thu Sep 29 13:43:45 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 90F6816A41F;
	Thu, 29 Sep 2005 13:43:45 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F9A743D48;
	Thu, 29 Sep 2005 13:43:45 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8TDhjPs025915;
	Thu, 29 Sep 2005 13:43:45 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from marius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8TDhjbr025914;
	Thu, 29 Sep 2005 13:43:45 GMT (envelope-from marius)
Message-Id: <200509291343.j8TDhjbr025914@repoman.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 29 Sep 2005 13:43:45 +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/archivers/rpm 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: Thu, 29 Sep 2005 13:43:45 -0000

marius      2005-09-29 13:43:45 UTC

  FreeBSD ports repository (src committer)

  Modified files:
    archivers/rpm        Makefile 
  Log:
  Add a missing CONFLICTS on archivers/rpm4.
  
  Approved by:    netchild
  
  Revision  Changes    Path
  1.54      +2 -0      ports/archivers/rpm/Makefile