From owner-cvs-all@FreeBSD.ORG  Wed Jan 30 08:25:45 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 956F816A5A5;
	Wed, 30 Jan 2008 08:25:45 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 646A213C458;
	Wed, 30 Jan 2008 08:25:45 +0000 (UTC)
	(envelope-from dinoex@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 m0U8Pj2L000902;
	Wed, 30 Jan 2008 08:25:45 GMT
	(envelope-from dinoex@repoman.freebsd.org)
Received: (from dinoex@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0U8PjAR000901;
	Wed, 30 Jan 2008 08:25:45 GMT (envelope-from dinoex)
Message-Id: <200801300825.m0U8PjAR000901@repoman.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Wed, 30 Jan 2008 08:25: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/net-p2p/amule2 Makefile ports/net-p2p/ed2k
 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: Wed, 30 Jan 2008 08:25:45 -0000

dinoex      2008-01-30 08:25:45 UTC

  FreeBSD ports repository

  Modified files:
    net-p2p/amule2       Makefile 
    net-p2p/ed2k         Makefile 
  Log:
  - add CONFLICTS for bin/ed2k
  PR:             120112
  Submitted by:   Yar Tikhiy
  
  Revision  Changes    Path
  1.21      +1 -1      ports/net-p2p/amule2/Makefile
  1.3       +1 -0      ports/net-p2p/ed2k/Makefile